From cc09fc47f18361664b1aadc9ce54dbbe3cf65a97 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Tue, 21 Aug 2012 14:59:28 +0000 Subject: Last rites, bug #426268 --- gnustep-libs/popplerkit/ChangeLog | 115 ------------- gnustep-libs/popplerkit/Manifest | 26 --- .../files/popplerkit-0.2-poppler6_support.patch | 191 --------------------- .../files/popplerkit-0.4.0-config-as-needed.patch | 38 ---- gnustep-libs/popplerkit/metadata.xml | 8 - gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild | 37 ---- 6 files changed, 415 deletions(-) delete mode 100644 gnustep-libs/popplerkit/ChangeLog delete mode 100644 gnustep-libs/popplerkit/Manifest delete mode 100644 gnustep-libs/popplerkit/files/popplerkit-0.2-poppler6_support.patch delete mode 100644 gnustep-libs/popplerkit/files/popplerkit-0.4.0-config-as-needed.patch delete mode 100644 gnustep-libs/popplerkit/metadata.xml delete mode 100644 gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild (limited to 'gnustep-libs') diff --git a/gnustep-libs/popplerkit/ChangeLog b/gnustep-libs/popplerkit/ChangeLog deleted file mode 100644 index 1848ab5916f4..000000000000 --- a/gnustep-libs/popplerkit/ChangeLog +++ /dev/null @@ -1,115 +0,0 @@ -# ChangeLog for gnustep-libs/popplerkit -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/ChangeLog,v 1.27 2012/08/08 17:22:33 dilfridge Exp $ - - 08 Aug 2012; Andreas K. Huettel - popplerkit-0.4.1.ebuild: - poppler xpdf-headers useflag is gone - - 08 Aug 2012; Andreas K. Huettel - popplerkit-0.4.1.ebuild: - xpdf-headers useflag for poppler is going away - - 02 May 2012; Jeff Horelick popplerkit-0.4.1.ebuild: - dev-util/pkgconfig -> virtual/pkgconfig - - 10 Feb 2010; Bernard Cafarelli - -popplerkit-0.2.ebuild, -popplerkit-0.4.0-r1.ebuild: - Drop old versions - - 10 Feb 2010; Samuli Suominen popplerkit-0.2.ebuild, - popplerkit-0.4.0-r1.ebuild, popplerkit-0.4.1.ebuild: - Fix poppler depend. - - 19 Jul 2009; nixnut popplerkit-0.4.1.ebuild: - ppc stable #273704 - - 11 Jun 2009; Markus Meier popplerkit-0.4.1.ebuild: - amd64 stable, bug #273704 - - 11 Jun 2009; Christian Faulhammer - popplerkit-0.4.1.ebuild: - stable x86, bug 273704 - - 30 Mar 2009; Peter Alfredsen popplerkit-0.2.ebuild, - popplerkit-0.4.0-r1.ebuild, popplerkit-0.4.1.ebuild: - Update dependencies w.r.t. bug 264230, fully-split-out poppler transition. - -*popplerkit-0.4.1 (23 Mar 2009) - - 23 Mar 2009; Bernard Cafarelli - +popplerkit-0.4.1.ebuild: - Version bump from Etoile 0.4.1 - - 05 Mar 2009; Bernard Cafarelli - popplerkit-0.4.0-r1.ebuild: - Filter out -Werror during build - -*popplerkit-0.4.0-r1 (08 Dec 2008) - - 08 Dec 2008; Bernard Cafarelli - +files/popplerkit-0.4.0-config-as-needed.patch, -popplerkit-0.4.0.ebuild, - +popplerkit-0.4.0-r1.ebuild: - Fix --as-needed support, bug #250175 - - 17 Nov 2008; Bernard Cafarelli - popplerkit-0.4.0.ebuild: - Fix compilation on MissingKit - -*popplerkit-0.4.0 (17 Nov 2008) - - 17 Nov 2008; Bernard Cafarelli - +popplerkit-0.4.0.ebuild: - Version bump from Etoile 0.4.0 - - 21 Jul 2008; Bernard Cafarelli - popplerkit-0.2.ebuild: - Add (well hidden) pkgconfig DEPEND, bug #232432 - - 27 Nov 2007; Bernard Cafarelli - files/digest-popplerkit-0.2, Manifest: - Fix Manifest - - 16 Nov 2007; Steve Dibb popplerkit-0.2.ebuild: - amd64 stable, bug 195990 - - 27 Oct 2007; nixnut popplerkit-0.2.ebuild: - Stable on ppc wrt bug 195990 - - 17 Oct 2007; Christian Faulhammer - popplerkit-0.2.ebuild: - stable x86, bug 195990 - - 11 Sep 2007; Bernard Cafarelli - +files/popplerkit-0.2-poppler6_support.patch, popplerkit-0.2.ebuild: - Add patch for poppler 0.6 support - -*popplerkit-0.2 (10 Sep 2007) - - 10 Sep 2007; Bernard Cafarelli - -popplerkit-0.0.0.20050609.ebuild, -popplerkit-0.0.0.20050720.ebuild, - +popplerkit-0.2.ebuild: - Bump from GNUstep overlay - - 06 Feb 2007; Diego Pettenò ChangeLog: - Regenerate digest in Manifest2 format. - - 08 Jan 2006; Michael Hanselmann metadata.xml: - Remove retiring dev from metadata. - -*popplerkit-0.0.0.20050720 (20 Jul 2005) - - 20 Jul 2005; Armando Di Cianno - +popplerkit-0.0.0.20050720.ebuild: - Version bump - - 16 Jul 2005; David Holm - popplerkit-0.0.0.20050609.ebuild: - Added to ~ppc. - -*popplerkit-0.0.0.20050609 (15 Jul 2005) - - 15 Jul 2005; Armando Di Cianno +metadata.xml, - +popplerkit-0.0.0.20050609.ebuild: - Original package import - diff --git a/gnustep-libs/popplerkit/Manifest b/gnustep-libs/popplerkit/Manifest deleted file mode 100644 index 25880c368ede..000000000000 --- a/gnustep-libs/popplerkit/Manifest +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX popplerkit-0.2-poppler6_support.patch 6044 SHA256 b41398eb79b16fe32fedc9d5ab3265b31f4cc156a33268b03b77241c0e9cf10e SHA512 d74cffe023f95b2950ad8f87910c27fc84218c6202847fa5342900e7cad320cc9d12831f9ed4e49b0232b279fede35ade7e35726d9509851580986c8215128e9 WHIRLPOOL c038f8eb7c1299ba4fbf5e353449bfdc14d448edba395abb26deafd9e6f14ecb4245f9a7b84300763fc7c1ec787643ee6724c5c11037eab6a26600b35f831cbc -AUX popplerkit-0.4.0-config-as-needed.patch 1636 SHA256 143dfd50d019e8b648db18492bab440bb089b8730cab7bb4d4093488a4ccf160 SHA512 158a36694282a09d6c3f876a6372257f5ee5ce771485992d12606dff3063262cc1c64f2ecdc160710cff141f850ee976f06e800c21a14db726612dae552f4d18 WHIRLPOOL 240402ed5066b9318b5b5bed87a75d8f6da1a0e9e461736a9ddb72b3cacc38d60136548577a5b913512d1ce4c6ab0d2c729e78104f5eaddc4b90dc27203691e3 -DIST etoile-0.4.1.tar.bz2 8281449 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25 -EBUILD popplerkit-0.4.1.ebuild 972 SHA256 04ece1d63c99172a09b39ae5afae29a4ef09927ba6c93bf5f7e6f1bad03ac645 SHA512 41e8b1d9c298a8067373b9d779dff4cbab612ea9bafb6c2c3c50792af5e00bacdfaf81ed4f7cc7e7a13c93e52d74e79902b6106964560e79c0b67e24d29bcd94 WHIRLPOOL c15541f5446bf15ffaa8c743b496ffa0542f0d1c7d6c31ee5d53892a9553509a01719afeca0edfa172b812b069aa2c31c6b96b6b1f5f1ea4080d0b45996dc2e2 -MISC ChangeLog 3718 SHA256 ae71b41d5fd9165709d62b99670cb0e17ac9b254ed9518ca44ec94173928e520 SHA512 ef3f63138ba2cfcccb646b975184c1746e3825dbda4ba56b5c952378d7128ae66f6a54d0bc525a845359c98e83a6635e08a630b9534c90d4aaeeaa3d60aeb813 WHIRLPOOL 0f66e60f074b442515b48ffe9a0b565abe17158691db258b3e2ab64848e6f1d740994a6f52e6091a596bd3fd1ff2538588efc95a4ca8ac62558386e241a6343a -MISC metadata.xml 249 SHA256 78beb5173d3c75a10c26540981e01218b86d92441d0a09c84b0af106d2e8b24a SHA512 24ed46f3b53daef2004458d5071073d8a29f9f1c139a4f16b21bf8e9057ab7552b9937f6daaca902c54c2a223fb30488e697e3267d9c78683d67d963f7fa749f WHIRLPOOL 52266d11385a493e5b5fee60302a0109becb196b598248a1ba2527098f8ffbf98b0bba7022e7dfd8bf7d5890e0e36f3e750528183c9742a4ef8320679b1af9c3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQIcBAEBCAAGBQJQIqDiAAoJENwGBM22xffePiYP/2ou/bnSWR2KKhxVw5JUC4sq -WscNMrsHYBnphdWE7nZlimKT6cp/vxdl3axEUwHslDAXo2vUq9CNMf3/u3nBmpxN -v8t00aGsDXok5VxHVXkNZWsd8Uj3+gyyEk6XzA7RO3KwPyaR2NgwF8DwnaordIZR -Gy/02QI3EFhcbZ4ZMynNTZYBgIaADAnTN2a9qUlaE93ReyToRKnXdGIarNmIt4X1 -RMljUUw9l3lrGYSLwEGjUbQ9XBj0Fsrr95na0BEmferI6se10Qop1OOabTR+Lh8q -Na4b0QSBLdXJ2h570ojxDjYqanINA4XkpSU5Y4aCldODEFR23cegADGZdrG9/syL -uQ6d35NyVV+so1G0haHobWWOE2C/YJCW0hp1RVrZFq63neg2GB9Mo9XOtwFeuD97 -SkTcYBl0ICIOG730WqiMj2TeBYw3f2V26U2jps5j9c+5WrU0Iodua85/shxBNjI0 -+247K6IIegfYFKJPSPuyZ3pUbeW4qjdQGrV149jEiYiA8/SlnvTAzp6MwHFfQCIw -QjA2ZU6PdsRfmfjB/CVB7WOFHlLQjmWNvLkgKekG9bd1/1/HtBVdxGYHsh811yd8 -WHB9fPjgtz7kvqceTSuJQnByO0SGa6LdV4vSGakhoA4TgrtNFOgg0mMilHP4RRzg -JiHXOZwvREHddmKnXVrj -=sSU5 ------END PGP SIGNATURE----- diff --git a/gnustep-libs/popplerkit/files/popplerkit-0.2-poppler6_support.patch b/gnustep-libs/popplerkit/files/popplerkit-0.2-poppler6_support.patch deleted file mode 100644 index 352d8812ed2c..000000000000 --- a/gnustep-libs/popplerkit/files/popplerkit-0.2-poppler6_support.patch +++ /dev/null @@ -1,191 +0,0 @@ -Index: Etoile/Frameworks/PopplerKit/bindings/poppler_page.cc -=================================================================== ---- Etoile/Frameworks/PopplerKit/bindings/poppler_page.cc (révision 2341) -+++ Etoile/Frameworks/PopplerKit/bindings/poppler_page.cc (révision 2342) -@@ -33,7 +33,8 @@ - return NULL; - } - -- if ((pageIndex <= 0) || (pageIndex > PDF_DOC(poppler_document)->getNumPages())) -+ if ((pageIndex <= 0) || -+ ((int)pageIndex > PDF_DOC(poppler_document)->getNumPages())) - { - return NULL; - } -@@ -69,8 +70,7 @@ - - #ifdef POPPLER_0_4 - return PAGE(poppler_page)->getWidth(); --#endif --#ifdef POPPLER_0_5 -+#else - return PAGE(poppler_page)->getMediaWidth(); - #endif - -@@ -85,9 +85,7 @@ - - #ifdef POPPLER_0_4 - return PAGE(poppler_page)->getHeight(); --#endif --#ifdef POPPLER_0_5 -+#else - return PAGE(poppler_page)->getMediaHeight(); - #endif -- - } -Index: Etoile/Frameworks/PopplerKit/bindings/poppler.cc -=================================================================== ---- Etoile/Frameworks/PopplerKit/bindings/poppler.cc (révision 2341) -+++ Etoile/Frameworks/PopplerKit/bindings/poppler.cc (révision 2342) -@@ -110,7 +110,7 @@ - } - - // tell fontconfig about application fonts -- for (int i = 0; i < nappFonts; i++) -+ for (unsigned int i = 0; i < nappFonts; i++) - { - if (FcConfigAppFontAddFile(FcConfigGetCurrent(), appFonts[i])) - { -@@ -118,12 +118,16 @@ - } - else - { -- fprintf(stderr, "failed to register application font %s\n"); -+ fprintf(stderr, "failed to register application font %s\n", appFonts[i]); - } - fflush(stderr); - } - -+#ifdef POPPLER_0_6 -+ globalParams = new GlobalParams(); -+#else - globalParams = new GlobalParams(NULL); -+#endif - #ifdef POPPLER_0_4 - globalParams->setupBaseFontsFc(NULL); - #endif -Index: Etoile/Frameworks/PopplerKit/bindings/poppler_splash_renderer.cc -=================================================================== ---- Etoile/Frameworks/PopplerKit/bindings/poppler_splash_renderer.cc (révision 2341) -+++ Etoile/Frameworks/PopplerKit/bindings/poppler_splash_renderer.cc (révision 2342) -@@ -38,8 +38,7 @@ - #ifdef POPPLER_0_4 - white.rgb8 = splashMakeRGB8(bg_red, bg_green, bg_blue); - void* splashDevice = new SplashOutputDev(splashModeRGB8, gFalse, white); --#endif --#ifdef POPPLER_0_5 -+#else // 0.5, 0.6 - white[0] = bg_red; - white[1] = bg_green; - white[2] = bg_blue; -@@ -86,13 +85,17 @@ - SYNCHRONIZED(PAGE(poppler_page)->displaySlice(SPLASH_DEV(output_dev), - (double)hDPI, (double)vDPI, - rotate, --#ifdef POPPLER_0_5 -+#ifndef POPPLER_0_4 // 0.5, 0.6 - gTrue, // useMediaBox - #endif - gTrue, // Crop - (int)sliceX, (int)sliceY, - (int)sliceW, (int)sliceH, -+#ifdef POPPLER_0_6 -+ gFalse, // printing -+#else - NULL, // Links -+#endif - PDF_DOC(poppler_document)->getCatalog())); - - return 1; -@@ -123,16 +126,14 @@ - - #ifdef POPPLER_0_4 - SplashRGB8* rgb8; --#endif --#ifdef POPPLER_0_5 -+#else // 0.5, 0.6 - SplashColorPtr color; - #endif - unsigned char* dataPtr; - - #ifdef POPPLER_0_4 - rgb8 = SPLASH_BITMAP(bitmap)->getDataPtr().rgb8; --#endif --#ifdef POPPLER_0_5 -+#else // 0.5, 0.6 - color = SPLASH_BITMAP(bitmap)->getDataPtr(); - #endif - -@@ -146,8 +147,7 @@ - *dataPtr++ = splashRGB8G(*rgb8); - *dataPtr++ = splashRGB8B(*rgb8); - ++rgb8; --#endif --#ifdef POPPLER_0_5 -+#else // 0.5, 0.6 - *dataPtr++ = splashRGB8R(color); - *dataPtr++ = splashRGB8G(color); - *dataPtr++ = splashRGB8B(color); -Index: Etoile/Frameworks/PopplerKit/bindings/GNUmakefile -=================================================================== ---- Etoile/Frameworks/PopplerKit/bindings/GNUmakefile (révision 2341) -+++ Etoile/Frameworks/PopplerKit/bindings/GNUmakefile (révision 2342) -@@ -55,4 +55,8 @@ - bindings_CFLAGS += -DPOPPLER_0_5 - endif - -+ifeq ($(POPPLER_0_6), YES) -+ bindings_CFLAGS += -DPOPPLER_0_6 -+endif -+ - include $(GNUSTEP_MAKEFILES)/subproject.make -Index: Etoile/Frameworks/PopplerKit/bindings/poppler_text.cc -=================================================================== ---- Etoile/Frameworks/PopplerKit/bindings/poppler_text.cc (révision 2341) -+++ Etoile/Frameworks/PopplerKit/bindings/poppler_text.cc (révision 2342) -@@ -51,10 +51,16 @@ - - SYNCHRONIZED(PAGE(poppler_page)->display(TEXT_DEV(text_device), - hDPI, vDPI, rotate, --#ifdef POPPLER_0_5 -+#ifndef POPPLER_0_4 - gTrue, // useMediaBox - #endif -- crop, NULL, PDF_DOC(poppler_document)->getCatalog())); -+ crop, -+#ifdef POPPLER_0_6 -+ gFalse, // printing -+#else -+ NULL, // links -+#endif -+ PDF_DOC(poppler_document)->getCatalog())); - return 1; - } - -@@ -70,7 +76,7 @@ - int result = TEXT_DEV(text_device)->findText(text_utf32, text_len, - start_at_top, stop_at_bottom, - start_at_last, stop_at_last, --#ifdef POPPLER_0_5 -+#ifndef POPPLER_0_4 // 0.5, 0.6 - gTrue, gFalse, - #endif - x_min, y_min, x_max, y_max); -Index: Etoile/Frameworks/PopplerKit/config.sh -=================================================================== ---- Etoile/Frameworks/PopplerKit/config.sh (révision 2341) -+++ Etoile/Frameworks/PopplerKit/config.sh (révision 2342) -@@ -60,6 +60,13 @@ - POPPLER_VERSION="POPPLER_0_5" - fi - -+${PKG_CONFIG} --atleast-version=0.5.9 poppler -+if [ $? -eq 0 ]; then -+ POPPLER_VERSION="POPPLER_0_6" -+fi -+ -+echo $POPPLER_VERSION -+ - # include freetype, just to be sure - ${PKG_CONFIG} --exists freetype2 - if [ $? -eq 0 ]; then diff --git a/gnustep-libs/popplerkit/files/popplerkit-0.4.0-config-as-needed.patch b/gnustep-libs/popplerkit/files/popplerkit-0.4.0-config-as-needed.patch deleted file mode 100644 index 179d81309d86..000000000000 --- a/gnustep-libs/popplerkit/files/popplerkit-0.4.0-config-as-needed.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- Frameworks/PopplerKit/config.sh.orig 2008-12-08 14:43:36.000000000 +0100 -+++ Frameworks/PopplerKit/config.sh 2008-12-08 14:43:51.000000000 +0100 -@@ -22,7 +22,7 @@ - exit 1 - fi - POPPLER_CFLAGS="${POPPLER_CFLAGS} `${PKG_CONFIG} --cflags fontconfig`" --POPPLER_LIBS="${POPPLER_LDFLAGS} `${PKG_CONFIG} --libs fontconfig`" -+POPPLER_LIBS="${POPPLER_LIBS} `${PKG_CONFIG} --libs fontconfig`" - - # poppler splash device - ${PKG_CONFIG} --exists poppler-splash -@@ -31,7 +31,7 @@ - exit 1 - fi - POPPLER_CFLAGS="${POPPLER_CFLAGS} `${PKG_CONFIG} --cflags poppler-splash`" --POPPLER_LIBS="${POPPLER_LDFLAGS} `${PKG_CONFIG} --libs poppler-splash`" -+POPPLER_LIBS="${POPPLER_LIBS} `${PKG_CONFIG} --libs poppler-splash`" - - # poppler cairo device - ${PKG_CONFIG} --exists poppler-cairo -@@ -42,7 +42,7 @@ - # Disable Cairo support for now to avoid most of problem - # HAVE_CAIRO="YES" - # POPPLER_CFLAGS="${POPPLER_CFLAGS} `${PKG_CONFIG} --cflags poppler-cairo`" --# POPPLER_LIBS="${POPPLER_LDFLAGS} `${PKG_CONFIG} --libs poppler-cairo`" -+# POPPLER_LIBS="${POPPLER_LIBS} `${PKG_CONFIG} --libs poppler-cairo`" - HAVE_CAIRO="NO" - fi - -@@ -85,7 +85,7 @@ - echo "FT_CFLAGS=${FT_CFLAGS}" >> config.make - echo "FT_LIBS=${FT_LIBS}" >> config.make - echo "ADDITIONAL_CFLAGS+=\$(POPPLER_CFLAGS) \$(FT_CFLAGS)" >> config.make --echo "ADDITIONAL_LDFLAGS+=\$(POPPLER_LIBS) \$(POPPLER_LIBS)" >> config.make -+echo "LIBRARIES_DEPEND_UPON+=\$(POPPLER_LIBS) \$(FT_LIBS)" >> config.make - # we add -I/usr/X11R6/include for older FreeBSD version. - echo "ADDITIONAL_INCLUDE_DIRS += -I/usr/X11R6/include" >> config.make - echo "HAVE_CAIRO=${HAVE_CAIRO}" >>config.make diff --git a/gnustep-libs/popplerkit/metadata.xml b/gnustep-libs/popplerkit/metadata.xml deleted file mode 100644 index e2a06b10cc27..000000000000 --- a/gnustep-libs/popplerkit/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - -gnustep - -A Framework for accessing and rendering PDF content - - diff --git a/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild b/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild deleted file mode 100644 index 46e4dc2cab82..000000000000 --- a/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild,v 1.9 2012/08/08 17:22:33 dilfridge Exp $ - -EAPI=2 - -inherit gnustep-2 - -S="${WORKDIR}/Etoile-${PV}/Frameworks/PopplerKit" - -DESCRIPTION="PopplerKit is a GNUstep/Cocoa framework for accessing and rendering PDF content." -HOMEPAGE="http://www.etoile-project.org" -SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.bz2" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -SLOT="0" -IUSE="" - -RDEPEND=">=app-text/poppler-0.18.4-r2 - >=media-libs/freetype-2" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.4.0-config-as-needed.patch - - cd "${WORKDIR}/Etoile-${PV}" - sed -i -e "s/-Werror//" etoile.make || die "sed failed" -} - -src_compile() { - # Compile MissingKit separately - cd "${S}"/MissingKit - gnustep-base_src_compile - cd "${S}" - gnustep-base_src_compile -} -- cgit v1.2.3-65-gdbad