1 |
yngwin 09/12/30 16:32:18 |
2 |
|
3 |
Added: obxprop.patch |
4 |
Removed: openbox-gnomesession.patch |
5 |
Log: |
6 |
Remove obsolete patch. Remove obsolete version, as 3.4.9 is a bugfix release. Add upstream patch for obxprop rename (bug 298660). |
7 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 x11-wm/openbox/files/obxprop.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/openbox/files/obxprop.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/openbox/files/obxprop.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: obxprop.patch |
16 |
=================================================================== |
17 |
From: Dana Jansens <danakj@×××××.net> |
18 |
Date: Mon, 21 Dec 2009 14:59:28 +0000 (-0500) |
19 |
Subject: Rename obprop to obxprop (Fixes bug #4419) |
20 |
X-Git-Url: http://git.icculus.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=6d8b7bd5f7ede1803c1259f5c1b760e5dbf4dbe3;hp=1fb198410e9d3ca660d91d1049249db0f2f47732 |
21 |
|
22 |
Rename obprop to obxprop (Fixes bug #4419) |
23 |
|
24 |
Avoids collision with openbabel. |
25 |
--- |
26 |
|
27 |
diff --git a/Makefile.am b/Makefile.am |
28 |
index 4b3e0b5..60c2232 100644 |
29 |
--- a/Makefile.am |
30 |
+++ b/Makefile.am |
31 |
@@ -33,7 +33,7 @@ bin_PROGRAMS = \ |
32 |
openbox/openbox \ |
33 |
tools/gdm-control/gdm-control \ |
34 |
tools/gnome-panel-control/gnome-panel-control \ |
35 |
- tools/obprop/obprop |
36 |
+ tools/obxprop/obxprop |
37 |
|
38 |
dist_secretbin_SCRIPTS = \ |
39 |
tools/xdg-autostart/xdg-autostart |
40 |
@@ -289,16 +289,16 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \ |
41 |
tools_gnome_panel_control_gnome_panel_control_SOURCES = \ |
42 |
tools/gnome-panel-control/gnome-panel-control.c |
43 |
|
44 |
-## obprop ## |
45 |
+## obxprop ## |
46 |
|
47 |
-tools_obprop_obprop_CPPFLAGS = \ |
48 |
+tools_obxprop_obxprop_CPPFLAGS = \ |
49 |
$(GLIB_CFLAGS) \ |
50 |
$(X_CFLAGS) |
51 |
-tools_obprop_obprop_LDADD = \ |
52 |
+tools_obxprop_obxprop_LDADD = \ |
53 |
$(GLIB_LIBS) \ |
54 |
$(X_LIBS) |
55 |
-tools_obprop_obprop_SOURCES = \ |
56 |
- tools/obprop/obprop.c |
57 |
+tools_obxprop_obxprop_SOURCES = \ |
58 |
+ tools/obxprop/obxprop.c |
59 |
|
60 |
## gdm-control ## |
61 |
|
62 |
diff --git a/data/rc.xml b/data/rc.xml |
63 |
index d7a31bd..eaf3df7 100644 |
64 |
--- a/data/rc.xml |
65 |
+++ b/data/rc.xml |
66 |
@@ -646,10 +646,10 @@ |
67 |
# this is an example with comments through out. use these to make your |
68 |
# own rules, but without the comments of course. |
69 |
|
70 |
- <application name="the window's _OB_NAME property (see obprop)" |
71 |
- class="the window's _OB_CLASS property (see obprop)" |
72 |
- role="the window's _OB_ROLE property (see obprop)" |
73 |
- type="the window's _NET_WM_WINDOW_TYPE (see obprob).. |
74 |
+ <application name="the window's _OB_NAME property (see obxprop)" |
75 |
+ class="the window's _OB_CLASS property (see obxprop)" |
76 |
+ role="the window's _OB_ROLE property (see obxprop)" |
77 |
+ type="the window's _NET_WM_WINDOW_TYPE (see obxprob).. |
78 |
(if unspecified, then it is 'dialog' for child windows)"> |
79 |
# the name or the class can be set, or both. this is used to match |
80 |
# windows when they appear. role can optionally be set as well, to |
81 |
diff --git a/tools/obprop/Makefile b/tools/obxprop/Makefile |
82 |
similarity index 100% |
83 |
rename from tools/obprop/Makefile |
84 |
rename to tools/obxprop/Makefile |
85 |
diff --git a/tools/obprop/obprop.c b/tools/obxprop/obxprop.c |
86 |
similarity index 99% |
87 |
rename from tools/obprop/obprop.c |
88 |
rename to tools/obxprop/obxprop.c |
89 |
index e288d7c..2685154 100644 |
90 |
--- a/tools/obprop/obprop.c |
91 |
+++ b/tools/obxprop/obxprop.c |
92 |
@@ -12,7 +12,7 @@ gint fail(const gchar *s) { |
93 |
else |
94 |
fprintf |
95 |
(stderr, |
96 |
- "Usage: obprop [OPTIONS]\n\n" |
97 |
+ "Usage: obxprop [OPTIONS]\n\n" |
98 |
"Options:\n" |
99 |
" --help Display this help and exit\n" |
100 |
" --display DISPLAY Connect to this X display\n" |