[mcomix/f15] Added patches.....
Mamoru Tasaka
mtasaka at fedoraproject.org
Thu Oct 27 23:02:05 UTC 2011
commit 6e6424c4fda152fffbe9a50861f8b01de3d59baf
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Fri Oct 28 08:02:01 2011 +0900
Added patches.....
mcomix-0.92-fedora-rpmbuild-gtk.patch | 13 +++++++++++++
mcomix-0.94-gettext-system-install.patch | 17 +++++++++++++++++
2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/mcomix-0.92-fedora-rpmbuild-gtk.patch b/mcomix-0.92-fedora-rpmbuild-gtk.patch
new file mode 100644
index 0000000..ad68dae
--- /dev/null
+++ b/mcomix-0.92-fedora-rpmbuild-gtk.patch
@@ -0,0 +1,13 @@
+--- mcomix-0.92/mcomix/constants.py.disp 2011-05-20 04:22:23.000000000 +0900
++++ mcomix-0.92/mcomix/constants.py 2011-08-21 23:26:06.000000000 +0900
+@@ -80,6 +80,10 @@
+ # Missing GTK is already handled in mcomixstarter.py,
+ # but this file is imported first, so ignore exceptions here.
+ pass
++except RuntimeError:
++ # On Fedora's rpmbuild. DISPLAY is always unset and Fedora's
++ # gtk fails to import without DISPLAY, ignore for now
++ pass
+
+
+ # vim: expandtab:sw=4:ts=4
diff --git a/mcomix-0.94-gettext-system-install.patch b/mcomix-0.94-gettext-system-install.patch
new file mode 100644
index 0000000..e12721a
--- /dev/null
+++ b/mcomix-0.94-gettext-system-install.patch
@@ -0,0 +1,17 @@
+--- mcomix-0.94/mcomix/i18n.py.debug 2011-09-22 19:53:56.000000000 +0900
++++ mcomix-0.94/mcomix/i18n.py 2011-10-10 04:00:39.000000000 +0900
+@@ -84,6 +84,14 @@
+ translation = gettext.GNUTranslations(
+ pkg_resources.resource_stream('mcomix.messages', resource))
+ break
++ else:
++ exec_path = os.path.abspath(sys.argv[0])
++ base_dir = os.path.dirname(os.path.dirname(exec_path))
++ locale_dir = os.path.join (base_dir, 'share', 'locale')
++ if gettext.find(domain=domain, localedir=locale_dir, languages=[lang]):
++ translation = gettext.translation(domain=domain, localedir=locale_dir,
++ languages=[lang], fallback=False)
++ break
+
+ translation.install(unicode=True)
+
More information about the scm-commits
mailing list