| 1 |
commit: c8f4fe21440e1dd522862db20bb2d1efe6ca7096 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 11 19:17:07 2020 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 11 19:17:07 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8f4fe21 |
| 7 |
|
| 8 |
x11-libs/gtk+: remove old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.12 |
| 11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-libs/gtk+/Manifest | 1 - |
| 14 |
.../files/3.24.4-more-gtkswitch-fallback.patch | 34 --- |
| 15 |
.../gtk+/files/gtk+-3.22.2-update-icon-cache.patch | 138 ------------ |
| 16 |
x11-libs/gtk+/gtk+-3.24.4-r1.ebuild | 235 --------------------- |
| 17 |
4 files changed, 408 deletions(-) |
| 18 |
|
| 19 |
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest |
| 20 |
index 7716ba624f8..90e7dc4c0f0 100644 |
| 21 |
--- a/x11-libs/gtk+/Manifest |
| 22 |
+++ b/x11-libs/gtk+/Manifest |
| 23 |
@@ -4,4 +4,3 @@ DIST gtk+-3.24.10.tar.xz 20958300 BLAKE2B 60a70341f15b59b95316cbce55cd18b54a6dff |
| 24 |
DIST gtk+-3.24.11.tar.xz 20974300 BLAKE2B f338782d6141df64f83caae84649558296e11240ab082d4db129480a77e85cd26f86dee66e7f2650db48f13a30b0cb7191a8deb4bc545c9c7ee3b73796638a98 SHA512 15e33169030aa38e363730e5b19bbde614897b1a0de5db29c5292940a97e3613383b3eeb1c83ab8c09015a2a3f3ad425511bacd8fdbb79b30e0a47d4d4b57008 |
| 25 |
DIST gtk+-3.24.13-patchset.tar.xz 57652 BLAKE2B deda8cb4e0026431b52c0299266d60c4d4be2a2c870bee06daf3d9f63918d47243b88c73c4441f9415c859116fd873f276496b7ea9c2243a9540351ca53c5897 SHA512 dc8abad0812c936f7316425ca456d5892f3438ca6f843ed49fd53258695958b2a52a1df878ff25547d176aa054ea48ae9fc1b971698afc4d4aedae9cb643feae |
| 26 |
DIST gtk+-3.24.13.tar.xz 23206464 BLAKE2B d58130d490d8886d0656a3106ddd4f24c0b83a512b6daa22cbb6cbfa6f0582a22a8f6e0063016c120e15b031a3c5585a557bd3dc94b1e55ac0ae553da871d64a SHA512 9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406 |
| 27 |
-DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1 |
| 28 |
|
| 29 |
diff --git a/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch b/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch |
| 30 |
deleted file mode 100644 |
| 31 |
index 629a2d750e1..00000000000 |
| 32 |
--- a/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,34 +0,0 @@ |
| 35 |
-From 6a4ce55a69c5ecbbf06bc905ac0bfdd04f64bb66 Mon Sep 17 00:00:00 2001 |
| 36 |
-From: Matthias Clasen <mclasen@××××××.com> |
| 37 |
-Date: Wed, 23 Jan 2019 12:02:27 -0500 |
| 38 |
-Subject: [PATCH] switch: Avoid problems with glyph availability |
| 39 |
- |
| 40 |
-If none of the glyphs we want are available, fall |
| 41 |
-back to using empty strings here, rather than causing |
| 42 |
-critical warnings. |
| 43 |
---- |
| 44 |
- gtk/gtkswitch.c | 2 ++ |
| 45 |
- 1 file changed, 2 insertions(+) |
| 46 |
- |
| 47 |
-diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c |
| 48 |
-index 1d42f572a9..4c49e243ed 100644 |
| 49 |
---- a/gtk/gtkswitch.c |
| 50 |
-+++ b/gtk/gtkswitch.c |
| 51 |
-@@ -302,12 +302,14 @@ gtk_switch_create_pango_layouts (GtkSwitch *self) |
| 52 |
- const char *on_glyphs[] = { |
| 53 |
- "⏽", /* U+23FD POWER ON SYMBOL */ |
| 54 |
- "❙", /* U+2759 MEDIUM VERTICAL BAR */ |
| 55 |
-+ "" |
| 56 |
- }; |
| 57 |
- |
| 58 |
- /* Glyphs for the OFF state, in descending order of preference */ |
| 59 |
- const char *off_glyphs[] = { |
| 60 |
- "⭘", /* U+2B58 HEAVY CIRCLE */ |
| 61 |
- "○", /* U+25CB WHITE CIRCLE */ |
| 62 |
-+ "" |
| 63 |
- }; |
| 64 |
- int i; |
| 65 |
- |
| 66 |
--- |
| 67 |
-2.17.0 |
| 68 |
- |
| 69 |
|
| 70 |
diff --git a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch |
| 71 |
deleted file mode 100644 |
| 72 |
index fc1e86e997d..00000000000 |
| 73 |
--- a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch |
| 74 |
+++ /dev/null |
| 75 |
@@ -1,138 +0,0 @@ |
| 76 |
-From 101b43f4a38904ee21070a3e2eb5ba03dfe17647 Mon Sep 17 00:00:00 2001 |
| 77 |
-From: Gilles Dartiguelongue <eva@g.o> |
| 78 |
-Date: Tue, 1 Nov 2016 15:24:22 +0100 |
| 79 |
-Subject: [PATCH] Always use external gtk-update-icon-cache |
| 80 |
- |
| 81 |
-Check for gtk-update-icon-cache to install demos, otherwise it is not |
| 82 |
-used when building. |
| 83 |
---- |
| 84 |
- configure.ac | 2 ++ |
| 85 |
- demos/gtk-demo/Makefile.am | 2 +- |
| 86 |
- demos/widget-factory/Makefile.am | 2 +- |
| 87 |
- docs/reference/gtk/Makefile.am | 1 - |
| 88 |
- gtk/Makefile.am | 44 ---------------------------------------- |
| 89 |
- 5 files changed, 4 insertions(+), 47 deletions(-) |
| 90 |
- |
| 91 |
-diff --git a/configure.ac b/configure.ac |
| 92 |
-index 4f9f183..ecf99dc 100644 |
| 93 |
---- a/configure.ac |
| 94 |
-+++ b/configure.ac |
| 95 |
-@@ -999,6 +999,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling |
| 96 |
- |
| 97 |
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) |
| 98 |
- |
| 99 |
-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no]) |
| 100 |
-+ |
| 101 |
- ######################################## |
| 102 |
- # Windowing system checks |
| 103 |
- ######################################## |
| 104 |
-diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am |
| 105 |
-index 8c15e16..5d774d2 100644 |
| 106 |
---- a/demos/gtk-demo/Makefile.am |
| 107 |
-+++ b/demos/gtk-demo/Makefile.am |
| 108 |
-@@ -171,7 +171,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy |
| 109 |
- dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png |
| 110 |
- dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png |
| 111 |
- |
| 112 |
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force |
| 113 |
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force |
| 114 |
- |
| 115 |
- install-data-hook: install-update-icon-cache |
| 116 |
- uninstall-hook: uninstall-update-icon-cache |
| 117 |
-diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am |
| 118 |
-index a6bfbdc..28a3be2 100644 |
| 119 |
---- a/demos/widget-factory/Makefile.am |
| 120 |
-+++ b/demos/widget-factory/Makefile.am |
| 121 |
-@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget |
| 122 |
- dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png |
| 123 |
- dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png |
| 124 |
- |
| 125 |
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force |
| 126 |
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force |
| 127 |
- |
| 128 |
- install-data-hook: install-update-icon-cache |
| 129 |
- uninstall-hook: uninstall-update-icon-cache |
| 130 |
-diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am |
| 131 |
-index 5a88a12..b51f3ac 100644 |
| 132 |
---- a/docs/reference/gtk/Makefile.am |
| 133 |
-+++ b/docs/reference/gtk/Makefile.am |
| 134 |
-@@ -504,7 +504,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in |
| 135 |
- |
| 136 |
- man_MANS = \ |
| 137 |
- gtk-query-immodules-3.0.1 \ |
| 138 |
-- gtk-update-icon-cache.1 \ |
| 139 |
- gtk-encode-symbolic-svg.1 \ |
| 140 |
- gtk-launch.1 \ |
| 141 |
- gtk3-demo.1 \ |
| 142 |
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am |
| 143 |
-index 3b76b82..d4c5681 100644 |
| 144 |
---- a/gtk/Makefile.am |
| 145 |
-+++ b/gtk/Makefile.am |
| 146 |
-@@ -1581,7 +1581,6 @@ endif |
| 147 |
- # |
| 148 |
- bin_PROGRAMS = \ |
| 149 |
- gtk-query-immodules-3.0 \ |
| 150 |
-- gtk-update-icon-cache \ |
| 151 |
- gtk-encode-symbolic-svg \ |
| 152 |
- gtk-builder-tool \ |
| 153 |
- gtk-query-settings \ |
| 154 |
-@@ -1594,9 +1593,6 @@ gtk_query_immodules_3_0_LDADD = \ |
| 155 |
- $(GMODULE_LIBS) \ |
| 156 |
- $(GTK_DEP_LIBS) |
| 157 |
- |
| 158 |
--gtk_update_icon_cache_SOURCES = updateiconcache.c |
| 159 |
--gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) |
| 160 |
-- |
| 161 |
- gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c |
| 162 |
- gtk_encode_symbolic_svg_LDADD = \ |
| 163 |
- $(GDK_PIXBUF_LIBS) \ |
| 164 |
-@@ -1621,46 +1617,6 @@ gtk_launch_LDADD = \ |
| 165 |
- $(top_builddir)/gdk/libgdk-3.la \ |
| 166 |
- $(GTK_DEP_LIBS) |
| 167 |
- |
| 168 |
--if OS_WIN32 |
| 169 |
-- |
| 170 |
--# Workaround for UAC silliness: programs with "update" in their name |
| 171 |
--# are believed to be installers and require elevated privileges to be |
| 172 |
--# used... Embed a manifest file into executable to tell Windows that |
| 173 |
--# gtk-update-icon-cache.exe doesn't require any special privileges. |
| 174 |
-- |
| 175 |
--GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest |
| 176 |
--GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc |
| 177 |
--GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o |
| 178 |
-- |
| 179 |
--$(GTK_UPDATE_ICON_CACHE_MANIFEST): |
| 180 |
-- (echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \ |
| 181 |
-- echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \ |
| 182 |
-- echo ' <assemblyIdentity version="1.0.0.0"' ; \ |
| 183 |
-- echo ' processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \ |
| 184 |
-- echo ' name="gtk-update-icon-cache.exe"' ; \ |
| 185 |
-- echo ' type="win32"/>' ; \ |
| 186 |
-- echo ' <!-- Identify the application security requirements. -->' ; \ |
| 187 |
-- echo ' <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \ |
| 188 |
-- echo ' <security>' ; \ |
| 189 |
-- echo ' <requestedPrivileges>' ; \ |
| 190 |
-- echo ' <requestedExecutionLevel' ; \ |
| 191 |
-- echo ' level="asInvoker"' ; \ |
| 192 |
-- echo ' uiAccess="false"/>' ; \ |
| 193 |
-- echo ' </requestedPrivileges>' ; \ |
| 194 |
-- echo ' </security>' ; \ |
| 195 |
-- echo ' </trustInfo>' ; \ |
| 196 |
-- echo '</assembly>' ) >$@ |
| 197 |
-- |
| 198 |
--$(GTK_UPDATE_ICON_CACHE_RC): |
| 199 |
-- (echo 'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@ |
| 200 |
-- |
| 201 |
--$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST) |
| 202 |
-- $(WINDRES) --input $< --output $@ --output-format=coff |
| 203 |
-- |
| 204 |
--gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT) |
| 205 |
-- |
| 206 |
--endif |
| 207 |
-- |
| 208 |
- .PHONY: files |
| 209 |
- |
| 210 |
- files: |
| 211 |
--- |
| 212 |
-2.10.1 |
| 213 |
- |
| 214 |
|
| 215 |
diff --git a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild |
| 216 |
deleted file mode 100644 |
| 217 |
index e3217afab7e..00000000000 |
| 218 |
--- a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild |
| 219 |
+++ /dev/null |
| 220 |
@@ -1,235 +0,0 @@ |
| 221 |
-# Copyright 1999-2019 Gentoo Authors |
| 222 |
-# Distributed under the terms of the GNU General Public License v2 |
| 223 |
- |
| 224 |
-EAPI=6 |
| 225 |
-GNOME2_LA_PUNT="yes" |
| 226 |
-GNOME2_EAUTORECONF="yes" |
| 227 |
- |
| 228 |
-inherit flag-o-matic gnome2 multilib virtualx multilib-minimal |
| 229 |
- |
| 230 |
-DESCRIPTION="Gimp ToolKit +" |
| 231 |
-HOMEPAGE="https://www.gtk.org/" |
| 232 |
- |
| 233 |
-LICENSE="LGPL-2+" |
| 234 |
-SLOT="3" |
| 235 |
-IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama" |
| 236 |
-REQUIRED_USE=" |
| 237 |
- || ( aqua wayland X ) |
| 238 |
- xinerama? ( X ) |
| 239 |
-" |
| 240 |
- |
| 241 |
-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" |
| 242 |
- |
| 243 |
-# Upstream wants us to do their job: |
| 244 |
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 |
| 245 |
-RESTRICT="test" |
| 246 |
- |
| 247 |
-# FIXME: introspection data is built against system installation of gtk+:3, |
| 248 |
-# bug #???? |
| 249 |
-COMMON_DEPEND=" |
| 250 |
- >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] |
| 251 |
- >=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}] |
| 252 |
- media-libs/fontconfig[${MULTILIB_USEDEP}] |
| 253 |
- >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}] |
| 254 |
- >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] |
| 255 |
- >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] |
| 256 |
- >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}] |
| 257 |
- >=media-libs/harfbuzz-0.9:= |
| 258 |
- x11-misc/shared-mime-info |
| 259 |
- |
| 260 |
- cloudprint? ( |
| 261 |
- >=net-libs/rest-0.7[${MULTILIB_USEDEP}] |
| 262 |
- >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) |
| 263 |
- colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) |
| 264 |
- cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) |
| 265 |
- introspection? ( >=dev-libs/gobject-introspection-1.39:= ) |
| 266 |
- wayland? ( |
| 267 |
- >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] |
| 268 |
- >=dev-libs/wayland-protocols-1.12 |
| 269 |
- media-libs/mesa[wayland,${MULTILIB_USEDEP}] |
| 270 |
- >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] |
| 271 |
- ) |
| 272 |
- X? ( |
| 273 |
- >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] |
| 274 |
- media-libs/mesa[X(+),${MULTILIB_USEDEP}] |
| 275 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
| 276 |
- >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] |
| 277 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
| 278 |
- >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
| 279 |
- x11-libs/libXcursor[${MULTILIB_USEDEP}] |
| 280 |
- x11-libs/libXfixes[${MULTILIB_USEDEP}] |
| 281 |
- x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
| 282 |
- x11-libs/libXdamage[${MULTILIB_USEDEP}] |
| 283 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
| 284 |
- ) |
| 285 |
-" |
| 286 |
-DEPEND="${COMMON_DEPEND} |
| 287 |
- app-text/docbook-xsl-stylesheets |
| 288 |
- app-text/docbook-xml-dtd:4.1.2 |
| 289 |
- dev-libs/libxslt |
| 290 |
- dev-libs/gobject-introspection-common |
| 291 |
- >=dev-util/gdbus-codegen-2.48 |
| 292 |
- dev-util/glib-utils |
| 293 |
- >=dev-util/gtk-doc-am-1.20 |
| 294 |
- gtk-doc? ( >=dev-util/gtk-doc-1.20 ) |
| 295 |
- >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] |
| 296 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
| 297 |
- X? ( x11-base/xorg-proto ) |
| 298 |
- test? ( |
| 299 |
- media-fonts/font-misc-misc |
| 300 |
- media-fonts/font-cursor-misc ) |
| 301 |
-" |
| 302 |
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
| 303 |
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
| 304 |
-RDEPEND="${COMMON_DEPEND} |
| 305 |
- >=dev-util/gtk-update-icon-cache-3 |
| 306 |
- !<gnome-base/gail-1000 |
| 307 |
- !<x11-libs/vte-0.31.0:2.90 |
| 308 |
-" |
| 309 |
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
| 310 |
-PDEPEND=" |
| 311 |
- gnome-base/librsvg[${MULTILIB_USEDEP}] |
| 312 |
- >=x11-themes/adwaita-icon-theme-3.14 |
| 313 |
- vim-syntax? ( app-vim/gtk-syntax ) |
| 314 |
-" |
| 315 |
- |
| 316 |
-MULTILIB_CHOST_TOOLS=( |
| 317 |
- /usr/bin/gtk-query-immodules-3.0$(get_exeext) |
| 318 |
-) |
| 319 |
- |
| 320 |
-strip_builddir() { |
| 321 |
- local rule=$1 |
| 322 |
- shift |
| 323 |
- local directory=$1 |
| 324 |
- shift |
| 325 |
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
| 326 |
- || die "Could not strip director ${directory} from build." |
| 327 |
-} |
| 328 |
- |
| 329 |
-src_prepare() { |
| 330 |
- if ! use test ; then |
| 331 |
- # don't waste time building tests |
| 332 |
- strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} |
| 333 |
- |
| 334 |
- # the tests dir needs to be build now because since commit |
| 335 |
- # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there |
| 336 |
- # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
| 337 |
- fi |
| 338 |
- |
| 339 |
- if ! use examples; then |
| 340 |
- # don't waste time building demos |
| 341 |
- strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
| 342 |
- strip_builddir SRC_SUBDIRS examples Makefile.{am,in} |
| 343 |
- fi |
| 344 |
- |
| 345 |
- # Add fallback to no glyph for GtkSwitch, so if no glyph for some reason is found, it at least doesn't mess things up completely |
| 346 |
- # gtk+-3.24.5 replaces these with CSS gadget icons, but we include this simpler version in revbump as a stable candidate without |
| 347 |
- # the Adwaita theme changes found in 3.24.5 |
| 348 |
- eapply "${FILESDIR}"/${PV}-more-gtkswitch-fallback.patch |
| 349 |
- |
| 350 |
- # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache |
| 351 |
- eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch |
| 352 |
- |
| 353 |
- # Fix broken autotools logic |
| 354 |
- eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch |
| 355 |
- |
| 356 |
- gnome2_src_prepare |
| 357 |
-} |
| 358 |
- |
| 359 |
-multilib_src_configure() { |
| 360 |
- # need libdir here to avoid a double slash in a path that libtool doesn't |
| 361 |
- # grok so well during install (// between $EPREFIX and usr ...) |
| 362 |
- # cloudprovider is not packaged in Gentoo |
| 363 |
- ECONF_SOURCE=${S} \ |
| 364 |
- gnome2_src_configure \ |
| 365 |
- $(use_enable aqua quartz-backend) \ |
| 366 |
- $(use_enable broadway broadway-backend) \ |
| 367 |
- $(use_enable cloudprint) \ |
| 368 |
- $(use_enable colord) \ |
| 369 |
- $(use_enable cups cups auto) \ |
| 370 |
- $(multilib_native_use_enable gtk-doc) \ |
| 371 |
- $(multilib_native_use_enable introspection) \ |
| 372 |
- $(use_enable wayland wayland-backend) \ |
| 373 |
- $(use_enable X x11-backend) \ |
| 374 |
- $(use_enable X xcomposite) \ |
| 375 |
- $(use_enable X xdamage) \ |
| 376 |
- $(use_enable X xfixes) \ |
| 377 |
- $(use_enable X xkb) \ |
| 378 |
- $(use_enable X xrandr) \ |
| 379 |
- $(use_enable xinerama) \ |
| 380 |
- --disable-cloudproviders \ |
| 381 |
- --disable-mir-backend \ |
| 382 |
- --disable-papi \ |
| 383 |
- --enable-man \ |
| 384 |
- --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
| 385 |
- --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
| 386 |
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
| 387 |
- |
| 388 |
- # work-around gtk-doc out-of-source brokedness |
| 389 |
- if multilib_is_native_abi; then |
| 390 |
- local d |
| 391 |
- for d in gdk gtk libgail-util; do |
| 392 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
| 393 |
- done |
| 394 |
- fi |
| 395 |
-} |
| 396 |
- |
| 397 |
-multilib_src_test() { |
| 398 |
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die |
| 399 |
- GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check |
| 400 |
-} |
| 401 |
- |
| 402 |
-multilib_src_install() { |
| 403 |
- gnome2_src_install |
| 404 |
-} |
| 405 |
- |
| 406 |
-multilib_src_install_all() { |
| 407 |
- insinto /etc/gtk-3.0 |
| 408 |
- doins "${FILESDIR}"/settings.ini |
| 409 |
- # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default |
| 410 |
- DOCS=( AUTHORS NEWS README ) |
| 411 |
- einstalldocs |
| 412 |
-} |
| 413 |
- |
| 414 |
-pkg_preinst() { |
| 415 |
- gnome2_pkg_preinst |
| 416 |
- |
| 417 |
- multilib_pkg_preinst() { |
| 418 |
- # Make immodules.cache belongs to gtk+ alone |
| 419 |
- local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" |
| 420 |
- |
| 421 |
- if [[ -e ${EROOT}${cache} ]]; then |
| 422 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
| 423 |
- else |
| 424 |
- touch "${ED}"/${cache} || die |
| 425 |
- fi |
| 426 |
- } |
| 427 |
- multilib_parallel_foreach_abi multilib_pkg_preinst |
| 428 |
-} |
| 429 |
- |
| 430 |
-pkg_postinst() { |
| 431 |
- gnome2_pkg_postinst |
| 432 |
- |
| 433 |
- multilib_pkg_postinst() { |
| 434 |
- gnome2_query_immodules_gtk3 \ |
| 435 |
- || die "Update immodules cache failed (for ${ABI})" |
| 436 |
- } |
| 437 |
- multilib_parallel_foreach_abi multilib_pkg_postinst |
| 438 |
- |
| 439 |
- if ! has_version "app-text/evince"; then |
| 440 |
- elog "Please install app-text/evince for print preview functionality." |
| 441 |
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
| 442 |
- elog "add it to your settings.ini file." |
| 443 |
- fi |
| 444 |
-} |
| 445 |
- |
| 446 |
-pkg_postrm() { |
| 447 |
- gnome2_pkg_postrm |
| 448 |
- |
| 449 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
| 450 |
- multilib_pkg_postrm() { |
| 451 |
- rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache |
| 452 |
- } |
| 453 |
- multilib_foreach_abi multilib_pkg_postrm |
| 454 |
- fi |
| 455 |
-} |
Archives