Added patch to fix working with fontconfig >= 2.4. See bug #148988. General dependancies overhaul, see bug #150669.

(Portage version: 2.1.1-r1)

5 files changed, 198 insertions, 6 deletions

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 <s4t4n@gentoo.org> +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 <s4t4n@gentoo.org> adesklets-0.6.1.ebuild:
   Moved xwifinfo dep to fix bug #128018 again.
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
+	<media-libs/fontconfig-2.4
 	>=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 <fontconfig/fontconfig.h>
+ , FcInit(),
+ AC_MSG_RESULT([yes])
+-AC_DEFINE(HAVE_FONTCONFIG_FONTCONFIG_H,1,[Define to 1 if you have the <fontconfig/fontconfig.h> header file.]),
++AC_DEFINE(HAVE_FONTCONFIG_FONTCONFIG_H,1,[Define to 1 if you have the <fontconfig/fontconfig.h> header file.])
++
++AC_MSG_CHECKING([For fontconfig FcFini()])
++AC_TRY_LINK(
++#include <fontconfig/fontconfig.h>
++, 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