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