Skip to content

Instantly share code, notes, and snippets.

@tota
Created September 9, 2009 05:14
Show Gist options
  • Save tota/183485 to your computer and use it in GitHub Desktop.
Save tota/183485 to your computer and use it in GitHub Desktop.
diff -urN japanese/trac.orig/Makefile japanese/trac/Makefile
--- japanese/trac.orig/Makefile 2009-04-25 10:13:16.000000000 +0900
+++ japanese/trac/Makefile 2009-09-09 13:52:25.000000000 +0900
@@ -6,7 +6,7 @@
#
PORTNAME= trac
-PORTVERSION= 0.11.4
+PORTVERSION= 0.11.5
CATEGORIES= japanese www devel python
MASTER_SITES= http://dist.bsdlab.org/ \
http://www.i-act.co.jp/project/products/downloads/
diff -urN japanese/trac.orig/distinfo japanese/trac/distinfo
--- japanese/trac.orig/distinfo 2009-04-25 10:13:16.000000000 +0900
+++ japanese/trac/distinfo 2009-09-09 13:54:21.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (Trac-0.11.4.ja1.zip) = 5eebfc43bce00c02931dde0969602f57
-SHA256 (Trac-0.11.4.ja1.zip) = a08976c2d02121e3cfceda5f6a7d4224cb1c1f1b8ec7d28855baff5321b8566e
-SIZE (Trac-0.11.4.ja1.zip) = 1007784
+MD5 (Trac-0.11.5.ja1.zip) = 9e7f40b8049864829616c09650f4a10b
+SHA256 (Trac-0.11.5.ja1.zip) = c8363ef1123f699fbd1ef45dac6044128a1f3a2c39a01607bae2692f6e14d458
+SIZE (Trac-0.11.5.ja1.zip) = 1008558
diff -urN japanese/trac.orig/files/patch-notification.py japanese/trac/files/patch-notification.py
--- japanese/trac.orig/files/patch-notification.py 2008-08-24 21:24:47.000000000 +0900
+++ japanese/trac/files/patch-notification.py 2009-09-09 14:02:45.000000000 +0900
@@ -1,6 +1,6 @@
---- trac/notification.py.orig 2008-08-17 14:28:38.000000000 +0900
-+++ trac/notification.py 2008-08-24 18:30:45.000000000 +0900
-@@ -248,6 +248,7 @@
+--- trac/notification.py.orig 2009-07-03 02:01:44.000000000 +0900
++++ trac/notification.py 2009-09-09 13:58:08.000000000 +0900
+@@ -243,6 +243,7 @@
def format_header(self, key, name, email=None):
from email.Header import Header
maxlength = MAXHEADERLEN-(len(key)+2)
@@ -8,7 +8,7 @@
# Do not sent ridiculous short headers
if maxlength < 10:
raise TracError(_("Header length is too short"))
-@@ -255,6 +256,13 @@
+@@ -250,6 +251,13 @@
tmp = name.encode('ascii')
header = Header(tmp, 'ascii', maxlinelen=maxlength)
except UnicodeEncodeError:
@@ -22,22 +22,12 @@
header = Header(name, self._charset, maxlinelen=maxlength)
if not email:
return header
-@@ -386,12 +394,17 @@
+@@ -382,7 +390,7 @@
headers['To'] = ', '.join(toaddrs)
if pcc:
headers['Cc'] = ', '.join(pcc)
- headers['Date'] = formatdate()
+ headers['Date'] = formatdate(time.time(), self.config.getbool('notification', 'local_timezone'))
- # sanity check
- if not self._charset.body_encoding:
- try:
- dummy = body.encode('ascii')
- except UnicodeDecodeError:
-+ try:
-+ dummy = unicode(body, 'utf8')
-+ body = dummy.encode('iso-2022-jp')
-+ self._charset.output_charset = 'iso-2022-jp'
-+ except UnicodeDecodeError:
- raise TracError(_("Ticket contains non-ASCII chars. " \
- "Please change encoding setting"))
msg = MIMEText(body, 'plain')
+ # Message class computes the wrong type from MIMEText constructor,
+ # which does not take a Charset object as initializer. Reset the
diff -urN japanese/trac.orig/pkg-plist japanese/trac/pkg-plist
--- japanese/trac.orig/pkg-plist 2008-12-31 14:14:49.000000000 +0900
+++ japanese/trac/pkg-plist 2009-09-09 14:11:50.000000000 +0900
@@ -83,6 +83,7 @@
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/changeset.png
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/closedticket.png
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/collapsed.png
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/download.png
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/css/about.css
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/css/admin.css
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/css/browser.css
@@ -238,6 +239,9 @@
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/compat.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/compat.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/compat.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/svntestenv.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/svntestenv.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/svntestenv.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/testcases.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/testcases.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/testcases.pyo
@@ -409,6 +413,9 @@
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/svn_fs.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/svn_fs.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/svn_fs.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/svn_prop.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/svn_prop.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/svn_prop.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/templates/browser.html
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/templates/changeset.html
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/templates/diff_form.html
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment