From 4e285621727027f1538bc9d29a8ade1faefe65eb Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sat, 11 May 2013 08:51:24 +0000 Subject: Fix remaining gtk+-3.8 issue (#469062 by Evgeny Bobkin) (Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) --- x11-themes/light-themes/ChangeLog | 9 +++- .../files/light-themes-0.1.93-gtk3.8-3.patch | 42 +++++++++++++++++++ .../light-themes/light-themes-0.1.93-r1.ebuild | 47 --------------------- .../light-themes/light-themes-0.1.93-r2.ebuild | 48 ++++++++++++++++++++++ 4 files changed, 98 insertions(+), 48 deletions(-) create mode 100644 x11-themes/light-themes/files/light-themes-0.1.93-gtk3.8-3.patch delete mode 100644 x11-themes/light-themes/light-themes-0.1.93-r1.ebuild create mode 100644 x11-themes/light-themes/light-themes-0.1.93-r2.ebuild (limited to 'x11-themes') diff --git a/x11-themes/light-themes/ChangeLog b/x11-themes/light-themes/ChangeLog index 42f0507f278d..2d15ca7a0816 100644 --- a/x11-themes/light-themes/ChangeLog +++ b/x11-themes/light-themes/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-themes/light-themes # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/light-themes/ChangeLog,v 1.18 2013/05/09 18:27:38 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/light-themes/ChangeLog,v 1.19 2013/05/11 08:51:24 pacho Exp $ + +*light-themes-0.1.93-r2 (11 May 2013) + + 11 May 2013; Pacho Ramos + +files/light-themes-0.1.93-gtk3.8-3.patch, +light-themes-0.1.93-r2.ebuild, + -light-themes-0.1.93-r1.ebuild: + Fix remaining gtk+-3.8 issue (#469062 by Evgeny Bobkin) *light-themes-0.1.93-r1 (09 May 2013) diff --git a/x11-themes/light-themes/files/light-themes-0.1.93-gtk3.8-3.patch b/x11-themes/light-themes/files/light-themes-0.1.93-gtk3.8-3.patch new file mode 100644 index 000000000000..4f51f7dab979 --- /dev/null +++ b/x11-themes/light-themes/files/light-themes-0.1.93-gtk3.8-3.patch @@ -0,0 +1,42 @@ +=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css' +--- Ambiance/gtk-3.0/gtk-widgets.css 2013-02-19 13:06:53 +0000 ++++ Ambiance/gtk-3.0/gtk-widgets.css 2013-03-01 23:35:05 +0000 +@@ -44,7 +44,6 @@ + -GtkToolbar-internal-padding: 0; + -GtkTreeView-expander-size: 8; + -GtkTreeView-vertical-separator: 0; +- -GtkWidget-wide-separators: true; + -GtkWidget-separator-width: 2; + -GtkWidget-separator-height: 2; + -GtkWidget-focus-padding: 0; +@@ -1567,6 +1566,8 @@ + + .menuitem.separator { + -GtkMenuItem-horizontal-padding: 0; ++ border: none; ++ color: @dark_bg_color; + } + + GtkTreeMenu .menuitem.separator, + +=== modified file 'Radiance/gtk-3.0/gtk-widgets.css' +--- Radiance/gtk-3.0/gtk-widgets.css 2013-02-19 13:06:53 +0000 ++++ Radiance/gtk-3.0/gtk-widgets.css 2013-03-01 23:35:05 +0000 +@@ -44,7 +44,6 @@ + -GtkToolbar-internal-padding: 0; + -GtkTreeView-expander-size: 8; + -GtkTreeView-vertical-separator: 0; +- -GtkWidget-wide-separators: true; + -GtkWidget-separator-width: 2; + -GtkWidget-separator-height: 2; + -GtkWidget-focus-padding: 0; +@@ -1567,6 +1566,8 @@ + + .menuitem.separator { + -GtkMenuItem-horizontal-padding: 0; ++ border: none; ++ color: @dark_bg_color; + } + + GtkTreeMenu .menuitem.separator, + diff --git a/x11-themes/light-themes/light-themes-0.1.93-r1.ebuild b/x11-themes/light-themes/light-themes-0.1.93-r1.ebuild deleted file mode 100644 index 2bfba69206ee..000000000000 --- a/x11-themes/light-themes/light-themes-0.1.93-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/light-themes/light-themes-0.1.93-r1.ebuild,v 1.1 2013/05/09 18:27:38 pacho Exp $ - -EAPI=5 -inherit eutils - -DESCRIPTION="GTK2/GTK3 Ambiance and Radiance themes from Ubuntu" -HOMEPAGE="https://launchpad.net/light-themes" -SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz" - -LICENSE="CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk3" - -DEPEND="" -RDEPEND="x11-themes/gtk-engines-murrine - gtk3? ( x11-themes/gtk-engines-unico )" - -src_prepare() { - # Apply upstream fixes for gtk+-3.8 compat, bug #469062 - # upstream: https://bugs.launchpad.net/ubuntu-themes/+bug/1130183 - epatch "${FILESDIR}/${P}-gtk3.8-1.patch" - epatch "${FILESDIR}/${P}-gtk3.8-2.patch" - - cp -r Ambiance/ Ambiance-Gentoo || die - cp -r Radiance/ Radiance-Gentoo || die - sed -i -e 's/Ambiance/Ambiance-Gentoo/g' Ambiance-Gentoo/index.theme \ - Ambiance-Gentoo/metacity-1/metacity-theme-1.xml || die - sed -i -e 's/Radiance/Radiance-Gentoo/g' Radiance-Gentoo/index.theme \ - Radiance-Gentoo/metacity-1/metacity-theme-1.xml || die - sed -i -e 's/nselected_bg_color:#f07746/nselected_bg_color:#755fbb/g' \ - Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.0/settings.ini \ - Radiance-Gentoo/gtk-2.0/gtkrc Radiance-Gentoo/gtk-3.0/settings.ini || die - sed -i -e 's/selected_bg_color #f07746/selected_bg_color #755fbb/g' \ - Ambiance-Gentoo/gtk-3.0/gtk-main.css Radiance-Gentoo/gtk-3.0/gtk-main.css || die -} - -src_install() { - insinto /usr/share/themes - doins -r Radiance* Ambiance* - - use gtk3 || { - rm -R "${D}"/usr/share/themes/*/gtk-3.0 || die - } -} diff --git a/x11-themes/light-themes/light-themes-0.1.93-r2.ebuild b/x11-themes/light-themes/light-themes-0.1.93-r2.ebuild new file mode 100644 index 000000000000..011fda0b0b1a --- /dev/null +++ b/x11-themes/light-themes/light-themes-0.1.93-r2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-themes/light-themes/light-themes-0.1.93-r2.ebuild,v 1.1 2013/05/11 08:51:24 pacho Exp $ + +EAPI=5 +inherit eutils + +DESCRIPTION="GTK2/GTK3 Ambiance and Radiance themes from Ubuntu" +HOMEPAGE="https://launchpad.net/light-themes" +SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz" + +LICENSE="CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk3" + +DEPEND="" +RDEPEND="x11-themes/gtk-engines-murrine + gtk3? ( x11-themes/gtk-engines-unico )" + +src_prepare() { + # Apply upstream fixes for gtk+-3.8 compat, bug #469062 + # upstream: https://bugs.launchpad.net/ubuntu-themes/+bug/1130183 + epatch "${FILESDIR}/${P}-gtk3.8-1.patch" + epatch "${FILESDIR}/${P}-gtk3.8-2.patch" + epatch "${FILESDIR}/${P}-gtk3.8-3.patch" + + cp -r Ambiance/ Ambiance-Gentoo || die + cp -r Radiance/ Radiance-Gentoo || die + sed -i -e 's/Ambiance/Ambiance-Gentoo/g' Ambiance-Gentoo/index.theme \ + Ambiance-Gentoo/metacity-1/metacity-theme-1.xml || die + sed -i -e 's/Radiance/Radiance-Gentoo/g' Radiance-Gentoo/index.theme \ + Radiance-Gentoo/metacity-1/metacity-theme-1.xml || die + sed -i -e 's/nselected_bg_color:#f07746/nselected_bg_color:#755fbb/g' \ + Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.0/settings.ini \ + Radiance-Gentoo/gtk-2.0/gtkrc Radiance-Gentoo/gtk-3.0/settings.ini || die + sed -i -e 's/selected_bg_color #f07746/selected_bg_color #755fbb/g' \ + Ambiance-Gentoo/gtk-3.0/gtk-main.css Radiance-Gentoo/gtk-3.0/gtk-main.css || die +} + +src_install() { + insinto /usr/share/themes + doins -r Radiance* Ambiance* + + use gtk3 || { + rm -R "${D}"/usr/share/themes/*/gtk-3.0 || die + } +} -- cgit v1.2.3-65-gdbad