Date: Sat, 25 Sep 2010 22:15:05 GMT From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/150948: [PATCH] deskutils/hamster-applet: fix runtime Message-ID: <201009252215.o8PMF5Oa076577@www.freebsd.org> Resent-Message-ID: <201009252220.o8PMK4YT095261@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150948 >Category: ports >Synopsis: [PATCH] deskutils/hamster-applet: fix runtime >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Sep 25 22:20:04 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Ruslan Mahmatkhanov >Release: 8.1-STABLE >Organization: >Environment: 8.1-STABLE i386 >Description: This patch fixes two issues: - fix i18n instead completely disable it - fix runtime of gnome-time-tracker and hamster-standalone >How-To-Repeat: Solution for second issue was found here: https://bugs.launchpad.net/ubuntu/+source/hamster-applet/+bug/600857 Now, when you try to run gnome-time-tracker or hamster-standalone you become to this: [mrk@smeshariki2 ~]> gnome-time-tracker Traceback (most recent call last): File "/usr/local/bin/gnome-time-tracker", line 39, in <module> from hamster import widgets File "/usr/local/lib/python2.6/site-packages/hamster/widgets/__init__.py", line 24, in <module> from activityentry import ActivityEntry File "/usr/local/lib/python2.6/site-packages/hamster/widgets/activityentry.py", line 23, in <module> from .hamster.configuration import runtime ImportError: No module named hamster.configuration >Fix: # cd /usr/ports/deskutils/ # patch -p0 < /path/to/hamster-applet.diff.txt Patch attached with submission follows: diff -ruNa hamster-applet/Makefile hamster-applet/Makefile --- hamster-applet/Makefile 2010-07-25 23:34:58.000000000 +0400 +++ hamster-applet/Makefile 2010-09-26 02:00:30.000000000 +0400 @@ -8,7 +8,7 @@ PORTNAME= hamster-applet PORTVERSION= 2.30.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff -ruNa hamster-applet/files/patch-src-hamster-widgets_activityentry.py hamster-applet/files/patch-src-hamster-widgets_activityentry.py --- hamster-applet/files/patch-src-hamster-widgets_activityentry.py 1970-01-01 03:00:00.000000000 +0300 +++ hamster-applet/files/patch-src-hamster-widgets_activityentry.py 2010-09-26 01:36:37.000000000 +0400 @@ -0,0 +1,16 @@ +--- src/hamster/widgets/activityentry.py 2010-06-22 13:59:09.000000000 +0400 ++++ src/hamster/widgets/activityentry.py 2010-09-26 01:29:25.000000000 +0400 +@@ -20,10 +20,10 @@ + import gtk, gobject + import datetime as dt + +-from .hamster.configuration import runtime ++from hamster.configuration import runtime + +-from .hamster import stuff +-from .hamster.stuff import format_duration ++from hamster import stuff ++from hamster.stuff import format_duration + + class ActivityEntry(gtk.Entry): + __gsignals__ = { diff -ruNa hamster-applet/files/patch-src-hamster-widgets_dateinput.py hamster-applet/files/patch-src-hamster-widgets_dateinput.py --- hamster-applet/files/patch-src-hamster-widgets_dateinput.py 1970-01-01 03:00:00.000000000 +0300 +++ hamster-applet/files/patch-src-hamster-widgets_dateinput.py 2010-09-26 01:38:59.000000000 +0400 @@ -0,0 +1,11 @@ +--- src/hamster/widgets/dateinput.py 2010-06-04 20:53:24.000000000 +0400 ++++ src/hamster/widgets/dateinput.py 2010-09-26 01:30:30.000000000 +0400 +@@ -17,7 +17,7 @@ + # You should have received a copy of the GNU General Public License + # along with Project Hamster. If not, see <http://www.gnu.org/licenses/>. + +-from .hamster.stuff import format_duration ++from hamster.stuff import format_duration + import gtk + import datetime as dt + import calendar diff -ruNa hamster-applet/files/patch-src-hamster-widgets_dayline.py hamster-applet/files/patch-src-hamster-widgets_dayline.py --- hamster-applet/files/patch-src-hamster-widgets_dayline.py 1970-01-01 03:00:00.000000000 +0300 +++ hamster-applet/files/patch-src-hamster-widgets_dayline.py 2010-09-26 01:39:10.000000000 +0400 @@ -0,0 +1,13 @@ +--- src/hamster/widgets/dayline.py 2010-06-22 13:59:09.000000000 +0400 ++++ src/hamster/widgets/dayline.py 2010-09-26 01:31:11.000000000 +0400 +@@ -20,8 +20,8 @@ + import gtk + import gobject + +-from .hamster import stuff +-from .hamster import graphics ++from hamster import stuff ++from hamster import graphics + + import time + import datetime as dt diff -ruNa hamster-applet/files/patch-src-hamster-widgets_facttree.py hamster-applet/files/patch-src-hamster-widgets_facttree.py --- hamster-applet/files/patch-src-hamster-widgets_facttree.py 1970-01-01 03:00:00.000000000 +0300 +++ hamster-applet/files/patch-src-hamster-widgets_facttree.py 2010-09-26 01:39:22.000000000 +0400 @@ -0,0 +1,13 @@ +--- src/hamster/widgets/facttree.py 2010-06-22 13:59:09.000000000 +0400 ++++ src/hamster/widgets/facttree.py 2010-09-26 01:31:57.000000000 +0400 +@@ -20,8 +20,8 @@ + import gtk, gobject + import datetime as dt + +-from .hamster import stuff +-from .hamster.stuff import format_duration, format_activity ++from hamster import stuff ++from hamster.stuff import format_duration, format_activity + from tags import Tag + + import pango diff -ruNa hamster-applet/files/patch-src-hamster-widgets_tags.py hamster-applet/files/patch-src-hamster-widgets_tags.py --- hamster-applet/files/patch-src-hamster-widgets_tags.py 1970-01-01 03:00:00.000000000 +0300 +++ hamster-applet/files/patch-src-hamster-widgets_tags.py 2010-09-26 01:39:33.000000000 +0400 @@ -0,0 +1,14 @@ +--- src/hamster/widgets/tags.py 2010-06-22 13:59:09.000000000 +0400 ++++ src/hamster/widgets/tags.py 2010-09-26 01:32:32.000000000 +0400 +@@ -21,9 +21,9 @@ + import pango, cairo + from math import pi + +-from .hamster import graphics ++from hamster import graphics + +-from .hamster.configuration import runtime ++from hamster.configuration import runtime + + class TagsEntry(gtk.Entry): + __gsignals__ = { diff -ruNa hamster-applet/files/patch-src-hamster-widgets_timechart.py hamster-applet/files/patch-src-hamster-widgets_timechart.py --- hamster-applet/files/patch-src-hamster-widgets_timechart.py 1970-01-01 03:00:00.000000000 +0300 +++ hamster-applet/files/patch-src-hamster-widgets_timechart.py 2010-09-26 01:39:44.000000000 +0400 @@ -0,0 +1,11 @@ +--- src/hamster/widgets/timechart.py 2010-06-22 13:59:09.000000000 +0400 ++++ src/hamster/widgets/timechart.py 2010-09-26 01:33:04.000000000 +0400 +@@ -20,7 +20,7 @@ + import os # for locale + import gtk, pango + +-from .hamster import graphics ++from hamster import graphics + + import time, datetime as dt + import calendar diff -ruNa hamster-applet/files/patch-src-hamster-widgets_timeinput.py hamster-applet/files/patch-src-hamster-widgets_timeinput.py --- hamster-applet/files/patch-src-hamster-widgets_timeinput.py 1970-01-01 03:00:00.000000000 +0300 +++ hamster-applet/files/patch-src-hamster-widgets_timeinput.py 2010-09-26 01:39:54.000000000 +0400 @@ -0,0 +1,11 @@ +--- src/hamster/widgets/timeinput.py 2010-06-04 20:53:24.000000000 +0400 ++++ src/hamster/widgets/timeinput.py 2010-09-26 01:33:38.000000000 +0400 +@@ -17,7 +17,7 @@ + # You should have received a copy of the GNU General Public License + # along with Project Hamster. If not, see <http://www.gnu.org/licenses/>. + +-from .hamster.stuff import format_duration ++from hamster.stuff import format_duration + import gtk + from gtk import keysyms + import datetime as dt diff -ruNa hamster-applet/files/patch-src_gnome-time-tracker hamster-applet/files/patch-src_gnome-time-tracker --- hamster-applet/files/patch-src_gnome-time-tracker 2010-06-25 01:15:38.000000000 +0400 +++ hamster-applet/files/patch-src_gnome-time-tracker 2010-09-26 01:55:47.000000000 +0400 @@ -1,22 +1,11 @@ ---- src/gnome-time-tracker.orig 2010-06-24 16:14:42.000000000 -0500 -+++ src/gnome-time-tracker 2010-06-24 16:15:22.000000000 -0500 -@@ -524,13 +524,13 @@ - from hamster import defs +--- src/gnome-time-tracker 2010-06-22 13:59:09.000000000 +0400 ++++ src/gnome-time-tracker 2010-09-26 01:52:16.000000000 +0400 +@@ -525,7 +525,7 @@ # Setup i18n -- locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) + locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) - for module in (gettext, locale): -- module.bindtextdomain('hamster-applet', locale_dir) -- module.textdomain('hamster-applet') -+# locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) -+# for module in (gettext, locale): -+# module.bindtextdomain('hamster-applet', locale_dir) -+# module.textdomain('hamster-applet') ++ for module in (gettext,): + module.bindtextdomain('hamster-applet', locale_dir) + module.textdomain('hamster-applet') -- if hasattr(module, 'bind_textdomain_codeset'): -- module.bind_textdomain_codeset('hamster-applet','UTF-8') -+# if hasattr(module, 'bind_textdomain_codeset'): -+# module.bind_textdomain_codeset('hamster-applet','UTF-8') - - gtk.gdk.threads_init() - app = ProjectHamster() diff -ruNa hamster-applet/files/patch-src_hamster-applet.py hamster-applet/files/patch-src_hamster-applet.py --- hamster-applet/files/patch-src_hamster-applet.py 2010-05-11 01:18:00.000000000 +0400 +++ hamster-applet/files/patch-src_hamster-applet.py 2010-09-26 01:56:00.000000000 +0400 @@ -1,22 +1,11 @@ ---- src/hamster-applet.py.orig 2010-01-29 17:37:34.000000000 +0800 -+++ src/hamster-applet.py 2010-01-29 17:38:21.000000000 +0800 -@@ -95,13 +95,13 @@ if __name__ == "__main__": - from hamster.configuration import runtime, dialogs +--- src/hamster-applet.py 2010-06-22 13:59:09.000000000 +0400 ++++ src/hamster-applet.py 2010-09-26 01:52:33.000000000 +0400 +@@ -96,7 +96,7 @@ # Setup i18n -- locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) + locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) - for module in (gettext, locale): -- module.bindtextdomain('hamster-applet', locale_dir) -- module.textdomain('hamster-applet') -+# locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) -+# for module in (gettext, locale): -+# module.bindtextdomain('hamster-applet', locale_dir) -+# module.textdomain('hamster-applet') - -- if hasattr(module, 'bind_textdomain_codeset'): -- module.bind_textdomain_codeset('hamster-applet','UTF-8') -+# if hasattr(module, 'bind_textdomain_codeset'): -+# module.bind_textdomain_codeset('hamster-applet','UTF-8') - - gtk.window_set_default_icon_name("hamster-applet") ++ for module in (gettext,): + module.bindtextdomain('hamster-applet', locale_dir) + module.textdomain('hamster-applet') diff -ruNa hamster-applet/files/patch-src_hamster-standalone hamster-applet/files/patch-src_hamster-standalone --- hamster-applet/files/patch-src_hamster-standalone 2010-06-25 01:15:38.000000000 +0400 +++ hamster-applet/files/patch-src_hamster-standalone 2010-09-26 01:56:12.000000000 +0400 @@ -1,22 +1,11 @@ ---- src/hamster-standalone.orig 2010-06-24 16:14:54.000000000 -0500 -+++ src/hamster-standalone 2010-06-24 16:15:43.000000000 -0500 -@@ -524,13 +524,13 @@ - from hamster import defs +--- src/hamster-standalone 2010-06-22 13:59:09.000000000 +0400 ++++ src/hamster-standalone 2010-09-26 01:52:50.000000000 +0400 +@@ -525,7 +525,7 @@ # Setup i18n -- locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) + locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) - for module in (gettext, locale): -- module.bindtextdomain('hamster-applet', locale_dir) -- module.textdomain('hamster-applet') -+# locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale")) -+# for module in (gettext, locale): -+# module.bindtextdomain('hamster-applet', locale_dir) -+# module.textdomain('hamster-applet') ++ for module in (gettext,): + module.bindtextdomain('hamster-applet', locale_dir) + module.textdomain('hamster-applet') -- if hasattr(module, 'bind_textdomain_codeset'): -- module.bind_textdomain_codeset('hamster-applet','UTF-8') -+# if hasattr(module, 'bind_textdomain_codeset'): -+# module.bind_textdomain_codeset('hamster-applet','UTF-8') - - gtk.gdk.threads_init() - app = ProjectHamster() >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009252215.o8PMF5Oa076577>