[patch] patch which solves the problem

0001-yelp-Fixed-automagic-lzma-support-and-updated-ebuil.patch (text/plain), 4.04 KB, created by Romain Perier (RETIRED) on 2009-04-14 17:10:02 UTC

From 88b27ff18299a32fb05e020ddbbfd0abc976c87f Mon Sep 17 00:00:00 2001
From: PERIER Romain <[e-mail]>
Date: Tue, 14 Apr 2009 19:03:14 +0200
Subject: [PATCH] yelp: Fixed automagic lzma support and updated ebuild with use_enable

---
 gnome-extra/yelp/Manifest                          |    3 +-
 .../yelp/files/yelp-2.26.0-automagic-lzma.patch    |   43 ++++++++++++++++++++
 gnome-extra/yelp/yelp-2.26.0.ebuild                |    9 +++-
 3 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 gnome-extra/yelp/files/yelp-2.26.0-automagic-lzma.patch

diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 5ecde19..985ff65 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,2 +1,3 @@
+AUX yelp-2.26.0-automagic-lzma.patch 1326 RMD160 9913b5dba53c1dcbc046e790327339e366e10acd SHA1 9992c4e197a502ab2937f8dcef5bf492b0e128df SHA256 1f5686f0d5ddf716dd7ae9844447344bc19750a695d09b3b4e4580178e18c44f
 DIST yelp-2.26.0.tar.bz2 1021362 RMD160 5f6f3f7b504d7522a39ba9e55e22cf2ca75589d7 SHA1 c1c3262d77d4515a0fd0a7840307533fda9ed0ea SHA256 0c5a91a206b26ef714e9929404f1711caadcee481299566011b4ae4232d151d0
-EBUILD yelp-2.26.0.ebuild 1578 RMD160 f4a87aed890afbf5c6295067cd4b2750056540a8 SHA1 0735d2cd99f09f23abaa0110e8f9273ac182c7de SHA256 49d8bbfb63a7a439f47bef11ce2824e6eb1f7cb2a70bb6d600d5fe46835c0810
+EBUILD yelp-2.26.0.ebuild 1598 RMD160 f47a20dfdbf0c6b24a09f52d6fe2ced6006b70b2 SHA1 3e11547b9e3705b21fa10a0db1ce29328de5bd0c SHA256 dc1976d23533deed4f20c9a2ac321bba630d293e9255380f5785ea6b60c37db5
diff --git a/gnome-extra/yelp/files/yelp-2.26.0-automagic-lzma.patch b/gnome-extra/yelp/files/yelp-2.26.0-automagic-lzma.patch
new file mode 100644
index 0000000..1ace314
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-2.26.0-automagic-lzma.patch
@@ -0,0 +1,43 @@
+ configure.in |   21 ++++++++++++++++++---
+ 1 files changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 1908249..bf5d129 100644
+--- a/configure.in
++++ b/configure.in
+@@ -194,10 +194,24 @@ AC_SUBST(Z_LIBS)], AC_MSG_ERROR([*** zlib is required]))
+ dnl ====================================
+ dnl = lzmadec for help converters
+ dnl ====================================
++
++AC_ARG_ENABLE([lzma],
++	AC_HELP_STRING([--enable-lzma],
++	[Enable lzma support @<:@default=yes@:>@]),
++	enable_lzma=$enableval, enable_lzma=yes)
++
+ LZMADEC_LIBS=
+-AC_CHECK_LIB(lzmadec, lzmadec_open, [LZMADEC_LIBS=-llzmadec 
+-				     AC_DEFINE(HAVE_LIBLZMADEC, 1, [Compile with liblzmadec support])])
+-AC_SUBST(LZMADEC_LIBS)
++if test x$enable_lzma = xyes; then
++   AC_CHECK_LIB(lzmadec, lzmadec_open, 
++   [LZMADEC_LIBS=-llzmadec 
++   AC_DEFINE(HAVE_LIBLZMADEC, 1, [Compile with liblzmadec support])])
++	
++   if test x$LZMADEC_LIBS != x-llzmadec; then
++      enable_lzma=no
++   fi
++
++   AC_SUBST(LZMADEC_LIBS)
++fi
+ 
+ dnl ====================================
+ dnl = Bzip2, for the help converters
+@@ -289,6 +303,7 @@ yelp-$VERSION:
+ 	compiler:		  ${CC}
+ 
+ 	Debug enabled:            ${enable_debug}
++	lzma  enabled:		  ${enable_lzma}
+ 	Search backend:           ${search_backend}
+ 	Mozilla version:          ${MOZILLA}
+ "
diff --git a/gnome-extra/yelp/yelp-2.26.0.ebuild b/gnome-extra/yelp/yelp-2.26.0.ebuild
index c9c7c8f..b775862 100644
--- a/gnome-extra/yelp/yelp-2.26.0.ebuild
+++ b/gnome-extra/yelp/yelp-2.26.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="1"
 
-inherit gnome2
+inherit gnome2 autotools
 
 DESCRIPTION="Help browser for GNOME"
 HOMEPAGE="http://www.gnome.org/"
@@ -46,11 +46,14 @@ src_unpack() {
 
 	# strip stupid options in configure, see bug #196621
 	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure || die "sed	failed"
+
+	epatch "${FILESDIR}/${P}-automagic-lzma.patch"
+	eautoreconf
 }
 
 pkg_setup() {
-	# FIXME: Add patch to make lzma-utils not automagic and use_enable here
-	G2CONF="${G2CONF} --enable-man --enable-info --with-gecko=libxul-embedding"
+	G2CONF="${G2CONF} --enable-man --enable-info 
+	--with-gecko=libxul-embedding $(use_enable lzma)"
 
 	if use beagle; then
 		G2CONF="${G2CONF} --with-search=beagle"
-- 
1.6.2.3