Attachment #188319 for bug #266128

View | Details | Raw Unified | Return to bug 266128
Collapse All | Expand All

Lines 1-2 Link Here

(-)a/gnome-extra/yelp/Manifest (-1 / +2 lines)
		1	AUX yelp-2.26.0-automagic-lzma.patch 1326 RMD160 9913b5dba53c1dcbc046e790327339e366e10acd SHA1 9992c4e197a502ab2937f8dcef5bf492b0e128df SHA256 1f5686f0d5ddf716dd7ae9844447344bc19750a695d09b3b4e4580178e18c44f
1	DIST yelp-2.26.0.tar.bz2 1021362 RMD160 5f6f3f7b504d7522a39ba9e55e22cf2ca75589d7 SHA1 c1c3262d77d4515a0fd0a7840307533fda9ed0ea SHA256 0c5a91a206b26ef714e9929404f1711caadcee481299566011b4ae4232d151d0	2	DIST yelp-2.26.0.tar.bz2 1021362 RMD160 5f6f3f7b504d7522a39ba9e55e22cf2ca75589d7 SHA1 c1c3262d77d4515a0fd0a7840307533fda9ed0ea SHA256 0c5a91a206b26ef714e9929404f1711caadcee481299566011b4ae4232d151d0
2	EBUILD yelp-2.26.0.ebuild 1578 RMD160 f4a87aed890afbf5c6295067cd4b2750056540a8 SHA1 0735d2cd99f09f23abaa0110e8f9273ac182c7de SHA256 49d8bbfb63a7a439f47bef11ce2824e6eb1f7cb2a70bb6d600d5fe46835c0810	3	EBUILD yelp-2.26.0.ebuild 1598 RMD160 f47a20dfdbf0c6b24a09f52d6fe2ced6006b70b2 SHA1 3e11547b9e3705b21fa10a0db1ce29328de5bd0c SHA256 dc1976d23533deed4f20c9a2ac321bba630d293e9255380f5785ea6b60c37db5




 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}
 "





EAPI="1"

inherit gnome2 autotools

DESCRIPTION="Help browser for GNOME"
HOMEPAGE="http://www.gnome.org/"


	# 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() {
	G2CONF="${G2CONF} --enable-man --enable-info 
	--with-gecko=libxul-embedding $(use_enable lzma)"

	if use beagle; then
		G2CONF="${G2CONF} --with-search=beagle"
- 

Return to bug 266128

Line 0 Link Here

(-)a/gnome-extra/yelp/files/yelp-2.26.0-automagic-lzma.patch (+43 lines)
	1	configure.in \| 21 ++++++++++++++++++---
	2	1 files changed, 18 insertions(+), 3 deletions(-)
	3
	4	diff --git a/configure.in b/configure.in
	5	index 1908249..bf5d129 100644
	6	--- a/configure.in
	7	+++ b/configure.in
	8	@@ -194,10 +194,24 @@ AC_SUBST(Z_LIBS)], AC_MSG_ERROR([*** zlib is required]))
	9	dnl ====================================
	10	dnl = lzmadec for help converters
	11	dnl ====================================
	12	+
	13	+AC_ARG_ENABLE([lzma],
	14	+ AC_HELP_STRING([--enable-lzma],
	15	+ [Enable lzma support @<:@default=yes@:>@]),
	16	+ enable_lzma=$enableval, enable_lzma=yes)
	17	+
	18	LZMADEC_LIBS=
	19	-AC_CHECK_LIB(lzmadec, lzmadec_open, [LZMADEC_LIBS=-llzmadec
	20	- AC_DEFINE(HAVE_LIBLZMADEC, 1, [Compile with liblzmadec support])])
	21	-AC_SUBST(LZMADEC_LIBS)
	22	+if test x$enable_lzma = xyes; then
	23	+ AC_CHECK_LIB(lzmadec, lzmadec_open,
	24	+ [LZMADEC_LIBS=-llzmadec
	25	+ AC_DEFINE(HAVE_LIBLZMADEC, 1, [Compile with liblzmadec support])])
	26	+
	27	+ if test x$LZMADEC_LIBS != x-llzmadec; then
	28	+ enable_lzma=no
	29	+ fi
	30	+
	31	+ AC_SUBST(LZMADEC_LIBS)
	32	+fi
	33
	34	dnl ====================================
	35	dnl = Bzip2, for the help converters
	36	@@ -289,6 +303,7 @@ yelp-$VERSION:
	37	compiler: ${CC}
	38
	39	Debug enabled: ${enable_debug}
	40	+ lzma enabled: ${enable_lzma}
	41	Search backend: ${search_backend}
	42	Mozilla version: ${MOZILLA}
	43	"

Lines 4-10 Link Here

(-)a/gnome-extra/yelp/yelp-2.26.0.ebuild (-4 / +6 lines)
4		4
5	EAPI="1"	5	EAPI="1"
6		6
7	inherit gnome2	7	inherit gnome2 autotools
8		8
9	DESCRIPTION="Help browser for GNOME"	9	DESCRIPTION="Help browser for GNOME"
10	HOMEPAGE="http://www.gnome.org/"	10	HOMEPAGE="http://www.gnome.org/"
Lines 46-56 src_unpack() { Link Here
46		46
47	# strip stupid options in configure, see bug #196621	47	# strip stupid options in configure, see bug #196621
48	sed -i 's\|$AM_CFLAGS -pedantic -ansi\|$AM_CFLAGS\|' configure \|\| die "sed failed"	48	sed -i 's\|$AM_CFLAGS -pedantic -ansi\|$AM_CFLAGS\|' configure \|\| die "sed failed"
		49
		50	epatch "${FILESDIR}/${P}-automagic-lzma.patch"
		51	eautoreconf
49	}	52	}
50		53
51	pkg_setup() {	54	pkg_setup() {
52	# FIXME: Add patch to make lzma-utils not automagic and use_enable here	55	G2CONF="${G2CONF} --enable-man --enable-info
53	G2CONF="${G2CONF} --enable-man --enable-info --with-gecko=libxul-embedding"	56	--with-gecko=libxul-embedding $(use_enable lzma)"
54		57
55	if use beagle; then	58	if use beagle; then
56	G2CONF="${G2CONF} --with-search=beagle"	59	G2CONF="${G2CONF} --with-search=beagle"
57	-