Work around mis-placed bracket problem, bug 361993

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/media-gfx/xloadimage/ChangeLog b/media-gfx/xloadimage/ChangeLog
index dc2a0f29fc8a365c933fc637b775c60175e8cdd3..0ae0740a5ca3ad4a9d6e90c64de2a1a7ae747510 100644 (file)
--- a/media-gfx/xloadimage/ChangeLog
+++ b/media-gfx/xloadimage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/xloadimage
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.53 2010/11/08 23:07:20 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.54 2011/08/25 20:51:13 dilfridge Exp $
+
+  25 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  xloadimage-4.1-r10.ebuild, xloadimage-4.1-r11.ebuild,
+  +files/xloadimage-4.1-bracket.patch:
+  Work around mis-placed bracket problem, bug 361993
 
   08 Nov 2010; Markus Meier <maekke@gentoo.org> xloadimage-4.1-r10.ebuild,
   xloadimage-4.1-r11.ebuild:

diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index fba29ba5d808068b785321ea9af5a0e53902f7a5..540bff4f35e98a4d63fc80cef2535d1bdd0a7148 100644 (file)
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX xloadimage-4.1-bracket.patch 518 RMD160 848289d06a5cf1dcd3bab467885c4b30611ecdca SHA1 c298e654ecca9f7e869bef75130a7a4dd3f72ba8 SHA256 cc5289450dceb1794dcf99a230c7011d99fcd45e26dcc276a7de25dbd6f5867e
 AUX xloadimage-4.1-endif.patch 321 RMD160 9d65994d8a2090bcf321bc48eaa4028263fe013f SHA1 4b3ed8fedb88c9ec9276a6bf2b48f372193f415c SHA256 a621ead90d893fd5d07d3034adf674d39235484f205198d47092e8e51bd71204
 AUX xloadimage-4.1-include-errno_h.patch 303 RMD160 a6125c8e94db89d348a4e358610bd195db044720 SHA1 94568ec6e2679c236b675754a49559f979e772e7 SHA256 705ea25d75585bd763b4330757266ac412ee30562e65b937722dad3e3141c56a
 AUX xloadimage-4.1-ldflags_and_exit.patch 775 RMD160 d7b44f8658d2e58aedf26c25c4075683ea9ad1b0 SHA1 3f9bf0f027e793454a02fcd8df3cecf5c74e0912 SHA256 f2b80e39246e495a5118f27e815cb8100b9619184580d35696c512a0d81b55fb
@@ -10,14 +11,24 @@ AUX xloadimage-gentoo.patch 8956 RMD160 f60ed7543ae72a598d37d665d2fd1b3e000a69c2
 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 RMD160 57f09f43e96fea7c103cd283aaea35245a44071a SHA1 2b577a1c230a99201a2cb48ba4b5d122f34da3c7 SHA256 addfd04c0a5667bb9c3f4ae6a9da35a443776086e30b84b2c3afa5eac161144a
 DIST xloadimage-4.1-gentoo.diff.bz2 41390 RMD160 63b160b968937d8c580c7876137263bdbaaa575d SHA1 6436b03b74429470b5491870706885dd7fe69f63 SHA256 dae93c4bd2955810252ff4dd5650386c34f82db8a7a1502c653bf965dad1632a
 DIST xloadimage.4.1.tar.gz 596021 RMD160 000271b40f58601cd1057b4e99c31a30da6e10af SHA1 0a8ee9b185702750706f68e4a34e086873f17690 SHA256 400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4
-EBUILD xloadimage-4.1-r10.ebuild 2110 RMD160 8468a40beab3aa12aa16605ebddc89712d3a3018 SHA1 c794237e5ded1a23802f1d968478eda6cd545a95 SHA256 3a4bdc5e7b9d32aee26dfccde1192dba9b372ba795e6e52c2e80e11780f1cde9
-EBUILD xloadimage-4.1-r11.ebuild 2206 RMD160 a0a2249a42a3458680f2c64378fcad35589a88db SHA1 8cd2a62ce958534c776ef6f1007efccbd718f425 SHA256 a6dddd62f2e5862daece18277769765eaaed1870abecc34a3efc4b539cec0d42
-MISC ChangeLog 8638 RMD160 93616499ecad05083693f04c32a5492c406085cc SHA1 ece7c6fa48561d925a33c84c812a9cd321804047 SHA256 7390630b24a147349d5d372979bcb4a1c4fc31fb3fe89dc181c98e774dcb8f52
+EBUILD xloadimage-4.1-r10.ebuild 2209 RMD160 56151d25964d8151509447a020b7a85ba40e93af SHA1 cf9fa2bb36434f821f7fab9b59d8aeed6bd5a3e8 SHA256 40694b4868236e80dbff89e6d1bc6a3e7dedf265136aae34b632a5f65c65ece6
+EBUILD xloadimage-4.1-r11.ebuild 2305 RMD160 aa304f550decdfcca456f931b42ac3ae3177a99a SHA1 918134d24a2bd389339ee9799d81b70284ef4542 SHA256 896915d7770a455ad763f475c995a0208d0084920e620bfa5a5518a8e23bd066
+MISC ChangeLog 8847 RMD160 9cdbaf1c0fb077494f47cd887dae3201949ad681 SHA1 8493d1842c3946af7ab524ff635da2aa769c26d6 SHA256 3f740ea9c561f5a4c4aca3ac9a3c782466a38f3b342e2d0377a851b7bd834ba2
 MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzYgucACgkQkKaRLQcq0GJVoQCdFxkacsbHrXGqP6l8vfFV4/Sc
-XLsAn0CrlJDPEFG8K4QP2FNqbSHHogcZ
-=LYnS
+iQIcBAEBCgAGBQJOVrXbAAoJENwGBM22xffe0EUP/RxrzJ94RGMukPGg5Lv7iy/V
+/CPUWgnNuVfYqRExW0Md8C7s0vfVjdcZ1dp2usNUuNujLK1CXesy8udursq/Z6Ev
+yGHD5gdFbQZXf4YexAnGE90d6qp3+1tFX4pVLhRq2k+nnx+dj6/jtXK3VnGWOb6A
+jS+WOQwtM+ECQHMl6iyjS82kvzY9oSQsloACoq1NcO18+E2fvy04Cl0ZnpPKm4kD
++hhEYcxsBs3I+G2kJS6zhA7LqJrV8U8NZ6yGxVnBcsEo/rFRIbHgSL8gd/ZLtW3H
+AiaWyR6slzLo37HPlfgwzIBx7n7r7WU3tSzVkTUuXYa2Z3036ZvHvf2kmsOul5wc
+voo5wpFFOgXCJ6kM+IrIXha6egym1Ze+4Yxbnj0ZWh2+0dnNSLfiJNyb3/92Mi1G
+2VaCPmbfkq2pfAp41sqRzkcy6JGxjQP1qjSQXm/tHS96Q/XSbtHxTNAvtu/OGqb+
+r5ha11YcfHcCJkPuRb0RF1wmWAm8OpAdxF1mmZQKsCHFBzd5OzMetiiaPZ6dA9lN
+6hUK2LximgO8NgeXYNopO1Gwb8O49Y8HU1l4iCPO2QNesWopJ90Sr+WtWLXrjtRV
+bkvARiwRuFK4VyxtMHpPS5Tuz/sRHZ/f8T7/MGhAAOvmX5lQ0ZgyJMiFsFCZ0Spy
+Y9ZeJu8gsa+F3vJpCpvO
+=J8W/
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-bracket.patch b/media-gfx/xloadimage/files/xloadimage-4.1-bracket.patch
new file mode 100644 (file)
index 0000000..5d71028
--- /dev/null
+++ b/media-gfx/xloadimage/files/xloadimage-4.1-bracket.patch
@@ -0,0 +1,13 @@
+diff -ruN xloadimage.4.1.patched/jpeg.c xloadimage.4.1/jpeg.c
+--- xloadimage.4.1.patched/jpeg.c      2011-08-25 22:44:04.835308001 +0200
++++ xloadimage.4.1/jpeg.c      2011-08-25 22:45:57.391307973 +0200
+@@ -321,8 +321,8 @@
+       cinfo->arith_code = TRUE;
+ #else
+       fprintf(stderr, "jpegDump: sorry, arithmetic coding not supported\n");
+-    }
+ #endif
++    }
+     else if (!strncmp("grayscale", name, strlen(name)) ||
+            !strncmp("greyscale", name, strlen(name)) ||
+            !strncmp("monochrome", name, strlen(name))) {

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r10.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r10.ebuild
index 8b7b42389c07d3efcb69b71eba4e5a1c6613a33c..ae9e23ec02d73c1eace6160745af3205ea0b556f 100644 (file)
--- a/media-gfx/xloadimage/xloadimage-4.1-r10.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r10.ebuild,v 1.11 2010/11/08 23:07:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r10.ebuild,v 1.12 2011/08/25 20:51:13 dilfridge Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -50,6 +50,9 @@ src_prepare() {
                -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
                png.c || die
 
+       # One of the previous patches screws up a bracket...
+       epatch "${FILESDIR}"/${P}-bracket.patch
+
        chmod +x configure
 }
 

diff --git a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
index d0345d454500f661496e313f551d4b2eaf71f170..338957a0dccccc6afb03dbb559d52b09a1544692 100644 (file)
--- a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild,v 1.2 2010/11/08 23:07:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild,v 1.3 2011/08/25 20:51:13 dilfridge Exp $
 
 EAPI=2
 inherit autotools eutils toolchain-funcs
@@ -50,6 +50,9 @@ src_prepare() {
                -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
                png.c || die
 
+       # One of the previous patches screws up a bracket...
+       epatch "${FILESDIR}"/${P}-bracket.patch
+
        chmod +x configure
        eautoreconf
 }