From b9de5c063277528161e6ec3fe192d876d8ffbce5 Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Mon, 24 Nov 2014 21:45:50 +0000 Subject: [PATCH] Revbump to fix as-needed, doxygen and freetype linkage (bug 514584, thanks Hendrik v. Raven). Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x62EEF090 --- app-text/paps/ChangeLog | 14 +++++-- app-text/paps/Manifest | 18 ++++++++- .../paps-0.6.8-fix-as-needed-build.patch | 36 ++++++++++++++++++ .../paps-0.6.8-fix-doxygen-acinclude.patch | 20 ++++++++++ .../paps-0.6.8-fix-freetype-include.patch | 13 +++++++ app-text/paps/paps-0.6.8-r1.ebuild | 37 +++++++++++++++++++ 6 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch create mode 100644 app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch create mode 100644 app-text/paps/files/paps-0.6.8-fix-freetype-include.patch create mode 100644 app-text/paps/paps-0.6.8-r1.ebuild diff --git a/app-text/paps/ChangeLog b/app-text/paps/ChangeLog index e8812ff52118..f8ab97ab962c 100644 --- a/app-text/paps/ChangeLog +++ b/app-text/paps/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-text/paps -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/paps/ChangeLog,v 1.4 2012/05/21 09:51:53 phajdan.jr Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/paps/ChangeLog,v 1.5 2014/11/24 21:45:46 xmw Exp $ + +*paps-0.6.8-r1 (24 Nov 2014) + + 24 Nov 2014; Michael Weber + +files/paps-0.6.8-fix-as-needed-build.patch, + +files/paps-0.6.8-fix-doxygen-acinclude.patch, + +files/paps-0.6.8-fix-freetype-include.patch, +paps-0.6.8-r1.ebuild: + Revbump to fix as-needed, doxygen and freetype linkage (bug 514584, thanks + Hendrik v. Raven). 21 May 2012; Pawel Hajdan jr paps-0.6.8.ebuild: x86 stable wrt bug #415463 @@ -17,4 +26,3 @@ +metadata.xml: Initial import, fixed bug 134367. Thanks to Ed Catmur and Petr Pisar for their ebuild. - diff --git a/app-text/paps/Manifest b/app-text/paps/Manifest index a11b96dad602..7efa50378689 100644 --- a/app-text/paps/Manifest +++ b/app-text/paps/Manifest @@ -1,4 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX paps-0.6.8-fix-as-needed-build.patch 1051 SHA256 0df19dae30e2e22142cc4085088c48e98201b33d308073883a0ac88fee88a6e8 SHA512 943a2e2d267cf339cc3958ae5622fb4f8c3cd25fca63fa6c91c5b37c34e833dbdaf3a11e038d00b23a44fc590a268729941fee790f9f513f0532f9c339141695 WHIRLPOOL 23ef8def7c451b9f7c20e3ddebecdd08fc2b812511021fe278f69a826dd16e50f97b8736aaaece8dcf3a82eca9dd466f02f28e71698e9e4d972ccd02dc425b5b +AUX paps-0.6.8-fix-doxygen-acinclude.patch 699 SHA256 3ad387e3acacb577ec8072d00a5886cc742c688b7ffa41824420bd04a4d7f1e7 SHA512 b3c0949e7b6579cd3c3f82692ca2e0e9479bf435cc99b8c9c71e1842e32bccd9a79c2c199541ced21812ebf5cfc0887304511aa7cd1d4eba4bb2d476c4710b7b WHIRLPOOL 8593a2394e8c973c16793fc3c9be393c5e8e11ac70c3e9e0f91c24e53aae7b10fd420cf43902890ebab91339d543bb4cf7f85e51b76421914f848301d6f71436 +AUX paps-0.6.8-fix-freetype-include.patch 300 SHA256 0b21aef4632fe2c8cf7901cd3273c218cff0043ee5fd37cb497e079d04dd2483 SHA512 d35ec14fe0bed8266da804cd8059dcd6e9813d81e0f0e8533a0619cafb30e87ebad1d124435a4fffeb70e42ad73f6e0d15d0b210cd215906b4cf35e50886f1e7 WHIRLPOOL fd8296a37cb785d843aca6af8cc1c0287bc30999ce2665d1c945a963b43ea0072f5a09577a0beb4d94ab17c13d32b55a8a9a5b8791f07a78dee65ecdf6e953dd DIST paps-0.6.8.tar.gz 460062 SHA256 db214c4ea7ecde2f7986b869f6249864d3ff364e6f210c15aa2824bcbd850a20 SHA512 db657d90179e11fe42bbcdbebe09a84f1927c99d0b539c9e29b66b3cb8ffcf33ff500c9d81835ae5a0880382bf8f24801f04742517b76b8e005b125a139d8bba WHIRLPOOL 69291aeadac3d85c1f0ca53bbe09b0510949b75159ca138c3102e1708e898a50a38fa4b78c9003957fb83da82ade57a5e26be8b63bb68c2022148f45f2615e27 +EBUILD paps-0.6.8-r1.ebuild 841 SHA256 697131b01857c54fef2cad4b98d0809c8b0d22795c1c715727457aba14788616 SHA512 0effa79e7848a3567dcfc743ffa2bb7b6e08d4e959ff987af5802448bb380b3980186d00d34cd1ba1e20486d837b3d886867039110efc30dde8505669cf18749 WHIRLPOOL 72cf4662cdf097dd58d8952ff1a69c211a92183fabc45ac3729cfe974c25c16b6b8a56ca8bbe53c1c2c8118d856f3b95df45fdd24737c4d870f7ecdc347c5919 EBUILD paps-0.6.8.ebuild 669 SHA256 ef08400f73811fcedf53008d86d984b5164af2da9956f91f8eb6a5693bf73249 SHA512 15648c3f1920fba6e030875a1948597a61aa80408dd6a1df9b99028a302e413f3d0c0957bf5f315dba1590c0ae0d5b0accfee00c72fb6c25aac3005b889753b3 WHIRLPOOL acf600ed185eed16c7c198f144ee74aa39371aa4705416fb0ccb8cfa2def41e890ecc214e163879e24b99736d876f1d9c35d86d40081889c7adc3928b99f708d -MISC ChangeLog 765 SHA256 8432bce2fdf2ff0882566a270cf4d02040b0a066ec9095bcd065e849461e9363 SHA512 37faf04aea77587a3fd62214ccdcdf11c514e665d180765857ca97222381d94ea0fce90bf948b208ecadd50ed4f39c613d051462beb04e512af5863d3b4a0a8d WHIRLPOOL 498f72dea79b9d994e0f1aa3538e065a324538df2bcc6fa4922ed63c508968914046c1d870bddfaa4f0ce807530184146e625cf6851b711745488f8884e8b80e +MISC ChangeLog 1099 SHA256 d78a9ab1332ea3d071217ae1b2fb2d460aca9910f58399fafe3711d7e32892cd SHA512 e8343e0fb7fa4f2beffa319a12c2aa707d4fb3304b43d23e6da13097009171511fdaceb1fbcd6aa4c57636390dfcbb5c0f507d4355055d553b0c4edcbc4cad2e WHIRLPOOL 16e357b727be853bc5d0623d51297947c1990b5b4e03a1504037187590da14caa5e8a1bcd4944ba2858d94a8cc9ef4d8b58aa1b48313c5335526ffe85141b458 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iL4EAREIAGYFAlRzpxFfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl +bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky +N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JBeDAD/Vezh5C0an23E/rGmocPZjUhA +furD54p5NWNLr+DCHcIA/3pdtmB8YBueZ115I2hWzOf0l18jztW7/tVCJw223MFk +=FYV5 +-----END PGP SIGNATURE----- diff --git a/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch new file mode 100644 index 000000000000..ec4ba8b2b180 --- /dev/null +++ b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch @@ -0,0 +1,36 @@ +--- paps-0.6.8/configure.in ++++ paps-0.6.8/configure.in +@@ -18,4 +18,6 @@ + + DX_INIT_DOXYGEN(libpaps, doxygen.cfg, doxygen-doc) + ++PKG_CHECK_MODULES([PANGO], [pangoft2]) ++ + AC_OUTPUT(Makefile src/Makefile) +--- paps-0.6.8/src/Makefile.am ++++ paps-0.6.8/src/Makefile.am +@@ -7,21 +7,19 @@ + bin_PROGRAMS = paps + paps_CFLAGS = -Wall + paps_SOURCES = paps.c +-paps_LDADD = $(lib_LIBRARIES) $(all_libraries) +-paps_LDFLAGS = `pkg-config --libs pangoft2` ++paps_LDADD = $(lib_LIBRARIES) $(all_libraries) $(PANGO_LIBS) + paps_DEPENDENCIES = $(lib_LIBRARIES) + + EXTRA_DIST = test_libpaps.c paps.1 + + # set the include path found by configure +-INCLUDES= $(all_includes) `pkg-config --cflags pangoft2` ++INCLUDES= $(all_includes) $(PANGO_CFLAGS) + + # Test program + noinst_PROGRAMS = test_libpaps + + + test_libpaps_SOURCES = test_libpaps.c +-test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries) +-test_libpaps_LDFLAGS = `pkg-config --libs pangoft2` ++test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries) $(PANGO_LIBS) + test_libpaps_DEPENDENCIES = $(lib_LIBRARIES) + diff --git a/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch new file mode 100644 index 000000000000..baba74b4b8bb --- /dev/null +++ b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch @@ -0,0 +1,20 @@ +--- paps-0.6.8/acinclude.m4 ++++ paps-0.6.8/acinclude.m4 +@@ -78,7 +78,7 @@ + AC_PATH_TOOL([$1], [$2]) + if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then + AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) +- AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0) ++ AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0) + fi + ]) + +@@ -101,7 +101,7 @@ + # ---------------------------------------------------------- + # Turn off the DX_CURRENT_FEATURE if the required feature is off. + AC_DEFUN([DX_CLEAR_DEPEND], [ +-test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0) ++test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0) + ]) + + # DX_FEATURE_ARG(FEATURE, DESCRIPTION, diff --git a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch new file mode 100644 index 000000000000..30b456e77416 --- /dev/null +++ b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch @@ -0,0 +1,13 @@ +--- paps-0.6.8/src/libpaps.c ++++ paps-0.6.8/src/libpaps.c +@@ -25,8 +25,8 @@ + + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include diff --git a/app-text/paps/paps-0.6.8-r1.ebuild b/app-text/paps/paps-0.6.8-r1.ebuild new file mode 100644 index 000000000000..edda11331042 --- /dev/null +++ b/app-text/paps/paps-0.6.8-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/paps/paps-0.6.8-r1.ebuild,v 1.1 2014/11/24 21:45:46 xmw Exp $ + +EAPI=5 + +inherit autotools eutils + +DESCRIPTION="Unicode-aware text to PostScript converter" +HOMEPAGE="http://paps.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="x11-libs/pango" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-fix-as-needed-build.patch \ + "${FILESDIR}"/${P}-fix-doxygen-acinclude.patch \ + "${FILESDIR}"/${P}-fix-freetype-include.patch + + mv configure.in configure.ac || die + + eautoreconf +} + +src_install() { + dobin src/paps + doman src/paps.1 + dodoc AUTHORS ChangeLog NEWS README TODO +} -- 2.26.2