summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2014-10-17 18:50:40 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2014-10-17 18:50:40 +0000
commitfeededbd7731ee0736f31493233cc1ef087a8494 (patch)
tree0d6ff4a754519030b783fa862680095a02e5bbe8 /kde-base/print-manager
parentBackport multilib support into 1.5.4:0, for stabilization bug #524308. (diff)
downloadhistorical-feededbd7731ee0736f31493233cc1ef087a8494.tar.gz
historical-feededbd7731ee0736f31493233cc1ef087a8494.tar.bz2
historical-feededbd7731ee0736f31493233cc1ef087a8494.zip
Fix build with cups-2.0, bug 525598
Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64 Manifest-Sign-Key: 0xEBE6A336BE19039C!
Diffstat (limited to 'kde-base/print-manager')
-rw-r--r--kde-base/print-manager/ChangeLog6
-rw-r--r--kde-base/print-manager/Manifest35
-rw-r--r--kde-base/print-manager/files/print-manager-4.14.1-cups20.patch72
-rw-r--r--kde-base/print-manager/print-manager-4.14.1.ebuild4
4 files changed, 99 insertions, 18 deletions
diff --git a/kde-base/print-manager/ChangeLog b/kde-base/print-manager/ChangeLog
index 8e7b266fd1d4..a2859fc8b191 100644
--- a/kde-base/print-manager/ChangeLog
+++ b/kde-base/print-manager/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/print-manager
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/print-manager/ChangeLog,v 1.84 2014/09/16 18:17:33 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/print-manager/ChangeLog,v 1.85 2014/10/17 18:50:30 dilfridge Exp $
+
+ 17 Oct 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+ print-manager-4.14.1.ebuild, +files/print-manager-4.14.1-cups20.patch:
+ Fix build with cups-2.0, bug 525598
*print-manager-4.14.1 (16 Sep 2014)
diff --git a/kde-base/print-manager/Manifest b/kde-base/print-manager/Manifest
index fee57eb7a537..393db06e9ca6 100644
--- a/kde-base/print-manager/Manifest
+++ b/kde-base/print-manager/Manifest
@@ -1,6 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX print-manager-4.14.1-cups20.patch 3354 SHA256 3fe146c93765f20d9e8156c82132a3fadaaee6481b5a0bb33599d38bbdb72106 SHA512 ee524b2571c98196c9c08cec46d5f9c0703ad21e39a8b9eed25268dd5717515844b5be5d0aa08c5b2dd466411feefba8608ff947860a14bb7c914add58a8bef5 WHIRLPOOL 350eab4b312ef824f4dd385810b0b75d9a4efd00b982a155d399dc57c2f4a50574bba1f45bd7e03acc2ad3bfdfe6f7bdf0ca4f2c32199573515f79d4595acf25
DIST print-manager-4.12.5.tar.xz 92376 SHA256 dd6e5bbc2c817af2b5f1920aae68a1c46c97d2c1f5865a8729544c5e065c5448 SHA512 38579d0c54909e9a43693c58273e9f6ac897f2c36987f287ed260449151672e239fbf7fef9a2f96412078356a944e9729743220e24dbe085ac723cc7b133c877 WHIRLPOOL 3555dc577fb66fedcc9878db7099f76c703e2d90b58091a5faf8d6e18a7987f9524ccd1c5c71243f847ec09d5a2db1f97a96adf909d35d4df2f62dca15ff963b
DIST print-manager-4.13.3.tar.xz 92420 SHA256 c3d0d3c6914b386420fc9c1bd2a3dc476d6456016b7a8ef14be05cccd5a26dc6 SHA512 a342c5c3ae11010db917f91154333f54ea8018b8aabf0f95593321f82c403302487e7c1d7092de1fd6f31c6de3578d1f88f27d7cdc61bcf2dd000b323d576ed8 WHIRLPOOL 74ce68249a932bd155b31db83c467ff9649d9cd0b6fffcc2be8c8be7e386f30a3074ac27518c25381956fa04382cade040bbbc5124092d6546b3548881020c50
DIST print-manager-4.14.0.tar.xz 92476 SHA256 9619ad5ec7adeb4c5e65057e7c0fc977b577a8aa1b177087d6224edfbb3ac9dd SHA512 0f4eb9be774161efd31f849822df0e95409e0499647300cc3fcffc74a471770cf28500b1ad910d36180c60230591b402bab8a2593d9bd5c88f4e3a66589605eb WHIRLPOOL 3ef329b43c60e88d74515a1ef378c57dfc33d918b5b10d1e1b8fc23f31ce3523ec71ca5d24ecb9f044d183d4b46fcfe3d5979d8213ed1a06230bc13299dac60a
@@ -8,23 +9,25 @@ DIST print-manager-4.14.1.tar.xz 92464 SHA256 74d9c20ce60227150bed14793bf9a07915
EBUILD print-manager-4.12.5.ebuild 576 SHA256 13990254597f7a280a18e913753bc997e74c98eb20b80e21302f7ad8d2f8f43a SHA512 349853c249b5f34cca333193879ae0fac94c3d153593f8fb5c001569609db9031f94a7f44b84ff03b2a51f052f5635505f030a5bd9900ab8d290e7197868727c WHIRLPOOL 89de76d086d99b5fe85ae146d14d298a7cc58290e6247db14d494bf3009fb3ca5d8efe97ff718bce327478bb5dce255e6e363d7bbaffff324e370df1c71d551d
EBUILD print-manager-4.13.3.ebuild 582 SHA256 cf19f2a47824a9bea21223dec0c59e22ecef7b5ab169220b253f5c44ae4afb5a SHA512 33c3dc852a2501807e342d133586180a1516760790dcf6d6dd2013976e8efb79718286ea06a506344d6faeceafdea4dd2cefdf8914aa337c05b613768c356882 WHIRLPOOL 91e37651383d550c2f494c363233e179c6bca2c46f7da70b8d1809d0113377a8b952c1528501797073f631f72bc4e06b5535369b4cc843548b345ee974593f07
EBUILD print-manager-4.14.0.ebuild 581 SHA256 927d3fc369d8f733ec6c715f02e66f338d2465f71943d38bc6a550166e0c0fd0 SHA512 84649d0efd6c7136d99079a138bc3748712a1d362b6c49ea6f4972a26686877bb502f4f2184009b7309273e68318f512c7c57173cd9888e29eaf0eec71a3fe00 WHIRLPOOL 23b863a675d6b8d013c2bc349346d0ea32079e579d764c5d66994ed0274dea440a991a53fa9b786bbb36bcfb834444bcbeffb6a2c1ae4bfa1fbf2781fb7b9010
-EBUILD print-manager-4.14.1.ebuild 581 SHA256 4f0d7878ae7ede9564083edec35e7dbd5cbc2c9f258f6c4b2fd73ed0b5fe670d SHA512 715f905a256140703ed30d16d1266b160360e294431738f89db27af333c9cb31d7656e858dcf602c73bce745acf1f89b6f9c1b54806e6b0842a7ed02cdd6d5d1 WHIRLPOOL c64994acf58ff361a2db9da9ec0896ef8bc23c8d99dbb51e6db1d5a1266fc228c62b391f62bffdf15a6228195c0f6a191d5a17e5d6330bba255f9f7dab87d4c5
-MISC ChangeLog 10487 SHA256 8187a57ff6353ca00d0c3372eb0e8ae4ed697614c3e940c66a8062a67ff89748 SHA512 8932613904737b15a512e569164367411ab0fcce15926c8e26ea5a0c7cca4f04b6af86c6f0f881a34bb2d246f14bb38d0622409ad3ef05f5cb286e2828dbfd84 WHIRLPOOL 97433586a0f2bef42c603748dbbd95baadf571c14a7af086867cba6c412b74fc0beffa580545c06b6b256312d1ab6304bcade6e4ea0a6a2cc77c9606ba690347
+EBUILD print-manager-4.14.1.ebuild 639 SHA256 4199967af4aa4b751d7bf37759343e9ed2f91a1fa17ad16b2edb31fdc3eae571 SHA512 e104931ecd7579f433612a80d630cc701117179e6afb87fdaefe6511bb68b2778691df61ad6942f233d4768221aed9d1ee2ff24d63d46a77a084f11747c952d7 WHIRLPOOL 335b509fba84820c80161828848ba0b242b26024bff179691ca17bcc06d015e78dba03944b4a6acd92c0e5bab2d606e5a68a84c6d9fb1ed7cf6a3d6bac874a2e
+MISC ChangeLog 10661 SHA256 f0f69b04a519fe64714e6041ccd83674781926be50807d6316aa1319bdec9f29 SHA512 d2077e7d38998a74e3b4da0a1f5aff933c704e42b354f26ca59c3bc99c5fa37ed707997aae38b3f377b6cc3bed9079bf7129b52815d563425401ee382ea6198e WHIRLPOOL b5e6ae7a47500596316c2082e46ce34977d2d1e55592a6e838c6864993fadc67733c4cac5f3afbd63a8fe43b5b73a80d2d85d37c47c7611d8949d4a35d32905d
MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
-iQIcBAEBCAAGBQJUGH+WAAoJEGVpnaTzz9K9MT4P/juwP8T10uT3nQ44TurL5a0l
-rGbhUppKBHfcTOsqde2t39xKqM/qWu+Q2Bj7etNP+ff7webeJVtrVivblcvvc0vT
-QVYzHgL0JYp98IWJJoGv9bNgWVh1878qnuRCTEiIEGmKPgJDWpMaHhmMKWMxRwGV
-cMK3ixZlJt+FHHjexNVjjnwqE8Wg3V9x6mZBmeIk0gO8Bx5SjoDI5Fxj7zgepc3Y
-mk9JNurR45ZYZSy+P8DIPhsnpKHRuRItn7fluCeRPQNIcQLZdHRiNhMwgxA6HrWx
-CZiEXr/AyrQRLo/D6vagUnY4zkQsD1kbdfhNKkEXPWeW4zRCvIN83jgrVDcAxRxd
-yigP+9SEBV6gEVUrei3k5Z/kKUy8jKM83sWuMpsg3/w2wNVTsO+5yNPHNX6s9DRW
-0H1+vxT5e7yc8RDMAJo1jJqNb5eQ2ptLATu7S68LMTynamigucdykusGQ7Cl57B3
-h4us47zEjJDPfBxdVZY8AQ9amXRmMeGNue49rAU7Z6hRwuYwWDk+Fxslrwgs7gYE
-nfsdDybXVkJO6siHU5r10MKTNTLTu1pQrTMPB/cT23QTbmv3GLzTUhu0uZIfXLdt
-cJIUlkIszxxTCKc2rIKcroXPwfsj239BiyWzUntuNAaWPizZ2ncDwtgX7oUO4F16
-TTJXrnVzx8nEptmcl2Xr
-=DpZ3
+iQJ8BAEBCABmBQJUQWT9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc65sP/jW5rpUQTT8JkmMXjggW8KyX
+em8y3/Jv7W3irPh27DEZ0yytt5dpgpzvk0cKIaM2eiSJcj4r7odSl9xgTYdaQwTu
+nHUlqi/q6PJ0AZdQMWq7+vbhDtvA3PRlJxoBcklik7UNP3dPbo9YC5UbbQDNEb+o
+oBoBySo3KPTij1Ag5aG/dTHeFbabS9UHctqCu5pdFrtz9ogGR1Sn6oouiaHRLQFF
+eOzn8LjOj6o4egkG8L1VufromMFN9NEAH+lwPZ0PpcEvuGjd3qO5KjX+0U6TKhkF
+XDi2DhDCYevE39S1H+kczKFHwX5WdFRnI4vpfeCnceBgnqCh2qmTOMFnHL514my+
+UTx9eb/U1AWaXauS3Xxioi2hN2juAaBYdrU4lZ//F05EMuIi5UYyczoxLyb0DxEZ
+XJJfe8fuLKBjUXIjFN5XrbtvvYRPm6OMCBkPT2yJRvOOBbhBXXwnTefKe8GoGWcj
+9n721E6gipqEWxAJg0qxeEihUFcfNWCn3gYW0gG4gJ9eRhrpcBKVSexe71ZQ4+kF
+6L07N61Z43Ndvoab+FfSK06P2Qpq4HpT6j55OsfHXAmb1H2tX4DSeShhJPkSVk7/
+LNW8vQikZdoPDZ+ajXMbm78cSFKZJXj6KkeiTw36LZZy9cAjwm1OpaWGh+yuDwlF
+Xz7INY1KIR7jOjZ4p0+J
+=wdDs
-----END PGP SIGNATURE-----
diff --git a/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch b/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch
new file mode 100644
index 000000000000..58c59dd61078
--- /dev/null
+++ b/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch
@@ -0,0 +1,72 @@
+diff --git a/libkcups/KCupsConnection.cpp b/libkcups/KCupsConnection.cpp
+index 713be2f..335fc46 100644
+--- a/libkcups/KCupsConnection.cpp
++++ b/libkcups/KCupsConnection.cpp
+@@ -377,11 +377,11 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration
+ response = request.sendIppRequest();
+ } while (retry("/", operation));
+
+-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
++#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
+ if (response && ippGetStatusCode(response) == IPP_OK) {
+ #else
+ if (response && response->request.status.status_code == IPP_OK) {
+-#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
++#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
+ ipp_attribute_t *attr;
+ if (subscriptionId >= 0) {
+ // Request was ok, just return the current subscription
+@@ -392,7 +392,7 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration
+ kWarning() << "No notify-subscription-id in response!";
+ ret = -1;
+ } else {
+-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
++#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
+ ret = ippGetInteger(attr, 0);
+ }
+ } else if (subscriptionId >= 0 && response && ippGetStatusCode(response) == IPP_NOT_FOUND) {
+@@ -406,7 +406,7 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration
+ kDebug() << "Subscription not found";
+ // When the subscription is not found try to get a new one
+ return renewDBusSubscription(-1, leaseDuration, events);
+-#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
++#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
+ } else {
+ kDebug() << "Request failed" << cupsLastError() << httpGetStatus(CUPS_HTTP_DEFAULT);
+ // When the server stops/restarts we will have some error so ignore it
+@@ -582,7 +582,7 @@ ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_t
+ ipp_attribute_t *attr;
+ ReturnArguments ret;
+
+-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
++#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
+ QVariantHash destAttributes;
+ for (attr = ippFirstAttribute(response); attr != NULL; attr = ippNextAttribute(response)) {
+ // We hit an attribute sepparator
+@@ -659,7 +659,7 @@ ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_t
+ break;
+ }
+ }
+-#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
++#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
+
+ return ret;
+ }
+@@ -667,7 +667,7 @@ ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_t
+ QVariant KCupsConnection::ippAttrToVariant(ipp_attribute_t *attr)
+ {
+ QVariant ret;
+-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
++#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
+ switch (ippGetValueTag(attr)) {
+ case IPP_TAG_INTEGER:
+ case IPP_TAG_ENUM:
+@@ -760,7 +760,7 @@ QVariant KCupsConnection::ippAttrToVariant(ipp_attribute_t *attr)
+ ret = values;
+ }
+ }
+-#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
++#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
+ return ret;
+ }
+
diff --git a/kde-base/print-manager/print-manager-4.14.1.ebuild b/kde-base/print-manager/print-manager-4.14.1.ebuild
index b1122bfcec3b..53bf65ea8e39 100644
--- a/kde-base/print-manager/print-manager-4.14.1.ebuild
+++ b/kde-base/print-manager/print-manager-4.14.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/print-manager/print-manager-4.14.1.ebuild,v 1.1 2014/09/16 18:17:33 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/print-manager/print-manager-4.14.1.ebuild,v 1.2 2014/10/17 18:50:30 dilfridge Exp $
EAPI=5
@@ -19,3 +19,5 @@ RDEPEND="${DEPEND}
!kde-misc/print-manager
app-admin/system-config-printer-gnome
"
+
+PATCHES=( "${FILESDIR}/${PN}-4.14.1-cups20.patch" )