diff --git a/x11/gnome/hamster-applet/Makefile b/x11/gnome/hamster-applet/Makefile index 28a08ba1437..f41e7def0d9 100644 --- a/x11/gnome/hamster-applet/Makefile +++ b/x11/gnome/hamster-applet/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.18 2009/12/21 18:03:18 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.19 2010/04/24 11:08:21 ajacoutot Exp $ COMMENT= time tracker applet for GNOME GNOME_PROJECT= hamster-applet -GNOME_VERSION= 2.28.2 -PKGNAME= ${DISTNAME}p0 +GNOME_VERSION= 2.30.0.1 CATEGORIES= productivity @@ -21,7 +20,8 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat ffi WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 WANTLIB += glib-2.0 glitz gmodule-2.0 gobject-2.0 gtk-x11-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 -WANTLIB += png pthread-stubs xcb z +WANTLIB += png pthread-stubs xcb z gthread-2.0 xcb-render +WANTLIB += xcb-render-util MODULES= devel/gettext \ lang/python \ @@ -40,7 +40,10 @@ RUN_DEPENDS= ::x11/gnome/controlcenter2 \ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" + pre-configure: - ${SUBST_CMD} ${WRKSRC}/hamster/hamster-applet.py + ${SUBST_CMD} ${WRKSRC}/src/hamster-applet.py \ + ${WRKSRC}/src/gnome-time-tracker \ + ${WRKSRC}/src/hamster-standalone .include diff --git a/x11/gnome/hamster-applet/distinfo b/x11/gnome/hamster-applet/distinfo index b3074e91e81..182fb948a12 100644 --- a/x11/gnome/hamster-applet/distinfo +++ b/x11/gnome/hamster-applet/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/hamster-applet-2.28.2.tar.bz2) = gmjy//cU/MSbY9pm1OibpQ== -RMD160 (gnome/hamster-applet-2.28.2.tar.bz2) = C+CFqEqXrLPjqrpM5KSGi/klVV4= -SHA1 (gnome/hamster-applet-2.28.2.tar.bz2) = pTMv56UNj9eJxWhgU/8ss6jqwns= -SHA256 (gnome/hamster-applet-2.28.2.tar.bz2) = vte5fuN+ZmkphnASHc8GoUVrm4JwmRWL7PZFAIcC5gg= -SIZE (gnome/hamster-applet-2.28.2.tar.bz2) = 518003 +MD5 (gnome/hamster-applet-2.30.0.1.tar.bz2) = HzJaxnY2SZufWD15ehnHNA== +RMD160 (gnome/hamster-applet-2.30.0.1.tar.bz2) = 0KEI8+3e+GjhHvDLXcL6DsUnmng= +SHA1 (gnome/hamster-applet-2.30.0.1.tar.bz2) = +0Fo3JW859ir1Kgss2K/T0CAuqI= +SHA256 (gnome/hamster-applet-2.30.0.1.tar.bz2) = dEjBK/OdaQLdxevRDtslo2kJ1GhiQvjbo0sbDUzCfbs= +SIZE (gnome/hamster-applet-2.30.0.1.tar.bz2) = 599409 diff --git a/x11/gnome/hamster-applet/patches/patch-configure b/x11/gnome/hamster-applet/patches/patch-configure new file mode 100644 index 00000000000..153457274c5 --- /dev/null +++ b/x11/gnome/hamster-applet/patches/patch-configure @@ -0,0 +1,24 @@ +$OpenBSD: patch-configure,v 1.1 2010/04/24 11:08:21 ajacoutot Exp $ + +The test cannot open the display and crashes. + +--- configure.orig Fri Apr 23 12:13:03 2010 ++++ configure Fri Apr 23 12:14:54 2010 +@@ -13330,7 +13330,7 @@ $as_echo "yes" >&6; } + fi + + +- ++if false; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnomeapplet module" >&5 + $as_echo_n "checking for gnomeapplet module... " >&6; } + if { { $as_echo "$as_me:${as_lineno-$LINENO}: DISPLAY= \$PYTHON -c ' +@@ -13369,7 +13369,7 @@ else + $as_echo "no" >&6; } + as_fn_error "gnomeapplet Python module required to build hamster" "$LINENO" 5 + fi +- ++fi + # Extract the first word of "pygtk-codegen-2.0", so it can be a program name with args. + set dummy pygtk-codegen-2.0; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/x11/gnome/hamster-applet/patches/patch-hamster_db_py b/x11/gnome/hamster-applet/patches/patch-hamster_db_py deleted file mode 100644 index 11c66609f24..00000000000 --- a/x11/gnome/hamster-applet/patches/patch-hamster_db_py +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-hamster_db_py,v 1.1 2009/10/13 23:36:16 jasper Exp $ ---- hamster/db.py.orig Wed Oct 14 01:01:58 2009 -+++ hamster/db.py Wed Oct 14 01:03:20 2009 -@@ -76,6 +76,13 @@ class Storage(storage.Storage): - print 'Error:could not change mode on %s!' % (db_file) - self.__setup.im_func.complete = True - self.run_fixtures() -+ -+ # In case we created the file read-only, change the mode. -+ if exists(HAMSTER_DB): -+ try: -+ os.chmod(HAMSTER_DB, 0664) -+ except Exception , msg: -+ print 'Error:could not change mode on %s!' % (HAMSTER_DB) - __setup.complete = False - - def __get_category_list(self): diff --git a/x11/gnome/hamster-applet/patches/patch-hamster_hamster-applet_py b/x11/gnome/hamster-applet/patches/patch-hamster_hamster-applet_py deleted file mode 100644 index c5a493741ec..00000000000 --- a/x11/gnome/hamster-applet/patches/patch-hamster_hamster-applet_py +++ /dev/null @@ -1,23 +0,0 @@ -$OpenBSD: patch-hamster_hamster-applet_py,v 1.4 2009/12/15 09:39:49 ajacoutot Exp $ ---- hamster/hamster-applet.py.orig Mon Dec 14 23:04:06 2009 -+++ hamster/hamster-applet.py Tue Dec 15 10:25:49 2009 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!${MODPY_BIN} - # - coding: utf-8 - - - # Copyright (C) 2007, 2008 Toms Bauģis -@@ -38,13 +38,6 @@ from hamster.configuration import runtime - - # Setup i18n - 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') - - def applet_factory(applet, iid): - applet.connect("destroy", on_destroy) diff --git a/x11/gnome/hamster-applet/patches/patch-src_gnome-time-tracker b/x11/gnome/hamster-applet/patches/patch-src_gnome-time-tracker new file mode 100644 index 00000000000..8164b573a77 --- /dev/null +++ b/x11/gnome/hamster-applet/patches/patch-src_gnome-time-tracker @@ -0,0 +1,25 @@ +$OpenBSD: patch-src_gnome-time-tracker,v 1.1 2010/04/24 11:08:21 ajacoutot Exp $ +--- src/gnome-time-tracker.orig Wed Mar 31 14:07:03 2010 ++++ src/gnome-time-tracker Sat Apr 24 12:56:12 2010 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!${MODPY_BIN} + # - coding: utf-8 - + + # Copyright (C) 2009, 2010 Toms Bauģis +@@ -522,15 +522,6 @@ class ProjectHamster(object): + + if __name__ == "__main__": + from hamster import defs +- +- # Setup i18n +- 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') + + gtk.gdk.threads_init() + app = ProjectHamster() diff --git a/x11/gnome/hamster-applet/patches/patch-src_hamster-applet_py b/x11/gnome/hamster-applet/patches/patch-src_hamster-applet_py new file mode 100644 index 00000000000..6d3383bf6f8 --- /dev/null +++ b/x11/gnome/hamster-applet/patches/patch-src_hamster-applet_py @@ -0,0 +1,26 @@ +$OpenBSD: patch-src_hamster-applet_py,v 1.1 2010/04/24 11:08:21 ajacoutot Exp $ + +- Fix path to python +- The bindtextdomain function isn't present in our python. + +--- src/hamster-applet.py.orig Mon Mar 29 13:45:01 2010 ++++ src/hamster-applet.py Fri Apr 23 12:09:25 2010 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!${MODPY_BIN} + # - coding: utf-8 - + + # Copyright (C) 2007, 2008 Toms Bauģis +@@ -96,12 +96,6 @@ if __name__ == "__main__": + + # Setup i18n + 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') + + gtk.window_set_default_icon_name("hamster-applet") + diff --git a/x11/gnome/hamster-applet/patches/patch-src_hamster-standalone b/x11/gnome/hamster-applet/patches/patch-src_hamster-standalone new file mode 100644 index 00000000000..87b8c0ae92a --- /dev/null +++ b/x11/gnome/hamster-applet/patches/patch-src_hamster-standalone @@ -0,0 +1,28 @@ +$OpenBSD: patch-src_hamster-standalone,v 1.1 2010/04/24 11:08:21 ajacoutot Exp $ + +- The bindtextdomain function isn't present in our python. + +--- src/hamster-standalone.orig Wed Mar 31 14:07:03 2010 ++++ src/hamster-standalone Sat Apr 24 12:55:36 2010 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!${MODPY_BIN} + # - coding: utf-8 - + + # Copyright (C) 2009, 2010 Toms Bauģis +@@ -522,15 +522,6 @@ class ProjectHamster(object): + + if __name__ == "__main__": + from hamster import defs +- +- # Setup i18n +- 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') + + gtk.gdk.threads_init() + app = ProjectHamster() diff --git a/x11/gnome/hamster-applet/pkg/PLIST b/x11/gnome/hamster-applet/pkg/PLIST index 023b29031ec..b003626c341 100644 --- a/x11/gnome/hamster-applet/pkg/PLIST +++ b/x11/gnome/hamster-applet/pkg/PLIST @@ -1,11 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.4 2009/12/21 18:03:18 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.5 2010/04/24 11:08:21 ajacoutot Exp $ +bin/gnome-time-tracker +bin/hamster-standalone lib/bonobo/servers/Hamster_Applet.server lib/hamster-applet/ lib/hamster-applet/hamster-applet lib/python${MODPY_VERSION}/site-packages/hamster/ -lib/python${MODPY_VERSION}/site-packages/hamster/KeyBinder.py -lib/python${MODPY_VERSION}/site-packages/hamster/KeyBinder.pyc -lib/python${MODPY_VERSION}/site-packages/hamster/KeyBinder.pyo lib/python${MODPY_VERSION}/site-packages/hamster/__init__.py lib/python${MODPY_VERSION}/site-packages/hamster/__init__.pyc lib/python${MODPY_VERSION}/site-packages/hamster/__init__.pyo @@ -55,9 +54,21 @@ lib/python${MODPY_VERSION}/site-packages/hamster/keybinder/__init__.pyo lib/python${MODPY_VERSION}/site-packages/hamster/keybinder/_keybinder.a lib/python${MODPY_VERSION}/site-packages/hamster/keybinder/_keybinder.la lib/python${MODPY_VERSION}/site-packages/hamster/keybinder/_keybinder.so +lib/python${MODPY_VERSION}/site-packages/hamster/overview.py +lib/python${MODPY_VERSION}/site-packages/hamster/overview.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/overview.pyo +lib/python${MODPY_VERSION}/site-packages/hamster/overview_activities.py +lib/python${MODPY_VERSION}/site-packages/hamster/overview_activities.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/overview_activities.pyo +lib/python${MODPY_VERSION}/site-packages/hamster/overview_totals.py +lib/python${MODPY_VERSION}/site-packages/hamster/overview_totals.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/overview_totals.pyo lib/python${MODPY_VERSION}/site-packages/hamster/preferences.py lib/python${MODPY_VERSION}/site-packages/hamster/preferences.pyc lib/python${MODPY_VERSION}/site-packages/hamster/preferences.pyo +lib/python${MODPY_VERSION}/site-packages/hamster/pytweener.py +lib/python${MODPY_VERSION}/site-packages/hamster/pytweener.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/pytweener.pyo lib/python${MODPY_VERSION}/site-packages/hamster/reports.py lib/python${MODPY_VERSION}/site-packages/hamster/reports.pyc lib/python${MODPY_VERSION}/site-packages/hamster/reports.pyo @@ -70,10 +81,117 @@ lib/python${MODPY_VERSION}/site-packages/hamster/storage.pyo lib/python${MODPY_VERSION}/site-packages/hamster/stuff.py lib/python${MODPY_VERSION}/site-packages/hamster/stuff.pyc lib/python${MODPY_VERSION}/site-packages/hamster/stuff.pyo -lib/python${MODPY_VERSION}/site-packages/hamster/widgets.py -lib/python${MODPY_VERSION}/site-packages/hamster/widgets.pyc -lib/python${MODPY_VERSION}/site-packages/hamster/widgets.pyo +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/ +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/__init__.py +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/__init__.pyo +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/activityentry.py +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/activityentry.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/activityentry.pyo +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/dateinput.py +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/dateinput.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/dateinput.pyo +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/dayline.py +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/dayline.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/dayline.pyo +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/facttree.py +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/facttree.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/facttree.pyo +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/reportchooserdialog.py +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/reportchooserdialog.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/reportchooserdialog.pyo +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/tags.py +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/tags.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/tags.pyo +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/timechart.py +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/timechart.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/timechart.pyo +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/timeinput.py +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/timeinput.pyc +lib/python${MODPY_VERSION}/site-packages/hamster/widgets/timeinput.pyo +share/applications/hamster-standalone.desktop share/gnome-control-center/keybindings/99-hamster-applet.xml +share/gnome/help/hamster-applet/ +share/gnome/help/hamster-applet/C/ +share/gnome/help/hamster-applet/C/backup.page +share/gnome/help/hamster-applet/C/figures/ +share/gnome/help/hamster-applet/C/figures/hamster-logo.png +share/gnome/help/hamster-applet/C/index.page +share/gnome/help/hamster-applet/C/input.page +share/gnome/help/hamster-applet/C/legal.xml +share/gnome/help/hamster-applet/C/merge.page +share/gnome/help/hamster-applet/C/reports.page +share/gnome/help/hamster-applet/C/statistics.page +share/gnome/help/hamster-applet/cs/ +share/gnome/help/hamster-applet/cs/backup.page +share/gnome/help/hamster-applet/cs/figures/ +share/gnome/help/hamster-applet/cs/figures/hamster-logo.png +share/gnome/help/hamster-applet/cs/index.page +share/gnome/help/hamster-applet/cs/input.page +share/gnome/help/hamster-applet/cs/legal.xml +share/gnome/help/hamster-applet/cs/merge.page +share/gnome/help/hamster-applet/cs/reports.page +share/gnome/help/hamster-applet/cs/statistics.page +share/gnome/help/hamster-applet/de/ +share/gnome/help/hamster-applet/de/backup.page +share/gnome/help/hamster-applet/de/figures/ +share/gnome/help/hamster-applet/de/figures/hamster-logo.png +share/gnome/help/hamster-applet/de/index.page +share/gnome/help/hamster-applet/de/input.page +share/gnome/help/hamster-applet/de/legal.xml +share/gnome/help/hamster-applet/de/merge.page +share/gnome/help/hamster-applet/de/reports.page +share/gnome/help/hamster-applet/de/statistics.page +share/gnome/help/hamster-applet/el/ +share/gnome/help/hamster-applet/el/backup.page +share/gnome/help/hamster-applet/el/figures/ +share/gnome/help/hamster-applet/el/figures/hamster-logo.png +share/gnome/help/hamster-applet/el/index.page +share/gnome/help/hamster-applet/el/input.page +share/gnome/help/hamster-applet/el/legal.xml +share/gnome/help/hamster-applet/el/merge.page +share/gnome/help/hamster-applet/el/reports.page +share/gnome/help/hamster-applet/el/statistics.page +share/gnome/help/hamster-applet/es/ +share/gnome/help/hamster-applet/es/backup.page +share/gnome/help/hamster-applet/es/figures/ +share/gnome/help/hamster-applet/es/figures/hamster-logo.png +share/gnome/help/hamster-applet/es/index.page +share/gnome/help/hamster-applet/es/input.page +share/gnome/help/hamster-applet/es/legal.xml +share/gnome/help/hamster-applet/es/merge.page +share/gnome/help/hamster-applet/es/reports.page +share/gnome/help/hamster-applet/es/statistics.page +share/gnome/help/hamster-applet/fr/ +share/gnome/help/hamster-applet/fr/backup.page +share/gnome/help/hamster-applet/fr/figures/ +share/gnome/help/hamster-applet/fr/figures/hamster-logo.png +share/gnome/help/hamster-applet/fr/index.page +share/gnome/help/hamster-applet/fr/input.page +share/gnome/help/hamster-applet/fr/legal.xml +share/gnome/help/hamster-applet/fr/merge.page +share/gnome/help/hamster-applet/fr/reports.page +share/gnome/help/hamster-applet/fr/statistics.page +share/gnome/help/hamster-applet/zh_HK/ +share/gnome/help/hamster-applet/zh_HK/backup.page +share/gnome/help/hamster-applet/zh_HK/figures/ +share/gnome/help/hamster-applet/zh_HK/figures/hamster-logo.png +share/gnome/help/hamster-applet/zh_HK/index.page +share/gnome/help/hamster-applet/zh_HK/input.page +share/gnome/help/hamster-applet/zh_HK/legal.xml +share/gnome/help/hamster-applet/zh_HK/merge.page +share/gnome/help/hamster-applet/zh_HK/reports.page +share/gnome/help/hamster-applet/zh_HK/statistics.page +share/gnome/help/hamster-applet/zh_TW/ +share/gnome/help/hamster-applet/zh_TW/backup.page +share/gnome/help/hamster-applet/zh_TW/figures/ +share/gnome/help/hamster-applet/zh_TW/figures/hamster-logo.png +share/gnome/help/hamster-applet/zh_TW/index.page +share/gnome/help/hamster-applet/zh_TW/input.page +share/gnome/help/hamster-applet/zh_TW/legal.xml +share/gnome/help/hamster-applet/zh_TW/merge.page +share/gnome/help/hamster-applet/zh_TW/reports.page +share/gnome/help/hamster-applet/zh_TW/statistics.page share/hamster-applet/ share/hamster-applet/Hamster_Applet.xml share/hamster-applet/applet.ui @@ -84,6 +202,9 @@ share/hamster-applet/art/stock_calendar-view-month.png share/hamster-applet/art/stock_calendar-view-week.png share/hamster-applet/edit_activity.ui share/hamster-applet/hamster.db +share/hamster-applet/hamster.ui +share/hamster-applet/overview.ui +share/hamster-applet/overview_totals.ui share/hamster-applet/preferences.ui share/hamster-applet/stats.ui share/icons/hicolor/16x16/apps/hamster-applet.png @@ -103,6 +224,7 @@ share/locale/cs/LC_MESSAGES/hamster-applet.mo share/locale/da/LC_MESSAGES/hamster-applet.mo share/locale/de/LC_MESSAGES/hamster-applet.mo share/locale/el/LC_MESSAGES/hamster-applet.mo +share/locale/en@shaw/LC_MESSAGES/hamster-applet.mo share/locale/en_GB/LC_MESSAGES/hamster-applet.mo share/locale/es/LC_MESSAGES/hamster-applet.mo share/locale/et/LC_MESSAGES/hamster-applet.mo