* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2011-03-05 20:23 Nirbheek Chauhan
0 siblings, 0 replies; 13+ messages in thread
From: Nirbheek Chauhan @ 2011-03-05 20:23 UTC (permalink / raw
To: gentoo-commits
commit: 29d59c95917bfae2f1659f385309b6d759318cb3
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 5 20:23:38 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Mar 5 20:23:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=29d59c95
x11-libs/gdk-pixbuf: 2.23.0 -> 2.23.1
* Drop all .la files
---
...xbuf-2.23.0.ebuild => gdk-pixbuf-2.23.1.ebuild} | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.1.ebuild
similarity index 92%
rename from x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.0.ebuild
rename to x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.1.ebuild
index afd89c4..e143a80 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.0.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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 $
@@ -15,9 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-# FIXME: stab upstream to raise glib dependendy, bug #350235
RDEPEND="
- >=dev-libs/glib-2.27
+ >=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 )
@@ -67,7 +66,7 @@ src_install() {
dodoc AUTHORS NEWS* README* || die "dodoc failed"
# New library, remove .la files
- rm -vf "${D}"/usr/lib*/gdk-pixbuf-2.0/*/loaders/*.la
+ find "${D}" -name '*.la' -exec rm -f '{}' + || die
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2011-06-28 8:36 Alexandre Restovtsev
0 siblings, 0 replies; 13+ messages in thread
From: Alexandre Restovtsev @ 2011-06-28 8:36 UTC (permalink / raw
To: gentoo-commits
commit: 492c4306af025e7f78dc9b57ec63e5cdab770dea
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jun 28 08:30:02 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jun 28 08:30:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=492c4306
x11-libs/gdk-pixbuf: 2.23.3 → 2.23.5 (security bump)
Fixes a denial of service vulnerability in the gif loader (CVE-2011-2485).
---
...xbuf-2.23.3.ebuild => gdk-pixbuf-2.23.5.ebuild} | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.3.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
similarity index 99%
rename from x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.3.ebuild
rename to x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
index 9c41709..a2f7f30 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.3.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
@@ -2,7 +2,7 @@
# 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="3"
+EAPI="4"
inherit gnome.org multilib libtool autotools
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2012-02-08 7:52 Priit Laes
0 siblings, 0 replies; 13+ messages in thread
From: Priit Laes @ 2012-02-08 7:52 UTC (permalink / raw
To: gentoo-commits
commit: f4d81809358509ae10aeb961ff8351ed4a5b0712
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Feb 7 11:05:10 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Feb 7 11:47:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f4d81809
x11-libs/gdk-pixbuf: Add 2.25.2 to overlay
---
x11-libs/gdk-pixbuf/ChangeLog | 185 ++++++++++++++++++++++++++
x11-libs/gdk-pixbuf/gdk-pixbuf-2.25.2.ebuild | 92 +++++++++++++
x11-libs/gdk-pixbuf/metadata.xml | 9 ++
3 files changed, 286 insertions(+), 0 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
new file mode 100644
index 0000000..c765841
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -0,0 +1,185 @@
+# ChangeLog for x11-libs/gdk-pixbuf
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.45 2012/02/04 18:25:49 tetromino Exp $
+
+ 04 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ gdk-pixbuf-2.24.0-r1.ebuild:
+ Drop superfluous elibtoolize call (bug #401983, thanks to Julian W.)
+
+*gdk-pixbuf-2.24.1 (31 Dec 2011)
+
+ 31 Dec 2011; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.24.1.ebuild,
+ -files/gdk-pixbuf-2.22.1-CVE-2011-2485.patch,
+ -files/gdk-pixbuf-2.22.1-fix-libpng15.patch, -gdk-pixbuf-2.22.1-r2.ebuild:
+ Version bump, add missing DEPEND on proper coreutils version (bug #395103 by
+ arnaud), remove old.
+
+ 13 Nov 2011; Justin Lecher <jlec@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild,
+ gdk-pixbuf-2.24.0-r1.ebuild:
+ Corrected Slotting of media-libs/tiff
+
+ 30 Oct 2011; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.24.0-r1.ebuild:
+ alpha/ia64/sh/sparc stable wrt #385699
+
+ 28 Oct 2011; Markus Meier <maekke@gentoo.org> gdk-pixbuf-2.24.0-r1.ebuild:
+ arm stable, bug #385699
+
+ 21 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ gdk-pixbuf-2.24.0-r1.ebuild:
+ x86 stable wrt bug #385699
+
+ 18 Oct 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.24.0-r1.ebuild:
+ Stable for HPPA (bug #385699).
+
+ 16 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
+ gdk-pixbuf-2.24.0-r1.ebuild:
+ ppc/ppc64 stable wrt #385699
+
+ 14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+ -gdk-pixbuf-2.23.5.ebuild, -gdk-pixbuf-2.24.0.ebuild:
+ old
+
+ 14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+ gdk-pixbuf-2.24.0-r1.ebuild:
+ amd64 stable wrt #385699
+
+ 09 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild,
+ gdk-pixbuf-2.23.5.ebuild, gdk-pixbuf-2.24.0.ebuild,
+ gdk-pixbuf-2.24.0-r1.ebuild:
+ add ewarn in case of gdk-pixbuf-query-loaders failure
+
+ 03 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild,
+ gdk-pixbuf-2.23.5.ebuild, gdk-pixbuf-2.24.0.ebuild,
+ gdk-pixbuf-2.24.0-r1.ebuild:
+ make gdk-pixbuf-query-loaders more atomic, fix segfault due to
+ __GL_NO_DSO_FINALIZER=1 in environment
+
+*gdk-pixbuf-2.24.0-r1 (15 Sep 2011)
+
+ 15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+ +gdk-pixbuf-2.24.0-r1.ebuild:
+ Use libpng.pc instead of versioned pkg-config file to generate
+ Requires.private: libpng instead of versioned one. This will avoid some
+ problems with libpng14 to libpng15 upgrade wrt #383655
+
+*gdk-pixbuf-2.24.0 (28 Aug 2011)
+
+ 28 Aug 2011; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.24.0.ebuild:
+ Version bump: Clean up dependencies in the .pc file, translation updates.
+
+ 28 Aug 2011; Fabian Groffen <grobian@gentoo.org> gdk-pixbuf-2.23.5.ebuild:
+ Marked ~x64-macos
+
+*gdk-pixbuf-2.23.5 (16 Aug 2011)
+
+ 16 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+ -gdk-pixbuf-2.22.1.ebuild, -gdk-pixbuf-2.22.1-r1.ebuild,
+ +gdk-pixbuf-2.23.5.ebuild:
+ Bump to 2.23.5, from gnome overlay for GNOME 3, remove old
+
+ 11 Jul 2011; Matt Turner <mattst88@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
+ Added ~mips, bug 364693
+
+ 09 Jul 2011; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
+ alpha/arm/ia64/sh/sparc stable wrt #371320
+
+ 09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
+ gdk-pixbuf-2.22.1-r2.ebuild:
+ ppc/ppc64 stable wrt #373999
+
+ 06 Jul 2011; Mark Loeser <halcy0n@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
+ Stable for ppc64; bug #371320
+
+ 05 Jul 2011; Thomas Kahle <tomka@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
+ x86 stable per bug 373999
+
+ 05 Jul 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
+ Stable for HPPA (bug #373999).
+
+ 04 Jul 2011; Pacho Ramos <pacho@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
+ amd64 stable, security bug #373999
+
+*gdk-pixbuf-2.22.1-r2 (04 Jul 2011)
+
+ 04 Jul 2011; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.22.1-r2.ebuild,
+ +files/gdk-pixbuf-2.22.1-CVE-2011-2485.patch:
+ GIF: Don't return a partially initialized pixbuf structure, fix security bug
+ #373999 by Tim Sammut.
+
+ 29 Jun 2011; Christoph Mende <angelos@gentoo.org>
+ gdk-pixbuf-2.22.1-r1.ebuild:
+ Stable on amd64 wrt bug #371320
+
+ 29 Jun 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
+ Stable for HPPA (bug #371320).
+
+ 28 Jun 2011; Brent Baude <ranger@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
+ Marking gdk-pixbuf-2.22.1-r1 ppc stable for bug 371320
+
+ 25 Jun 2011; Pacho Ramos <pacho@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
+ PDEPEND on gnome-base/librsvg conditionally (bug #373001 by Lev Babiev).
+
+ 22 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ gdk-pixbuf-2.22.1-r1.ebuild:
+ x86 stable wrt security bug #371320
+
+ 05 Jun 2011; Pacho Ramos <pacho@gentoo.org> -gdk-pixbuf-2.22.0.ebuild,
+ gdk-pixbuf-2.22.1-r1.ebuild:
+ PDEPEND on gnome-base/librsvg as reported in bug #363715 by Cedric. Remove
+ old.
+
+ 29 Apr 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
+ Marked ~hppa (bug #364693).
+
+*gdk-pixbuf-2.22.1-r1 (24 Apr 2011)
+
+ 24 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+ +gdk-pixbuf-2.22.1-r1.ebuild:
+ Drop keywords on hppa/mips w.r.t. KEYWORDREQ bug 364693
+
+ 15 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
+ Remove unrequired libtool files.
+
+ 04 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+ gdk-pixbuf-2.22.1.ebuild, +files/gdk-pixbuf-2.22.1-fix-libpng15.patch:
+ Fix building with libpng-1.5, bug 354557
+
+ 22 Mar 2011; Brent Baude <ranger@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
+ Marking gdk-pixbuf-2.22.1 ppc stable for bug 353436
+
+ 21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
+ ppc64 stable wrt #353436
+
+ 12 Mar 2011; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
+ alpha/arm/ia64/sh/sparc stable wrt #353436
+
+ 07 Mar 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
+ Stable for HPPA (bug #353436).
+
+ 24 Feb 2011; Thomas Kahle <tomka@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
+ x86 stable per bug 353436
+
+ 23 Feb 2011; Markos Chandras <hwoarang@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
+ Stable on amd64 wrt bug #353436
+
+*gdk-pixbuf-2.22.1 (09 Nov 2010)
+
+ 09 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+ +gdk-pixbuf-2.22.1.ebuild:
+ Version bump. Implement GIcon interface, fix loader.cache detection on
+ windows, translation updates.
+
+ 07 Nov 2010; Jory A. Pratt <anarchy@gentoo.org> gdk-pixbuf-2.22.0.ebuild:
+ Convert media-libs/jpeg to virtual/jpeg
+
+ 24 Sep 2010; <nirbheek@gentoo.org> gdk-pixbuf-2.22.0.ebuild:
+ Remove .la files too
+
+*gdk-pixbuf-2.22.0 (24 Sep 2010)
+
+ 24 Sep 2010; <nirbheek@gentoo.org>
+ +files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch,
+ +gdk-pixbuf-2.22.0.ebuild, +metadata.xml:
+ Add gdk-pixbuf, split off gtk+ so it can be shared b/w gtk+:2 and gtk+:3.
+ Inherits gtk's keywords.
+
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.25.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.25.2.ebuild
new file mode 100644
index 0000000..066d2c9
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.25.2.ebuild
@@ -0,0 +1,92 @@
+# 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.24.1.ebuild,v 1.1 2011/12/31 18:24:32 pacho 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.27.2:2
+ >=media-libs/libpng-1.4:0
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/jasper )
+ tiff? ( >=media-libs/tiff-3.9.2:0 )
+ X? ( x11-libs/libX11 )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/pkgconfig-0.9
+ >=sys-apps/coreutils-8.5
+ >=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() {
+ # This will avoid polluting the pkg-config file with versioned libpng,
+ # which is causing problems with libpng14 -> libpng15 upgrade
+ # See upstream bug #667068
+ sed -i -e 's:libpng15:libpng libpng15:' configure.ac || die
+ 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
+ dodoc AUTHORS NEWS* README*
+
+ # New library, remove .la files
+ find "${D}" -name '*.la' -exec rm -f '{}' + || die
+}
+
+pkg_postinst() {
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+
+ tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+ # be atomic!
+ gdk-pixbuf-query-loaders > "${tmp_file}"
+ if [ "${?}" = "0" ]; then
+ cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+ else
+ ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run"
+ fi
+ rm "${tmp_file}"
+
+ 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
+}
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
new file mode 100644
index 0000000..e86947c
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+ for introspection</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2012-03-22 5:14 Alexandre Restovtsev
0 siblings, 0 replies; 13+ messages in thread
From: Alexandre Restovtsev @ 2012-03-22 5:14 UTC (permalink / raw
To: gentoo-commits
commit: 93de027cf484a0197f7fb22cf439cf31f5d55b93
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 05:12:10 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Mar 22 05:12:10 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=93de027c
x11-libs/gdk-pixbuf: 2.25.2 → 2.26.0
---
...xbuf-2.25.2.ebuild => gdk-pixbuf-2.26.0.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.25.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.0.ebuild
similarity index 100%
rename from x11-libs/gdk-pixbuf/gdk-pixbuf-2.25.2.ebuild
rename to x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.0.ebuild
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2013-03-08 14:39 Priit Laes
0 siblings, 0 replies; 13+ messages in thread
From: Priit Laes @ 2013-03-08 14:39 UTC (permalink / raw
To: gentoo-commits
commit: 8d802e780fee9d8e948761c7dfe3f0a0c7d2ea58
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Mar 8 14:31:57 2013 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Mar 8 14:31:57 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8d802e78
x11-libs/gdk-pixbuf: Add 2.27.2 to overlay
---
x11-libs/gdk-pixbuf/ChangeLog | 185 --------------------------
x11-libs/gdk-pixbuf/gdk-pixbuf-2.27.2.ebuild | 86 ++++++++++++
2 files changed, 86 insertions(+), 185 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
deleted file mode 100644
index c765841..0000000
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ /dev/null
@@ -1,185 +0,0 @@
-# ChangeLog for x11-libs/gdk-pixbuf
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.45 2012/02/04 18:25:49 tetromino Exp $
-
- 04 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
- gdk-pixbuf-2.24.0-r1.ebuild:
- Drop superfluous elibtoolize call (bug #401983, thanks to Julian W.)
-
-*gdk-pixbuf-2.24.1 (31 Dec 2011)
-
- 31 Dec 2011; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.24.1.ebuild,
- -files/gdk-pixbuf-2.22.1-CVE-2011-2485.patch,
- -files/gdk-pixbuf-2.22.1-fix-libpng15.patch, -gdk-pixbuf-2.22.1-r2.ebuild:
- Version bump, add missing DEPEND on proper coreutils version (bug #395103 by
- arnaud), remove old.
-
- 13 Nov 2011; Justin Lecher <jlec@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild,
- gdk-pixbuf-2.24.0-r1.ebuild:
- Corrected Slotting of media-libs/tiff
-
- 30 Oct 2011; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.24.0-r1.ebuild:
- alpha/ia64/sh/sparc stable wrt #385699
-
- 28 Oct 2011; Markus Meier <maekke@gentoo.org> gdk-pixbuf-2.24.0-r1.ebuild:
- arm stable, bug #385699
-
- 21 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- gdk-pixbuf-2.24.0-r1.ebuild:
- x86 stable wrt bug #385699
-
- 18 Oct 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.24.0-r1.ebuild:
- Stable for HPPA (bug #385699).
-
- 16 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
- gdk-pixbuf-2.24.0-r1.ebuild:
- ppc/ppc64 stable wrt #385699
-
- 14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
- -gdk-pixbuf-2.23.5.ebuild, -gdk-pixbuf-2.24.0.ebuild:
- old
-
- 14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
- gdk-pixbuf-2.24.0-r1.ebuild:
- amd64 stable wrt #385699
-
- 09 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild,
- gdk-pixbuf-2.23.5.ebuild, gdk-pixbuf-2.24.0.ebuild,
- gdk-pixbuf-2.24.0-r1.ebuild:
- add ewarn in case of gdk-pixbuf-query-loaders failure
-
- 03 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild,
- gdk-pixbuf-2.23.5.ebuild, gdk-pixbuf-2.24.0.ebuild,
- gdk-pixbuf-2.24.0-r1.ebuild:
- make gdk-pixbuf-query-loaders more atomic, fix segfault due to
- __GL_NO_DSO_FINALIZER=1 in environment
-
-*gdk-pixbuf-2.24.0-r1 (15 Sep 2011)
-
- 15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
- +gdk-pixbuf-2.24.0-r1.ebuild:
- Use libpng.pc instead of versioned pkg-config file to generate
- Requires.private: libpng instead of versioned one. This will avoid some
- problems with libpng14 to libpng15 upgrade wrt #383655
-
-*gdk-pixbuf-2.24.0 (28 Aug 2011)
-
- 28 Aug 2011; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.24.0.ebuild:
- Version bump: Clean up dependencies in the .pc file, translation updates.
-
- 28 Aug 2011; Fabian Groffen <grobian@gentoo.org> gdk-pixbuf-2.23.5.ebuild:
- Marked ~x64-macos
-
-*gdk-pixbuf-2.23.5 (16 Aug 2011)
-
- 16 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
- -gdk-pixbuf-2.22.1.ebuild, -gdk-pixbuf-2.22.1-r1.ebuild,
- +gdk-pixbuf-2.23.5.ebuild:
- Bump to 2.23.5, from gnome overlay for GNOME 3, remove old
-
- 11 Jul 2011; Matt Turner <mattst88@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
- Added ~mips, bug 364693
-
- 09 Jul 2011; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
- alpha/arm/ia64/sh/sparc stable wrt #371320
-
- 09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
- gdk-pixbuf-2.22.1-r2.ebuild:
- ppc/ppc64 stable wrt #373999
-
- 06 Jul 2011; Mark Loeser <halcy0n@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
- Stable for ppc64; bug #371320
-
- 05 Jul 2011; Thomas Kahle <tomka@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
- x86 stable per bug 373999
-
- 05 Jul 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
- Stable for HPPA (bug #373999).
-
- 04 Jul 2011; Pacho Ramos <pacho@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
- amd64 stable, security bug #373999
-
-*gdk-pixbuf-2.22.1-r2 (04 Jul 2011)
-
- 04 Jul 2011; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.22.1-r2.ebuild,
- +files/gdk-pixbuf-2.22.1-CVE-2011-2485.patch:
- GIF: Don't return a partially initialized pixbuf structure, fix security bug
- #373999 by Tim Sammut.
-
- 29 Jun 2011; Christoph Mende <angelos@gentoo.org>
- gdk-pixbuf-2.22.1-r1.ebuild:
- Stable on amd64 wrt bug #371320
-
- 29 Jun 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
- Stable for HPPA (bug #371320).
-
- 28 Jun 2011; Brent Baude <ranger@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
- Marking gdk-pixbuf-2.22.1-r1 ppc stable for bug 371320
-
- 25 Jun 2011; Pacho Ramos <pacho@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
- PDEPEND on gnome-base/librsvg conditionally (bug #373001 by Lev Babiev).
-
- 22 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- gdk-pixbuf-2.22.1-r1.ebuild:
- x86 stable wrt security bug #371320
-
- 05 Jun 2011; Pacho Ramos <pacho@gentoo.org> -gdk-pixbuf-2.22.0.ebuild,
- gdk-pixbuf-2.22.1-r1.ebuild:
- PDEPEND on gnome-base/librsvg as reported in bug #363715 by Cedric. Remove
- old.
-
- 29 Apr 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
- Marked ~hppa (bug #364693).
-
-*gdk-pixbuf-2.22.1-r1 (24 Apr 2011)
-
- 24 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
- +gdk-pixbuf-2.22.1-r1.ebuild:
- Drop keywords on hppa/mips w.r.t. KEYWORDREQ bug 364693
-
- 15 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
- Remove unrequired libtool files.
-
- 04 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
- gdk-pixbuf-2.22.1.ebuild, +files/gdk-pixbuf-2.22.1-fix-libpng15.patch:
- Fix building with libpng-1.5, bug 354557
-
- 22 Mar 2011; Brent Baude <ranger@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
- Marking gdk-pixbuf-2.22.1 ppc stable for bug 353436
-
- 21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
- ppc64 stable wrt #353436
-
- 12 Mar 2011; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
- alpha/arm/ia64/sh/sparc stable wrt #353436
-
- 07 Mar 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
- Stable for HPPA (bug #353436).
-
- 24 Feb 2011; Thomas Kahle <tomka@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
- x86 stable per bug 353436
-
- 23 Feb 2011; Markos Chandras <hwoarang@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
- Stable on amd64 wrt bug #353436
-
-*gdk-pixbuf-2.22.1 (09 Nov 2010)
-
- 09 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
- +gdk-pixbuf-2.22.1.ebuild:
- Version bump. Implement GIcon interface, fix loader.cache detection on
- windows, translation updates.
-
- 07 Nov 2010; Jory A. Pratt <anarchy@gentoo.org> gdk-pixbuf-2.22.0.ebuild:
- Convert media-libs/jpeg to virtual/jpeg
-
- 24 Sep 2010; <nirbheek@gentoo.org> gdk-pixbuf-2.22.0.ebuild:
- Remove .la files too
-
-*gdk-pixbuf-2.22.0 (24 Sep 2010)
-
- 24 Sep 2010; <nirbheek@gentoo.org>
- +files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch,
- +gdk-pixbuf-2.22.0.ebuild, +metadata.xml:
- Add gdk-pixbuf, split off gtk+ so it can be shared b/w gtk+:2 and gtk+:3.
- Inherits gtk's keywords.
-
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.27.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.27.2.ebuild
new file mode 100644
index 0000000..d83692b
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.27.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit eutils gnome.org multilib libtool
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.34.0:2
+ >=media-libs/libpng-1.4:0=
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ jpeg? ( virtual/jpeg:= )
+ jpeg2k? ( media-libs/jasper:= )
+ tiff? ( >=media-libs/tiff-3.9.2:0= )
+ X? ( x11-libs/libX11 )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-doc-am-1.11
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig"
+# 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() {
+ # This will avoid polluting the pkg-config file with versioned libpng,
+ # which is causing problems with libpng14 -> libpng15 upgrade
+ # See upstream bug #667068
+ sed -e 's:libpng15:libpng libpng15:' \
+ -i configure || die
+ default
+ elibtoolize # for Darwin modules
+}
+
+src_configure() {
+ # png always on to display icons (foser)
+ # TODO: gio sniffing?
+ econf \
+ $(usex debug --enable-debug=yes "") \
+ $(use_with jpeg libjpeg) \
+ $(use_with jpeg2k libjasper) \
+ $(use_with tiff libtiff) \
+ $(use_enable introspection) \
+ $(use_with X x11) \
+ --with-libpng
+}
+
+src_install() {
+ default
+ dodoc AUTHORS NEWS* README*
+
+ # New library, remove .la files
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+
+ tmp_file=$(mktemp -t tmp_gdk_pixbuf_ebuild.XXXXXXXXXX)
+ # be atomic!
+ gdk-pixbuf-query-loaders > "${tmp_file}"
+ if [ "${?}" = "0" ]; then
+ cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+ else
+ ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run"
+ fi
+ rm "${tmp_file}"
+
+ 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] 13+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2013-12-11 23:44 Gilles Dartiguelongue
0 siblings, 0 replies; 13+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-11 23:44 UTC (permalink / raw
To: gentoo-commits
commit: 5742eaa8a7ce18ca080dddbca979647f297feb11
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 23:35:46 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 23:43:44 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5742eaa8
x11-libs/gdk-pixbuf: 2.28.2 → 2.30.1
---
...xbuf-2.27.2.ebuild => gdk-pixbuf-2.30.1.ebuild} | 62 +++++++++++++---------
1 file changed, 38 insertions(+), 24 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.27.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.1.ebuild
similarity index 61%
rename from x11-libs/gdk-pixbuf/gdk-pixbuf-2.27.2.ebuild
rename to x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.1.ebuild
index d83692b..b52d9aa 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.27.2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.1.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit eutils gnome.org multilib libtool
+inherit gnome.org gnome2-utils multilib libtool
DESCRIPTION="Image loading library for GTK+"
HOMEPAGE="http://www.gtk.org/"
@@ -15,37 +15,41 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
IUSE="+X debug +introspection jpeg jpeg2k tiff test"
COMMON_DEPEND="
- >=dev-libs/glib-2.34.0:2
+ >=dev-libs/glib-2.37.2:2
>=media-libs/libpng-1.4:0=
introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
- jpeg? ( virtual/jpeg:= )
+ jpeg? ( virtual/jpeg:0= )
jpeg2k? ( media-libs/jasper:= )
tiff? ( >=media-libs/tiff-3.9.2:0= )
- X? ( x11-libs/libX11 )"
+ X? ( x11-libs/libX11 )
+"
DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.11
>=sys-devel/gettext-0.17
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
# 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"
+ !<x11-libs/gtk+-2.90.4:3
+"
src_prepare() {
# This will avoid polluting the pkg-config file with versioned libpng,
# which is causing problems with libpng14 -> libpng15 upgrade
# See upstream bug #667068
- sed -e 's:libpng15:libpng libpng15:' \
- -i configure || die
+ # First check that the pattern is present, to catch upstream changes on bumps,
+ # because sed doesn't return failure code if it doesn't do any replacements
+ grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
+ sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
default
- elibtoolize # for Darwin modules
+ elibtoolize # for Darwin modules, bug #????
}
src_configure() {
- # png always on to display icons (foser)
- # TODO: gio sniffing?
+ # png always on to display icons
econf \
$(usex debug --enable-debug=yes "") \
$(use_with jpeg libjpeg) \
@@ -57,30 +61,40 @@ src_configure() {
}
src_install() {
- default
- dodoc AUTHORS NEWS* README*
-
- # New library, remove .la files
+ # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+ MAKEOPTS+=" -j1" default
prune_libtool_files --modules
}
+pkg_preinst() {
+ gnome2_gdk_pixbuf_savelist
+
+ # Make sure loaders.cache belongs to gdk-pixbuf alone
+ local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+}
+
pkg_postinst() {
# causes segfault if set, see bug 375615
unset __GL_NO_DSO_FINALIZER
- tmp_file=$(mktemp -t tmp_gdk_pixbuf_ebuild.XXXXXXXXXX)
- # be atomic!
- gdk-pixbuf-query-loaders > "${tmp_file}"
- if [ "${?}" = "0" ]; then
- cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
- else
- ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run"
- fi
- rm "${tmp_file}"
+ gnome2_gdk_pixbuf_update
+ # Migration snippet for when this was handled by gtk+
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
}
+
+pkg_postrm() {
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ rm -f "${EROOT}"usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache
+ fi
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2013-12-24 16:57 Gilles Dartiguelongue
0 siblings, 0 replies; 13+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-24 16:57 UTC (permalink / raw
To: gentoo-commits
commit: b0d6185ba75060c1117c48365cd5d260513d7f99
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 23:15:38 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 23:15:38 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b0d6185b
x11-libs/gdk-pixbuf: moved to gentoo-x86
---
x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.1.ebuild | 100 ---------------------------
1 file changed, 100 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.1.ebuild
deleted file mode 100644
index b52d9aa..0000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit gnome.org gnome2-utils multilib libtool
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X debug +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.37.2:2
- >=media-libs/libpng-1.4:0=
- introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
- jpeg? ( virtual/jpeg:0= )
- jpeg2k? ( media-libs/jasper:= )
- tiff? ( >=media-libs/tiff-3.9.2:0= )
- X? ( x11-libs/libX11 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-doc-am-1.11
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-# 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() {
- # This will avoid polluting the pkg-config file with versioned libpng,
- # which is causing problems with libpng14 -> libpng15 upgrade
- # See upstream bug #667068
- # First check that the pattern is present, to catch upstream changes on bumps,
- # because sed doesn't return failure code if it doesn't do any replacements
- grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
- sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
- default
- elibtoolize # for Darwin modules, bug #????
-}
-
-src_configure() {
- # png always on to display icons
- econf \
- $(usex debug --enable-debug=yes "") \
- $(use_with jpeg libjpeg) \
- $(use_with jpeg2k libjasper) \
- $(use_with tiff libtiff) \
- $(use_enable introspection) \
- $(use_with X x11) \
- --with-libpng
-}
-
-src_install() {
- # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
- MAKEOPTS+=" -j1" default
- prune_libtool_files --modules
-}
-
-pkg_preinst() {
- gnome2_gdk_pixbuf_savelist
-
- # Make sure loaders.cache belongs to gdk-pixbuf alone
- local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
-}
-
-pkg_postinst() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
-
- gnome2_gdk_pixbuf_update
-
- # Migration snippet for when this was handled by gtk+
- 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
-}
-
-pkg_postrm() {
- if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
- rm -f "${EROOT}"usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache
- fi
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2014-10-26 9:21 Gilles Dartiguelongue
0 siblings, 0 replies; 13+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-26 9:21 UTC (permalink / raw
To: gentoo-commits
commit: e59cc93f9fc1f81182ec262c5a6293e8067853cb
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 25 21:14:11 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 26 09:21:33 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e59cc93f
x11-libs/gdk-pixbuf: clean up metadata.xml
---
x11-libs/gdk-pixbuf/metadata.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index e86947c..6e0e2ec 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -2,8 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>gnome</herd>
- <use>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
- for introspection</flag>
- </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2015-05-14 23:02 Gilles Dartiguelongue
0 siblings, 0 replies; 13+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-14 23:02 UTC (permalink / raw
To: gentoo-commits
commit: c7031993cabf84277316efddf2c4e32ed2d5dc9d
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 22:59:37 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu May 14 22:59:37 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=c7031993
x11-libs/gdk-pixbuf: 2.30.8 → 2.31.4
x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.4.ebuild | 117 +++++++++++++++++++++++++++
1 file changed, 117 insertions(+)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.4.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.4.ebuild
new file mode 100644
index 0000000..9f9673d
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+ tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+ X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-doc-am-1.20
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+# 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
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gdk-pixbuf-query-loaders
+)
+
+src_prepare() {
+ # This will avoid polluting the pkg-config file with versioned libpng,
+ # which is causing problems with libpng14 -> libpng15 upgrade
+ # See upstream bug #667068
+ # First check that the pattern is present, to catch upstream changes on bumps,
+ # because sed doesn't return failure code if it doesn't do any replacements
+ grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
+ sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+ [[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # png always on to display icons
+ ECONF_SOURCE="${S}" \
+ gnome2_src_configure \
+ $(usex debug --enable-debug=yes "") \
+ $(use_with jpeg libjpeg) \
+ $(use_with jpeg2k libjasper) \
+ $(use_with tiff libtiff) \
+ $(multilib_native_use_enable introspection) \
+ $(use_with X x11) \
+ --with-libpng
+}
+
+multilib_src_install() {
+ # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+ MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make sure loaders.cache belongs to gdk-pixbuf alone
+ local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+
+ multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+
+ multilib_foreach_abi gnome2_pkg_postinst
+
+ # Migration snippet for when this was handled by gtk+
+ 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
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+ fi
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2015-05-15 7:25 Gilles Dartiguelongue
0 siblings, 0 replies; 13+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-15 7:25 UTC (permalink / raw
To: gentoo-commits
commit: d0a945436d9d3f6001d5f5fd48f45fb03393e074
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 07:21:27 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri May 15 07:21:50 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d0a94543
x11-libs/gdk-pixbuf: add workaround to install gtk-doc, bug #549166
x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.4.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.4.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.4.ebuild
index 9f9673d..82fe538 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.4.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.4.ebuild
@@ -70,6 +70,11 @@ multilib_src_configure() {
$(multilib_native_use_enable introspection) \
$(use_with X x11) \
--with-libpng
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+ fi
}
multilib_src_install() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2015-08-01 0:50 Alexandre Rostovtsev
0 siblings, 0 replies; 13+ messages in thread
From: Alexandre Rostovtsev @ 2015-08-01 0:50 UTC (permalink / raw
To: gentoo-commits
commit: 710fe5dbbadd80c18ffc306d292403364824d309
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 1 00:49:07 2015 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sat Aug 1 00:49:07 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=710fe5db
x11-libs/gdk-pixbuf: 2.31.4 → 2.31.5
Fixes integer overflow (bug #556314)
Package-Manager: portage-2.2.20
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D
.../gdk-pixbuf/{gdk-pixbuf-2.31.4.ebuild => gdk-pixbuf-2.31.5.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.4.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.5.ebuild
similarity index 99%
rename from x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.4.ebuild
rename to x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.5.ebuild
index 82fe538..e59d782 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.4.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.31.5.ebuild
@@ -27,7 +27,7 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.20
- >=sys-devel/gettext-0.17
+ >=sys-devel/gettext-0.19
virtual/pkgconfig
"
# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2015-10-13 1:07 Alexandre Rostovtsev
0 siblings, 0 replies; 13+ messages in thread
From: Alexandre Rostovtsev @ 2015-10-13 1:07 UTC (permalink / raw
To: gentoo-commits
commit: b57d414cf9a520259aa8abcee70593048a17533f
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 01:06:27 2015 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 01:06:27 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b57d414c
x11-libs/gdk-pixbuf: add live ebuild
x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild | 131 +++++++++++++++++++++++++++++
1 file changed, 131 insertions(+)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
new file mode 100644
index 0000000..14c57b8
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+fi
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+if [[ ${PV} = 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="+X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+ tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+ X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-doc-am-1.20
+ >=sys-devel/gettext-0.19
+ virtual/pkgconfig
+"
+# 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
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gdk-pixbuf-query-loaders
+)
+
+src_prepare() {
+ [[ ${PV} = 9999 ]] && eautoreconf
+
+ # This will avoid polluting the pkg-config file with versioned libpng,
+ # which is causing problems with libpng14 -> libpng15 upgrade
+ # See upstream bug #667068
+ # First check that the pattern is present, to catch upstream changes on bumps,
+ # because sed doesn't return failure code if it doesn't do any replacements
+ grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
+ sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+ [[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # png always on to display icons
+ ECONF_SOURCE="${S}" \
+ gnome2_src_configure \
+ $(usex debug --enable-debug=yes "") \
+ $(use_with jpeg libjpeg) \
+ $(use_with jpeg2k libjasper) \
+ $(use_with tiff libtiff) \
+ $(multilib_native_use_enable introspection) \
+ $(use_with X x11) \
+ --with-libpng
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+ fi
+}
+
+multilib_src_install() {
+ # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+ MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make sure loaders.cache belongs to gdk-pixbuf alone
+ local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+
+ multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+
+ multilib_foreach_abi gnome2_pkg_postinst
+
+ # Migration snippet for when this was handled by gtk+
+ 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
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+ fi
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/
@ 2017-09-02 14:55 Gilles Dartiguelongue
0 siblings, 0 replies; 13+ messages in thread
From: Gilles Dartiguelongue @ 2017-09-02 14:55 UTC (permalink / raw
To: gentoo-commits
commit: 2a7be77d73a548cb8cee0c7076c9b93fb50d7029
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 2 14:55:11 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 14:55:11 2017 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2a7be77d
x11-libs/gdk-pixbuf: sync with gentoo repository
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Manifest-Sign-Key: 0x5A56C8CD0C13248A
x11-libs/gdk-pixbuf/gdk-pixbuf-2.34.0.ebuild | 121 ---------------------------
x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild | 16 ++--
x11-libs/gdk-pixbuf/metadata.xml | 3 +
3 files changed, 10 insertions(+), 130 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.34.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.34.0.ebuild
deleted file mode 100644
index d674ae1f..00000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.34.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X debug +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
- X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-doc-am-1.20
- >=sys-devel/gettext-0.19
- virtual/pkgconfig
-"
-# 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
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gdk-pixbuf-query-loaders
-)
-
-src_prepare() {
- # See https://bugzilla.gnome.org/show_bug.cgi?id=756590
- epatch "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
-
- # This will avoid polluting the pkg-config file with versioned libpng,
- # which is causing problems with libpng14 -> libpng15 upgrade
- # See upstream bug #667068
- # First check that the pattern is present, to catch upstream changes on bumps,
- # because sed doesn't return failure code if it doesn't do any replacements
- grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
- sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
- [[ ${CHOST} == *-solaris* ]] && append-libs intl
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- # png always on to display icons
- ECONF_SOURCE="${S}" \
- gnome2_src_configure \
- $(usex debug --enable-debug=yes "") \
- $(use_with jpeg libjpeg) \
- $(use_with jpeg2k libjasper) \
- $(use_with tiff libtiff) \
- $(multilib_native_use_enable introspection) \
- $(use_with X x11) \
- --with-libpng
-
- # work-around gtk-doc out-of-source brokedness
- if multilib_is_native_abi; then
- ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
- fi
-}
-
-multilib_src_install() {
- # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- multilib_pkg_preinst() {
- # Make sure loaders.cache belongs to gdk-pixbuf alone
- local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
- }
-
- multilib_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
-
- multilib_foreach_abi gnome2_pkg_postinst
-
- # Migration snippet for when this was handled by gtk+
- 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
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
- fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
index faa412ea..09f42ea4 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=6
GNOME2_LA_PUNT="yes"
-inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
+inherit flag-o-matic gnome2 multilib multilib-minimal
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -19,12 +17,12 @@ SLOT="2"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="X debug +introspection jpeg jpeg2k tiff test"
COMMON_DEPEND="
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
@@ -46,12 +44,12 @@ RDEPEND="${COMMON_DEPEND}
"
MULTILIB_CHOST_TOOLS=(
- /usr/bin/gdk-pixbuf-query-loaders
+ /usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
)
src_prepare() {
# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
- epatch "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+ eapply "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
# This will avoid polluting the pkg-config file with versioned libpng,
# which is causing problems with libpng14 -> libpng15 upgrade
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index 39980802..6c6d2ea4 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -5,4 +5,7 @@
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+<use>
+ <flag name="X">Build and install the legacy gdk_pixbuf_xlib-2.0 library</flag>
+</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-09-02 14:55 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-22 5:14 [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2017-09-02 14:55 Gilles Dartiguelongue
2015-10-13 1:07 Alexandre Rostovtsev
2015-08-01 0:50 Alexandre Rostovtsev
2015-05-15 7:25 Gilles Dartiguelongue
2015-05-14 23:02 Gilles Dartiguelongue
2014-10-26 9:21 Gilles Dartiguelongue
2013-12-24 16:57 Gilles Dartiguelongue
2013-12-11 23:44 Gilles Dartiguelongue
2013-03-08 14:39 Priit Laes
2012-02-08 7:52 Priit Laes
2011-06-28 8:36 Alexandre Restovtsev
2011-03-05 20:23 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox