diff options
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/fltk/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/fltk/Manifest | 17 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch | 22 | ||||
| -rw-r--r-- | x11-libs/fltk/fltk-1.3.2_p10088.ebuild | 5 |
4 files changed, 41 insertions, 9 deletions
diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog index c53840951595..9cb38d041bbf 100644 --- a/x11-libs/fltk/ChangeLog +++ b/x11-libs/fltk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/fltk # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.239 2014/02/02 11:15:30 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.240 2014/08/21 11:25:33 ssuominen Exp $ + + 21 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> + +files/fltk-1.3.2-jpeg-9a.patch, fltk-1.3.2_p10088.ebuild: + Fix building with media-libs/jpeg >= 9a wrt #479774 by Gabriel Marcano *fltk-1.3.2_p10088 (02 Feb 2014) diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest index 594261243c53..f691de39a50d 100644 --- a/x11-libs/fltk/Manifest +++ b/x11-libs/fltk/Manifest @@ -7,16 +7,21 @@ AUX fltk-1.3.0-share.patch 2015 SHA256 9d756497b7c880b8eac8ab4a60de279cad36ef0a9 AUX fltk-1.3.1-as-needed.patch 5672 SHA256 46931bde1b60bbc82d12b638d9e1dddaf98e671c74b13154e05a79ebe877e1f1 SHA512 710051e55183eaa212ff9480a6e4c68a1c5331d80cbaff366cd362fc9d8b5ad10521c38ce684abe2a2f48ae0df448eb0c87f0b0db88a1f46a91f9650aa09a0fa WHIRLPOOL ee97f40e8bc48608c088a23b97ab3d80ce0317575bb51d5c4ef1c300ef7362484ed607a7d25f0ebfc7e50e33fe75335f47406d3c40ab8f257133366baf6071f3 AUX fltk-1.3.2-conf-tests.patch 2259 SHA256 f309d0871780ebb830ede6dfc99c660eb48878c830aada0d8264aae3d9abbde6 SHA512 35d0ae931ef055066f71e674c2efe57b7f8d000a05632842e70c9dbf6736fe28810be25eb7a0a06ad739e72c758f60391373ce43be81ae4638e67f4d20852459 WHIRLPOOL c56189507b1b81aa87c520de4ac01915c5de9a12412b54ca7d5ab8f30f7f4ae3270171fdb66e3608ce514328958cef820d4271d9570037d77512286205e3c697 AUX fltk-1.3.2-desktop.patch 456 SHA256 6e519612de37f4cea83bded50dc3bf856c13af53da108def188a5edcbf3d506f SHA512 405b604471f86d2eb013b1e7ee2d73574cb322ee3e519092c984bbb0fe46cf2438762c63ff6a1c31467e92257dc84fa4d1725ff50238379273ca28c687f1bc13 WHIRLPOOL 613bd7ae2ba18f3d68fedb9bd32a771a8b242395d494ac139c26da9175ccb454f24baad1d4715fed7f369a3e0ae73f1ab1d7811e270d0fe3061df8dd3bf6ca11 +AUX fltk-1.3.2-jpeg-9a.patch 583 SHA256 5dd7ddcf9c393e0d73f361a06e190e1abcb9b2c1fd04753cae03a3dac8da1c96 SHA512 faf615c5f65e4f0ffbe6131469a971fc60bb1c376d71c59182d406b8481c55ff4e5264dac168a9cd1164b00b86678fb7141b119f91dee83307eb7ee6522a35ee WHIRLPOOL 31d4729b1aa5eb1aa32df453a589a1c23f50d96889e04992338d7ee0ddec5dc75287833ed8956e052ae026997a0a7c059f8e0cbbdceef4e8a6143380d022e6c2 DIST fltk-1.3.2-source.tar.gz 4260874 SHA256 176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4 SHA512 9372a34d8dfc4b4ece7632683c1c92f9ea9e538ba6eec08bec69615e2b2c885957d229a5ec495830f673b6a059f55a94b61727e8eb1fb7b3bd37005dc0b8312e WHIRLPOOL 10c85d1ae50ccd3d9f66285483d39bc0e61b9f3306f87412841ceed9a45fd45f0476b28f7e7652658f6fcc48533d1ec4974a9eb98ca0f535b662a70209c1f781 DIST fltk-1.3.2_p10088.tar.bz2 3679398 SHA256 76fc7a63adfdc7c20fd4779d4d02adb4c8fb74913af3b52a38f07954d8ff439d SHA512 c27b9a50ab0bf5fb4c7e4e502de90a39008805833846a98460b1fac771018b234100e6168d95da2ac3168b8f3c9a42dbc03cc451773ed83e8371e72128f2d690 WHIRLPOOL ef788f3dc5b78bd3586637fedc2678003c0d66bde35ca6b596e973019c232db51d3a416823b1a71eda857f88c3435365e061dbd33de57a6b367e1077342ff07f EBUILD fltk-1.3.2.ebuild 3667 SHA256 2f6dafa4899ec2c5512925f09a8cbe2fcc70fb4086aef380d8a3b7958eefa77b SHA512 0725a2cf279f964295e16b29d1eab5d8653553d6499ac4f8a8e970e4a75f701b1593df8a1c271456e8e66d27506a30c1d9949f8cf0c33c7140d8ea0f54f49bfb WHIRLPOOL cb605e2d62a4980110402f6f2d212e60ee4f017d3eb0da998cebb5e8f71f086d5bd7a41aa7bb9f5c9d1ad01b35d2c3623c8c6bdf118e6267ed217ac317b22a23 -EBUILD fltk-1.3.2_p10088.ebuild 3900 SHA256 46af83efa46bf0f53a7c686bd7b059d161bfcd8b8842b5ade87a73e6f4b4cfd9 SHA512 16f253ae9ca41498b7cdc20bffdccf7ea1441ee84ae6ab02c570d7cc6557f428660ad9753003399667eeee45252d8b26e5002f52c7292c07176403f4fe762f6c WHIRLPOOL 87c889bc71615cad71f7be36a6c91671bf739b706d8717c9dc77d1520c26a1679a90eff3f22be0e53a38f9c0989c52f8245b3801fd530e33c0e113424750f9e9 -MISC ChangeLog 33223 SHA256 840387035c8768096e49b22c26814bbf416bf1239d9ed80b35596644630cac12 SHA512 d1dc46e57b24980efef8acc54fdf17abc54784192963aad44335e6f54d475506186be805c48293ff77f7bc8ac95210db317ce1a8f6df6cb231b9a74d4b4e9bf1 WHIRLPOOL efbfae4e8a165b8219d9a0a4949e19f0a973d6ebcf8ffe30b268c0543e3378ee7304d9aa6270702300524d32fa5edf16a0e35c769548126eaade45e98d8973d9 +EBUILD fltk-1.3.2_p10088.ebuild 3950 SHA256 a26b72122dc3865ba9ce726b0bc86f4db040ffa69a4bbabd4b09c1ecacfafd7a SHA512 3e6feb2b555aed1bed61280ac2def2124ded02525ffe3604a01d8d1313ba352cfd0d1b631bfcdd38c8e6fdd73d40356e591e36cd6f47c693381564daf9fea342 WHIRLPOOL dcb56dffe2afdb3b79ca313fb1b0a7e65b0b1589c12b25e2cc146543fd82cca5fcb666392e1c0532ce140edef8903f2765f75e3963971a1656675ea2f3635b09 +MISC ChangeLog 33418 SHA256 846058d3a3438aff27e2d4344c723ba62a45ecc53e596ce9eec09390e480fa23 SHA512 0af07f38af5a60bdcb7dccc2376b82475bbb05c6835302dfdf63eeff2e57e9754cb9be2cb47d10c038e248c07df580e80861f435df1ac3af392496bdce0fca21 WHIRLPOOL bf651d5ff0b12d1d89a3fef753e3016a7f5d848a30ac8889984e722e532ac3147d4ab85957e774857ec4c4cf216208e896aa9046a3ecb01bfae1c621d913b1a1 MISC metadata.xml 589 SHA256 46e3321a6cd7d0a7a4810a9db46b9d45fdc2bf72ae8ada22b9b37438c1a6b7f5 SHA512 d346f5c21cba93ebe8b86091483aae647d4f84913c886bcf59d6e75b2a1dee3dbd76313f590f86ccec01195cea6ed40ec22240ee530921f3490f786263f4b65c WHIRLPOOL c46e8e6f6b98c8caf2cc41773582e0fe6be822cd55acc89ee8f8f0e3716841ab64553cfbde024c782194bd3b45c04535903859f2eeb0d987b4e7708d5567067b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlLuKNcACgkQVWmRsqeSphPtWQCbBoVtT0K9RoRGlpV+f4VADZAa -GcoAn03DtMP0r2RwGLqCsmlfpfgvcclM -=cCKM +iQEcBAEBCAAGBQJT9da/AAoJEEdUh39IaPFN/zMIAJ5waY/JLfHVoZMTpU7lMWC4 +BtUeEo+MsLrYBAlfuInkSHJTPS+Jotlb6hU1DThFfm/eRgunGqQYGSd9I7M71fJZ +ZG+xAwM8cSZHTa0cTWvwC652UwDOyWNnIyfqPaNGNwnMPQhaNTuGWuDCIpgxtYNu +OkIzdg+o3U9B6VieNgzU+mWauR9RouVD33/GZK6I2NX4dZZxKSVzuXbgRUJKIox0 +kiQ7088q6QV27qgdPTp4I4zoPrhAf7ytbRzP863rFY3uJIzsrfldv4Sfr4Inr85J +rh935AGqYfMKOVzNNJLPOzgfSDfVWYlzEweyRt50WY8F5aCEIVUz+yt5J9+Re0Y= +=3+R6 -----END PGP SIGNATURE----- diff --git a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch new file mode 100644 index 000000000000..701f04ca6168 --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch @@ -0,0 +1,22 @@ +http://bugs.gentoo.org/479774 + +--- src/Fl_JPEG_Image.cxx ++++ src/Fl_JPEG_Image.cxx +@@ -155,7 +155,7 @@ + + jpeg_create_decompress(&dinfo); + jpeg_stdio_src(&dinfo, fp); +- jpeg_read_header(&dinfo, 1); ++ jpeg_read_header(&dinfo, TRUE); + + dinfo.quantize_colors = (boolean)FALSE; + dinfo.out_color_space = JCS_RGB; +@@ -337,7 +337,7 @@ + + jpeg_create_decompress(&dinfo); + jpeg_mem_src(&dinfo, data); +- jpeg_read_header(&dinfo, 1); ++ jpeg_read_header(&dinfo, TRUE); + + dinfo.quantize_colors = (boolean)FALSE; + dinfo.out_color_space = JCS_RGB; diff --git a/x11-libs/fltk/fltk-1.3.2_p10088.ebuild b/x11-libs/fltk/fltk-1.3.2_p10088.ebuild index b4af3ba16919..61bf603c98ec 100644 --- a/x11-libs/fltk/fltk-1.3.2_p10088.ebuild +++ b/x11-libs/fltk/fltk-1.3.2_p10088.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/x11-libs/fltk/fltk-1.3.2_p10088.ebuild,v 1.1 2014/02/02 11:15:30 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.2_p10088.ebuild,v 1.2 2014/08/21 11:25:33 ssuominen Exp $ EAPI=5 @@ -49,7 +49,8 @@ src_prepare() { "${FILESDIR}"/${PN}-1.3.1-as-needed.patch \ "${FILESDIR}"/${PN}-1.3.2-desktop.patch \ "${FILESDIR}"/${PN}-1.3.0-share.patch \ - "${FILESDIR}"/${PN}-1.3.2-conf-tests.patch + "${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \ + "${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch sed \ -e 's:@HLINKS@::g' -i FL/Makefile.in || die sed -i \ |