View | Details | Raw Unified | Return to bug 230916 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +16 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	ccsm
4
PORTNAME=	ccsm
5
PORTVERSION=	0.8.4
5
PORTVERSION=	0.8.4
6
PORTREVISION=	7
6
PORTREVISION=	8
7
CATEGORIES=	x11-wm
7
CATEGORIES=	x11-wm
8
MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
8
MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
9
9
Lines 15-28 Link Here
15
15
16
RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:x11-wm/compizconfig-python
16
RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:x11-wm/compizconfig-python
17
17
18
USES=		gettext gmake gnome python:2.7 tar:bzip2
18
USES=		gmake gnome python:2.7 tar:bzip2
19
USE_GNOME=	intltool pygtk2
19
USE_GNOME=	pygtk2
20
20
21
INSTALLS_ICONS=	yes
21
INSTALLS_ICONS=	yes
22
22
23
OPTIONS_DEFINE=		NLS
24
OPTIONS_DEFAULT=	NLS
25
OPTIONS_SUB=		yes
26
27
NLS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-setup.py
28
NLS_USES=		gettext-runtime gettext-tools
29
NLS_USE=		GNOME=intltool
30
23
post-patch:
31
post-patch:
24
	${REINPLACE_CMD} 's,@python ,@${PYTHON_CMD} ,' ${WRKSRC}/Makefile
32
	${REINPLACE_CMD} 's,@python ,@${PYTHON_CMD} ,' ${WRKSRC}/Makefile
25
33
34
post-patch-NLS-off:
35
.for file in Conflicts.py Constants.py.in Pages.py Settings.py Utils.py Widgets.py Window.py
36
	${REINPLACE_CMD} 's|_ = gettext.gettext|def _(message): return message|;/gettext/d' ${WRKSRC}/ccm/${file}
37
.endfor
38
26
do-install:
39
do-install:
27
	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py install --root=${STAGEDIR} --prefix=${PREFIX})
40
	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py install --root=${STAGEDIR} --prefix=${PREFIX})
28
41
(-)files/extra-patch-setup.py (+38 lines)
Line 0 Link Here
1
--- setup.py.orig	2009-10-14 01:05:30 UTC
2
+++ setup.py
3
@@ -111,9 +111,9 @@ f = open (os.path.join ("ccm/Constants.py"), "wt")
4
 f.write (data)
5
 f.close ()
6
 
7
-cmd = "intltool-merge -d -u po/ ccsm.desktop.in ccsm.desktop".split(" ")
8
-proc = subprocess.Popen(cmd)
9
-proc.wait()
10
+with open('ccsm.desktop', 'w') as output_file:
11
+    cmd = "sed s/_Name/Name/g;s/_Comment/Comment/g ccsm.desktop.in".split(" ")
12
+    proc = subprocess.check_call(cmd, stdout=output_file)
13
 
14
 custom_images = []
15
 
16
@@ -149,22 +149,6 @@ for dir, subdirs, files in os.walk("images/"):
17
             data_files.append((global_icon_path + dir[7:], global_images))
18
 
19
 data_files.append(("share/ccsm/images", custom_images))
20
-
21
-podir = os.path.join (os.path.realpath ("."), "po")
22
-if os.path.isdir (podir):
23
-    buildcmd = "msgfmt -o build/locale/%s/ccsm.mo po/%s.po"
24
-    mopath = "build/locale/%s/ccsm.mo"
25
-    destpath = "share/locale/%s/LC_MESSAGES"
26
-    for name in os.listdir (podir):
27
-        if name[-2:] == "po":
28
-            name = name[:-3]
29
-            if sys.argv[1] == "build" \
30
-               or (sys.argv[1] == "install" and \
31
-                   not os.path.exists (mopath % name)):
32
-                if not os.path.isdir ("build/locale/" + name):
33
-                    os.makedirs ("build/locale/" + name)
34
-                os.system (buildcmd % (name, name))
35
-            data_files.append ((destpath % name, [mopath % name]))
36
 
37
 setup (
38
         name             = "ccsm",
(-)pkg-plist (-43 / +43 lines)
Lines 139-184 Link Here
139
share/icons/hicolor/32x32/apps/ccsm.svg
139
share/icons/hicolor/32x32/apps/ccsm.svg
140
share/icons/hicolor/48x48/apps/ccsm.png
140
share/icons/hicolor/48x48/apps/ccsm.png
141
share/icons/hicolor/scalable/apps/ccsm.svg
141
share/icons/hicolor/scalable/apps/ccsm.svg
142
share/locale/ar/LC_MESSAGES/ccsm.mo
142
%%NLS%%share/locale/ar/LC_MESSAGES/ccsm.mo
143
share/locale/as/LC_MESSAGES/ccsm.mo
143
%%NLS%%share/locale/as/LC_MESSAGES/ccsm.mo
144
share/locale/be/LC_MESSAGES/ccsm.mo
144
%%NLS%%share/locale/be/LC_MESSAGES/ccsm.mo
145
share/locale/bg/LC_MESSAGES/ccsm.mo
145
%%NLS%%share/locale/bg/LC_MESSAGES/ccsm.mo
146
share/locale/bn/LC_MESSAGES/ccsm.mo
146
%%NLS%%share/locale/bn/LC_MESSAGES/ccsm.mo
147
share/locale/bn_IN/LC_MESSAGES/ccsm.mo
147
%%NLS%%share/locale/bn_IN/LC_MESSAGES/ccsm.mo
148
share/locale/ca/LC_MESSAGES/ccsm.mo
148
%%NLS%%share/locale/ca/LC_MESSAGES/ccsm.mo
149
share/locale/cs/LC_MESSAGES/ccsm.mo
149
%%NLS%%share/locale/cs/LC_MESSAGES/ccsm.mo
150
share/locale/da/LC_MESSAGES/ccsm.mo
150
%%NLS%%share/locale/da/LC_MESSAGES/ccsm.mo
151
share/locale/de/LC_MESSAGES/ccsm.mo
151
%%NLS%%share/locale/de/LC_MESSAGES/ccsm.mo
152
share/locale/el/LC_MESSAGES/ccsm.mo
152
%%NLS%%share/locale/el/LC_MESSAGES/ccsm.mo
153
share/locale/en_GB/LC_MESSAGES/ccsm.mo
153
%%NLS%%share/locale/en_GB/LC_MESSAGES/ccsm.mo
154
share/locale/es/LC_MESSAGES/ccsm.mo
154
%%NLS%%share/locale/es/LC_MESSAGES/ccsm.mo
155
share/locale/eu/LC_MESSAGES/ccsm.mo
155
%%NLS%%share/locale/eu/LC_MESSAGES/ccsm.mo
156
share/locale/fa/LC_MESSAGES/ccsm.mo
156
%%NLS%%share/locale/fa/LC_MESSAGES/ccsm.mo
157
share/locale/fi/LC_MESSAGES/ccsm.mo
157
%%NLS%%share/locale/fi/LC_MESSAGES/ccsm.mo
158
share/locale/fr/LC_MESSAGES/ccsm.mo
158
%%NLS%%share/locale/fr/LC_MESSAGES/ccsm.mo
159
share/locale/gl/LC_MESSAGES/ccsm.mo
159
%%NLS%%share/locale/gl/LC_MESSAGES/ccsm.mo
160
share/locale/gu/LC_MESSAGES/ccsm.mo
160
%%NLS%%share/locale/gu/LC_MESSAGES/ccsm.mo
161
share/locale/he/LC_MESSAGES/ccsm.mo
161
%%NLS%%share/locale/he/LC_MESSAGES/ccsm.mo
162
share/locale/hi/LC_MESSAGES/ccsm.mo
162
%%NLS%%share/locale/hi/LC_MESSAGES/ccsm.mo
163
share/locale/hr/LC_MESSAGES/ccsm.mo
163
%%NLS%%share/locale/hr/LC_MESSAGES/ccsm.mo
164
share/locale/hu/LC_MESSAGES/ccsm.mo
164
%%NLS%%share/locale/hu/LC_MESSAGES/ccsm.mo
165
share/locale/id/LC_MESSAGES/ccsm.mo
165
%%NLS%%share/locale/id/LC_MESSAGES/ccsm.mo
166
share/locale/it/LC_MESSAGES/ccsm.mo
166
%%NLS%%share/locale/it/LC_MESSAGES/ccsm.mo
167
share/locale/ja/LC_MESSAGES/ccsm.mo
167
%%NLS%%share/locale/ja/LC_MESSAGES/ccsm.mo
168
share/locale/ko/LC_MESSAGES/ccsm.mo
168
%%NLS%%share/locale/ko/LC_MESSAGES/ccsm.mo
169
share/locale/md/LC_MESSAGES/ccsm.mo
169
%%NLS%%share/locale/md/LC_MESSAGES/ccsm.mo
170
share/locale/ml_IN/LC_MESSAGES/ccsm.mo
170
%%NLS%%share/locale/ml_IN/LC_MESSAGES/ccsm.mo
171
share/locale/nb/LC_MESSAGES/ccsm.mo
171
%%NLS%%share/locale/nb/LC_MESSAGES/ccsm.mo
172
share/locale/nl/LC_MESSAGES/ccsm.mo
172
%%NLS%%share/locale/nl/LC_MESSAGES/ccsm.mo
173
share/locale/or/LC_MESSAGES/ccsm.mo
173
%%NLS%%share/locale/or/LC_MESSAGES/ccsm.mo
174
share/locale/pa/LC_MESSAGES/ccsm.mo
174
%%NLS%%share/locale/pa/LC_MESSAGES/ccsm.mo
175
share/locale/pl/LC_MESSAGES/ccsm.mo
175
%%NLS%%share/locale/pl/LC_MESSAGES/ccsm.mo
176
share/locale/pt/LC_MESSAGES/ccsm.mo
176
%%NLS%%share/locale/pt/LC_MESSAGES/ccsm.mo
177
share/locale/pt_BR/LC_MESSAGES/ccsm.mo
177
%%NLS%%share/locale/pt_BR/LC_MESSAGES/ccsm.mo
178
share/locale/ru/LC_MESSAGES/ccsm.mo
178
%%NLS%%share/locale/ru/LC_MESSAGES/ccsm.mo
179
share/locale/sk/LC_MESSAGES/ccsm.mo
179
%%NLS%%share/locale/sk/LC_MESSAGES/ccsm.mo
180
share/locale/sv/LC_MESSAGES/ccsm.mo
180
%%NLS%%share/locale/sv/LC_MESSAGES/ccsm.mo
181
share/locale/tr/LC_MESSAGES/ccsm.mo
181
%%NLS%%share/locale/tr/LC_MESSAGES/ccsm.mo
182
share/locale/wo/LC_MESSAGES/ccsm.mo
182
%%NLS%%share/locale/wo/LC_MESSAGES/ccsm.mo
183
share/locale/zh_CN/LC_MESSAGES/ccsm.mo
183
%%NLS%%share/locale/zh_CN/LC_MESSAGES/ccsm.mo
184
share/locale/zh_HK/LC_MESSAGES/ccsm.mo
184
%%NLS%%share/locale/zh_HK/LC_MESSAGES/ccsm.mo

Return to bug 230916