1 |
commit: f162e6dab285aefc570d27f9b0f075065bc2309b |
2 |
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Feb 5 11:41:59 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 5 19:06:51 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f162e6da |
7 |
|
8 |
x11-misc/driconf: Bump eapi, use newer python eclass, fix issues |
9 |
|
10 |
Fixes: https://bugs.gentoo.org/352016 |
11 |
drop-old-tooltips patch is made by Rafał Mużyło, see bug #352016 |
12 |
|
13 |
Also fixes following QA issuses: |
14 |
* /usr/share/applications/driconf.desktop: error: value "GNOME;Application;Settings;AdvancedSettings;" for key "Categories" in group "Desktop Entry" contains an unregistered value "AdvancedSettings"; values extending the format should start with "X-" |
15 |
* /usr/share/applications/driconf.desktop: warning: value "GNOME;Application;Settings;AdvancedSettings;" for key "Categories" in group "Desktop Entry" contains a deprecated value "Application" |
16 |
|
17 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
18 |
Closes: https://github.com/gentoo/gentoo/pull/3826 |
19 |
|
20 |
x11-misc/driconf/driconf-0.9.1-r2.ebuild | 52 ++++++++++++++++++ |
21 |
.../driconf/files/driconf-0.9.1-desktop-menu.patch | 9 ++++ |
22 |
.../files/driconf-0.9.1-driconf_simpleui.py.patch | 4 +- |
23 |
.../files/driconf-0.9.1-drop-old-tooltips.patch | 61 ++++++++++++++++++++++ |
24 |
.../files/driconf-0.9.1-glxinfo-unicode.patch | 4 +- |
25 |
.../driconf-0.9.1-update-toolbar-methods.patch | 4 +- |
26 |
6 files changed, 128 insertions(+), 6 deletions(-) |
27 |
|
28 |
diff --git a/x11-misc/driconf/driconf-0.9.1-r2.ebuild b/x11-misc/driconf/driconf-0.9.1-r2.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000..c3b79c2 |
31 |
--- /dev/null |
32 |
+++ b/x11-misc/driconf/driconf-0.9.1-r2.ebuild |
33 |
@@ -0,0 +1,52 @@ |
34 |
+# Copyright 1999-2017 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+# $Id$ |
37 |
+ |
38 |
+EAPI=6 |
39 |
+ |
40 |
+PYTHON_COMPAT=( python2_7 ) |
41 |
+PYTHON_REQ_USE="xml" |
42 |
+ |
43 |
+inherit distutils-r1 eutils |
44 |
+ |
45 |
+DESCRIPTION="driconf is a GTK+2 GUI configurator for DRI" |
46 |
+HOMEPAGE="https://dri.freedesktop.org/wiki/DriConf" |
47 |
+SRC_URI="https://freedesktop.org/~fxkuehl/${PN}/${P}.tar.gz" |
48 |
+ |
49 |
+LICENSE="GPL-2" |
50 |
+SLOT="0" |
51 |
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" |
52 |
+IUSE="" |
53 |
+ |
54 |
+RDEPEND="x11-libs/gtk+:2 |
55 |
+ dev-python/pygtk:2[${PYTHON_USEDEP}] |
56 |
+ x11-apps/xdriinfo" |
57 |
+DEPEND="${RDEPEND}" |
58 |
+ |
59 |
+DOCS=( CHANGELOG COPYING PKG-INFO README TODO ) |
60 |
+PATCHES=( |
61 |
+ "${FILESDIR}"/${P}-glxinfo-unicode.patch |
62 |
+ "${FILESDIR}"/${P}-update-toolbar-methods.patch |
63 |
+ "${FILESDIR}"/${P}-driconf_simpleui.py.patch |
64 |
+ "${FILESDIR}"/${P}-desktop-menu.patch |
65 |
+ "${FILESDIR}"/${P}-drop-old-tooltips.patch |
66 |
+) |
67 |
+ |
68 |
+python_prepare_all() { |
69 |
+ distutils-r1_python_prepare_all |
70 |
+ |
71 |
+ # Fix install locations which breaks location policy - Josh_B |
72 |
+ sed -i \ |
73 |
+ -e 's:/usr/local:/usr:g' \ |
74 |
+ driconf \ |
75 |
+ driconf.desktop \ |
76 |
+ driconf.py \ |
77 |
+ setup.cfg \ |
78 |
+ setup.py \ |
79 |
+ || die "Sed failed!" |
80 |
+} |
81 |
+ |
82 |
+python_install_all() { |
83 |
+ distutils-r1_python_install_all |
84 |
+ domenu driconf.desktop |
85 |
+} |
86 |
|
87 |
diff --git a/x11-misc/driconf/files/driconf-0.9.1-desktop-menu.patch b/x11-misc/driconf/files/driconf-0.9.1-desktop-menu.patch |
88 |
new file mode 100644 |
89 |
index 00000000..a8ca984 |
90 |
--- /dev/null |
91 |
+++ b/x11-misc/driconf/files/driconf-0.9.1-desktop-menu.patch |
92 |
@@ -0,0 +1,9 @@ |
93 |
+--- a/driconf.desktop 2006-09-18 04:41:45.000000000 +0300 |
94 |
++++ b/driconf.desktop 2017-02-05 13:14:11.319444931 +0200 |
95 |
+@@ -5,5 +5,5 @@ |
96 |
+ Exec=driconf |
97 |
+ Icon=/usr/local/share/driconf/driconf-icon.png |
98 |
+ Type=Application |
99 |
+-Categories=GNOME;Application;Settings;AdvancedSettings; |
100 |
++Categories=GNOME;Settings;HardwareSettings; |
101 |
+ StartupNotify=true |
102 |
|
103 |
diff --git a/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch b/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch |
104 |
index fb661c8..71403cd 100644 |
105 |
--- a/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch |
106 |
+++ b/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch |
107 |
@@ -1,7 +1,7 @@ |
108 |
http://cvs.fedoraproject.org/viewvc/rpms/driconf/devel/ |
109 |
|
110 |
---- driconf_simpleui.py |
111 |
-+++ driconf_simpleui.py |
112 |
+--- a/driconf_simpleui.py |
113 |
++++ b/driconf_simpleui.py |
114 |
@@ -266,8 +266,8 @@ |
115 |
j = i |
116 |
break |
117 |
|
118 |
diff --git a/x11-misc/driconf/files/driconf-0.9.1-drop-old-tooltips.patch b/x11-misc/driconf/files/driconf-0.9.1-drop-old-tooltips.patch |
119 |
new file mode 100644 |
120 |
index 00000000..65291de |
121 |
--- /dev/null |
122 |
+++ b/x11-misc/driconf/files/driconf-0.9.1-drop-old-tooltips.patch |
123 |
@@ -0,0 +1,61 @@ |
124 |
+diff -ur driconf-0.9.1-old/driconf_commonui.py driconf-0.9.1/driconf_commonui.py |
125 |
+--- a/driconf_commonui.py 2006-09-18 04:03:43.000000000 +0200 |
126 |
++++ b/driconf_commonui.py 2011-01-09 21:09:43.000000000 +0100 |
127 |
+@@ -299,8 +299,7 @@ |
128 |
+ self.label.set_active (page.app.options.has_key (opt.name)) |
129 |
+ self.label.set_sensitive (page.app.device.config.writable) |
130 |
+ self.label.connect ("clicked", self.checkOpt) |
131 |
+- tooltipString = str(opt) |
132 |
+- page.tooltips.set_tip (self.label, tooltipString) |
133 |
++ self.label.set_tooltip_text (str(opt)) |
134 |
+ self.label.show() |
135 |
+ page.table.attach (self.label, 0, 1, i, i+1, |
136 |
+ gtk.EXPAND|gtk.FILL, 0, 5, 5) |
137 |
+@@ -316,10 +315,10 @@ |
138 |
+ self.resetButton.set_relief (gtk.RELIEF_NONE) |
139 |
+ self.resetButton.set_sensitive (sensitive) |
140 |
+ if removable: |
141 |
+- page.tooltips.set_tip(self.resetButton, _("Remove")) |
142 |
++ self.resetButton.set_tooltip_text(_("Remove")) |
143 |
+ self.resetButton.connect ("clicked", self.removeOpt) |
144 |
+ else: |
145 |
+- page.tooltips.set_tip(self.resetButton, _("Reset to default value")) |
146 |
++ self.resetButton.set_tooltip_text(_("Reset to default value")) |
147 |
+ self.resetButton.connect ("clicked", self.resetOpt) |
148 |
+ self.resetButton.show() |
149 |
+ page.table.attach (self.resetButton, 2, 3, i, i+1, 0, 0, 5, 5) |
150 |
+@@ -510,7 +509,6 @@ |
151 |
+ self.optSection = optSection |
152 |
+ self.app = app |
153 |
+ self.simple = simple |
154 |
+- self.tooltips = gtk.Tooltips() |
155 |
+ self.table = gtk.Table (len(optSection.optList), 3) |
156 |
+ self.optLines = [] |
157 |
+ for i in range (len(optSection.optList)): |
158 |
+diff -ur driconf-0.9.1-old/driconf_complexui.py driconf-0.9.1/driconf_complexui.py |
159 |
+--- a/driconf_complexui.py 2006-09-18 02:53:44.000000000 +0200 |
160 |
++++ b/driconf_complexui.py 2011-01-09 21:10:29.000000000 +0100 |
161 |
+@@ -41,11 +41,10 @@ |
162 |
+ self.set_label_widget (frameLabel) |
163 |
+ self.driver = driver |
164 |
+ self.app = app |
165 |
+- tooltips = gtk.Tooltips() |
166 |
+ table = gtk.Table(2, 2) |
167 |
+ self.execCheck = WrappingCheckButton (_("Apply only to this executable")) |
168 |
+ self.execCheck.set_sensitive (app.device.config.writable) |
169 |
+- tooltips.set_tip (self.execCheck, _( |
170 |
++ self.execCheck.set_tooltip_text (_( |
171 |
+ "Leave this disabled to configure all applications.\n" |
172 |
+ "Beware that some applications or games are just a shell script " |
173 |
+ "that starts a real executable with a different name.")) |
174 |
+diff -ur driconf-0.9.1-old/driconf_simpleui.py driconf-0.9.1/driconf_simpleui.py |
175 |
+--- a/driconf_simpleui.py 2006-09-18 02:49:54.000000000 +0200 |
176 |
++++ b/driconf_simpleui.py 2011-01-09 21:10:51.000000000 +0100 |
177 |
+@@ -342,7 +342,6 @@ |
178 |
+ self.set_policy (gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) |
179 |
+ self.driver = driver |
180 |
+ self.app = app |
181 |
+- self.tooltips = gtk.Tooltips() |
182 |
+ self.table = None |
183 |
+ self.refreshOptions() |
184 |
+ |
185 |
|
186 |
diff --git a/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch b/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch |
187 |
index df41550..2df25d5 100644 |
188 |
--- a/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch |
189 |
+++ b/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch |
190 |
@@ -1,7 +1,7 @@ |
191 |
http://cvs.fedoraproject.org/viewvc/rpms/driconf/devel/ |
192 |
|
193 |
---- driconf_simpleui.py |
194 |
-+++ driconf_simpleui.py |
195 |
+--- a/driconf_simpleui.py |
196 |
++++ b/driconf_simpleui.py |
197 |
@@ -450,11 +450,13 @@ class MainWindow (gtk.Window): |
198 |
else: |
199 |
screen = self.screens[0] |
200 |
|
201 |
diff --git a/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch b/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch |
202 |
index d6ce7e5..294c262 100644 |
203 |
--- a/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch |
204 |
+++ b/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch |
205 |
@@ -1,7 +1,7 @@ |
206 |
http://cvs.fedoraproject.org/viewvc/rpms/driconf/devel/ |
207 |
|
208 |
---- driconf_complexui.py |
209 |
-+++ driconf_complexui.py |
210 |
+--- a/driconf_complexui.py |
211 |
++++ b/driconf_complexui.py |
212 |
@@ -838,42 +838,73 @@ class MainWindow (gtk.Window): |
213 |
self.paned.show() |
214 |
self.toolbar = gtk.Toolbar () |