1 |
commit: a92cdbc6d2dfbbf011658e49c888153ccbcdbdf5 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 14 19:50:19 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 14 19:51:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a92cdbc6 |
7 |
|
8 |
x11-libs/gdk-pixbuf: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
x11-libs/gdk-pixbuf/Manifest | 1 - |
14 |
.../files/2.36.11-fix-libtiff-disable.patch | 26 ----- |
15 |
x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild | 127 --------------------- |
16 |
3 files changed, 154 deletions(-) |
17 |
|
18 |
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest |
19 |
index 8c610bda12c..3e4ce22587e 100644 |
20 |
--- a/x11-libs/gdk-pixbuf/Manifest |
21 |
+++ b/x11-libs/gdk-pixbuf/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6ffbc69fa66236d91b29a6e923c01b91054eb491d2ba15a2e5d2d694f143eb0cc472bbed9bfce0bc015d6602449920fa SHA512 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3 |
24 |
DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9 |
25 |
DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b |
26 |
|
27 |
diff --git a/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch b/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch |
28 |
deleted file mode 100644 |
29 |
index 23caca99a59..00000000000 |
30 |
--- a/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch |
31 |
+++ /dev/null |
32 |
@@ -1,26 +0,0 @@ |
33 |
-From 5c4edf2cc22468a8410c19cb8b236b227fca300a Mon Sep 17 00:00:00 2001 |
34 |
-From: Alexander Kanavin <alex.kanavin@×××××.com> |
35 |
-Date: Tue, 10 Oct 2017 14:33:18 +0300 |
36 |
-Subject: [PATCH] build: Fix --without-libtiff not having an effect |
37 |
- |
38 |
-https://bugzilla.gnome.org/show_bug.cgi?id=788770 |
39 |
---- |
40 |
- configure.ac | 2 +- |
41 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
42 |
- |
43 |
-diff --git a/configure.ac b/configure.ac |
44 |
-index b45f407b5..9f5d6fbee 100644 |
45 |
---- a/configure.ac |
46 |
-+++ b/configure.ac |
47 |
-@@ -676,7 +676,7 @@ if test x$gio_can_sniff = x; then |
48 |
- AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data]) |
49 |
- fi |
50 |
- |
51 |
--AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != x) |
52 |
-+AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno) |
53 |
- AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x) |
54 |
- AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x) |
55 |
- AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x) |
56 |
--- |
57 |
-2.15.0 |
58 |
- |
59 |
|
60 |
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild |
61 |
deleted file mode 100644 |
62 |
index 5cf84878340..00000000000 |
63 |
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild |
64 |
+++ /dev/null |
65 |
@@ -1,127 +0,0 @@ |
66 |
-# Copyright 1999-2018 Gentoo Authors |
67 |
-# Distributed under the terms of the GNU General Public License v2 |
68 |
- |
69 |
-EAPI=6 |
70 |
-GNOME2_LA_PUNT="yes" |
71 |
-GNOME2_EAUTORECONF="yes" |
72 |
- |
73 |
-inherit flag-o-matic gnome2 multilib multilib-minimal |
74 |
- |
75 |
-DESCRIPTION="Image loading library for GTK+" |
76 |
-HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" |
77 |
- |
78 |
-LICENSE="LGPL-2+" |
79 |
-SLOT="2" |
80 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
81 |
-IUSE="X debug +introspection jpeg jpeg2k tiff test" |
82 |
- |
83 |
-COMMON_DEPEND=" |
84 |
- >=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}] |
85 |
- >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] |
86 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) |
87 |
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
88 |
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) |
89 |
- tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) |
90 |
- X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) |
91 |
-" |
92 |
-DEPEND="${COMMON_DEPEND} |
93 |
- dev-util/glib-utils |
94 |
- >=dev-util/gtk-doc-am-1.20 |
95 |
- >=sys-devel/gettext-0.19 |
96 |
- virtual/pkgconfig |
97 |
-" |
98 |
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise |
99 |
-RDEPEND="${COMMON_DEPEND} |
100 |
- !<gnome-base/gail-1000 |
101 |
- !<gnome-base/librsvg-2.31.0 |
102 |
- !<x11-libs/gtk+-2.21.3:2 |
103 |
- !<x11-libs/gtk+-2.90.4:3 |
104 |
-" |
105 |
- |
106 |
-MULTILIB_CHOST_TOOLS=( |
107 |
- /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) |
108 |
-) |
109 |
- |
110 |
-PATCHES=( |
111 |
- # Do not run lowmem test on uclibc |
112 |
- # See https://bugzilla.gnome.org/show_bug.cgi?id=756590 |
113 |
- "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch |
114 |
- # Fix --without-libtiff having no effect (from master) |
115 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=788770 |
116 |
- "${FILESDIR}"/${PV}-fix-libtiff-disable.patch |
117 |
-) |
118 |
- |
119 |
-src_prepare() { |
120 |
- # This will avoid polluting the pkg-config file with versioned libpng, |
121 |
- # which is causing problems with libpng14 -> libpng15 upgrade |
122 |
- # See upstream bug #667068 |
123 |
- # First check that the pattern is present, to catch upstream changes on bumps, |
124 |
- # because sed doesn't return failure code if it doesn't do any replacements |
125 |
- grep -q 'l in libpng16' configure || die "libpng check order has changed upstream" |
126 |
- sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die |
127 |
- [[ ${CHOST} == *-solaris* ]] && append-libs intl |
128 |
- |
129 |
- gnome2_src_prepare |
130 |
-} |
131 |
- |
132 |
-multilib_src_configure() { |
133 |
- # png always on to display icons |
134 |
- ECONF_SOURCE="${S}" \ |
135 |
- gnome2_src_configure \ |
136 |
- $(usex debug --enable-debug=yes "") \ |
137 |
- $(use_with jpeg libjpeg) \ |
138 |
- $(use_with jpeg2k libjasper) \ |
139 |
- $(use_with tiff libtiff) \ |
140 |
- $(multilib_native_use_enable introspection) \ |
141 |
- $(use_with X x11) \ |
142 |
- --with-libpng |
143 |
- |
144 |
- # work-around gtk-doc out-of-source brokedness |
145 |
- if multilib_is_native_abi; then |
146 |
- ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die |
147 |
- fi |
148 |
-} |
149 |
- |
150 |
-multilib_src_install() { |
151 |
- # Parallel install fails when no gdk-pixbuf is already installed, bug #481372 |
152 |
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install |
153 |
-} |
154 |
- |
155 |
-pkg_preinst() { |
156 |
- gnome2_pkg_preinst |
157 |
- |
158 |
- multilib_pkg_preinst() { |
159 |
- # Make sure loaders.cache belongs to gdk-pixbuf alone |
160 |
- local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" |
161 |
- |
162 |
- if [[ -e ${EROOT}${cache} ]]; then |
163 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
164 |
- else |
165 |
- touch "${ED}"/${cache} || die |
166 |
- fi |
167 |
- } |
168 |
- |
169 |
- multilib_foreach_abi multilib_pkg_preinst |
170 |
-} |
171 |
- |
172 |
-pkg_postinst() { |
173 |
- # causes segfault if set, see bug 375615 |
174 |
- unset __GL_NO_DSO_FINALIZER |
175 |
- |
176 |
- multilib_foreach_abi gnome2_pkg_postinst |
177 |
- |
178 |
- # Migration snippet for when this was handled by gtk+ |
179 |
- if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then |
180 |
- elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders |
181 |
- elog "to do that you can use qfile from portage-utils:" |
182 |
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)" |
183 |
- fi |
184 |
-} |
185 |
- |
186 |
-pkg_postrm() { |
187 |
- gnome2_pkg_postrm |
188 |
- |
189 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
190 |
- rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache |
191 |
- fi |
192 |
-} |