1 |
commit: a5dfb686bfacc26b3d446f9effcab54afa3aae8e |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 11 06:07:52 2017 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 16 08:27:38 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5dfb686 |
7 |
|
8 |
x11-libs/gtk+: version bump 3.22.19 → 3.22.26 |
9 |
|
10 |
Keep cloudproviders disabled as it is not packaged yet. |
11 |
|
12 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
13 |
|
14 |
x11-libs/gtk+/Manifest | 1 + |
15 |
.../gtk+-3.22.20-libcloudproviders-automagic.patch | 57 +++++ |
16 |
x11-libs/gtk+/gtk+-3.22.26.ebuild | 231 +++++++++++++++++++++ |
17 |
3 files changed, 289 insertions(+) |
18 |
|
19 |
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest |
20 |
index 82cccd9dc6e..2829621a3f8 100644 |
21 |
--- a/x11-libs/gtk+/Manifest |
22 |
+++ b/x11-libs/gtk+/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1 |
25 |
DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2 |
26 |
+DIST gtk+-3.22.26.tar.xz 18922136 BLAKE2B a1e43be24abe2bda8eb63f3794b191b152abb5717334f8f46fe3158eb7ec92d5413ed3ca0df2a1ad676deacee3e7ce5e737661ec5f5c911609d40d3b9379c4c4 SHA512 2fd3a4175168d37f243359bac5df84722a2830fe5b62f86b914ce39ff500f0361e412843922343dffef8bee8f1205799ff86dd3ae8ac419928f4fe977e0e946f |
27 |
|
28 |
diff --git a/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch b/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..8913bc88bd4 |
31 |
--- /dev/null |
32 |
+++ b/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch |
33 |
@@ -0,0 +1,57 @@ |
34 |
+From 4588c9c6463d8958d8305caafa58ea5c263fd352 Mon Sep 17 00:00:00 2001 |
35 |
+From: Gilles Dartiguelongue <eva@g.o> |
36 |
+Date: Tue, 16 Jan 2018 09:07:38 +0100 |
37 |
+Subject: [PATCH] Fix libcloudproviders check |
38 |
+ |
39 |
+Use autotools managed variables and make use of pkgconfig macros. |
40 |
+--- |
41 |
+ configure.ac | 26 +++++++++++++------------- |
42 |
+ 1 file changed, 13 insertions(+), 13 deletions(-) |
43 |
+ |
44 |
+diff --git a/configure.ac b/configure.ac |
45 |
+index 24110386b4..cebe66c2e5 100644 |
46 |
+--- a/configure.ac |
47 |
++++ b/configure.ac |
48 |
+@@ -349,8 +349,10 @@ AC_ARG_ENABLE(mir-backend, |
49 |
+ |
50 |
+ AC_ARG_ENABLE(cloudproviders, |
51 |
+ [AS_HELP_STRING([--enable-cloudproviders], |
52 |
+- [enable libcloudproviders integration])], |
53 |
+- [cloudproviders_set=yes]) |
54 |
++ [enable libcloudproviders integration]) |
55 |
++ ], |
56 |
++ [], |
57 |
++ [enable_cloudproviders=yes]) |
58 |
+ |
59 |
+ if test -z "$backend_set"; then |
60 |
+ if test "$platform_win32" = yes; then |
61 |
+@@ -1350,17 +1352,15 @@ fi |
62 |
+ # Check for libcloudproviders |
63 |
+ |
64 |
+ CLOUDPROVIDER_PACKAGES="" |
65 |
+-if test "x$cloudproviders_set" = "xyes"; then |
66 |
+- CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version" |
67 |
+- if $PKG_CONFIG --exists $CLOUDPROVIDER_PACKAGES ; then |
68 |
+- AC_DEFINE(HAVE_CLOUDPROVIDERS, [1], |
69 |
+- [Define if libcloudproviders is available] |
70 |
+- ) |
71 |
+- else |
72 |
+- AC_MSG_ERROR([ |
73 |
+-*** libcloudproviders not found.]) |
74 |
+- fi |
75 |
+-fi |
76 |
++AS_IF([test "$enable_cloudproviders" = "yes"], |
77 |
++ [ |
78 |
++ CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version" |
79 |
++ PKG_CHECK_EXISTS( |
80 |
++ [$CLOUDPROVIDER_PACKAGES], |
81 |
++ [AC_DEFINE(HAVE_CLOUDPROVIDERS, [1], [Define if libcloudproviders is available])], |
82 |
++ [AC_MSG_ERROR([*** libcloudproviders not found])] |
83 |
++ ) |
84 |
++ ]) |
85 |
+ |
86 |
+ CFLAGS="$saved_cflags" |
87 |
+ LDFLAGS="$saved_ldflags" |
88 |
+-- |
89 |
+2.15.1 |
90 |
+ |
91 |
|
92 |
diff --git a/x11-libs/gtk+/gtk+-3.22.26.ebuild b/x11-libs/gtk+/gtk+-3.22.26.ebuild |
93 |
new file mode 100644 |
94 |
index 00000000000..0f2ed64289c |
95 |
--- /dev/null |
96 |
+++ b/x11-libs/gtk+/gtk+-3.22.26.ebuild |
97 |
@@ -0,0 +1,231 @@ |
98 |
+# Copyright 1999-2018 Gentoo Foundation |
99 |
+# Distributed under the terms of the GNU General Public License v2 |
100 |
+ |
101 |
+EAPI=6 |
102 |
+GNOME2_LA_PUNT="yes" |
103 |
+ |
104 |
+inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal |
105 |
+ |
106 |
+DESCRIPTION="Gimp ToolKit +" |
107 |
+HOMEPAGE="https://www.gtk.org/" |
108 |
+ |
109 |
+LICENSE="LGPL-2+" |
110 |
+SLOT="3" |
111 |
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama" |
112 |
+REQUIRED_USE=" |
113 |
+ || ( aqua wayland X ) |
114 |
+ xinerama? ( X ) |
115 |
+" |
116 |
+ |
117 |
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
118 |
+ |
119 |
+# Upstream wants us to do their job: |
120 |
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 |
121 |
+RESTRICT="test" |
122 |
+ |
123 |
+# FIXME: introspection data is built against system installation of gtk+:3, |
124 |
+# bug #???? |
125 |
+COMMON_DEPEND=" |
126 |
+ >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] |
127 |
+ >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}] |
128 |
+ media-libs/fontconfig[${MULTILIB_USEDEP}] |
129 |
+ >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}] |
130 |
+ >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] |
131 |
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] |
132 |
+ >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] |
133 |
+ x11-misc/shared-mime-info |
134 |
+ |
135 |
+ cloudprint? ( |
136 |
+ >=net-libs/rest-0.7[${MULTILIB_USEDEP}] |
137 |
+ >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) |
138 |
+ colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) |
139 |
+ cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) |
140 |
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= ) |
141 |
+ wayland? ( |
142 |
+ >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] |
143 |
+ >=dev-libs/wayland-protocols-1.9 |
144 |
+ media-libs/mesa[wayland,${MULTILIB_USEDEP}] |
145 |
+ >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] |
146 |
+ ) |
147 |
+ X? ( |
148 |
+ >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] |
149 |
+ x11-libs/libX11[${MULTILIB_USEDEP}] |
150 |
+ >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] |
151 |
+ x11-libs/libXext[${MULTILIB_USEDEP}] |
152 |
+ >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
153 |
+ x11-libs/libXcursor[${MULTILIB_USEDEP}] |
154 |
+ x11-libs/libXfixes[${MULTILIB_USEDEP}] |
155 |
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
156 |
+ x11-libs/libXdamage[${MULTILIB_USEDEP}] |
157 |
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
158 |
+ ) |
159 |
+" |
160 |
+DEPEND="${COMMON_DEPEND} |
161 |
+ app-text/docbook-xsl-stylesheets |
162 |
+ app-text/docbook-xml-dtd:4.1.2 |
163 |
+ dev-libs/libxslt |
164 |
+ dev-libs/gobject-introspection-common |
165 |
+ >=dev-util/gdbus-codegen-2.48 |
166 |
+ >=dev-util/gtk-doc-am-1.20 |
167 |
+ >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] |
168 |
+ virtual/pkgconfig[${MULTILIB_USEDEP}] |
169 |
+ X? ( |
170 |
+ x11-proto/xextproto[${MULTILIB_USEDEP}] |
171 |
+ x11-proto/xproto[${MULTILIB_USEDEP}] |
172 |
+ x11-proto/inputproto[${MULTILIB_USEDEP}] |
173 |
+ x11-proto/damageproto[${MULTILIB_USEDEP}] |
174 |
+ xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) |
175 |
+ ) |
176 |
+ test? ( |
177 |
+ media-fonts/font-misc-misc |
178 |
+ media-fonts/font-cursor-misc ) |
179 |
+" |
180 |
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
181 |
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
182 |
+RDEPEND="${COMMON_DEPEND} |
183 |
+ >=dev-util/gtk-update-icon-cache-3 |
184 |
+ !<gnome-base/gail-1000 |
185 |
+ !<x11-libs/vte-0.31.0:2.90 |
186 |
+" |
187 |
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
188 |
+PDEPEND=" |
189 |
+ gnome-base/librsvg[${MULTILIB_USEDEP}] |
190 |
+ >=x11-themes/adwaita-icon-theme-3.14 |
191 |
+ vim-syntax? ( app-vim/gtk-syntax ) |
192 |
+" |
193 |
+ |
194 |
+MULTILIB_CHOST_TOOLS=( |
195 |
+ /usr/bin/gtk-query-immodules-3.0$(get_exeext) |
196 |
+) |
197 |
+ |
198 |
+strip_builddir() { |
199 |
+ local rule=$1 |
200 |
+ shift |
201 |
+ local directory=$1 |
202 |
+ shift |
203 |
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
204 |
+ || die "Could not strip director ${directory} from build." |
205 |
+} |
206 |
+ |
207 |
+src_prepare() { |
208 |
+ if ! use test ; then |
209 |
+ # don't waste time building tests |
210 |
+ strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} |
211 |
+ |
212 |
+ # the tests dir needs to be build now because since commit |
213 |
+ # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there |
214 |
+ # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
215 |
+ fi |
216 |
+ |
217 |
+ if ! use examples; then |
218 |
+ # don't waste time building demos |
219 |
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
220 |
+ strip_builddir SRC_SUBDIRS examples Makefile.{am,in} |
221 |
+ fi |
222 |
+ |
223 |
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache |
224 |
+ eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch |
225 |
+ |
226 |
+ # Fix broken autotools logic |
227 |
+ eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch |
228 |
+ |
229 |
+ eautoreconf |
230 |
+ gnome2_src_prepare |
231 |
+} |
232 |
+ |
233 |
+multilib_src_configure() { |
234 |
+ # need libdir here to avoid a double slash in a path that libtool doesn't |
235 |
+ # grok so well during install (// between $EPREFIX and usr ...) |
236 |
+ # cloudprovider is not packaged in Gentoo |
237 |
+ ECONF_SOURCE=${S} \ |
238 |
+ gnome2_src_configure \ |
239 |
+ $(use_enable aqua quartz-backend) \ |
240 |
+ $(use_enable broadway broadway-backend) \ |
241 |
+ $(use_enable cloudprint) \ |
242 |
+ $(use_enable colord) \ |
243 |
+ $(use_enable cups cups auto) \ |
244 |
+ $(multilib_native_use_enable introspection) \ |
245 |
+ $(use_enable wayland wayland-backend) \ |
246 |
+ $(use_enable X x11-backend) \ |
247 |
+ $(use_enable X xcomposite) \ |
248 |
+ $(use_enable X xdamage) \ |
249 |
+ $(use_enable X xfixes) \ |
250 |
+ $(use_enable X xkb) \ |
251 |
+ $(use_enable X xrandr) \ |
252 |
+ $(use_enable xinerama) \ |
253 |
+ --disable-cloudproviders \ |
254 |
+ --disable-mir-backend \ |
255 |
+ --disable-papi \ |
256 |
+ --enable-man \ |
257 |
+ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
258 |
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
259 |
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
260 |
+ |
261 |
+ # work-around gtk-doc out-of-source brokedness |
262 |
+ if multilib_is_native_abi; then |
263 |
+ local d |
264 |
+ for d in gdk gtk libgail-util; do |
265 |
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
266 |
+ done |
267 |
+ fi |
268 |
+} |
269 |
+ |
270 |
+multilib_src_test() { |
271 |
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die |
272 |
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check |
273 |
+} |
274 |
+ |
275 |
+multilib_src_install() { |
276 |
+ gnome2_src_install |
277 |
+} |
278 |
+ |
279 |
+multilib_src_install_all() { |
280 |
+ insinto /etc/gtk-3.0 |
281 |
+ doins "${FILESDIR}"/settings.ini |
282 |
+ # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default |
283 |
+ DOCS=( AUTHORS NEWS README ) |
284 |
+ einstalldocs |
285 |
+} |
286 |
+ |
287 |
+pkg_preinst() { |
288 |
+ gnome2_pkg_preinst |
289 |
+ |
290 |
+ multilib_pkg_preinst() { |
291 |
+ # Make immodules.cache belongs to gtk+ alone |
292 |
+ local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" |
293 |
+ |
294 |
+ if [[ -e ${EROOT}${cache} ]]; then |
295 |
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die |
296 |
+ else |
297 |
+ touch "${ED}"/${cache} || die |
298 |
+ fi |
299 |
+ } |
300 |
+ multilib_parallel_foreach_abi multilib_pkg_preinst |
301 |
+} |
302 |
+ |
303 |
+pkg_postinst() { |
304 |
+ gnome2_pkg_postinst |
305 |
+ |
306 |
+ multilib_pkg_postinst() { |
307 |
+ gnome2_query_immodules_gtk3 \ |
308 |
+ || die "Update immodules cache failed (for ${ABI})" |
309 |
+ } |
310 |
+ multilib_parallel_foreach_abi multilib_pkg_postinst |
311 |
+ |
312 |
+ if ! has_version "app-text/evince"; then |
313 |
+ elog "Please install app-text/evince for print preview functionality." |
314 |
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
315 |
+ elog "add it to your settings.ini file." |
316 |
+ fi |
317 |
+} |
318 |
+ |
319 |
+pkg_postrm() { |
320 |
+ gnome2_pkg_postrm |
321 |
+ |
322 |
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then |
323 |
+ multilib_pkg_postrm() { |
324 |
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache |
325 |
+ } |
326 |
+ multilib_foreach_abi multilib_pkg_postrm |
327 |
+ fi |
328 |
+} |