diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-07-07 05:46:12 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-07-07 05:46:12 +0000 |
| commit | 19585e291b1cc7a9121613982b822536d8577c98 (patch) | |
| tree | f24447593437370819dfca364956264bcfa75bab /gnome-base | |
| parent | sed to ignore already sysmlink existence error. #515164 (diff) | |
| download | historical-19585e291b1cc7a9121613982b822536d8577c98.tar.gz historical-19585e291b1cc7a9121613982b822536d8577c98.tar.bz2 historical-19585e291b1cc7a9121613982b822536d8577c98.zip | |
Fix incomplete substitution of cups-config, bug #516566.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/libgnomeprint/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/libgnomeprint/Manifest | 32 | ||||
| -rw-r--r-- | gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch | 2 |
3 files changed, 22 insertions, 18 deletions
diff --git a/gnome-base/libgnomeprint/ChangeLog b/gnome-base/libgnomeprint/ChangeLog index 0f7db21fae30..d1067fd1823b 100644 --- a/gnome-base/libgnomeprint/ChangeLog +++ b/gnome-base/libgnomeprint/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/libgnomeprint # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.198 2014/06/29 09:45:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.199 2014/07/07 05:46:07 mgorny Exp $ + + 07 Jul 2014; Michał Górny <mgorny@gentoo.org> + files/libgnomeprint-2.18.8-cups-config.patch: + Fix incomplete substitution of cups-config, bug #516566. *libgnomeprint-2.18.8-r1 (29 Jun 2014) diff --git a/gnome-base/libgnomeprint/Manifest b/gnome-base/libgnomeprint/Manifest index d31ca5a0e360..b69ee09c5769 100644 --- a/gnome-base/libgnomeprint/Manifest +++ b/gnome-base/libgnomeprint/Manifest @@ -2,30 +2,30 @@ Hash: SHA256 AUX libgnomeprint-2.18.8-bison3.patch 861 SHA256 f90696e4ee1f4fb49bd3a3fe62e3443efef6f4918aeaf7586cab692a035463c3 SHA512 c13f2c5618bf28047e80155ed6d391930c5c986f4640d1e83aa3c323da7052bb2babf1772a37bc2782babd8ed072d18596d32792d4abf9440946dfd56e6cbfe8 WHIRLPOOL 35a128f849428a3bdb449b503783f6f26db4111ad66a6d5d446d23005ddbccfcd3b487b89cc955be86c1a2f1c9b77c1db2ebe67e2224b95eb0595d6d2f96cdae -AUX libgnomeprint-2.18.8-cups-config.patch 1447 SHA256 9a1f3a54ebd023f6b03805cbe695299ea2ba01234535cd9ec951884378b916a0 SHA512 d8574b6a387c376bbc1047146ceedffee754bdd406f9bceb2165832d867042c836cf3780cfdd29bbdeae8b7c1eb21b178d014ee84b8ec7c2d456da71fe2984b6 WHIRLPOOL 38813b5d432feb520df27bbb681d03de6b039fb31959e1f9df0d1b850c772cb4346e943599a6e943424b2a605bad309c8d5c901373196c82875f9673814986b6 +AUX libgnomeprint-2.18.8-cups-config.patch 1448 SHA256 6dc35755ab4baba1ae8a2a5531762b7ae9978197debe8fc2b4b3532704866c5d SHA512 3290c71f0be264afe94428fb5c2f68287371a02e7497b657c9d3b9ef9bc358f82773d17da94fe67e585233236b9b5f2aed2d01ea5dc1c7e8f50696e00d80c89d WHIRLPOOL cf93a0e01594a5c0a374809cc20428f3b529a600b8bc01393403bd234f89a4c75609ddc253c96f4163a841dbc0bdd515f8fd4779e242dc19b3903d6ec7317567 AUX libgnomeprint-2.18.8-freetype-2.5.1.patch 2993 SHA256 9a84d95d833fc77ebaefc7722cb5efe851a89cf139428c721829542f8492d215 SHA512 bb628829fd81ef2163540920a014effb219548c78837acb638eaded7a5fc077ace17c7287c6553c725e1452c0e87ded310bdf7811cadc309b9bfbfe7d7f9ca0f WHIRLPOOL 4622b611fdd9d97503b52a7eb0fedd3ea1ce488d850bbde637e7c8b151f3b52ac91bcb889ae36f904fa64fa27a1229a27c2e5aff005f4aedb40a95e69053e9af AUX libgnomeprint-2.18.8-stdio-include.patch 271 SHA256 9a0a7631ce4c209acdd3916ff1911dfd106d3379e8d822a0968c976be25a459c SHA512 3905f9d85606504666b8b4585a8360fc372504f2431049abf4518b8d8106c4c6e69f6cc401b48810d4252763f6adfcafe1303695350f91a17e2522f02898fce7 WHIRLPOOL 0f51a7836bb4303762138f6b48b158927195705509b827859f88838f7bc5127dcb98f92215a4674695407d5b59d12d576c4d89e9d68d48ee623293ec7040b563 DIST libgnomeprint-2.18.8.tar.bz2 880489 SHA256 1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691 SHA512 eca4f118e918f8db04332c3c6df5370ee45497057b44747457b05f0517c55b38271b24cdf7493b8ba24875b2d53d99b5e64d5d63a04cd7fd895cb02ae1606469 WHIRLPOOL cfe18a12dfa0b3a8e659e8bff07764fcf93d02fc7e28f8d9f52796fe1044a30b257ab15a21b88438696841d7b8a61976c9af64971039141b73fa55ec00537a37 EBUILD libgnomeprint-2.18.8-r1.ebuild 2171 SHA256 d908ddcf96c831b654380b9a745182c69b0dcb8ab2b02af79841ad2505d83ce1 SHA512 c45093cfc2862d328b3246ad96c19f2ef1dc9fbaa130012f92b6266eaf182b6cdc33891a7103fc8e0d73dbf7e3768286b2c0b5c79d7dc91e28b6c10112d48d98 WHIRLPOOL b73e97f7ce6d44c802136fb6bc0677b70b082d4dbb47ce263bc198ec567a6df9918be3f5ae9f5114c734a395abeba9fa6b177cac22bce3e444a71d76ef488997 EBUILD libgnomeprint-2.18.8.ebuild 1691 SHA256 0d6255fa187607f43771bc121b3255e643598c91e66ff9cc8a819fe449e5f769 SHA512 4ab16a9ae5b7875605d1e63fcbe458b9afbb3b25c27f74a4d38a0d34ae7ad4e5956aa783ef213b3acfe51135afbe7edc77b2972368a868ff169df23761f4197a WHIRLPOOL 6ba0239e41bc02605e5bf4fa376f6f783cc5670e768cb9559609e99dec106c5fe0ffc7f15c745387d6e9cf01c06d8d725ac9f4fac809a03f1a86d29d31f7f2ba -MISC ChangeLog 24489 SHA256 6ef3a57d59a528e4f5f8f1a43d4ca53aa779eb53f3563b9254cbd36504697263 SHA512 fa9b6f05051c10a5c12adf13a4b21b6177b76ba66a6df53b0862e3f1672ca6f51a7d6f3e2cf9ea245ec96fcedf2c0b0e608c8add6ea8f3f6bdc77fa6f09092c2 WHIRLPOOL 089a08f3c2ccab5116708bb4e6544f32618bc6ac8bbf7548ce514054c3712805e9aa6a702c40a2f5566cc1c4be7fefbf6913502bf0e75ca1a35b03afaf63c43b +MISC ChangeLog 24647 SHA256 e6c4cc9f10ca1ed0277fc23665236deeecde6e08e48fc1c8c512f602ddc271c6 SHA512 63d4d0de9b353e8f4e057c2d659782a59f064aa4aeb919987b36a6d090d6f5e3caca799ee29fadb06d942c6be1432fe9bd8fb341453996704aa20f169c48dbc3 WHIRLPOOL ecb755ff99d5f25eb4222eb5c0f2911705008ee3bc10297b2b95589d30d810ced59fb168f6ef6e36ec87e76e7504eed81605b9324604ca2002fecfca16934227 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJTr+AnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJTujQmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOsAEP/RKydgh3I0rhJAunoOR2+M4x -Dlj5/zfkRrQ524Gmv8RjA9dbZczIS0lfPsaseFLiMbRxu86d/EahTUT1pZT97NN3 -m428G69WNgJ2dX5AOCaHeHpVkNeVF8nK6dKxl1ksVmiaLIVUwwmSkik2tofVjkvy -0GlR1HrbQTrGw2mbR80F0tFsTRoFkhWA4bkHsIKPVspfJRYv4sWcNHAUh5K045fO -O3qS155NaUNGm22LdN3061M63FuqT0IEIVoZGYXbppH63LZ6d2M1wyoTTgsvTMcD -ovlk+1pMYhoBpAeUXfyv/dPan+GmcUoy0eXPNe7VhT7q8NNPS7MNbTA+xzb2fBWY -zSkiG8GX17TRlZ5sRaaZoPbEpl6e+R7GUwklKfCC3LZki0YZG2/m/Mg3qrUnaB/1 -UmUOT/nFNKD9+KyDtW1q2VglGBdS/dc5sXNpExsLg5t/IOwZb+d7whkb/nMWiQCD -wtok/oRcNwTsQ72GaEEONaQT70eqvUNM6pnJBFQOTVZxeNSC81Y1hvjUW6jnD9Sl -584qF6pyWWLrxw95501rI6JN7DRYaQT7C2JQAhFrhDqLv29YASf0Gn+gkFTUlsAd -op9ed/FnCTKtjcofMxIKp2i9oRZPvIY9u+vV+LmZDaD9NaX85HSfQhESuaIZ3z+B -5kSIo084rbx6lEDxd8pr -=yD0/ +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxxQP/3JLV1Jk1XSn4h/CGUl0or9o +eNuxulwTO+xAaRcGIcLgq2UsFhBng3vAyQEbBdTtVU0T3NAgn5X1rwvz8mpLfDRT +WkMMQkAeHIbNu+tnpS2jom9q0absQlJQ/0f6/4pN9nVsds1VYkb8O12Nj7WoipLg +0vE4PzEUByO3pp8IdlmCA1/OaVljCYZboVS1RuzGvf9bBjBFYSJa9cOCTVKGzUiK +LLOK/P4zx7w4ORzvXg4VbGzIA8wouHTn2rExGYLgc4MIYf2jN4HrC/yAcDPhwVLk +vl4U0cgpWuzC945OrXwZ6U9quVJjQAZdGqLsYIHBgbylNXsaeIZLlWJnMsf05mBQ +8dp8sThpH5P9WT5OvMJVodukjIEHz8ORuKwuRm0a9ROv9QZBVpgFCycba/i6lhVf +JglHRpjVRBPs6wxkuVXLd7Jurxl5+vOnEjmgExN8xz7eNIY3DhzOprpsbgRd83X0 +GrtDedCgwb9l3ZPloo1DR8KNTJkQODlGz44PZ8t9MGJed2h4rO73OPB4N9aT867N +217Xm2uuSlAk7p2V95T5q5sFMU9tqzRVIqNW5/O5cpfLCrpEZ+I/KczIYSjOIs76 +Cromx/cpxt+1pShsVRgjgOBRK+Qu5DgM7QprMlYJn1HTimQkfkkc6r+8NQ4wrkxW +khUKPUasHRc+4S8EornU +=JoCE -----END PGP SIGNATURE----- diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch index d44b76b5dcbc..999c6f075203 100644 --- a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch +++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch @@ -29,7 +29,7 @@ index 729278d..186fabf 100644 else - CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config --libs`" - CUPS_CFLAGS="$CUPS_CFLAGS `cups-config --cflags`" -+ CUPS_LIBS="$CUPS_LIBS `$CUPS_CONFIG --ldflags` `cups-config --libs`" ++ CUPS_LIBS="$CUPS_LIBS `$CUPS_CONFIG --ldflags` `$CUPS_CONFIG --libs`" + CUPS_CFLAGS="$CUPS_CFLAGS `$CUPS_CONFIG --cflags`" AC_MSG_RESULT(Found version $verstxt) fi |