* [gentoo-commits] proj/betagarden:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/
@ 2011-08-12 19:45 Sebastian Pipping
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping @ 2011-08-12 19:45 UTC (permalink / raw
To: gentoo-commits
commit: 8968a0f3f58e059ff726c6ca62f42041efb596fc
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Aug 12 18:39:36 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 19:41:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=8968a0f3
x11-libs/gdk-pixbuf: 2.23.5
---
.../gdk-pixbuf-2.21.4-fix-automagic-x11.patch | 24 ++++++
x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild | 81 ++++++++++++++++++++
2 files changed, 105 insertions(+), 0 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch
new file mode 100644
index 0000000..ae7ec2c
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch
@@ -0,0 +1,24 @@
+Adds a new configure option to remove the automagic dependency on libX11.
+
+--- configure.ac
++++ configure.ac
+@@ -929,7 +929,18 @@ GDK_PIXBUF_XLIB_PACKAGES=
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
+ GDK_PIXBUF_XLIB_EXTRA_LIBS=
+
+-if $PKG_CONFIG --exists x11; then
++AC_ARG_WITH(x11,
++ AC_HELP_STRING([--with-x11=@<:@no/auto/yes@:>@],
++ [build X11 support @<:@default=auto@:>@]),,
++ [
++ if $PKG_CONFIG --exists x11; then
++ with_x11=yes
++ else
++ with_x11=no
++ fi
++ ])
++
++if test x$with_x11 = xyes; then
+ AM_CONDITIONAL(USE_X11, true)
+ PKG_CHECK_MODULES(GDK_PIXBUF_XLIB_DEP, x11 gobject-2.0)
+ else
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
new file mode 100644
index 0000000..ad59998
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1.ebuild,v 1.1 2010/11/08 23:22:59 eva Exp $
+
+EAPI="4"
+
+inherit gnome.org multilib libtool autotools
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="" # due to copy-bump
+IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.27.2
+ >=media-libs/libpng-1.2.43-r2:0
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/jasper )
+ tiff? ( >=media-libs/tiff-3.9.2 )
+ X? ( x11-libs/libX11 )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/pkgconfig-0.9
+ >=sys-devel/gettext-0.17
+ >=dev-util/gtk-doc-am-1.11
+ doc? (
+ >=dev-util/gtk-doc-1.11
+ ~app-text/docbook-xml-dtd-4.1.2 )"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gail-1000
+ !<gnome-base/librsvg-2.31.0
+ !<x11-libs/gtk+-2.21.3:2
+ !<x11-libs/gtk+-2.90.4:3"
+
+src_prepare() {
+ # Only build against libX11 if the user wants to do so
+ epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
+
+ elibtoolize
+ eautoreconf
+}
+
+src_configure() {
+ # png always on to display icons (foser)
+ local myconf="
+ $(use_enable doc gtk-doc)
+ $(use_with jpeg libjpeg)
+ $(use_with jpeg2k libjasper)
+ $(use_with tiff libtiff)
+ $(use_enable introspection)
+ $(use_with X x11)
+ --with-libpng"
+
+ # Passing --disable-debug is not recommended for production use
+ use debug && myconf="${myconf} --enable-debug=yes"
+
+ econf ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "Installation failed"
+
+ dodoc AUTHORS NEWS* README* || die "dodoc failed"
+
+ # New library, remove .la files
+ find "${D}" -name '*.la' -exec rm -f '{}' + || die
+}
+
+pkg_postinst() {
+ gdk-pixbuf-query-loaders > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+
+ if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+ elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+ elog "to do that you can use qfile from portage-utils:"
+ elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+ fi
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/
@ 2011-09-08 20:16 Sebastian Pipping
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping @ 2011-09-08 20:16 UTC (permalink / raw
To: gentoo-commits
commit: b3aea6b6f7ed79f48a2aec75a0f04d20cba561dc
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Sep 8 20:14:23 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 20:15:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=b3aea6b6
x11-libs/gdk-pixbuf: 2.23.5 in main tree by now
---
.../gdk-pixbuf-2.21.4-fix-automagic-x11.patch | 24 ------
x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild | 81 --------------------
2 files changed, 0 insertions(+), 105 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch
deleted file mode 100644
index ae7ec2c..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Adds a new configure option to remove the automagic dependency on libX11.
-
---- configure.ac
-+++ configure.ac
-@@ -929,7 +929,18 @@ GDK_PIXBUF_XLIB_PACKAGES=
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
- GDK_PIXBUF_XLIB_EXTRA_LIBS=
-
--if $PKG_CONFIG --exists x11; then
-+AC_ARG_WITH(x11,
-+ AC_HELP_STRING([--with-x11=@<:@no/auto/yes@:>@],
-+ [build X11 support @<:@default=auto@:>@]),,
-+ [
-+ if $PKG_CONFIG --exists x11; then
-+ with_x11=yes
-+ else
-+ with_x11=no
-+ fi
-+ ])
-+
-+if test x$with_x11 = xyes; then
- AM_CONDITIONAL(USE_X11, true)
- PKG_CHECK_MODULES(GDK_PIXBUF_XLIB_DEP, x11 gobject-2.0)
- else
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
deleted file mode 100644
index ad59998..0000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1.ebuild,v 1.1 2010/11/08 23:22:59 eva Exp $
-
-EAPI="4"
-
-inherit gnome.org multilib libtool autotools
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="" # due to copy-bump
-IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.27.2
- >=media-libs/libpng-1.2.43-r2:0
- introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/jasper )
- tiff? ( >=media-libs/tiff-3.9.2 )
- X? ( x11-libs/libX11 )"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/pkgconfig-0.9
- >=sys-devel/gettext-0.17
- >=dev-util/gtk-doc-am-1.11
- doc? (
- >=dev-util/gtk-doc-1.11
- ~app-text/docbook-xml-dtd-4.1.2 )"
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gail-1000
- !<gnome-base/librsvg-2.31.0
- !<x11-libs/gtk+-2.21.3:2
- !<x11-libs/gtk+-2.90.4:3"
-
-src_prepare() {
- # Only build against libX11 if the user wants to do so
- epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
-
- elibtoolize
- eautoreconf
-}
-
-src_configure() {
- # png always on to display icons (foser)
- local myconf="
- $(use_enable doc gtk-doc)
- $(use_with jpeg libjpeg)
- $(use_with jpeg2k libjasper)
- $(use_with tiff libtiff)
- $(use_enable introspection)
- $(use_with X x11)
- --with-libpng"
-
- # Passing --disable-debug is not recommended for production use
- use debug && myconf="${myconf} --enable-debug=yes"
-
- econf ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Installation failed"
-
- dodoc AUTHORS NEWS* README* || die "dodoc failed"
-
- # New library, remove .la files
- find "${D}" -name '*.la' -exec rm -f '{}' + || die
-}
-
-pkg_postinst() {
- gdk-pixbuf-query-loaders > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-
- if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
- elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
- elog "to do that you can use qfile from portage-utils:"
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-08 20:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-08 20:16 [gentoo-commits] proj/betagarden:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/ Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2011-08-12 19:45 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox