[x11-libs/gdk-pixbuf] remove, Gentoo version used now
This commit is contained in:
@@ -1,5 +0,0 @@
|
||||
AUX gdk-pixbuf-2.21.4-fix-automagic-x11.patch 715 RMD160 efeaa25e97e7620018ae3ca5b62d74ff6e0fd0d1 SHA1 d67d28548ce340034f5afb0ca07b699fd1a0619e SHA256 e977da6d4731a0164b7346a790dfabb95a951f9986fa623abd171bce79f63bcb
|
||||
DIST gdk-pixbuf-2.24.0.tar.xz 1176324 RMD160 38e9896dd9a1ed6bf207509cd635828cebe674b8 SHA1 6a78751630a54fdef9a6a3928322c98e6c1ef60c SHA256 67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7
|
||||
EBUILD gdk-pixbuf-2.24.0-r1.ebuild 2740 RMD160 2b33c630db5264727c8eafed01204289a3c13520 SHA1 e2ea2363a9b66a7fa52a5384ab675e09ac341f3d SHA256 87fd40396193835f35c26e132d868a300e78eca78f3ba2e1468df4939ada5845
|
||||
MISC GENTOO 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
|
||||
MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
|
||||
@@ -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
|
||||
@@ -1,93 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils 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 )
|
||||
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, upstream bug #657569
|
||||
epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
|
||||
|
||||
# This will avoid polluting the pkg-config file with versioned libpng,
|
||||
# which is causing problems with libpng14 -> libpng15 upgrade
|
||||
sed -i -e 's:libpng15:libpng libpng15:' configure.ac || die
|
||||
|
||||
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
|
||||
dodoc AUTHORS NEWS* README*
|
||||
|
||||
# New library, remove .la files
|
||||
find "${D}" -name '*.la' -exec rm -f '{}' + || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# causes segfault if set
|
||||
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"
|
||||
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
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
<?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>
|
||||
Reference in New Issue
Block a user