commit: 6d995e6e89c222af0d0e1db0f949f8554c018ab0
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 15:01:28 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 15:01:59 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d995e6e
x11-themes/gtk-engines: Fix java apps look (#523074 by Alex Barker), also apply
the Fedora fixes/improvements for this.
Package-Manager: portage-2.2.20.1
.../files/gtk-engines-2.20.2-auto-mnemonics.patch | 12 ++++
.../files/gtk-engines-2.20.2-change-bullet.patch | 11 ++++
.../files/gtk-engines-2.20.2-java-look.patch | 22 ++++++++
.../files/gtk-engines-2.20.2-tooltips.patch | 25 +++++++++
.../files/gtk-engines-2.20.2-window-dragging.patch | 12 ++++
.../gtk-engines/gtk-engines-2.20.2-r2.ebuild | 64 ++++++++++++++++++++++
6 files changed, 146 insertions(+)
diff --git
a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-auto-mnemonics.patch
b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-auto-mnemonics.patch
new file mode 100644
index 0000000..dc6ca97
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-auto-mnemonics.patch
@@ -0,0 +1,12 @@
+diff -up gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc.mnemonics
gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc
+--- gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc.mnemonics
2010-03-23 19:47:09.838066932 -0400
++++ gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc 2010-01-12
22:29:47.507357239 -0500
+@@ -3,6 +3,8 @@
+
+ gtk-color-scheme =
"base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#E7F3FD"
+
++gtk-auto-mnemonics = 1
++
+ style "default" {
+ xthickness = 1
+ ythickness = 1
diff --git
a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-change-bullet.patch
b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-change-bullet.patch
new file mode 100644
index 0000000..bc80a92
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-change-bullet.patch
@@ -0,0 +1,11 @@
+--- gtk-engines-2.18.2/themes/Clearlooks/gtk-2.0/gtkrc.change-bullet
2009-08-25 11:25:25.348520380 -0400
++++ gtk-engines-2.18.2/themes/Clearlooks/gtk-2.0/gtkrc 2009-08-25
11:26:30.477514482 -0400
+@@ -16,6 +16,8 @@ style "default" {
+
+ GtkCheckButton::indicator-size = 14
+
++ GtkEntry::invisible-char = 0x2022
++
+ GtkPaned::handle-size = 6
+
+ GtkRange::trough-border = 0
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-java-look.patch
b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-java-look.patch
new file mode 100644
index 0000000..b038366
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-java-look.patch
@@ -0,0 +1,22 @@
+--- gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc.orig 2011-11-27
14:25:46.523593240 -0800
++++ gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc 2011-11-27
14:25:34.400658810 -0800
+@@ -207,8 +207,8 @@
+ }
+
+ style "menu" {
+- xthickness = 0
+- ythickness = 0
++ xthickness = 2
++ ythickness = 2
+
+ bg[NORMAL] = shade (1.08, @bg_color)
+
+@@ -229,7 +229,7 @@
+ # 2. The line should go to the edges (ie. no border at the left/right)
+ style "separator_menu_item" {
+ xthickness = 1
+- ythickness = 0
++ ythickness = 1
+
+ GtkSeparatorMenuItem::horizontal-padding = 0
+ GtkWidget::wide-separators = 1
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-tooltips.patch
b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-tooltips.patch
new file mode 100644
index 0000000..898fc0c
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-tooltips.patch
@@ -0,0 +1,25 @@
+diff -up gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc.tooltips
gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc
+--- gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc.tooltips
2009-10-23 17:28:48.131886076 -0400
++++ gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc 2009-10-23
17:29:58.968890361 -0400
+@@ -1,7 +1,7 @@
+
+ # Please keep this gtkrc in sync with the other ones from Clearlooks based
themes.
+
+-gtk-color-scheme =
"base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#F5F5B5"
++gtk-color-scheme =
"base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#E7F3FD"
+
+ style "default" {
+ xthickness = 1
+@@ -276,9 +276,11 @@ style "treeview_header" = "default" {
+ }
+
+ style "tooltips" {
+- xthickness = 4
++ xthickness = 8
+ ythickness = 4
+
++ GtkWidget::new-tooltip-style = 1
++
+ bg[NORMAL] = @tooltip_bg_color
+ fg[NORMAL] = @tooltip_fg_color
+ }
diff --git
a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-window-dragging.patch
b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-window-dragging.patch
new file mode 100644
index 0000000..94abccd
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-window-dragging.patch
@@ -0,0 +1,12 @@
+diff -up gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc.dragbar
gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc
+--- gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc.dragbar 2010-03-23
19:50:58.478062184 -0400
++++ gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc 2010-03-23
19:51:13.611066722 -0400
+@@ -203,6 +203,8 @@ style "comboboxentry" {
+
+ style "menubar" {
+
++ GtkWidget::window-dragging = 1
++
+ engine "clearlooks" {
+ hint = "menubar"
+ }
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
new file mode 100644
index 0000000..24fe97e
--- /dev/null
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2 multilib-minimal
+
+DESCRIPTION="GTK+2 standard engines and themes"
+HOMEPAGE="http://www.gtk.org/";
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux
~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="accessibility lua"
+
+RDEPEND="
+ >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
+ lua? ( dev-lang/lua:0[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20140508
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.31
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+ # Patch from 2.21.x, fixes building with glib-2.32, bug #410455
+ epatch "${FILESDIR}/${P}-glib.h.patch"
+
+ # Fix java apps look, bug #523074
+ epatch "${FILESDIR}/${P}-java-look.patch"
+
+ # Apply Fedora fixes/improvements
+ epatch "${FILESDIR}"/${P}-auto-mnemonics.patch
+ epatch "${FILESDIR}"/${P}-change-bullet.patch
+ epatch "${FILESDIR}"/${P}-tooltips.patch
+ epatch "${FILESDIR}"/${P}-window-dragging.patch
+
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --enable-animation \
+ $(use_enable lua) \
+ $(use_with lua system-lua) \
+ $(use_enable accessibility hc)
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+}
