1 |
eva 08/10/24 07:25:51 |
2 |
|
3 |
Added: deskbar-applet-2.24.1-multilib.patch |
4 |
Log: |
5 |
Fix multilib patch, fix bug #243778. |
6 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 gnome-extra/deskbar-applet/files/deskbar-applet-2.24.1-multilib.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/deskbar-applet/files/deskbar-applet-2.24.1-multilib.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/deskbar-applet/files/deskbar-applet-2.24.1-multilib.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: deskbar-applet-2.24.1-multilib.patch |
15 |
=================================================================== |
16 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/core/keybinder/Makefile.am deskbar-applet-2.24.1/deskbar/core/keybinder/Makefile.am |
17 |
--- deskbar-applet-2.24.1.old/deskbar/core/keybinder/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
18 |
+++ deskbar-applet-2.24.1/deskbar/core/keybinder/Makefile.am 2008-10-24 08:53:30.000000000 +0200 |
19 |
@@ -1,6 +1,6 @@ |
20 |
INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS) |
21 |
|
22 |
-_keybinderdir = $(pythondir)/deskbar/core/keybinder |
23 |
+_keybinderdir = $(pyexecdir)/deskbar/core/keybinder |
24 |
_keybinder_LTLIBRARIES = _keybinder.la |
25 |
_keybinder_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_keybinder |
26 |
_keybinder_la_LIBADD = $(DESKBAR_LIBS) |
27 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/core/Makefile.am deskbar-applet-2.24.1/deskbar/core/Makefile.am |
28 |
--- deskbar-applet-2.24.1.old/deskbar/core/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
29 |
+++ deskbar-applet-2.24.1/deskbar/core/Makefile.am 2008-10-24 08:53:30.000000000 +0200 |
30 |
@@ -1,6 +1,6 @@ |
31 |
SUBDIRS = keybinder updater _userdirs |
32 |
|
33 |
-deskbar_coredir = $(pythondir)/deskbar/core |
34 |
+deskbar_coredir = $(pyexecdir)/deskbar/core |
35 |
deskbar_core_PYTHON = \ |
36 |
__init__.py \ |
37 |
BrowserMatch.py \ |
38 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/core/updater/Makefile.am deskbar-applet-2.24.1/deskbar/core/updater/Makefile.am |
39 |
--- deskbar-applet-2.24.1.old/deskbar/core/updater/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
40 |
+++ deskbar-applet-2.24.1/deskbar/core/updater/Makefile.am 2008-10-24 08:53:30.000000000 +0200 |
41 |
@@ -1,4 +1,4 @@ |
42 |
-updaterdir = $(pythondir)/deskbar/core/updater |
43 |
+updaterdir = $(pyexecdir)/deskbar/core/updater |
44 |
updater_PYTHON = \ |
45 |
__init__.py \ |
46 |
Capuchin.py |
47 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/core/_userdirs/Makefile.am deskbar-applet-2.24.1/deskbar/core/_userdirs/Makefile.am |
48 |
--- deskbar-applet-2.24.1.old/deskbar/core/_userdirs/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
49 |
+++ deskbar-applet-2.24.1/deskbar/core/_userdirs/Makefile.am 2008-10-24 08:53:30.000000000 +0200 |
50 |
@@ -1,6 +1,6 @@ |
51 |
INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS) $(GLIB_CFLAGS) |
52 |
|
53 |
-__userdirsdir = $(pythondir)/deskbar/core/_userdirs |
54 |
+__userdirsdir = $(pyexecdir)/deskbar/core/_userdirs |
55 |
__userdirs_LTLIBRARIES = __userdirs.la |
56 |
__userdirs_la_LDFLAGS = -module -avoid-version -export-symbols-regex init__userdirs |
57 |
__userdirs_la_LIBADD = $(DESKBAR_LIBS) $(GLIB_LIBS) |
58 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/handlers/actions/Makefile.am deskbar-applet-2.24.1/deskbar/handlers/actions/Makefile.am |
59 |
--- deskbar-applet-2.24.1.old/deskbar/handlers/actions/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
60 |
+++ deskbar-applet-2.24.1/deskbar/handlers/actions/Makefile.am 2008-10-24 08:53:31.000000000 +0200 |
61 |
@@ -1,4 +1,4 @@ |
62 |
-deskbar_actionsdir = $(pythondir)/deskbar/handlers/actions |
63 |
+deskbar_actionsdir = $(pyexecdir)/deskbar/handlers/actions |
64 |
deskbar_actions_PYTHON = \ |
65 |
__init__.py \ |
66 |
ActionsFactory.py \ |
67 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/handlers/evolution/Makefile.am deskbar-applet-2.24.1/deskbar/handlers/evolution/Makefile.am |
68 |
--- deskbar-applet-2.24.1.old/deskbar/handlers/evolution/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
69 |
+++ deskbar-applet-2.24.1/deskbar/handlers/evolution/Makefile.am 2008-10-24 08:53:31.000000000 +0200 |
70 |
@@ -1,6 +1,6 @@ |
71 |
INCLUDES = $(PYTHON_INCLUDES) $(EVOLUTION_CFLAGS) |
72 |
|
73 |
-_evolutiondir = $(pythondir)/deskbar/handlers/evolution |
74 |
+_evolutiondir = $(pyexecdir)/deskbar/handlers/evolution |
75 |
_evolution_LTLIBRARIES = _evolution.la |
76 |
_evolution_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_evolution |
77 |
_evolution_la_LIBADD = $(EVOLUTION_LIBS) |
78 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/handlers/gdmclient/Makefile.am deskbar-applet-2.24.1/deskbar/handlers/gdmclient/Makefile.am |
79 |
--- deskbar-applet-2.24.1.old/deskbar/handlers/gdmclient/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
80 |
+++ deskbar-applet-2.24.1/deskbar/handlers/gdmclient/Makefile.am 2008-10-24 08:53:31.000000000 +0200 |
81 |
@@ -1,6 +1,6 @@ |
82 |
INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS) |
83 |
|
84 |
-_gdmclientdir = $(pythondir)/deskbar/handlers/gdmclient |
85 |
+_gdmclientdir = $(pyexecdir)/deskbar/handlers/gdmclient |
86 |
_gdmclient_LTLIBRARIES = _gdmclient.la |
87 |
_gdmclient_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gdmclient |
88 |
_gdmclient_la_LIBADD = $(DESKBAR_LIBS) |
89 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/handlers/Makefile.am deskbar-applet-2.24.1/deskbar/handlers/Makefile.am |
90 |
--- deskbar-applet-2.24.1.old/deskbar/handlers/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
91 |
+++ deskbar-applet-2.24.1/deskbar/handlers/Makefile.am 2008-10-24 08:53:31.000000000 +0200 |
92 |
@@ -4,7 +4,7 @@ |
93 |
SUBDIRS += evolution |
94 |
endif |
95 |
|
96 |
-deskbar_handlers_modulesdir = $(pythondir)/deskbar/handlers |
97 |
+deskbar_handlers_modulesdir = $(pyexecdir)/deskbar/handlers |
98 |
deskbar_handlers_modules_PYTHON = __init__.py |
99 |
|
100 |
deskbar_handlersdir = $(libdir)/deskbar-applet/modules-2.20-compatible |
101 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/interfaces/Makefile.am deskbar-applet-2.24.1/deskbar/interfaces/Makefile.am |
102 |
--- deskbar-applet-2.24.1.old/deskbar/interfaces/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
103 |
+++ deskbar-applet-2.24.1/deskbar/interfaces/Makefile.am 2008-10-24 08:53:30.000000000 +0200 |
104 |
@@ -1,4 +1,4 @@ |
105 |
-deskbar_interfacesdir = $(pythondir)/deskbar/interfaces |
106 |
+deskbar_interfacesdir = $(pyexecdir)/deskbar/interfaces |
107 |
deskbar_interfaces_PYTHON = \ |
108 |
__init__.py \ |
109 |
Action.py \ |
110 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/Makefile.am deskbar-applet-2.24.1/deskbar/Makefile.am |
111 |
--- deskbar-applet-2.24.1.old/deskbar/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
112 |
+++ deskbar-applet-2.24.1/deskbar/Makefile.am 2008-10-24 08:53:31.000000000 +0200 |
113 |
@@ -6,7 +6,7 @@ |
114 |
deskbarbindir = $(libdir)/deskbar-applet |
115 |
deskbarbin_SCRIPTS = deskbar-applet |
116 |
|
117 |
-deskbardir = $(pythondir)/deskbar |
118 |
+deskbardir = $(pyexecdir)/deskbar |
119 |
deskbar_PYTHON = \ |
120 |
defs.py \ |
121 |
gtkexcepthook.py \ |
122 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/osutils/Makefile.am deskbar-applet-2.24.1/deskbar/osutils/Makefile.am |
123 |
--- deskbar-applet-2.24.1.old/deskbar/osutils/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
124 |
+++ deskbar-applet-2.24.1/deskbar/osutils/Makefile.am 2008-10-24 08:53:31.000000000 +0200 |
125 |
@@ -1,6 +1,6 @@ |
126 |
INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS) |
127 |
|
128 |
-_osutilsdir = $(pythondir)/deskbar/osutils |
129 |
+_osutilsdir = $(pyexecdir)/deskbar/osutils |
130 |
_osutils_LTLIBRARIES = _osutils.la |
131 |
_osutils_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_osutils |
132 |
_osutils_la_LIBADD = $(DESKBAR_LIBS) |
133 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/ui/cuemiac/Makefile.am deskbar-applet-2.24.1/deskbar/ui/cuemiac/Makefile.am |
134 |
--- deskbar-applet-2.24.1.old/deskbar/ui/cuemiac/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
135 |
+++ deskbar-applet-2.24.1/deskbar/ui/cuemiac/Makefile.am 2008-10-24 08:53:30.000000000 +0200 |
136 |
@@ -1,4 +1,4 @@ |
137 |
-deskbar_cuemiacdir = $(pythondir)/deskbar/ui/cuemiac |
138 |
+deskbar_cuemiacdir = $(pyexecdir)/deskbar/ui/cuemiac |
139 |
deskbar_cuemiac_PYTHON = \ |
140 |
__init__.py \ |
141 |
CuemiacActionsTreeView.py \ |
142 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/ui/iconentry/Makefile.am deskbar-applet-2.24.1/deskbar/ui/iconentry/Makefile.am |
143 |
--- deskbar-applet-2.24.1.old/deskbar/ui/iconentry/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
144 |
+++ deskbar-applet-2.24.1/deskbar/ui/iconentry/Makefile.am 2008-10-24 08:53:30.000000000 +0200 |
145 |
@@ -1,6 +1,6 @@ |
146 |
INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS) |
147 |
|
148 |
-_iconentrydir = $(pythondir)/deskbar/ui/iconentry |
149 |
+_iconentrydir = $(pyexecdir)/deskbar/ui/iconentry |
150 |
_iconentry_LTLIBRARIES = _iconentry.la |
151 |
_iconentry_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_iconentry |
152 |
_iconentry_la_LIBADD = $(DESKBAR_LIBS) |
153 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/ui/Makefile.am deskbar-applet-2.24.1/deskbar/ui/Makefile.am |
154 |
--- deskbar-applet-2.24.1.old/deskbar/ui/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
155 |
+++ deskbar-applet-2.24.1/deskbar/ui/Makefile.am 2008-10-24 08:53:30.000000000 +0200 |
156 |
@@ -1,6 +1,6 @@ |
157 |
SUBDIRS = cuemiac iconentry preferences |
158 |
|
159 |
-deskbar_uidir = $(pythondir)/deskbar/ui |
160 |
+deskbar_uidir = $(pyexecdir)/deskbar/ui |
161 |
deskbar_ui_PYTHON = \ |
162 |
__init__.py \ |
163 |
About.py \ |
164 |
diff -Nura deskbar-applet-2.24.1.old/deskbar/ui/preferences/Makefile.am deskbar-applet-2.24.1/deskbar/ui/preferences/Makefile.am |
165 |
--- deskbar-applet-2.24.1.old/deskbar/ui/preferences/Makefile.am 2008-10-24 08:50:46.000000000 +0200 |
166 |
+++ deskbar-applet-2.24.1/deskbar/ui/preferences/Makefile.am 2008-10-24 08:53:30.000000000 +0200 |
167 |
@@ -1,4 +1,4 @@ |
168 |
-deskbar_preferencesdir = $(pythondir)/deskbar/ui/preferences |
169 |
+deskbar_preferencesdir = $(pyexecdir)/deskbar/ui/preferences |
170 |
deskbar_preferences_PYTHON = \ |
171 |
__init__.py \ |
172 |
AccelEntry.py \ |