FreeBSD Bugzilla – Attachment 201971 Details for
Bug 230916
[patch] x11-wm/ccsm: add LICENSE and option NLS
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch file generated with svn diff
ccsm-0.8.4_8.diff (text/plain), 13.66 KB, created by
Samy Mahmoudi
on 2019-02-13 02:20:47 UTC
(
hide
)
Description:
Patch file generated with svn diff
Filename:
MIME Type:
Creator:
Samy Mahmoudi
Created:
2019-02-13 02:20:47 UTC
Size:
13.66 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (révision 492788) >+++ Makefile (copie de travail) >@@ -3,7 +3,7 @@ > > PORTNAME= ccsm > PORTVERSION= 0.8.4 >-PORTREVISION= 7 >+PORTREVISION= 8 > CATEGORIES= x11-wm > MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ > >@@ -15,11 +15,19 @@ > > RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:x11-wm/compizconfig-python > >-USES= gettext gmake gnome python:2.7 tar:bzip2 >-USE_GNOME= intltool pygtk2 >+USES= gmake gnome python:2.7 tar:bzip2 >+USE_GNOME= pygtk2 > > INSTALLS_ICONS= yes > >+OPTIONS_DEFINE= NLS >+OPTIONS_DEFAULT= NLS >+OPTIONS_SUB= yes >+ >+NLS_EXTRA_PATCHES_OFF= ${PATCHDIR}/nls-off-patches >+NLS_USES= gettext-runtime gettext-tools >+NLS_USE= GNOME=intltool >+ > post-patch: > ${REINPLACE_CMD} 's,@python ,@${PYTHON_CMD} ,' ${WRKSRC}/Makefile > >Index: files/nls-off-patches/patch-ccm_Conflicts.py >=================================================================== >--- files/nls-off-patches/patch-ccm_Conflicts.py (nonexistent) >+++ files/nls-off-patches/patch-ccm_Conflicts.py (copie de travail) >@@ -0,0 +1,15 @@ >+--- ccm/Conflicts.py.orig 2019-02-12 22:36:58 UTC >++++ ccm/Conflicts.py >+@@ -28,11 +28,8 @@ from ccm.Constants import * >+ from ccm.Utils import * >+ >+ import locale >+-import gettext >+ locale.setlocale(locale.LC_ALL, "") >+-gettext.bindtextdomain("ccsm", DataDir + "/locale") >+-gettext.textdomain("ccsm") >+-_ = gettext.gettext >++def _(message): return message >+ >+ class Conflict: >+ def __init__(self, autoResolve): > >Property changes on: files/nls-off-patches/patch-ccm_Conflicts.py >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/nls-off-patches/patch-ccm_Constants.py.in >=================================================================== >--- files/nls-off-patches/patch-ccm_Constants.py.in (nonexistent) >+++ files/nls-off-patches/patch-ccm_Constants.py.in (copie de travail) >@@ -0,0 +1,15 @@ >+--- ccm/Constants.py.in.orig 2019-02-12 23:47:49 UTC >++++ ccm/Constants.py.in >+@@ -84,11 +84,8 @@ Version = "@version@" >+ # Translation >+ # >+ import locale >+-import gettext >+ locale.setlocale(locale.LC_ALL, "") >+-gettext.bindtextdomain("ccsm", DataDir + "/locale") >+-gettext.textdomain("ccsm") >+-_ = gettext.gettext >++def _(message): return message >+ >+ # Category Transaltion Table >+ # Just to get them into gettext > >Property changes on: files/nls-off-patches/patch-ccm_Constants.py.in >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/nls-off-patches/patch-ccm_Pages.py >=================================================================== >--- files/nls-off-patches/patch-ccm_Pages.py (nonexistent) >+++ files/nls-off-patches/patch-ccm_Pages.py (copie de travail) >@@ -0,0 +1,15 @@ >+--- ccm/Pages.py.orig 2019-02-12 22:45:54 UTC >++++ ccm/Pages.py >+@@ -36,11 +36,8 @@ from ccm.Utils import * >+ from ccm.Widgets import * >+ >+ import locale >+-import gettext >+ locale.setlocale(locale.LC_ALL, "") >+-gettext.bindtextdomain("ccsm", DataDir + "/locale") >+-gettext.textdomain("ccsm") >+-_ = gettext.gettext >++def _(message): return message >+ >+ CurrentUpdater = None >+ > >Property changes on: files/nls-off-patches/patch-ccm_Pages.py >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/nls-off-patches/patch-ccm_Settings.py >=================================================================== >--- files/nls-off-patches/patch-ccm_Settings.py (nonexistent) >+++ files/nls-off-patches/patch-ccm_Settings.py (copie de travail) >@@ -0,0 +1,15 @@ >+--- ccm/Settings.py.orig 2019-02-12 22:46:18 UTC >++++ ccm/Settings.py >+@@ -33,11 +33,8 @@ from ccm.Utils import * >+ from ccm.Pages import * >+ >+ import locale >+-import gettext >+ locale.setlocale(locale.LC_ALL, "") >+-gettext.bindtextdomain("ccsm", DataDir + "/locale") >+-gettext.textdomain("ccsm") >+-_ = gettext.gettext >++def _(message): return message >+ >+ NAItemText = _("N/A") >+ > >Property changes on: files/nls-off-patches/patch-ccm_Settings.py >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/nls-off-patches/patch-ccm_Utils.py >=================================================================== >--- files/nls-off-patches/patch-ccm_Utils.py (nonexistent) >+++ files/nls-off-patches/patch-ccm_Utils.py (copie de travail) >@@ -0,0 +1,15 @@ >+--- ccm/Utils.py.orig 2019-02-12 22:46:43 UTC >++++ ccm/Utils.py >+@@ -36,11 +36,8 @@ import operator >+ import itertools >+ >+ import locale >+-import gettext >+ locale.setlocale(locale.LC_ALL, "") >+-gettext.bindtextdomain("ccsm", DataDir + "/locale") >+-gettext.textdomain("ccsm") >+-_ = gettext.gettext >++def _(message): return message >+ >+ IconTheme = gtk.icon_theme_get_default() >+ if not IconDir in IconTheme.get_search_path(): > >Property changes on: files/nls-off-patches/patch-ccm_Utils.py >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/nls-off-patches/patch-ccm_Widgets.py >=================================================================== >--- files/nls-off-patches/patch-ccm_Widgets.py (nonexistent) >+++ files/nls-off-patches/patch-ccm_Widgets.py (copie de travail) >@@ -0,0 +1,15 @@ >+--- ccm/Widgets.py.orig 2019-02-12 22:47:52 UTC >++++ ccm/Widgets.py >+@@ -37,11 +37,8 @@ from ccm.Constants import * >+ from ccm.Conflicts import * >+ >+ import locale >+-import gettext >+ locale.setlocale(locale.LC_ALL, "") >+-gettext.bindtextdomain("ccsm", DataDir + "/locale") >+-gettext.textdomain("ccsm") >+-_ = gettext.gettext >++def _(message): return message >+ >+ # >+ # Try to use gtk like coding style for consistency > >Property changes on: files/nls-off-patches/patch-ccm_Widgets.py >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/nls-off-patches/patch-ccm_Window.py >=================================================================== >--- files/nls-off-patches/patch-ccm_Window.py (nonexistent) >+++ files/nls-off-patches/patch-ccm_Window.py (copie de travail) >@@ -0,0 +1,15 @@ >+--- ccm/Window.py.orig 2019-02-12 22:48:32 UTC >++++ ccm/Window.py >+@@ -31,11 +31,8 @@ from ccm.Constants import * >+ from ccm.Conflicts import * >+ >+ import locale >+-import gettext >+ locale.setlocale(locale.LC_ALL, "") >+-gettext.bindtextdomain("ccsm", DataDir + "/locale") >+-gettext.textdomain("ccsm") >+-_ = gettext.gettext >++def _(message): return message >+ >+ class MainWin(gtk.Window): >+ > >Property changes on: files/nls-off-patches/patch-ccm_Window.py >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/nls-off-patches/patch-setup.py >=================================================================== >--- files/nls-off-patches/patch-setup.py (nonexistent) >+++ files/nls-off-patches/patch-setup.py (copie de travail) >@@ -0,0 +1,38 @@ >+--- setup.py.orig 2009-10-14 01:05:30 UTC >++++ setup.py >+@@ -111,9 +111,9 @@ f = open (os.path.join ("ccm/Constants.py"), "wt") >+ f.write (data) >+ f.close () >+ >+-cmd = "intltool-merge -d -u po/ ccsm.desktop.in ccsm.desktop".split(" ") >+-proc = subprocess.Popen(cmd) >+-proc.wait() >++with open('ccsm.desktop', 'w') as output_file: >++ cmd = "sed s/_Name/Name/g;s/_Comment/Comment/g ccsm.desktop.in".split(" ") >++ proc = subprocess.check_call(cmd, stdout=output_file) >+ >+ custom_images = [] >+ >+@@ -149,22 +149,6 @@ for dir, subdirs, files in os.walk("images/"): >+ data_files.append((global_icon_path + dir[7:], global_images)) >+ >+ data_files.append(("share/ccsm/images", custom_images)) >+- >+-podir = os.path.join (os.path.realpath ("."), "po") >+-if os.path.isdir (podir): >+- buildcmd = "msgfmt -o build/locale/%s/ccsm.mo po/%s.po" >+- mopath = "build/locale/%s/ccsm.mo" >+- destpath = "share/locale/%s/LC_MESSAGES" >+- for name in os.listdir (podir): >+- if name[-2:] == "po": >+- name = name[:-3] >+- if sys.argv[1] == "build" \ >+- or (sys.argv[1] == "install" and \ >+- not os.path.exists (mopath % name)): >+- if not os.path.isdir ("build/locale/" + name): >+- os.makedirs ("build/locale/" + name) >+- os.system (buildcmd % (name, name)) >+- data_files.append ((destpath % name, [mopath % name])) >+ >+ setup ( >+ name = "ccsm", > >Property changes on: files/nls-off-patches/patch-setup.py >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: pkg-plist >=================================================================== >--- pkg-plist (révision 492788) >+++ pkg-plist (copie de travail) >@@ -139,46 +139,46 @@ > share/icons/hicolor/32x32/apps/ccsm.svg > share/icons/hicolor/48x48/apps/ccsm.png > share/icons/hicolor/scalable/apps/ccsm.svg >-share/locale/ar/LC_MESSAGES/ccsm.mo >-share/locale/as/LC_MESSAGES/ccsm.mo >-share/locale/be/LC_MESSAGES/ccsm.mo >-share/locale/bg/LC_MESSAGES/ccsm.mo >-share/locale/bn/LC_MESSAGES/ccsm.mo >-share/locale/bn_IN/LC_MESSAGES/ccsm.mo >-share/locale/ca/LC_MESSAGES/ccsm.mo >-share/locale/cs/LC_MESSAGES/ccsm.mo >-share/locale/da/LC_MESSAGES/ccsm.mo >-share/locale/de/LC_MESSAGES/ccsm.mo >-share/locale/el/LC_MESSAGES/ccsm.mo >-share/locale/en_GB/LC_MESSAGES/ccsm.mo >-share/locale/es/LC_MESSAGES/ccsm.mo >-share/locale/eu/LC_MESSAGES/ccsm.mo >-share/locale/fa/LC_MESSAGES/ccsm.mo >-share/locale/fi/LC_MESSAGES/ccsm.mo >-share/locale/fr/LC_MESSAGES/ccsm.mo >-share/locale/gl/LC_MESSAGES/ccsm.mo >-share/locale/gu/LC_MESSAGES/ccsm.mo >-share/locale/he/LC_MESSAGES/ccsm.mo >-share/locale/hi/LC_MESSAGES/ccsm.mo >-share/locale/hr/LC_MESSAGES/ccsm.mo >-share/locale/hu/LC_MESSAGES/ccsm.mo >-share/locale/id/LC_MESSAGES/ccsm.mo >-share/locale/it/LC_MESSAGES/ccsm.mo >-share/locale/ja/LC_MESSAGES/ccsm.mo >-share/locale/ko/LC_MESSAGES/ccsm.mo >-share/locale/md/LC_MESSAGES/ccsm.mo >-share/locale/ml_IN/LC_MESSAGES/ccsm.mo >-share/locale/nb/LC_MESSAGES/ccsm.mo >-share/locale/nl/LC_MESSAGES/ccsm.mo >-share/locale/or/LC_MESSAGES/ccsm.mo >-share/locale/pa/LC_MESSAGES/ccsm.mo >-share/locale/pl/LC_MESSAGES/ccsm.mo >-share/locale/pt/LC_MESSAGES/ccsm.mo >-share/locale/pt_BR/LC_MESSAGES/ccsm.mo >-share/locale/ru/LC_MESSAGES/ccsm.mo >-share/locale/sk/LC_MESSAGES/ccsm.mo >-share/locale/sv/LC_MESSAGES/ccsm.mo >-share/locale/tr/LC_MESSAGES/ccsm.mo >-share/locale/wo/LC_MESSAGES/ccsm.mo >-share/locale/zh_CN/LC_MESSAGES/ccsm.mo >-share/locale/zh_HK/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/ar/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/as/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/be/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/bg/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/bn/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/bn_IN/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/ca/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/cs/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/da/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/de/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/el/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/en_GB/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/es/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/eu/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/fa/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/fi/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/fr/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/gl/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/gu/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/he/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/hi/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/hr/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/hu/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/id/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/it/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/ja/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/ko/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/md/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/ml_IN/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/nb/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/nl/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/or/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/pa/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/pl/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/pt/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/ru/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/sk/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/sv/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/tr/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/wo/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ccsm.mo >+%%NLS%%share/locale/zh_HK/LC_MESSAGES/ccsm.mo
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 230916
:
196569
|
201971
|
201972
|
201973
|
202311