commit: 8dc59f314801c6a91ede2f37c0c9f3ee1e1f8716 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Mon Oct 31 22:05:23 2016 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Tue Nov 1 11:18:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc59f31
x11-themes/gnome-themes-standard: version bump 3.20.2-r1 → 3.22.2 Package-Manager: portage-2.3.2 x11-themes/gnome-themes-standard/Manifest | 1 + ...ome-themes-standard-3.22.2-exclude-engine.patch | 63 ++++++++++++++++++++++ .../gnome-themes-standard-3.22.2.ebuild | 46 ++++++++++++++++ 3 files changed, 110 insertions(+) diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest index 341db5d..17e198a 100644 --- a/x11-themes/gnome-themes-standard/Manifest +++ b/x11-themes/gnome-themes-standard/Manifest @@ -1,3 +1,4 @@ DIST gnome-themes-standard-3.16.2.tar.xz 2866556 SHA256 59eb79a59d44b5cd8daa8de1e7559fb5186503dcd78e47d0b72cb896d8654b9f SHA512 483e63e1f01d6a0c26a07def12f19d59406a2f89202db599876cff8542215b4d5eb8a054805eb16a4e027c76399f4bb498ed326e136ecf482c71f5a0b8cb5556 WHIRLPOOL ce585f3f17220538bbea025c201b3939a69b3dfba4186fc6312c63ea4e290a3dbfd526f93f0f3396e92b2e57908a936c442278a7a5323c0c0c0c571337a2caf8 DIST gnome-themes-standard-3.18.0.tar.xz 2866336 SHA256 e646eb04c225282b7df7fff65741adaad4cf9ed2c12616b7310e7edd27d2bacb SHA512 67f0c674dd673a578093248fddb4637bd4f06f9f2eee9b5cd68218ea46790b76105a76e8c35e900170f4f76fd1b0eea4f48845c8414e3a71caa297f1c1c94d98 WHIRLPOOL 5aa52fdd333d5d6a833b78ff3e6d67a43a4459152a88d0d1734712c3b04070f8584175a1443dbe1983aa8f97e6bbb82285de3d52b700145ffb8fd0ff16bc37b1 DIST gnome-themes-standard-3.20.2.tar.xz 2878508 SHA256 9d0d9c4b2c9f9008301c3c1878ebb95859a735b7fd4a6a518802b9637e4a7915 SHA512 ce6dd2697e4afd5f36b6c362086eb5d5f3732ab863770f024e4970b2f7399b8ae6e49241de99bf8b558e4d80869ec1002d817f3dd9e7b8fbf9ea8da5a1d386fc WHIRLPOOL aa3e2f2f8a845cf6d1d09726cb58b113a8f4d6cf0cbf04b450602ba8ff17668dd827e0c2de40326f1a388d9a8998e03db4c301395a2e41ec3666e0c40cd23883 +DIST gnome-themes-standard-3.22.2.tar.xz 2900572 SHA256 b34516cd59b873c187c1897c25bac3b9ce2d30a472f1fd7ae9d7105d93e17da5 SHA512 d1fe6d93d06b9a231898055cf801adace0949c06658a08b445c3e0aaf127a4682d857463ee08a74d3652bad9e19bfaff4f651b5174cbeb76c99143da25cf39bd WHIRLPOOL 31c2e71d180b281d15319ca777a216d4db6be5639b4fb1ae33dbd1ff3981b4953ac934b58d1a77565c811d2c835f9d62518d342d8e5c1dc0a8ba5a8e437952aa diff --git a/x11-themes/gnome-themes-standard/files/gnome-themes-standard-3.22.2-exclude-engine.patch b/x11-themes/gnome-themes-standard/files/gnome-themes-standard-3.22.2-exclude-engine.patch new file mode 100644 index 00000000..7cdceff --- /dev/null +++ b/x11-themes/gnome-themes-standard/files/gnome-themes-standard-3.22.2-exclude-engine.patch @@ -0,0 +1,63 @@ +From 58fd7206211e8e4d42ce6925718e56f84a1b4eb3 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <[email protected]> +Date: Mon, 3 Oct 2016 00:38:57 +0200 +Subject: [PATCH] Control build of gtk+2 adwaita theme engine from configure + +Rather than whole gtk+-2 theme. + +This only makes sense in Gentoo as the theme engine has been split to +a separate package to allow gtk+2 free systems. +--- + themes/Adwaita-dark/Makefile.am | 6 +----- + themes/Adwaita/Makefile.am | 6 +----- + themes/Adwaita/gtk-2.0/Makefile.am | 2 ++ + 3 files changed, 4 insertions(+), 10 deletions(-) + +diff --git a/themes/Adwaita-dark/Makefile.am b/themes/Adwaita-dark/Makefile.am +index 8a381b9..c5efcbf 100644 +--- a/themes/Adwaita-dark/Makefile.am ++++ b/themes/Adwaita-dark/Makefile.am +@@ -1,8 +1,4 @@ +-SUBDIRS = gtk-3.0 +- +-if GTK2_ENGINE +-SUBDIRS += gtk-2.0 +-endif ++SUBDIRS = gtk-2.0 gtk-3.0 + + THEME_NAME=Adwaita-dark + THEME_IN_FILES=index.theme.in +diff --git a/themes/Adwaita/Makefile.am b/themes/Adwaita/Makefile.am +index 8583535..617b9a6 100644 +--- a/themes/Adwaita/Makefile.am ++++ b/themes/Adwaita/Makefile.am +@@ -1,8 +1,4 @@ +-SUBDIRS = gtk-3.0 +- +-if GTK2_ENGINE +-SUBDIRS += gtk-2.0 +-endif ++SUBDIRS = gtk-2.0 gtk-3.0 + + THEME_NAME=Adwaita + THEME_IN_FILES=index.theme.in +diff --git a/themes/Adwaita/gtk-2.0/Makefile.am b/themes/Adwaita/gtk-2.0/Makefile.am +index 1e56f7f..9108cc4 100644 +--- a/themes/Adwaita/gtk-2.0/Makefile.am ++++ b/themes/Adwaita/gtk-2.0/Makefile.am +@@ -1,3 +1,4 @@ ++if GTK2_ENGINE + enginedir = $(libdir)/gtk-2.0/$(GTK2_VERSION)/engines + engine_LTLIBRARIES = libadwaita.la + +@@ -5,6 +6,7 @@ libadwaita_la_CFLAGS = $(GTK2_ENGINE_CFLAGS) + libadwaita_la_SOURCES = adwaita_engine.c + libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined + libadwaita_la_LIBADD = $(GTK2_ENGINE_LIBS) ++endif + + themedir = $(datadir)/themes/Adwaita/gtk-2.0 + theme_DATA = gtkrc main.rc apps.rc hacks.rc +-- +2.10.1 + diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.22.2.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.22.2.ebuild new file mode 100644 index 00000000..e1845b2 --- /dev/null +++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.22.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools gnome.org + +DESCRIPTION="Standard Themes for GNOME Applications" +HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"; + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris" + +# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose +# their default background image +RDEPEND=" + >=gnome-base/gsettings-desktop-schemas-3.4 +" +DEPEND=" + >=dev-util/intltool-0.40 + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + # https://bugzilla.gnome.org/show_bug.cgi?id=746920 + "${FILESDIR}"/${PN}-3.14.2.3-srcdir.patch + # Leave build of gtk+:2 engine to x11-themes/gtk-engines-adwaita + "${FILESDIR}"/${PN}-3.22.2-exclude-engine.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + ECONF_SOURCE="${S}" econf \ + --disable-static \ + --disable-gtk2-engine \ + --disable-gtk3-engine \ + GTK_UPDATE_ICON_CACHE=$(type -P true) +}
