From 58b325fe6d0f69ec806b429a8a23cb70a23faf3b Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Fri, 12 Dec 2014 11:09:15 +0000 Subject: [PATCH] No fbgs to remove when USE=-fbcon (bug #532354 by Maxim Britov). Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- media-gfx/fbida/ChangeLog | 7 +- media-gfx/fbida/Manifest | 13 +- media-gfx/fbida/fbida-2.09-r3.ebuild | 120 ------------------ media-gfx/fbida/fbida-2.09-r4.ebuild | 4 +- .../fbida/files/fbida-2.09-giflib-4.2.patch | 29 ----- .../fbida/files/fbida-2.09-giflib-5.patch | 50 -------- 6 files changed, 13 insertions(+), 210 deletions(-) delete mode 100644 media-gfx/fbida/fbida-2.09-r3.ebuild delete mode 100644 media-gfx/fbida/files/fbida-2.09-giflib-4.2.patch delete mode 100644 media-gfx/fbida/files/fbida-2.09-giflib-5.patch diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog index 485d2de0d35a..f0ff6ccea6ec 100644 --- a/media-gfx/fbida/ChangeLog +++ b/media-gfx/fbida/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/fbida # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.115 2014/11/27 01:53:32 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.116 2014/12/12 11:09:14 jer Exp $ + + 12 Dec 2014; Jeroen Roovers -fbida-2.09-r3.ebuild, + fbida-2.09-r4.ebuild, -files/fbida-2.09-giflib-4.2.patch, + -files/fbida-2.09-giflib-5.patch: + No fbgs to remove when USE=-fbcon (bug #532354 by Maxim Britov). *fbida-2.09-r4 (27 Nov 2014) diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index 766c2f5eabce..c762cfd8101e 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -2,23 +2,20 @@ Hash: SHA256 AUX fbida-2.08-posix-make.patch 1495 SHA256 7f8b0a7f46205efcb765133f287bfac7023e837f159364f8932ac146b4428c10 SHA512 ee7a6382d15ac90090c8f44e7cf674a0f924960ea1328bf1a783308f6414b1496aa50d0c97b3a5c10f4a2481c3c760e87a10358e92bf0740341eeabfbdce9314 WHIRLPOOL 36c857966aeea8c68822066e0971fa45ad6103daf967c1394d84096d257698002ea6a75d1cadb836dca2cbfa955ecbce93c8276745137bbaa75b16ee637ee1ac -AUX fbida-2.09-giflib-4.2.patch 752 SHA256 1093ad96cb38b38a2952bbed2475605dff0c06f80681114fd8c8c631e0733c6c SHA512 5fd824664b1afbf9d03a56a6b4f657434f802dde987bce4ef6d0805848f468d603433b3a7227388aaa791483af7211fea9f73dd3ee754203826209d930652aab WHIRLPOOL 05d4f8d08b7fb19de0f067de50d949e3d2f11d3eca8958d03a49d4cbe58609e8137a56b1ec84f73cf9a041c36666291d0a9c9f451128579f5bc255f52ec3be30 -AUX fbida-2.09-giflib-5.patch 1186 SHA256 52ad356f1dcb34a9a95169e53092d7e3d42e4ff5ef7784489db7716849d44ad4 SHA512 e8c1b0501a54c1a32623b0f9ae22ed4167fef090b7e81a69bf22a7000e3743d4b7ba60f13968eed4ed488eab7f082e2810e517657de89d828ce9fb2ae3b31b0f WHIRLPOOL 4b280825e4b798cbcd94e7676c577d9fdfe444d053923ee6a4c96033d35373629ffa5ada0d242bb07129b888a0cd47a3ab5dd6ec2555295e3d83da8b3df536f1 AUX fbida-2.09-giflib.patch 2402 SHA256 e4ab03707e126f31bf39db9e24ab14c748b2dff1d098a33b4cecf23b4f6aea15 SHA512 65b7dc8ba5f984ca81bb4a9c52cc6da3e7f309be07f7a1862e2bb1b76d2127c7d252c6fb35369c0836855bb59dc9be0d47bc8cdaaf1b5bc2abafcc96d2704c0c WHIRLPOOL d1998a433c2dc54698527db23ff9097bf6cbd6dc7a5d522f6e7fdfb962dfeb5198e90d4a657c3c0c372f545c1149e1375834f15c2aed3da1e5a5d37824d2f89f AUX fbida-2.09-make.patch 994 SHA256 ac11e8f072de7e36e41d42b5760cd99dcea9e19a951ed93e13880a2c69868f67 SHA512 e4bd6f16fc9ab51529d32f5c200867cc44ed418d0eb63a2649e3cfc17cdf0fa0cdbbb12d1031e855b86fe021345c1656dd53a6455851baf3d4a986719eb6013d WHIRLPOOL 23e7c8d188e2804f4646b2f783db6c0c94d807aa92de942d90e50b7d02c7eb8e0c481ee6459ddb9524f246074991b839646088e3f99ac90c02c91ececec94136 AUX ida-desktop.patch 384 SHA256 68b73ebe6ebc04dd3c205ee328c61c9d0b523c9ba87dda9301f82eab306b9e57 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737 WHIRLPOOL 5ff72a36831f60b2965964e53b105121c0de042e18abfc19d348c35496dada17c466d2e0d1cbeb778238a62380a4a2d7e3998e15565accf3b69dc19f80aa0e32 DIST fbida-2.09-jpeg-9a.patch.bz2 29392 SHA256 d0979bb7b33b34c2b01f0fe14825812319b0ec08f00f0de6cf9a0533a5f6dba8 SHA512 f644f464231967589a2f1ad0fdc9025d60348a9de20d468fc6abdf3dc0cbf07522e3f71a94930df3c54055fc445df035b4b007efa7e6a3f7acbec90e28dc86c8 WHIRLPOOL 372aa56e698f82ff9dd8adacb5de9347e40849653553d810e4f5c0fca731ca8e863f8a20658db071ca11ed8d6bc8794c36ec5fd8c0a2426d8e500389703f2e95 DIST fbida-2.09.tar.gz 248086 SHA256 dd40b3572f79c6524480ac652c9b32e3867cb53e6c53db51415ddbb20f5231e6 SHA512 b939ca656fc28e3df652610821b9c11f7ab20ad1bd393c40de74f631fad0af463bfaf4f0520484edc12922b1fc288d08fae7c92789c711ce96b0caf50dde25ba WHIRLPOOL 222538f80fc7e878d142cd4dc44089d12b717ee8ae921e514bb3b85322b972cc96300594ae89d7cc1cb006868a0c75abacaa7ddff15041bc672c27d565a00a4b DIST ida.png.bz2 11928 SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 WHIRLPOOL 1b5e7835aa8a555a231ca58da8e249974639b29b1e15586c2d2d5a33e96908df1a3782fbe61d0c51dc888b7304c9f7541a96af4ca2b956b393909feb534ab5be -EBUILD fbida-2.09-r3.ebuild 2672 SHA256 7dcdfecd9fb107f6a25cf89fdbf0457bafe9f9fcdeb4a7f0c729a4471db6ed7c SHA512 43b8f2b637558177caf936c27edc88bf2f7898ac98bcced01cf63ffc02c4a157a8b4490c23b7eb8ac4ef8a047e23a959cc538275a58f637678383e858879942f WHIRLPOOL 4d130a670198fc2db2add5d6cbf8addb79ab556317cf6201455e7b64a35448cbaf4f9d199d70a415244d8bd38cec5c25df248728e717809215e78934550a58ab -EBUILD fbida-2.09-r4.ebuild 2646 SHA256 39b8f0c91b0d6c9762ca39bd1d64a7b780eaf6ba64c84617f353402688d301b7 SHA512 cfc440daf209a42d927add640ece580d3f05b013456cdde29a4007d90f9f5f573c8df199c2593f5d1a169e71f859a6ce8c14812b5c46d25863b3d749a4dc5bda WHIRLPOOL 22eabe3019a829a4fbf86c281fa68734854d184b35220bc17317accba75aca2964b13f65ba7d109bbfeba95536383de7a5fb953d6d47b09f005bd614ec87622c +EBUILD fbida-2.09-r4.ebuild 2659 SHA256 5181d9c2ec8309c6863e656c491366fcba1b76b0c463e9cfaef2e5b5be27028a SHA512 ce07fa0e5c1d1d66411b9cbed04844a9eb5a7ebef0823cc5e5d4dac3bd028981a547525e75ac076294d272daff80022a5c5a9c98fbd72fb1dd75b15f9b2c6bf8 WHIRLPOOL 8b1dfc83e58056f0972847ca3714d2d28c30418fb44b00c6a89e564052a3eab0214b69df25577fe8e369b34d6d661641391fd698f257ab276f3f837d47f19d48 EBUILD fbida-2.09.ebuild 2597 SHA256 01ba79b5a8966788c0730ffc99607bda24ac022b25736d589f3ddcc8e20c2c62 SHA512 b44b11b35374c1f811cf6b50c3b992f2b4cdfffa73dd8c717cde8f7ece1cdb8d4cad9c987f6f6e2e4454b503be18376ad572d9ec868102d4b401198bedf49094 WHIRLPOOL 46be264669ecbe5b6c3ac36e6a3da7c5a32e138e3ee2bd4a417fbcc97f42216a177ccc53960ea2f60519c9cc47b70a07cef36f84fc77e99b2289fa481b53b7fe -MISC ChangeLog 14476 SHA256 a43d6e115721f9c7de0713ee96240b149d3762f2846ce005e2a8930eb5293e20 SHA512 e4711fda386cf5a610ee2c6ec12f43ddd7aa8cb236a51367f0a6d45329c14dd97f31dced048a106f2349bfa3ab8809c7746cf3ddf1019a50d96fa6c68b51090f WHIRLPOOL 95e44a66ce01164544a7551e845dcde70e2e4a56fd568b2da664800dcd07ca442e5269234cc41c26a7bd6863206568831aef397500f4496cfa1791aded6e5b78 +MISC ChangeLog 14710 SHA256 8f55fcbd507ba1be271e2d15c5d80c56e2b01323f6416032cad4a7e12dd2d59e SHA512 f44084067356d96f9f37186f1ae1b8143bb0cd400be1e2298edbe08af7457f4d300cbe367adba69ae021fa364d68b357f33c48bad687efbfacf74482528dee33 WHIRLPOOL 2a2db8a970b6be7d81074dda5aeadbf96f49e4f038fff93a8fa144d3ae12ef7c341101147169e4f10a51aadd8ccfedff63854f98610a087f02b56ecc86318a06 MISC metadata.xml 409 SHA256 30adb8b77b731331a7981157faa6d76bb71beba7311635639ebfaf0d545af0c0 SHA512 48ddfb184fb23a70a73dcf9e3d5441fb0bf28956afea3eb69cacc1c4bf211a2571afdda83426c6be003b86ac9632acf14b87e9b518d0ed76e89a0b0a037b221e WHIRLPOOL cc8c6349745adb96e88a5e325ee37c170bee9055a3b2628ba2885cc53eb3e97f5dd3ae8b745c9385a0fbf37c219cc179cadb9ba80f3c1849c601b4e783ea8c3b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlR2hB0ACgkQVWmRsqeSphOREQCeOTK8kh4m9l/JRRqHWRR0z8/2 -kBsAn2QCuHH5325ykuKG2LzM7uPHocIz -=L313 +iEYEAREIAAYFAlSKzNsACgkQVWmRsqeSphO9jgCeJudNfmhs/BE62gpuhu9EkQ3O +1J8An2TBfPAMOsnM7n9GLclRjElJ4Z0c +=LGyc -----END PGP SIGNATURE----- diff --git a/media-gfx/fbida/fbida-2.09-r3.ebuild b/media-gfx/fbida/fbida-2.09-r3.ebuild deleted file mode 100644 index af8f04640114..000000000000 --- a/media-gfx/fbida/fbida-2.09-r3.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r3.ebuild,v 1.1 2014/09/25 10:09:28 jer Exp $ - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)" -HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/" -SRC_URI=" - http://www.kraxel.org/releases/${PN}/${P}.tar.gz - http://dev.gentoo.org/~jer/${P}-jpeg-9a.patch.bz2 - mirror://gentoo/ida.png.bz2 -" -LICENSE="GPL-2 IJG" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86" -IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp" -REQUIRED_USE=" - pdf? ( tiff ) -" - -RDEPEND=" - !media-gfx/fbi - >=media-libs/fontconfig-2.2 - >=media-libs/freetype-2.0 - media-libs/libexif - curl? ( net-misc/curl ) - gif? ( >media-libs/giflib-4.2 ) - lirc? ( app-misc/lirc ) - png? ( media-libs/libpng ) - scanner? ( media-gfx/sane-backends ) - tiff? ( media-libs/tiff ) - virtual/jpeg - virtual/ttf-fonts - webp? ( media-libs/libwebp ) - X? ( - >=x11-libs/motif-2.3:0 - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXt - ) -" - -DEPEND=" - ${RDEPEND} - X? ( x11-proto/xextproto x11-proto/xproto ) - pdf? ( app-text/ghostscript-gpl ) -" - -src_prepare() { - sed -e 's:DGifOpenFileName,ungif:DGifOpenFileName,gif:' \ - -e 's:-lungif:-lgif:' -i "${S}/GNUmakefile" - - if [[ $(gcc-major-version) -lt 4 ]]; then - sed -e 's:-Wno-pointer-sign::' -i "${S}/GNUmakefile" || die - fi - - epatch "${FILESDIR}"/ida-desktop.patch - epatch "${FILESDIR}"/${PN}-2.09-make.patch - epatch "${FILESDIR}"/${P}-giflib-4.2.patch - epatch "${FILESDIR}"/${P}-giflib-5.patch - - pushd jpeg/ >/dev/null - epatch -p2 "${WORKDIR}"/${P}-jpeg-9a.patch - popd >/dev/null - - tc-export CC CPP -} - -src_configure() { - # Let autoconf do its job and then fix things to build fbida - # according to our specifications - emake Make.config - - gentoo_fbida() { - local useflag=${1} - local config=${2} - - local option="no" - use ${useflag} && option="yes" - - sed -i \ - -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \ - "${S}/Make.config" || die - } - - gentoo_fbida X MOTIF - gentoo_fbida curl LIBCURL - gentoo_fbida fbcon LINUX_FB_H - gentoo_fbida gif LIBUNGIF - gentoo_fbida lirc LIBLIRC - gentoo_fbida pdf LIBTIFF - gentoo_fbida png LIBPNG - gentoo_fbida scanner LIBSANE - gentoo_fbida tiff LIBTIFF - gentoo_fbida webp LIBWEBP -} - -src_compile() { - emake verbose=yes -} - -src_install() { - emake \ - DESTDIR="${D}" \ - STRIP="" \ - prefix=/usr \ - install - - dodoc README - - use pdf || \ - rm -f "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 - - if use X ; then - doicon "${WORKDIR}"/ida.png - domenu desktop/ida.desktop - fi -} diff --git a/media-gfx/fbida/fbida-2.09-r4.ebuild b/media-gfx/fbida/fbida-2.09-r4.ebuild index 4fd7bd7062b5..136f26491765 100644 --- a/media-gfx/fbida/fbida-2.09-r4.ebuild +++ b/media-gfx/fbida/fbida-2.09-r4.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/media-gfx/fbida/fbida-2.09-r4.ebuild,v 1.1 2014/11/27 01:53:32 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r4.ebuild,v 1.2 2014/12/12 11:09:14 jer Exp $ EAPI=5 inherit eutils toolchain-funcs @@ -111,7 +111,7 @@ src_install() { dodoc README - if ! use pdf; then + if use fbcon && ! use pdf; then rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die fi diff --git a/media-gfx/fbida/files/fbida-2.09-giflib-4.2.patch b/media-gfx/fbida/files/fbida-2.09-giflib-4.2.patch deleted file mode 100644 index c3685c31e97b..000000000000 --- a/media-gfx/fbida/files/fbida-2.09-giflib-4.2.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/rd/read-gif.c -+++ b/rd/read-gif.c -@@ -25,7 +25,7 @@ - if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) { - if (debug) - fprintf(stderr,"gif: DGifGetRecordType failed\n"); -- PrintGifError(); -+ GifErrorString(); - return -1; - } - switch (RecordType) { -@@ -42,7 +42,7 @@ - if (rc == GIF_ERROR) { - if (debug) - fprintf(stderr,"gif: DGifGetExtension failed\n"); -- PrintGifError(); -+ GifErrorString(); - return -1; - } - if (debug) { -@@ -108,7 +108,7 @@ - if (GIF_ERROR == DGifGetImageDesc(h->gif)) { - if (debug) - fprintf(stderr,"gif: DGifGetImageDesc failed\n"); -- PrintGifError(); -+ GifErrorString(); - } - if (NULL == h->gif->SColorMap && - NULL == h->gif->Image.ColorMap) { diff --git a/media-gfx/fbida/files/fbida-2.09-giflib-5.patch b/media-gfx/fbida/files/fbida-2.09-giflib-5.patch deleted file mode 100644 index 449954b0f104..000000000000 --- a/media-gfx/fbida/files/fbida-2.09-giflib-5.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/rd/read-gif.c -+++ b/rd/read-gif.c -@@ -25,7 +25,11 @@ - if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) { - if (debug) - fprintf(stderr,"gif: DGifGetRecordType failed\n"); -+#if GIFLIB_MAJOR >= 5 -+ GifErrorString((NULL)); -+#else - GifErrorString(); -+#endif - return -1; - } - switch (RecordType) { -@@ -42,7 +46,11 @@ - if (rc == GIF_ERROR) { - if (debug) - fprintf(stderr,"gif: DGifGetExtension failed\n"); -+#if GIFLIB_MAJOR >= 5 -+ GifErrorString((NULL)); -+#else - GifErrorString(); -+#endif - return -1; - } - if (debug) { -@@ -98,7 +106,11 @@ - memset(h,0,sizeof(*h)); - - h->infile = fp; -+#if GIFLIB_MAJOR >= 5 -+ h->gif = DGifOpenFileHandle(fileno(fp),NULL); -+#else - h->gif = DGifOpenFileHandle(fileno(fp)); -+#endif - h->row = malloc(h->gif->SWidth * sizeof(GifPixelType)); - - while (0 == image) { -@@ -108,7 +120,11 @@ - if (GIF_ERROR == DGifGetImageDesc(h->gif)) { - if (debug) - fprintf(stderr,"gif: DGifGetImageDesc failed\n"); -+#if GIFLIB_MAJOR >= 5 -+ GifErrorString((NULL)); -+#else - GifErrorString(); -+#endif - } - if (NULL == h->gif->SColorMap && - NULL == h->gif->Image.ColorMap) { -- 2.26.2