1 |
commit: b45887407f91da7c815c5f245696a05e87a2ec9c |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 12 20:42:37 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 12 21:00:05 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4588740 |
7 |
|
8 |
x11-libs/gtk+: bump to 3.24.7 |
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/gtk+/Manifest | 1 + |
14 |
x11-libs/gtk+/gtk+-3.24.7.ebuild | 230 +++++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 231 insertions(+) |
16 |
|
17 |
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest |
18 |
index af9e8e1b9f3..e5d6d4f56b4 100644 |
19 |
--- a/x11-libs/gtk+/Manifest |
20 |
+++ b/x11-libs/gtk+/Manifest |
21 |
@@ -4,3 +4,4 @@ DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ec |
22 |
DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1 |
23 |
DIST gtk+-3.24.5-patchset-20190206.tar.xz 4208 BLAKE2B 09d1dcd0a6312f042739c633ef5c3a3b26c81f586c4c1396bc9ed4cd5e8a891507d6a6857e91b481794c8c6ea1e9511b756e7307775acb4ec53f561283c2139c SHA512 e3748ab10032d1c388b50ac35e295d08f7373c70186d35ee52f8a31ea53cddbac61eb25e5c6aac9855a4cb02c25ed0d2361241fe2530b6ce6738fb5e4840817e |
24 |
DIST gtk+-3.24.5.tar.xz 21012108 BLAKE2B 25b8fc92655be190a0dc082ee303614026054d9bf17f93e8df11129f77fe1e6dc9cc97d5ceeab139eb905e3d61ea918b01d39f342e11d06fb3245c590567d24a SHA512 344988c9e2a2d7fd2fd1e367a113be7c4a32c28c9cf395aeab923e25256b99856091d1583d3f8557aac6919a930a4d0af69b966486caab559c7d9d22585cc1a1 |
25 |
+DIST gtk+-3.24.7.tar.xz 19375708 BLAKE2B 28ec4106258a7ecfa78d2f3dd8d2145cdf8ecbb55167bf22002e38186721e2e1658885032630eb306785bfe36486834c40e34fd5ac20d1c30d4f5de58cba7fae SHA512 2605087c3e09c81192769e6c4bcc4374e0fadbc4d05433edeaefd9915e128ff925c64fb3d07799bacccb16d85d31e53936ac09c696a09349efa6e21d886074c5 |
26 |
|
27 |
diff --git a/x11-libs/gtk+/gtk+-3.24.7.ebuild b/x11-libs/gtk+/gtk+-3.24.7.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..4b530734859 |
30 |
--- /dev/null |
31 |
+++ b/x11-libs/gtk+/gtk+-3.24.7.ebuild |
32 |
@@ -0,0 +1,230 @@ |
33 |
+# Copyright 1999-2019 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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.53.4: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-1.2[${MULTILIB_USEDEP}] ) |
78 |
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= ) |
79 |
+ wayland? ( |
80 |
+ >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] |
81 |
+ >=dev-libs/wayland-protocols-1.12 |
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 |
+ x11-libs/libX11[${MULTILIB_USEDEP}] |
88 |
+ >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] |
89 |
+ x11-libs/libXext[${MULTILIB_USEDEP}] |
90 |
+ >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
91 |
+ x11-libs/libXcursor[${MULTILIB_USEDEP}] |
92 |
+ x11-libs/libXfixes[${MULTILIB_USEDEP}] |
93 |
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
94 |
+ x11-libs/libXdamage[${MULTILIB_USEDEP}] |
95 |
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
96 |
+ ) |
97 |
+" |
98 |
+DEPEND="${COMMON_DEPEND} |
99 |
+ app-text/docbook-xsl-stylesheets |
100 |
+ app-text/docbook-xml-dtd:4.1.2 |
101 |
+ dev-libs/libxslt |
102 |
+ dev-libs/gobject-introspection-common |
103 |
+ >=dev-util/gdbus-codegen-2.48 |
104 |
+ dev-util/glib-utils |
105 |
+ >=dev-util/gtk-doc-am-1.20 |
106 |
+ gtk-doc? ( >=dev-util/gtk-doc-1.20 ) |
107 |
+ >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] |
108 |
+ virtual/pkgconfig[${MULTILIB_USEDEP}] |
109 |
+ X? ( x11-base/xorg-proto ) |
110 |
+ test? ( |
111 |
+ media-fonts/font-misc-misc |
112 |
+ media-fonts/font-cursor-misc ) |
113 |
+" |
114 |
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
115 |
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
116 |
+RDEPEND="${COMMON_DEPEND} |
117 |
+ >=dev-util/gtk-update-icon-cache-3 |
118 |
+ !<gnome-base/gail-1000 |
119 |
+ !<x11-libs/vte-0.31.0:2.90 |
120 |
+" |
121 |
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
122 |
+PDEPEND=" |
123 |
+ gnome-base/librsvg[${MULTILIB_USEDEP}] |
124 |
+ >=x11-themes/adwaita-icon-theme-3.14 |
125 |
+ vim-syntax? ( app-vim/gtk-syntax ) |
126 |
+" |
127 |
+ |
128 |
+MULTILIB_CHOST_TOOLS=( |
129 |
+ /usr/bin/gtk-query-immodules-3.0$(get_exeext) |
130 |
+) |
131 |
+ |
132 |
+strip_builddir() { |
133 |
+ local rule=$1 |
134 |
+ shift |
135 |
+ local directory=$1 |
136 |
+ shift |
137 |
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
138 |
+ || die "Could not strip director ${directory} from build." |
139 |
+} |
140 |
+ |
141 |
+src_prepare() { |
142 |
+ if ! use test ; then |
143 |
+ # don't waste time building tests |
144 |
+ strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} |
145 |
+ |
146 |
+ # the tests dir needs to be build now because since commit |
147 |
+ # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there |
148 |
+ # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
149 |
+ fi |
150 |
+ |
151 |
+ if ! use examples; then |
152 |
+ # don't waste time building demos |
153 |
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
154 |
+ strip_builddir SRC_SUBDIRS examples Makefile.{am,in} |
155 |
+ fi |
156 |
+ |
157 |
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache |
158 |
+ eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch |
159 |
+ |
160 |
+ # Fix broken autotools logic |
161 |
+ eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch |
162 |
+ |
163 |
+ gnome2_src_prepare |
164 |
+} |
165 |
+ |
166 |
+multilib_src_configure() { |
167 |
+ # need libdir here to avoid a double slash in a path that libtool doesn't |
168 |
+ # grok so well during install (// between $EPREFIX and usr ...) |
169 |
+ # cloudprovider is not packaged in Gentoo |
170 |
+ ECONF_SOURCE=${S} \ |
171 |
+ gnome2_src_configure \ |
172 |
+ $(use_enable aqua quartz-backend) \ |
173 |
+ $(use_enable broadway broadway-backend) \ |
174 |
+ $(use_enable cloudprint) \ |
175 |
+ $(use_enable colord) \ |
176 |
+ $(use_enable cups cups auto) \ |
177 |
+ $(multilib_native_use_enable gtk-doc) \ |
178 |
+ $(multilib_native_use_enable introspection) \ |
179 |
+ $(use_enable wayland wayland-backend) \ |
180 |
+ $(use_enable X x11-backend) \ |
181 |
+ $(use_enable X xcomposite) \ |
182 |
+ $(use_enable X xdamage) \ |
183 |
+ $(use_enable X xfixes) \ |
184 |
+ $(use_enable X xkb) \ |
185 |
+ $(use_enable X xrandr) \ |
186 |
+ $(use_enable xinerama) \ |
187 |
+ --disable-cloudproviders \ |
188 |
+ --disable-mir-backend \ |
189 |
+ --disable-papi \ |
190 |
+ --enable-man \ |
191 |
+ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
192 |
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
193 |
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
194 |
+ |
195 |
+ # work-around gtk-doc out-of-source brokedness |
196 |
+ if multilib_is_native_abi; then |
197 |
+ local d |
198 |
+ for d in gdk gtk libgail-util; do |
199 |
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
200 |
+ done |
201 |
+ fi |
202 |
+} |
203 |
+ |
204 |
+multilib_src_test() { |
205 |
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die |
206 |
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check |
207 |
+} |
208 |
+ |
209 |
+multilib_src_install() { |
210 |
+ gnome2_src_install |
211 |
+} |
212 |
+ |
213 |
+multilib_src_install_all() { |
214 |
+ insinto /etc/gtk-3.0 |
215 |
+ doins "${FILESDIR}"/settings.ini |
216 |
+ # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default |
217 |
+ DOCS=( AUTHORS NEWS README ) |
218 |
+ einstalldocs |
219 |
+} |
220 |
+ |
221 |
+pkg_preinst() { |
222 |
+ gnome2_pkg_preinst |
223 |
+ |
224 |
+ multilib_pkg_preinst() { |
225 |
+ # Make immodules.cache belongs to gtk+ alone |
226 |
+ local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" |
227 |
+ |
228 |
+ if [[ -e ${EROOT}${cache} ]]; then |
229 |
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die |
230 |
+ else |
231 |
+ touch "${ED}"/${cache} || die |
232 |
+ fi |
233 |
+ } |
234 |
+ multilib_parallel_foreach_abi multilib_pkg_preinst |
235 |
+} |
236 |
+ |
237 |
+pkg_postinst() { |
238 |
+ gnome2_pkg_postinst |
239 |
+ |
240 |
+ multilib_pkg_postinst() { |
241 |
+ gnome2_query_immodules_gtk3 \ |
242 |
+ || die "Update immodules cache failed (for ${ABI})" |
243 |
+ } |
244 |
+ multilib_parallel_foreach_abi multilib_pkg_postinst |
245 |
+ |
246 |
+ if ! has_version "app-text/evince"; then |
247 |
+ elog "Please install app-text/evince for print preview functionality." |
248 |
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
249 |
+ elog "add it to your settings.ini file." |
250 |
+ fi |
251 |
+} |
252 |
+ |
253 |
+pkg_postrm() { |
254 |
+ gnome2_pkg_postrm |
255 |
+ |
256 |
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then |
257 |
+ multilib_pkg_postrm() { |
258 |
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache |
259 |
+ } |
260 |
+ multilib_foreach_abi multilib_pkg_postrm |
261 |
+ fi |
262 |
+} |