version bump, includes jpeg-9 patch from jer@gentoo.org (bug #520674)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xDDF971F118EEA5E6!

4 files changed, 126 insertions, 17 deletions

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index d796d9b701ec..b771cc8e311a 100644
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/fox
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.187 2014/07/04 21:23:34 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.188 2014/11/11 21:07:26 mabi Exp $
+
+*fox-1.7.49 (11 Nov 2014)
+
+  11 Nov 2014; Matti Bickel <mabi@gentoo.org> +files/jpeg-9.patch,
+  +fox-1.7.49.ebuild:
+  version bump, includes jpeg-9 patch from jer@gentoo.org (bug #520674)
 
   04 Jul 2014; Matti Bickel <mabi@gentoo.org> -fox-1.7.44.ebuild:
   remove old
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 1fc6b0a8adc0..25d8ef53cb30 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -2,32 +2,35 @@
 Hash: SHA256
 
 AUX fox-1.6.40-libpng15.patch 937 SHA256 4cb7f95eb90607417c6ebae01fc680f498543f06be2e3ce60b55f988b07d2ebd SHA512 e86f48bcd2dc5c8e733beb89a9f49361665442c7c34ef9347e23b138b5c6b0b735af898623a9aa85f711a0d0fef61960206bda95cde7a29e6861ba43cf687f67 WHIRLPOOL 58c163e46ab777d937ef144934ee8f5cb85906aecfbff00a9ce2566d88380650752eb0dac5917b1bd4347d9456469a97e52e961760f5e7e942463319ca21d6e7
+AUX jpeg-9.patch 908 SHA256 164e0a65bd9d4b5d0795884867ee139675c7bec2bffe640eade24de1e0ba9fa0 SHA512 cdb662f6440acc91de0bed860708c2c3cc7f7cae8247e2d79617180b73adc9bb75496ab03a12e6edc5ec4d8bec9df2412a30d95a24bdadd63480b793c1868344 WHIRLPOOL f63d81ebb9b8e6e9a42d0cbb50bded64fda49f9fe99ae3fe2ec29a47d1d7c7d975a529bfe482add6a23bb8aba42d60d05ca326ccc0f7dec9c216f3a7054ff80f
 DIST fox-1.6.45.tar.gz 4372554 SHA256 ec2ec7042c3198f78adea25b8958027955af4e3f8371733d1ff43fe5289bc4d6 SHA512 a5fbe6b27ac8bf2b0419e670f80dec2ae39c25988193d3910b62612776e932f8a3289694a2032124394cc367415aa2e6a8820b83a61a78f6bc78b4749f0b2e72 WHIRLPOOL f447cbb19efd3d3bc2b54d4c43f5d4f03884c2b272f27a71304c0360b4a30b4f393947e8c826c1bb5e88a8b039294fbf9e5d54b33dbb184dc9815a3944e3b48a
 DIST fox-1.6.49.tar.gz 4383152 SHA256 3679ecd23064958259fbef5898aabb048d63b2dcb796de1d8801fe0b51e5a90e SHA512 cd7dd5fd26bcdde6ed69d547e2b08582f0e88b66b6f1bac9b5cd2279b543edbf5b9a63cc2ed05f1a1fd7e7309ede96404cf7a5d2d8eb8763dc0fb41d613b0ee8 WHIRLPOOL 1592d2560a7967c491dcfeda40e66a45d2811424e222c5f1e768b28c8ce147d7815f46d22006ac9809b967d0c825b7828aad206ab55bcb80cae064f646fd3608
 DIST fox-1.7.45.tar.gz 5254563 SHA256 78f2b5f609a52d21da08e693d45b8eeb9d4ceed52ad86e451ef4485f2375c829 SHA512 ec8acf0eb0b1882254f7df2abdcb87445992fc9fb8165afcc08b8dd52a718cb31953849efc7a530bd682e6265687bdf4dc9fb5c930557b9405235182894684b0 WHIRLPOOL 08808e67e0e31c7389b1d4ac097d7d707fb48a925df233021913bc80363002c0c4ce19c8630f4bd5c87ebb5bc5c010dc7f3260f415dfa5b60390c5aae316de78
 DIST fox-1.7.47.tar.gz 5271135 SHA256 7f1de8566b88b0010137ea1172168d53494d2d14bfa03fe32f7796146a31a2a3 SHA512 8802c7a21ba35b48a638fb87354da3de54c82ebdd3f931a601f55473fe1f7c16bfa2df253e8531af2058665d9b6f31adf52f6973c2d94f435cc90ac112af22ed WHIRLPOOL fbcf4540b268e95fa4d70ed335d8f499ec46e18390cdc090c98c21b4be5ff3ec576439265cfcf8b90c037fed7937c3a5f19f8544db1906cf86a3f255b8092d62
+DIST fox-1.7.49.tar.gz 5336321 SHA256 2435c56cde3ba6617c638af4f3bac39e8f4d5dd5a5c6d0805d274c7ba05c520c SHA512 da6c3478370f1e72091675e49f8458a6722eca4735bf89052b2b7ef02f4e74ee41f10c9fcc39a24a1571dd0bb1cdf779e9dea5bf15be20722ca783c9d59eb6e9 WHIRLPOOL 53ad3d34e57507702fc2ac9bd7b446021a99e3dff5b337cda090a670b06d4733abce2bbca88a7586e8af2d00f16ee84b0bd3c42f66fd6e430cc6d342bb76b1ff
 EBUILD fox-1.6.45.ebuild 1095 SHA256 9a4bb8046148608e3d2ac9b58cb21be5b5d3ca6f541b8d6a65a4201fe0cf9137 SHA512 ed9c450069293958a6caaab6133e1685014f69df59f17b0e60c75687466c5056bc16ee4917697220f8458ff22503e9949aeeaa89fee3af735f4b1da236687d2c WHIRLPOOL 5c536539e03d3dc39f180a1e712cdcee2fde1c0ee506911ff67d2291ce4a6d16595f70ab3f7e083bcd87e0f9922dc3ffcc06b3b9a770dcd9584f48cd1562b9f5
 EBUILD fox-1.6.49.ebuild 1094 SHA256 077584c4b5198e857471db1d04e2803688c543fd64b6da82bc7a4b133432f37d SHA512 52abc611a001d2760cad42aab6daccaa0993e589843203de752ebdc83e8e8c48d517494be20860bd81cd5d2182b3223034f055fdd90430ee3a3c5a37a68d94bb WHIRLPOOL 33b87c35bbe24330ef53ceb6ab526a8da25ad8c01ab699a42950a0815cc4c29f373de05854d55083c7593291c5aa69d873828e69b7c31c0495e2d071303adb92
 EBUILD fox-1.7.45.ebuild 1390 SHA256 886cef49bf8ace635108bec08164d564b0dcbdf3618350391090cbb918233924 SHA512 9562fad4424d5b3177979680c417c2075a129f14f16f94ddafd7f4e1e2d7d8e34c124a31a848d52b0621b07c800be635c04f91f860271777e9530e856b5e7708 WHIRLPOOL 79f5abd8d8eaa497c3319bc05310e0cb0c5cd8274476d05da259bea815df7ed6135a1bbfa647effc8ca4d21401ed0b6e6f1fb9789bc930d36dfb1099c115df12
 EBUILD fox-1.7.47.ebuild 1390 SHA256 43d867c0e1993ef696f8f0d8adbd88957c859cb2349eb73292c00a938c10536f SHA512 1a4b09830ce73f5cb18e21ed73ce0e5edacb84bdf96a494525073f893285771c31ac4d0b10d36c117d9f180aa97af1bb45d03cb8e322ca20cc062f57dda8df87 WHIRLPOOL ea5e52aec492ed18dc2f9352ae0f104efea9d8bb31adc173c9f6319cf1d9566a12d9e50644a7ddb45679b8eb0465e8b6a2227601961d6a76c6f5fbce63938f66
-MISC ChangeLog 23133 SHA256 ecbea238a48a06481a87f941d890346480e1ee8cd2f7c5b991805d6e9e77da55 SHA512 9fa3bc6a3351f0666b03eac96d456e6f67bec283661263afa300662ef0167905c5bc55d4308c9e7190b747cc9d623acb8e363dd3eb9836046a9c61c71f1fe580 WHIRLPOOL cf8c7157754aa82cc1f2d4b69fbfc9c012a090b58267a41113936e2c6b83c24f841ace3644018bcc55541c36c3c5a8911eb5b2a4b715c42547a033a451602aff
+EBUILD fox-1.7.49.ebuild 1461 SHA256 8ebffdba802d19276ba0534bc30ed303119b5e92bbd9c9401c5c9ef353ab9156 SHA512 cd29fec4d9cd8dad07f36dbe29438bf6a04581c8426de34f0feb4b5be6d62540eaea8d4e4a4734cee7ed69b1113ed6c8fdfb0af98c31250a36fcb94340c8c8a4 WHIRLPOOL 4dc2600cfee3929d258fc5caef99cf8f3a1798e16fc4079a8cf08709b74ebb56e702c71a27af20a420f9b4c449d197dc5eb2226625db8b784a00b5d54bbd882d
+MISC ChangeLog 23322 SHA256 3b5f4738c4bdb74f4705feb61767cc780b21dadb02029d181260f537809286d4 SHA512 5649463ac827c215c4e6fe8c62a05f2dcb5c55331ad7b54d30838f328e5b660c53dccf290a39d52dca657243054c2c20c7e740e4466b3c75f1f6ff77206eb397 WHIRLPOOL 95ae42b0af98d1a6fe5a9446bc98aa062461cf19a763cf97f1fdd65609aa829b79caa7ca84d31626f039f3897f44328b45d96dcb66abe63be9e41db174e5c354
 MISC metadata.xml 225 SHA256 5ac870ed26b6e1b9996db97cc5d4b674d914ff9730a7da68d45f34273ae15b7b SHA512 eff5b76a5fbd985b1fe83542cd677f1c36baf0e2cd45360b85fe68b10d62b388cc7ef81fcfe773f007779fe46bb0059a5433c1ca4c9cce7792495a4258d9221c WHIRLPOOL 689070d9e59d0f3b14fdb41cdbccb35632de096857aab39c3bd34b18c4574be8edda1b661ad12e278127f7e1317334cb0fb5dc612fa7e22d7f65c2a8559fa1a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTtxtXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUYnqVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNzE1M0M4QzQxMzM4REREMjMzQjg4NUZE
-REY5NzFGMTE4RUVBNUU2AAoJEN35cfEY7qXmhmcP/icl6KV0OLkW4b7MmllaLtJb
-BNmSembXDtxOHOOcv7VS/WCx4T8CFWThmmWjtF2Rsows22sfg0/xC5mHqfzdBfZH
-Vgx2gTFs7b27KDw6LXDfp8lsCAVkz7aG4IkanMjn5h1eGtJqoGwLD0lTT06o5+QY
-ra5+NzI1PMsIh965ZKutNUILarKouJ8UBOYrsfo14oaXNqgC3VarMklGLBZf18gf
-vmJf+87+hIMumBkHvcnecvVIX+FG/fMKwy3O6nX3X69xoLVwVBuzw7HAKA/GZR4b
-xX+FCV1MLszeCgzZlJanmeB7mq7gplRECTr5SYp1JQLOQjaJzbK3dvqRbvMyecM3
-9N39tyEcCnGhv6IAJ0EJRiL5mUZd3y6M1ERrZyJ/AjOpd0Cp7OUyNh0NKWBCd0Mc
-mqXPycvXEPmIfRoI59bj39e9/RTrUXqCrR1mf62i4R7O0VFq555CVoNyB1t48iWW
-2/bJ5yoaO6DbGGc7T5OZ7BtpmHsWfGvYTBOJp3j6lA/ISf6NT4j9Pal05Pe/cWeZ
-6J9ETJmlDFDbM7Ro9ChXG5B0bs3aRHNEUFe2U9DOzlA0TCB0x3+BMvP0MMCG73t8
-EJTjq3N5pXA3mTD2zyfdvKxmUU3KD/Zsoq7N6bHZM0FhU9Ekzh6BF9N24aRiCfyt
-uzWdL6/0sbq8tHZ0aIBK
-=cqOm
+REY5NzFGMTE4RUVBNUU2AAoJEN35cfEY7qXmcNYP/1AgFLjSZzVXACC/W/T8U50c
+jKt/Ucnpbxp+4ejo9w5FxQAYA3CJgZjOUvvYuljEesnLxipAPlZBHtnlJyi7ouHU
+vo87uqhKMmgzIGcpXWrZezGQPlHAU2Dhduoz7vb6xQCDvphwfP96E/BRzcIb0FI5
+KUF6O8ysHtf+VpQWGlZ7dMTbx6UiD5I8mfOJKyFiadaJo1Kl8PNdjie2LHRB68vY
+WL5Ss8ihFYSJ9p9861qvudv04FIGSIMUIHjMnovHpL5OnEF8Y3SIBNA0mPrbDbAg
+G+0YdpdC36BFOUtMOWs+W/72qjA5ky8HMRCi+OQooUaEOW8dOAixDYblasCFoLY5
+G0MVqZcc4VkbI1o6vwcMo22dbTO3rzgfdYnvt0gibesMbTK7n4hnX4F7fDOwkWDf
+qpqlhV85Ocb4Vt0l4OU3iBghCGNIytOq4ehW0LrEbRrAM1KvQLSZb5ApxzLIOYXc
+ouYl/usaUCE0NPheUwMVaHTBkFiR49IE2BgJKQaWQ1knVdlY6GTM7ycd4qsPMpsN
+iHuOUfV3I5NqxrVWIbbPVmTNszE3TuJ+SJ2V29oV+ILrHIKrnnwEsOyuOqi6Lw+p
+w1mWvxuOrwOxM3SJX3hAdnpKodQyLC0qYLSKseYHWn+y61IAnVW+7jQdz8u0AmK2
+dBk5TNDtfxODsLRJf2wv
+=Iig/
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fox/files/jpeg-9.patch b/x11-libs/fox/files/jpeg-9.patch
new file mode 100644
index 000000000000..8075f03251c1
--- /dev/null
+++ b/x11-libs/fox/files/jpeg-9.patch
@@ -0,0 +1,40 @@
+--- a/lib/fxjpegio.cpp
++++ b/lib/fxjpegio.cpp
+@@ -138,7 +138,7 @@
+     src->pub.next_input_byte=src->buffer;
+     src->pub.bytes_in_buffer=1;
+     }
+-  return true;
++  return TRUE;
+   }
+ 
+ 
+@@ -216,7 +216,7 @@
+   srcinfo.src=&src.pub;
+ 
+   // read the header from the jpg;
+-  jpeg_read_header(&srcinfo,true);
++  jpeg_read_header(&srcinfo,TRUE);
+ 
+   // make sure the output is RGB
+   srcinfo.out_color_space=JCS_RGB;
+@@ -279,7 +279,7 @@
+   dest->stream->save(dest->buffer,JPEG_BUFFER_SIZE);
+   dest->pub.free_in_buffer=JPEG_BUFFER_SIZE;
+   dest->pub.next_output_byte=dest->buffer;
+-  return true;
++  return TRUE;
+   }
+ 
+ 
+@@ -336,8 +336,8 @@
+   dstinfo.dest=&dst.pub;
+ 
+   jpeg_set_defaults(&dstinfo);
+-  jpeg_set_quality(&dstinfo,quality,true);
+-  jpeg_start_compress(&dstinfo,true);
++  jpeg_set_quality(&dstinfo,quality,TRUE);
++  jpeg_start_compress(&dstinfo,TRUE);
+ 
+   // Write the jpeg data
+   pp=data;
diff --git a/x11-libs/fox/fox-1.7.49.ebuild b/x11-libs/fox/fox-1.7.49.ebuild
new file mode 100644
index 000000000000..78c7d1177fb3
--- /dev/null
+++ b/x11-libs/fox/fox-1.7.49.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.7.49.ebuild,v 1.1 2014/11/11 21:07:26 mabi Exp $
+
+EAPI=5
+
+inherit fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.7"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
+
+# newish autoconf needed for working mmap check
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/fox-wrapper
+	>=sys-devel/autoconf-2.67
+	bzip2? ( app-arch/bzip2 )
+	jpeg? ( virtual/jpeg )
+	opengl? ( virtual/glu virtual/opengl )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2
+		x11-libs/libXft )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-libs/libXt"
+
+src_prepare() {
+	fox_src_prepare
+	epatch "${FILESDIR}/jpeg-9.patch"
+}
+
+src_configure() {
+	FOXCONF="$(use_enable bzip2 bz2lib) \
+		$(use_enable jpeg) \
+		$(use_with opengl) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_with truetype xft) \
+		$(use_enable zlib)" fox_src_configure
+}
+
+src_install() {
+	fox_src_install
+	CP="${ED}/usr/bin/ControlPanel"
+	if [[ -f ${CP} ]] ; then
+		mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
+			die "Failed to install ControlPanel"
+	fi
+}
+
+pkg_postinst() {
+	fox_pkg_postinst
+
+	einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
+	einfo "with other packages."
+}