diff options
author | Pacho Ramos <pacho@gentoo.org> | 2010-04-18 10:10:03 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2010-04-18 10:10:03 +0000 |
commit | d9150ffbb81aee8cd119f473889575e6ac2d582d (patch) | |
tree | 627928bda2c33a20290a03f1efbdebea247f2bd1 /gnome-base/librsvg | |
parent | dev-perl/Astro-SunTime and =dev-perl/POE-Test-Loops-1.020 are gone (diff) | |
download | historical-d9150ffbb81aee8cd119f473889575e6ac2d582d.tar.gz historical-d9150ffbb81aee8cd119f473889575e6ac2d582d.tar.bz2 historical-d9150ffbb81aee8cd119f473889575e6ac2d582d.zip |
Build misc tools only when desired (bug #226231)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'gnome-base/librsvg')
-rw-r--r-- | gnome-base/librsvg/ChangeLog | 7 | ||||
-rw-r--r-- | gnome-base/librsvg/Manifest | 13 | ||||
-rw-r--r-- | gnome-base/librsvg/files/librsvg-2.26.2-choosable-tools.patch | 76 | ||||
-rw-r--r-- | gnome-base/librsvg/librsvg-2.26.2.ebuild | 11 | ||||
-rw-r--r-- | gnome-base/librsvg/metadata.xml | 3 |
5 files changed, 100 insertions, 10 deletions
diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog index 526f0d2648b7..72341907dae5 100644 --- a/gnome-base/librsvg/ChangeLog +++ b/gnome-base/librsvg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/librsvg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.205 2010/03/30 16:39:47 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.206 2010/04/18 10:10:02 pacho Exp $ + + 18 Apr 2010; Pacho Ramos <pacho@gentoo.org> librsvg-2.26.2.ebuild, + +files/librsvg-2.26.2-choosable-tools.patch, metadata.xml: + Build misc tools only when desired (bug #226231). Thanks a lot to Didier + Barvaux for his work on this. *librsvg-2.26.2 (30 Mar 2010) diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest index bbfcfc0ea58c..54b789d080e7 100644 --- a/gnome-base/librsvg/Manifest +++ b/gnome-base/librsvg/Manifest @@ -2,19 +2,20 @@ Hash: SHA1 AUX librsvg-2.22.3-fix-segfault-with-firefox.patch 538 RMD160 e52da5a491d8b2a93b264a4d79b8a19307635dce SHA1 b773d7e022725f8bdc00707bfb8b5a3098d8e1a5 SHA256 bcd27c5d3662525cbc9df31c0f3bd4c36d7dc85c7ee867f9dd129cce233db2d7 +AUX librsvg-2.26.2-choosable-tools.patch 2372 RMD160 e1b842cd8eab8bec5affa8ad6dc12fc12bdd5311 SHA1 d6861edc02adaa50a40cb14a979dc1f51a332757 SHA256 6b29bd95e6c61619cd6cde778a38149db318e21315457b6ab7637d4ce1de0f7a DIST librsvg-2.22.3.tar.bz2 491576 RMD160 54c834fbfb028b98f699bfeec94cd411b2d3f7bb SHA1 032f8142b1e41e07740cd91030b1873a0b9c42d2 SHA256 63f7cc948b60447c76e6797a2d521cba308ed42c673bd4b2212e1f0b4cd60f0a DIST librsvg-2.26.0.tar.bz2 477499 RMD160 9e8197519e4e48f736e6bb65d2993478b0f64451 SHA1 61044be4bcd5945f5711f788e1aa303a80b69e32 SHA256 fdcab5f0d86198d8cbd4ffe5b333076f75e707f6d7e4af5e87a8644ff7533bea DIST librsvg-2.26.2.tar.bz2 485744 RMD160 701d82a76a384aedb3ab1dcf7be589149ab456b8 SHA1 3c529b5e28a8924fa95d74814dd63b53182c903c SHA256 e82fb920901e211a54cff5df88c327bedec8565b324e2f529f428f492361c60f EBUILD librsvg-2.22.3-r1.ebuild 1792 RMD160 b857a36a66e3d6f883a3a0c9d68fb2c9e652c584 SHA1 f090b7be61df312556757cd033dfd0f7a196d3e1 SHA256 da7acf4222320bb6d7e756c0ea8482e6b3d7765b4c0eac5246e3d49ba1dca56b EBUILD librsvg-2.22.3.ebuild 1579 RMD160 5138015365adf25c32ced9b058256de28d471bfd SHA1 5d6be0136f05c276e556a161e12ab26e5a57a176 SHA256 6ee5ba5e1f51b741c82e24388b0eabf7e5456c25c28c7b01b2aac059685893ba EBUILD librsvg-2.26.0.ebuild 1888 RMD160 875bacded459c11c7cdb6da8553141bb6e8b650f SHA1 7f500d61a7c198923526d3f8c90230dcfc56f0b7 SHA256 e2b42e4b7acc7db9105e0ca03c580f391338062d8fbd56da59b2cf952ae8c07e -EBUILD librsvg-2.26.2.ebuild 1713 RMD160 0cfee36f8979e3c75281c1d7d50c563cb69cfd66 SHA1 28fec921ebbbf2ae08523f757e824d7dcb623ce1 SHA256 aea1e3834f28997945ee873e83f691e88087fe85b283489763785742205cd262 -MISC ChangeLog 25581 RMD160 2034ea0c85b514468a493ce1725514d86ba92c18 SHA1 9941cb76f98ef1605ca1adddde2866328a87b1f1 SHA256 5ee750cb3e145e163e91f47d2c8e323638f553885abf3978e19c689403a64a00 -MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +EBUILD librsvg-2.26.2.ebuild 1865 RMD160 ea7659734caf9f36afb2741a86d2df6b54b1faeb SHA1 29b1baa8cc78d0b045cefad5b958446d7347ee38 SHA256 5842dace1c29d23a6d0abecc963469a53ceff85631ef53efbd5ef208521d1a49 +MISC ChangeLog 25819 RMD160 9ef7fff2e948c3c65df286d230c7ac23bd2a09b5 SHA1 2da987eec6f417165cc814013874c605ca060693 SHA256 215d7e645bcbe7c454f996cfcb7571551d118812683bfd92190c5a7190dd4092 +MISC metadata.xml 224 RMD160 f5f4831e7844c3bf2c25dd076673fdd9a3d1031a SHA1 fda8c1df897460ba96e15e7e661c4f266860cf26 SHA256 e1333ec0c96a03ada3a7b313d1c0903f39e103a7ef4b33275ab2c6f0087c5208 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuyKVkACgkQCaWpQKGI+9T/SwCfdKU6dmuuk5qKiNa4EwpisiKF -AjMAn2W1bqKJ5MDEn+Gg0Jn7KTLYRfu7 -=in0m +iEYEARECAAYFAkvK2oMACgkQCaWpQKGI+9S4jgCePnvHGcrZzMngzJWjcM4tslV9 +nQ8AnAnP47CeqALidtUCd9Q4W1KhnUgh +=A2P9 -----END PGP SIGNATURE----- diff --git a/gnome-base/librsvg/files/librsvg-2.26.2-choosable-tools.patch b/gnome-base/librsvg/files/librsvg-2.26.2-choosable-tools.patch new file mode 100644 index 000000000000..3d9c9a1cd02d --- /dev/null +++ b/gnome-base/librsvg/files/librsvg-2.26.2-choosable-tools.patch @@ -0,0 +1,76 @@ +From 4e7f090d1b2e2bb7c6a47d6f45edc8adb335e9a3 Mon Sep 17 00:00:00 2001 +From: Didier Barvaux <didier-bugzilla@barvaux.org> +Date: Sat, 17 Apr 2010 21:25:29 +0000 +Subject: Add --enable-tools/--disable-tools options to avoid building miscellaneous tools + +Fix for bug #614123. +--- +diff --git a/Makefile.am b/Makefile.am +index 67e6411..c562c32 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,7 +8,9 @@ SUBDIRS = . gdk-pixbuf-loader gtk-engine data tests doc + + lib_LTLIBRARIES = librsvg-2.la + bin_PROGRAMS = rsvg-convert $(target_rsvg_view) ++if BUILD_MISC_TOOLS + noinst_PROGRAMS = test-performance rsvg-dimensions ++endif + + man_MANS = rsvg.1 + +diff --git a/configure.in b/configure.in +index 6e102ae..a1b547a 100644 +--- a/configure.in ++++ b/configure.in +@@ -286,6 +286,23 @@ GTK_DOC_CHECK([1.0]) + AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed) + + dnl =========================================================================== ++dnl Do we build the miscellaenous tools provided with librsvg ? ++ ++AC_ARG_ENABLE(tools, ++ AC_HELP_STRING([--disable-tools], ++ [do not build miscellaenous tools [default=no]]), ++ [build_misc_tools=$enableval], ++ [build_misc_tools=yes]) ++ ++AC_MSG_CHECKING(whether to build miscellaenous tools) ++if test "x$build_misc_tools" = "xyes" ; then ++ AC_MSG_RESULT(yes) ++else ++ AC_MSG_RESULT(no) ++fi ++AM_CONDITIONAL([BUILD_MISC_TOOLS], [test "x$build_misc_tools" = "xyes"]) ++ ++dnl =========================================================================== + + m4_copy([AC_DEFUN],[glib_DEFUN]) + glib_DEFUN([GLIB_LC_MESSAGES], +@@ -334,6 +351,7 @@ librsvg-$LIBRSVG_VERSION + + Build GdkPixbuf loader: ${enable_pixbuf_loader} + Build theme engine: ${enable_gtk_theme} ++ Build miscellaenous tools: ${build_misc_tools} + Handle svgz files: ${test_gsf} + Use GIO: ${test_gio} + Use libcroco for css parsing: ${test_croco} +diff --git a/tests/pdiff/Makefile.am b/tests/pdiff/Makefile.am +index 47ed8c1..8e77972 100644 +--- a/tests/pdiff/Makefile.am ++++ b/tests/pdiff/Makefile.am +@@ -1,3 +1,5 @@ ++if BUILD_MISC_TOOLS ++ + noinst_PROGRAMS = perceptualdiff + + noinst_LTLIBRARIES = libpdiff.la +@@ -14,3 +16,6 @@ perceptualdiff_SOURCES = \ + + INCLUDES = $(LIBRSVG_CFLAGS) + LDADD = libpdiff.la $(LIBRSVG_LIBS) -lm ++ ++endif ++ +-- +cgit v0.8.3.1 diff --git a/gnome-base/librsvg/librsvg-2.26.2.ebuild b/gnome-base/librsvg/librsvg-2.26.2.ebuild index f9bab0a913f1..51131698e1ed 100644 --- a/gnome-base/librsvg/librsvg-2.26.2.ebuild +++ b/gnome-base/librsvg/librsvg-2.26.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.26.2.ebuild,v 1.1 2010/03/30 16:39:47 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.26.2.ebuild,v 1.2 2010/04/18 10:10:03 pacho Exp $ -inherit eutils gnome2 multilib +inherit autotools eutils gnome2 multilib DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" HOMEPAGE="http://librsvg.sourceforge.net/" @@ -10,7 +10,7 @@ HOMEPAGE="http://librsvg.sourceforge.net/" LICENSE="LGPL-2" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="doc zlib" +IUSE="doc tools zlib" RDEPEND=">=media-libs/fontconfig-1.0.1 >=media-libs/freetype-2 @@ -30,6 +30,7 @@ DOCS="AUTHORS ChangeLog README NEWS TODO" pkg_setup() { # croco is forced on to respect SVG specification G2CONF="${G2CONF} + $(use_enable tools) $(use_with zlib svgz) --with-croco --enable-pixbuf-loader @@ -41,6 +42,10 @@ src_unpack() { # gcc-4.3.2-r3 related segfault with various apps like firefox -- bug 239992 epatch "${FILESDIR}/${PN}-2.22.3-fix-segfault-with-firefox.patch" + + # Build extra tools only when desired, bug 226231 + epatch "${FILESDIR}/${P}-choosable-tools.patch" + eautoreconf } set_gtk_confdir() { diff --git a/gnome-base/librsvg/metadata.xml b/gnome-base/librsvg/metadata.xml index da6fd63d0085..becd44344985 100644 --- a/gnome-base/librsvg/metadata.xml +++ b/gnome-base/librsvg/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>gnome</herd> +<use> + <flag name="tools">Build miscellaneous tools</flag> +</use> </pkgmetadata> |