1 |
commit: ffb25ae45268877469b1bf2b047e34b442f8a45e |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 17 21:51:31 2020 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 17 21:53:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb25ae4 |
7 |
|
8 |
x11-libs/gtk+: bump to 3.24.14 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707344 |
11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
13 |
|
14 |
x11-libs/gtk+/Manifest | 1 + |
15 |
x11-libs/gtk+/gtk+-3.24.14.ebuild | 245 ++++++++++++++++++++++++++++++++++++++ |
16 |
2 files changed, 246 insertions(+) |
17 |
|
18 |
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest |
19 |
index 00d86c0111d..0948e01bed2 100644 |
20 |
--- a/x11-libs/gtk+/Manifest |
21 |
+++ b/x11-libs/gtk+/Manifest |
22 |
@@ -3,3 +3,4 @@ DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169 |
23 |
DIST gtk+-3.24.11.tar.xz 20974300 BLAKE2B f338782d6141df64f83caae84649558296e11240ab082d4db129480a77e85cd26f86dee66e7f2650db48f13a30b0cb7191a8deb4bc545c9c7ee3b73796638a98 SHA512 15e33169030aa38e363730e5b19bbde614897b1a0de5db29c5292940a97e3613383b3eeb1c83ab8c09015a2a3f3ad425511bacd8fdbb79b30e0a47d4d4b57008 |
24 |
DIST gtk+-3.24.13-patchset.tar.xz 57652 BLAKE2B deda8cb4e0026431b52c0299266d60c4d4be2a2c870bee06daf3d9f63918d47243b88c73c4441f9415c859116fd873f276496b7ea9c2243a9540351ca53c5897 SHA512 dc8abad0812c936f7316425ca456d5892f3438ca6f843ed49fd53258695958b2a52a1df878ff25547d176aa054ea48ae9fc1b971698afc4d4aedae9cb643feae |
25 |
DIST gtk+-3.24.13.tar.xz 23206464 BLAKE2B d58130d490d8886d0656a3106ddd4f24c0b83a512b6daa22cbb6cbfa6f0582a22a8f6e0063016c120e15b031a3c5585a557bd3dc94b1e55ac0ae553da871d64a SHA512 9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406 |
26 |
+DIST gtk+-3.24.14.tar.xz 20420928 BLAKE2B 3113dd672b819a21cd13eb5849a34fbc659b8cba4e7f8a6667450cb13a497ad2c41878870047ede175ee42cfcbdaf3d3a32d07e12cd386892694d4eadf341e0a SHA512 a5ce659508933f6a3825aaafe9b30f51bd1357a62a6c66526ebd716627c829aa24543b4f8bd6f701dceda1d9fff94ad105f89f02a14d53749744e868bdff26bf |
27 |
|
28 |
diff --git a/x11-libs/gtk+/gtk+-3.24.14.ebuild b/x11-libs/gtk+/gtk+-3.24.14.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..29ca19b6baa |
31 |
--- /dev/null |
32 |
+++ b/x11-libs/gtk+/gtk+-3.24.14.ebuild |
33 |
@@ -0,0 +1,245 @@ |
34 |
+# Copyright 1999-2020 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=6 |
38 |
+GNOME2_LA_PUNT="yes" |
39 |
+GNOME2_EAUTORECONF="yes" |
40 |
+ |
41 |
+inherit flag-o-matic gnome2 multilib virtualx multilib-minimal |
42 |
+ |
43 |
+DESCRIPTION="Gimp ToolKit +" |
44 |
+HOMEPAGE="https://www.gtk.org/" |
45 |
+ |
46 |
+LICENSE="LGPL-2+" |
47 |
+SLOT="3" |
48 |
+IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama" |
49 |
+REQUIRED_USE=" |
50 |
+ || ( aqua wayland X ) |
51 |
+ xinerama? ( X ) |
52 |
+" |
53 |
+ |
54 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
55 |
+ |
56 |
+# Upstream wants us to do their job: |
57 |
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 |
58 |
+RESTRICT="test" |
59 |
+ |
60 |
+# FIXME: introspection data is built against system installation of gtk+:3, |
61 |
+# bug #???? |
62 |
+COMMON_DEPEND=" |
63 |
+ >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] |
64 |
+ >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] |
65 |
+ >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] |
66 |
+ media-libs/fontconfig[${MULTILIB_USEDEP}] |
67 |
+ >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}] |
68 |
+ >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] |
69 |
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] |
70 |
+ >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}] |
71 |
+ >=media-libs/harfbuzz-0.9:= |
72 |
+ x11-misc/shared-mime-info |
73 |
+ |
74 |
+ cloudprint? ( |
75 |
+ >=net-libs/rest-0.7[${MULTILIB_USEDEP}] |
76 |
+ >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) |
77 |
+ colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) |
78 |
+ cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) |
79 |
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= ) |
80 |
+ wayland? ( |
81 |
+ >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] |
82 |
+ >=dev-libs/wayland-protocols-1.14 |
83 |
+ media-libs/mesa[wayland,${MULTILIB_USEDEP}] |
84 |
+ >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] |
85 |
+ ) |
86 |
+ X? ( |
87 |
+ >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] |
88 |
+ media-libs/mesa[X(+),${MULTILIB_USEDEP}] |
89 |
+ x11-libs/libX11[${MULTILIB_USEDEP}] |
90 |
+ >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] |
91 |
+ x11-libs/libXext[${MULTILIB_USEDEP}] |
92 |
+ >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
93 |
+ x11-libs/libXcursor[${MULTILIB_USEDEP}] |
94 |
+ x11-libs/libXfixes[${MULTILIB_USEDEP}] |
95 |
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
96 |
+ x11-libs/libXdamage[${MULTILIB_USEDEP}] |
97 |
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
98 |
+ ) |
99 |
+" |
100 |
+DEPEND="${COMMON_DEPEND} |
101 |
+ app-text/docbook-xsl-stylesheets |
102 |
+ app-text/docbook-xml-dtd:4.1.2 |
103 |
+ dev-libs/libxslt |
104 |
+ dev-libs/gobject-introspection-common |
105 |
+ >=dev-util/gdbus-codegen-2.48 |
106 |
+ dev-util/glib-utils |
107 |
+ >=dev-util/gtk-doc-am-1.20 |
108 |
+ gtk-doc? ( >=dev-util/gtk-doc-1.20 |
109 |
+ app-text/docbook-xml-dtd:4.3 ) |
110 |
+ >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] |
111 |
+ virtual/pkgconfig[${MULTILIB_USEDEP}] |
112 |
+ X? ( x11-base/xorg-proto ) |
113 |
+ test? ( |
114 |
+ media-fonts/font-misc-misc |
115 |
+ media-fonts/font-cursor-misc ) |
116 |
+" |
117 |
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
118 |
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
119 |
+RDEPEND="${COMMON_DEPEND} |
120 |
+ >=dev-util/gtk-update-icon-cache-3 |
121 |
+ !<gnome-base/gail-1000 |
122 |
+ !<x11-libs/vte-0.31.0:2.90 |
123 |
+" |
124 |
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
125 |
+PDEPEND=" |
126 |
+ gnome-base/librsvg[${MULTILIB_USEDEP}] |
127 |
+ >=x11-themes/adwaita-icon-theme-3.14 |
128 |
+ vim-syntax? ( app-vim/gtk-syntax ) |
129 |
+" |
130 |
+ |
131 |
+MULTILIB_CHOST_TOOLS=( |
132 |
+ /usr/bin/gtk-query-immodules-3.0$(get_exeext) |
133 |
+) |
134 |
+ |
135 |
+strip_builddir() { |
136 |
+ local rule=$1 |
137 |
+ shift |
138 |
+ local directory=$1 |
139 |
+ shift |
140 |
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
141 |
+ || die "Could not strip director ${directory} from build." |
142 |
+} |
143 |
+ |
144 |
+src_prepare() { |
145 |
+ if ! use test ; then |
146 |
+ # don't waste time building tests |
147 |
+ strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} |
148 |
+ |
149 |
+ # the tests dir needs to be build now because since commit |
150 |
+ # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there |
151 |
+ # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
152 |
+ fi |
153 |
+ |
154 |
+ if ! use examples; then |
155 |
+ # don't waste time building demos |
156 |
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
157 |
+ strip_builddir SRC_SUBDIRS examples Makefile.{am,in} |
158 |
+ fi |
159 |
+ |
160 |
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache |
161 |
+ eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch |
162 |
+ |
163 |
+ # Fix broken autotools logic |
164 |
+ eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch |
165 |
+ |
166 |
+ gnome2_src_prepare |
167 |
+} |
168 |
+ |
169 |
+multilib_src_configure() { |
170 |
+ local myconf=( |
171 |
+ $(use_enable aqua quartz-backend) |
172 |
+ $(use_enable broadway broadway-backend) |
173 |
+ $(use_enable cloudprint) |
174 |
+ $(use_enable colord) |
175 |
+ $(use_enable cups cups auto) |
176 |
+ $(multilib_native_use_enable gtk-doc) |
177 |
+ $(multilib_native_use_enable introspection) |
178 |
+ $(use_enable wayland wayland-backend) |
179 |
+ $(use_enable X x11-backend) |
180 |
+ $(use_enable X xcomposite) |
181 |
+ $(use_enable X xdamage) |
182 |
+ $(use_enable X xfixes) |
183 |
+ $(use_enable X xkb) |
184 |
+ $(use_enable X xrandr) |
185 |
+ $(use_enable xinerama) |
186 |
+ # cloudprovider is not packaged in Gentoo yet |
187 |
+ --disable-cloudproviders |
188 |
+ --disable-papi |
189 |
+ # sysprof integration needs >=sysprof-3.33.2 |
190 |
+ --disable-profiler |
191 |
+ --enable-man |
192 |
+ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog |
193 |
+ # need libdir here to avoid a double slash in a path that libtool doesn't |
194 |
+ # grok so well during install (// between $EPREFIX and usr ...) |
195 |
+ # TODO: Is this still the case? |
196 |
+ --libdir="${EPREFIX}"/usr/$(get_libdir) |
197 |
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
198 |
+ ) |
199 |
+ |
200 |
+ if use wayland; then |
201 |
+ myconf+=( |
202 |
+ # Include wayland immodule into gtk itself, to avoid problems like |
203 |
+ # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a |
204 |
+ # user overridden GTK_IM_MODULE envvar |
205 |
+ --with-included-immodules=wayland |
206 |
+ ) |
207 |
+ fi; |
208 |
+ |
209 |
+ ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" |
210 |
+ |
211 |
+ # work-around gtk-doc out-of-source brokedness |
212 |
+ if multilib_is_native_abi; then |
213 |
+ local d |
214 |
+ for d in gdk gtk libgail-util; do |
215 |
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
216 |
+ done |
217 |
+ fi |
218 |
+} |
219 |
+ |
220 |
+multilib_src_test() { |
221 |
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die |
222 |
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check |
223 |
+} |
224 |
+ |
225 |
+multilib_src_install() { |
226 |
+ gnome2_src_install |
227 |
+} |
228 |
+ |
229 |
+multilib_src_install_all() { |
230 |
+ insinto /etc/gtk-3.0 |
231 |
+ doins "${FILESDIR}"/settings.ini |
232 |
+ # Skip README.{in,commits,win32} that would get installed by default |
233 |
+ DOCS=( AUTHORS ChangeLog NEWS README ) |
234 |
+ einstalldocs |
235 |
+} |
236 |
+ |
237 |
+pkg_preinst() { |
238 |
+ gnome2_pkg_preinst |
239 |
+ |
240 |
+ multilib_pkg_preinst() { |
241 |
+ # Make immodules.cache belongs to gtk+ alone |
242 |
+ local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" |
243 |
+ |
244 |
+ if [[ -e ${EROOT}${cache} ]]; then |
245 |
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die |
246 |
+ else |
247 |
+ touch "${ED}"/${cache} || die |
248 |
+ fi |
249 |
+ } |
250 |
+ multilib_parallel_foreach_abi multilib_pkg_preinst |
251 |
+} |
252 |
+ |
253 |
+pkg_postinst() { |
254 |
+ gnome2_pkg_postinst |
255 |
+ |
256 |
+ multilib_pkg_postinst() { |
257 |
+ gnome2_query_immodules_gtk3 \ |
258 |
+ || die "Update immodules cache failed (for ${ABI})" |
259 |
+ } |
260 |
+ multilib_parallel_foreach_abi multilib_pkg_postinst |
261 |
+ |
262 |
+ if ! has_version "app-text/evince"; then |
263 |
+ elog "Please install app-text/evince for print preview functionality." |
264 |
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
265 |
+ elog "add it to your settings.ini file." |
266 |
+ fi |
267 |
+} |
268 |
+ |
269 |
+pkg_postrm() { |
270 |
+ gnome2_pkg_postrm |
271 |
+ |
272 |
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then |
273 |
+ multilib_pkg_postrm() { |
274 |
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache |
275 |
+ } |
276 |
+ multilib_foreach_abi multilib_pkg_postrm |
277 |
+ fi |
278 |
+} |