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