From: Michele Noberasco Date: Mon, 20 Nov 2006 14:09:18 +0000 (+0000) Subject: Added patch to fix working with fontconfig >= 2.4. See bug #148988. General dependanc... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb36146b3b78f3f9bfc58b17e38fdbefcd6184b8;p=gentoo.git Added patch to fix working with fontconfig >= 2.4. See bug #148988. General dependancies overhaul, see bug #150669. Package-Manager: portage-2.1.1-r1 --- diff --git a/x11-misc/adesklets/ChangeLog b/x11-misc/adesklets/ChangeLog index 624266e2f3bc..261eee3a19b5 100644 --- a/x11-misc/adesklets/ChangeLog +++ b/x11-misc/adesklets/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-misc/adesklets # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/ChangeLog,v 1.29 2006/08/30 08:13:56 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/ChangeLog,v 1.30 2006/11/20 14:09:18 s4t4n Exp $ + +*adesklets-0.6.1-r1 (20 Nov 2006) + + 20 Nov 2006; Michele Noberasco +adesklets-0.6.1-r1.ebuild: + Revision bump. Added patch to use fontconfig >= 2.4. See bug #148988. Also, + made fontconfig support optional and revisited package dependancies. See bug #150669. + adesklets-0.6.1.ebuild: + Revisited package dependancies. See bug #150669. 30 Aug 2006; Michele Noberasco adesklets-0.6.1.ebuild: Moved xwifinfo dep to fix bug #128018 again. diff --git a/x11-misc/adesklets/Manifest b/x11-misc/adesklets/Manifest index a283817eaaec..5f5dab654d33 100644 --- a/x11-misc/adesklets/Manifest +++ b/x11-misc/adesklets/Manifest @@ -2,19 +2,27 @@ AUX adesklets-0.6.1-fix-as-needed.patch 836 RMD160 1f799d0e597a369b7100afe1badb1 MD5 8a0dc1e97e80eb18d3f389195abb66ca files/adesklets-0.6.1-fix-as-needed.patch 836 RMD160 1f799d0e597a369b7100afe1badb15813229c287 files/adesklets-0.6.1-fix-as-needed.patch 836 SHA256 b79da39dcf10f0e8d6c59f70209ef6b8944766984f6993a3b7562c1e19bdb928 files/adesklets-0.6.1-fix-as-needed.patch 836 +AUX adesklets-0.6.1-fontconfig.patch 1480 RMD160 c6d18e7c76cba6d9281307dc2dafce9b1af6745e SHA1 1cdb78e9bfeb1baed1c3690213f9001fc46470c3 SHA256 3d6d6f475ef79e4a243ff368ded4f419eada5ef0b9f98830ca5d4b4b8b4964c7 +MD5 0374aec97670c90713fcabc2710e2160 files/adesklets-0.6.1-fontconfig.patch 1480 +RMD160 c6d18e7c76cba6d9281307dc2dafce9b1af6745e files/adesklets-0.6.1-fontconfig.patch 1480 +SHA256 3d6d6f475ef79e4a243ff368ded4f419eada5ef0b9f98830ca5d4b4b8b4964c7 files/adesklets-0.6.1-fontconfig.patch 1480 AUX adesklets-ctrlmenu.patch 776 RMD160 9895b6f002a9c67925c31dc06dce79bbb52d2dfc SHA1 c6fb7c4dc8395d151fef905487ec1e44d4ea34c7 SHA256 1d0859c7a033d8dd6673613b1d57683692530b3274fbdf23ce9d6a655d39f91e MD5 00a2cce2428caedc9eb20a9cdd3b40a0 files/adesklets-ctrlmenu.patch 776 RMD160 9895b6f002a9c67925c31dc06dce79bbb52d2dfc files/adesklets-ctrlmenu.patch 776 SHA256 1d0859c7a033d8dd6673613b1d57683692530b3274fbdf23ce9d6a655d39f91e files/adesklets-ctrlmenu.patch 776 DIST adesklets-0.6.1.tar.bz2 387553 RMD160 65cca6fe53f23f029c74cb101022e4481ee114d0 SHA1 bb81b4cedd5b0389b96d47c4ba57b3298fc05146 SHA256 9998e240715c34b5d4c8b31b5ed1fef38262a39fad08fa65be0b58a47eccc3c2 -EBUILD adesklets-0.6.1.ebuild 2948 RMD160 c838c87ecf70550e7832c4d0c5667d7e1cf219f5 SHA1 d05f2dbe9d1ef29cbc8a34fb3f6d2ced0cdee20d SHA256 45768095da05a464194bf7ec20416d67646ad807e4e193f93bca1fa6ddfcf2d4 -MD5 6c4dd4cf937bd83f5ed9182ba702e17b adesklets-0.6.1.ebuild 2948 -RMD160 c838c87ecf70550e7832c4d0c5667d7e1cf219f5 adesklets-0.6.1.ebuild 2948 -SHA256 45768095da05a464194bf7ec20416d67646ad807e4e193f93bca1fa6ddfcf2d4 adesklets-0.6.1.ebuild 2948 -MISC ChangeLog 4853 RMD160 6b72efc984c7718cd5d644fb6dddc966491c65b7 SHA1 6f781c4e514ab1dba9b75519f3a07bedddd589da SHA256 7d52c889f1122c19cac1babcfee36e3f39a679419896f409e385d8cc0a517845 -MD5 f365f7afb79e7e13bc047ec7acbfc8f1 ChangeLog 4853 -RMD160 6b72efc984c7718cd5d644fb6dddc966491c65b7 ChangeLog 4853 -SHA256 7d52c889f1122c19cac1babcfee36e3f39a679419896f409e385d8cc0a517845 ChangeLog 4853 +EBUILD adesklets-0.6.1-r1.ebuild 3242 RMD160 a2093f482b859a4dced0d6b1162a35706b69e915 SHA1 5aa79be4728d2b8c6ddfebf1541701e19a512922 SHA256 b6779137e3c74f51f1f62d6bf48fafda298e6101e99621e055d5b9b382394ddf +MD5 4092eddb595f42a326e87f7e3bd6847f adesklets-0.6.1-r1.ebuild 3242 +RMD160 a2093f482b859a4dced0d6b1162a35706b69e915 adesklets-0.6.1-r1.ebuild 3242 +SHA256 b6779137e3c74f51f1f62d6bf48fafda298e6101e99621e055d5b9b382394ddf adesklets-0.6.1-r1.ebuild 3242 +EBUILD adesklets-0.6.1.ebuild 3015 RMD160 a8269f8afc961cb67e844ad6406e5a71f57c668c SHA1 044f97f65b2e5e7349127e0c49f526fcc2f02a6b SHA256 d3bb7b81f3fecb3fdc79399a3dd9229492e06c518eaefe3855e04a540ab3f112 +MD5 a3c013c81c0a27512037da8013ca8883 adesklets-0.6.1.ebuild 3015 +RMD160 a8269f8afc961cb67e844ad6406e5a71f57c668c adesklets-0.6.1.ebuild 3015 +SHA256 d3bb7b81f3fecb3fdc79399a3dd9229492e06c518eaefe3855e04a540ab3f112 adesklets-0.6.1.ebuild 3015 +MISC ChangeLog 5212 RMD160 d494c17998161e40646f688d514a168c300d7cc2 SHA1 33ac977460ce77b10b4dfda03544bb2159d5134e SHA256 490313a8fdce38e015216ea9137ea79cb3785e3e99a112474f8456d8fd96d61d +MD5 dc60bc9f359a0128da86bf32e158156f ChangeLog 5212 +RMD160 d494c17998161e40646f688d514a168c300d7cc2 ChangeLog 5212 +SHA256 490313a8fdce38e015216ea9137ea79cb3785e3e99a112474f8456d8fd96d61d ChangeLog 5212 MISC metadata.xml 551 RMD160 99b9eb03ca5c5ab03e1625584e1d09cd1724f7c3 SHA1 42da0483253593302e16025c8b416279aa7a870b SHA256 a6180c2f4d9890bb483e436f94c17de4a08b9e027d54d712240df00b62950e54 MD5 ba2766b0b67886a694c4c93cdab3c972 metadata.xml 551 RMD160 99b9eb03ca5c5ab03e1625584e1d09cd1724f7c3 metadata.xml 551 @@ -22,3 +30,6 @@ SHA256 a6180c2f4d9890bb483e436f94c17de4a08b9e027d54d712240df00b62950e54 metadata MD5 a2ab582e0187319f71cf0f5af237f095 files/digest-adesklets-0.6.1 250 RMD160 48b082b853c5f1ef670c9531b9d734b314dc63f1 files/digest-adesklets-0.6.1 250 SHA256 33691330baa736d4a7ff8f2413194e42e9071dc7d86bb63680d383d64a1c03ea files/digest-adesklets-0.6.1 250 +MD5 a2ab582e0187319f71cf0f5af237f095 files/digest-adesklets-0.6.1-r1 250 +RMD160 48b082b853c5f1ef670c9531b9d734b314dc63f1 files/digest-adesklets-0.6.1-r1 250 +SHA256 33691330baa736d4a7ff8f2413194e42e9071dc7d86bb63680d383d64a1c03ea files/digest-adesklets-0.6.1-r1 250 diff --git a/x11-misc/adesklets/adesklets-0.6.1-r1.ebuild b/x11-misc/adesklets/adesklets-0.6.1-r1.ebuild new file mode 100644 index 000000000000..1d3943326d97 --- /dev/null +++ b/x11-misc/adesklets/adesklets-0.6.1-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/adesklets-0.6.1-r1.ebuild,v 1.1 2006/11/20 14:09:18 s4t4n Exp $ + +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" + +inherit eutils perl-module autotools + +DESCRIPTION="An interactive Imlib2 console for the X Window system" +HOMEPAGE="http://adesklets.sf.net/" +SRC_URI="mirror://sourceforge/adesklets/${P}.tar.bz2" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="X python perl debug ctrlmenu fontconfig" + +RDEPEND="X? ( || ( ( + x11-libs/libX11 + x11-apps/xprop + x11-libs/libXt ) + virtual/x11 ) + python? ( >=dev-lang/python-2.4.3-r1 ) + perl? ( >=dev-lang/perl-5.8.2 ) + fontconfig? ( >=media-libs/fontconfig-2.3.2-r1 ) + >=media-libs/imlib2-1.2.0-r2 + >=x11-apps/xwininfo-1.0.2 ) + >=sys-apps/sed-4.1.4-r1 + >=sys-apps/coreutils-5.94-r1 + >=sys-process/procps-3.2.6" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.20 + X? ( || ( x11-proto/xproto virtual/x11 ) )" + +src_unpack() +{ + unpack ${A} + cd ${S} + + #Fix for bug #123538: control context menu fix + epatch ${FILESDIR}/${PN}-ctrlmenu.patch + + #Fix for bug #131813: linker flags ordering + epatch ${FILESDIR}/${P}-fix-as-needed.patch + + #Fix for bug #148988: fontconfig >= 2.4 support + use fontconfig && + { + epatch ${FILESDIR}/${P}-fontconfig.patch + eautoreconf + } + + # when performing minor changes to src/adesklets.c or src/commands.c, + # touching these files will avoid unneeded processing + touch scripting/enums scripting/prototypes +} + +src_compile() +{ + local myconf="" + + use X || myconf="--without-x" + use python || myconf="${myconf} --without-python-support" + use perl || myconf="${myconf} --without-perl-support" + myconf="${myconf} $(use_enable debug)" + use ctrlmenu && myconf="--enable-control-on-context-menu" + + econf ${myconf} || die + emake || die +} + +src_install() +{ + dodir usr/share/info + dodir usr/share/man/man1 + make DESTDIR=${D} install || die + doinfo doc/*.info || die "info page installation failed" + doman doc/*.1 || die "man page installation failed" + dodoc ChangeLog NEWS TODO AUTHORS + use debug && + { + echo 'ADESKLETS_LOG="/tmp/adesklets_log"' > 70adesklets + doenvd 70adesklets + } + + # Fix for bug #142169 + use perl && fixlocalpod +} + +pkg_postinst() +{ + use X || + { + ewarn "You did not install the X Window support for ${P}" + ewarn "If you intend to use it to display desklets, this" + ewarn "is a mistake." + echo + ewarn "Type USE=\"X\" emerge adesklets to correct this." + echo + einfo "Please also note that if it is what you intended" + einfo "to do, you need also to install imlib2 without" + einfo "X support to effectively remove all dependencies." + echo + } + + use python || + { + ewarn "You did not install the python bindings for ${P}" + ewarn "If you intend to use it to display desklets, this" + ewarn "is most probably an error." + echo + ewarn "Type USE=\"python\" emerge adesklets to correct this." + echo + } + + use debug && + { + ewarn "You installed a debug build. Make sure you do:" + echo + ewarn "source /etc/profile" + echo + ewarn "If you want to use adesklets from your already" + ewarn "opened sessions. The sessions log are automatically" + ewarn "saved to /tmp/adesklets_log.pid*." + } +} diff --git a/x11-misc/adesklets/adesklets-0.6.1.ebuild b/x11-misc/adesklets/adesklets-0.6.1.ebuild index 383cad30c6e8..9234b792dc38 100644 --- a/x11-misc/adesklets/adesklets-0.6.1.ebuild +++ b/x11-misc/adesklets/adesklets-0.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/adesklets-0.6.1.ebuild,v 1.7 2006/08/30 08:18:19 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/adesklets/adesklets-0.6.1.ebuild,v 1.8 2006/11/20 14:09:18 s4t4n Exp $ inherit eutils perl-module @@ -18,15 +18,18 @@ RDEPEND="X? ( || ( ( x11-apps/xprop x11-libs/libXt ) virtual/x11 ) + python? ( >=dev-lang/python-2.4.3-r1 ) + perl? ( >=dev-lang/perl-5.8.2 ) + >=media-libs/imlib2-1.2.0-r2 >=x11-apps/xwininfo-1.0.2 ) >=sys-apps/sed-4.1.4-r1 >=sys-apps/coreutils-5.94-r1 + =sys-process/procps-3.2.6" -DEPEND=">=media-libs/imlib2-1.2.0-r2 - X? ( || ( x11-proto/xproto virtual/x11 ) ) - python? ( >=dev-lang/python-2.4.3-r1 ) - perl? ( >=dev-lang/perl-5.8.2 )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.20 + X? ( || ( x11-proto/xproto virtual/x11 ) )" src_unpack() { diff --git a/x11-misc/adesklets/files/adesklets-0.6.1-fontconfig.patch b/x11-misc/adesklets/files/adesklets-0.6.1-fontconfig.patch new file mode 100644 index 000000000000..e7a1ad5ca3e7 --- /dev/null +++ b/x11-misc/adesklets/files/adesklets-0.6.1-fontconfig.patch @@ -0,0 +1,50 @@ +--- configure.ac ++++ configure.ac +@@ -1,4 +1,4 @@ +-dnl Initialize autoconf and automake ++nl Initialize autoconf and automake + AC_INIT + AC_CONFIG_SRCDIR(src/main.c) + AC_PREREQ(2.52) +@@ -428,7 +428,18 @@ AC_TRY_LINK( + #include + , FcInit(), + AC_MSG_RESULT([yes]) +-AC_DEFINE(HAVE_FONTCONFIG_FONTCONFIG_H,1,[Define to 1 if you have the header file.]), ++AC_DEFINE(HAVE_FONTCONFIG_FONTCONFIG_H,1,[Define to 1 if you have the header file.]) ++ ++AC_MSG_CHECKING([For fontconfig FcFini()]) ++AC_TRY_LINK( ++#include ++, FcFini(), ++AC_MSG_RESULT([yes]) ++AC_DEFINE(HAVE_FONTCONFIG_FCFINI,1,[Define to 1 if FcFini() call exists]) ++, ++AC_MSG_RESULT([no])) ++ ++, + AC_MSG_RESULT([no]) + FONTCONFIG_LIBS= + FONTCONFIG_CFLAGS= +--- src/xwindow.c ++++ src/xwindow.c +@@ -123,9 +123,17 @@ + if ((strlen((char*)file)>4) && + (strstr((char*)file+strlen((char*)file)-4,".ttf"))) + imlib_add_path_to_font_path(dirname((char*)file)); +- FcFontSetDestroy(fs); +- FcObjectSetDestroy(os); + } ++#ifdef HAVE_FONTCONFIG_FCFINI ++ FcFini(); ++#else ++ /* On FontConfig >= 2.4, this causes a segfault, probably due to the new ++ caching mechanism: we don't have to care, since FcFini() always exists, ++ and does the dirty dessalocation job just fine. ++ */ ++ if (fs) FcFontSetDestroy(fs); ++ FcObjectSetDestroy(os); ++#endif + } + #endif + imlib_add_path_to_font_path("."); diff --git a/x11-misc/adesklets/files/digest-adesklets-0.6.1-r1 b/x11-misc/adesklets/files/digest-adesklets-0.6.1-r1 new file mode 100644 index 000000000000..a7aa89b2fdbb --- /dev/null +++ b/x11-misc/adesklets/files/digest-adesklets-0.6.1-r1 @@ -0,0 +1,3 @@ +MD5 cd390c9398449c5566033e2e4792bccb adesklets-0.6.1.tar.bz2 387553 +RMD160 65cca6fe53f23f029c74cb101022e4481ee114d0 adesklets-0.6.1.tar.bz2 387553 +SHA256 9998e240715c34b5d4c8b31b5ed1fef38262a39fad08fa65be0b58a47eccc3c2 adesklets-0.6.1.tar.bz2 387553