aboutsummaryrefslogtreecommitdiffstats
path: root/deskutils/timer-applet
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils/timer-applet')
-rw-r--r--deskutils/timer-applet/Makefile18
-rw-r--r--deskutils/timer-applet/distinfo6
-rw-r--r--deskutils/timer-applet/files/patch-src_timer-applet.c51
-rw-r--r--deskutils/timer-applet/pkg-plist5
4 files changed, 58 insertions, 22 deletions
diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index 56993711f26a..dc9a43a5dc5c 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= timer-applet
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.2
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= timerapplet
@@ -20,29 +19,18 @@ RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/gtk-events/clicked.wav:${PORTSDIR}/au
USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --bindir=${PREFIX}/libexec # applets belong to libexec
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GCONF_SCHEMAS= timer-applet.schemas
INSTALLS_OMF= yes
-OMFDIR= ${PREFIX}/share/gnome/omf/${PORTNAME}
post-patch:
@${REINPLACE_CMD} -e \
- 's|/usr/share/pixmaps/|${PREFIX}/share/gnome/pixmaps/|; \
- s|location="timer-applet"|location="${PREFIX}/libexec/timer-applet"|' \
- ${WRKSRC}/GNOME_TimerApplet.server.in
+ 's|/usr/share/pixmaps/|${PREFIX}/share/gnome/pixmaps/|' \
+ ${WRKSRC}/GNOME_TimerApplet.server.in.in
@${REINPLACE_CMD} -e \
's|$$(datadir)/sounds|${X11BASE}/share/gnome/sounds|' \
${WRKSRC}/src/Makefile.in
- @${MKDIR} ${WRKSRC}/omf-install
-
-post-install:
- ${MKDIR} ${OMFDIR}
-.for lang in C fr
- ${INSTALL_DATA} ${WRKSRC}/omf-install/${PORTNAME}-${lang}.omf ${OMFDIR}
- -scrollkeeper-install -q ${OMFDIR}/${PORTNAME}-${lang}.omf
-.endfor
.include <bsd.port.mk>
diff --git a/deskutils/timer-applet/distinfo b/deskutils/timer-applet/distinfo
index be6e78284af3..a0b6e4390843 100644
--- a/deskutils/timer-applet/distinfo
+++ b/deskutils/timer-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (timer-applet-1.1.1.tar.gz) = db9dacfa6bd35904dc88740764b1750e
-SHA256 (timer-applet-1.1.1.tar.gz) = d9c4ee6eb322a232e18f932ef78ce53a2156a4ed478507e9328834b4ca1fe739
-SIZE (timer-applet-1.1.1.tar.gz) = 172976
+MD5 (timer-applet-1.2.tar.gz) = 00dfc31e32a9a4cad3084b78a49c8a40
+SHA256 (timer-applet-1.2.tar.gz) = f1b3ef59f2bb0124da23eadc9b74949b3a6cf96dafd912171a4f008aef9841ae
+SIZE (timer-applet-1.2.tar.gz) = 183072
diff --git a/deskutils/timer-applet/files/patch-src_timer-applet.c b/deskutils/timer-applet/files/patch-src_timer-applet.c
new file mode 100644
index 000000000000..1a3ecaec0416
--- /dev/null
+++ b/deskutils/timer-applet/files/patch-src_timer-applet.c
@@ -0,0 +1,51 @@
+--- src/timer-applet.c.orig Wed Dec 14 23:39:09 2005
++++ src/timer-applet.c Sun Jan 29 03:52:57 2006
+@@ -872,11 +872,11 @@
+ update_presets_submenu (TimerApplet *timer_applet)
+ {
+ BonoboUIComponent *popup_component;
++ int i;
+
+ popup_component = panel_applet_get_popup_component (PANEL_APPLET (timer_applet->applet));
+
+ /* Remove existing menu items. */
+- int i;
+ for (i = 0;; i++) {
+ gchar *item_path = g_strdup_printf (PRESETS_SUBMENU_PATH "/Preset_%d", i);
+ if (bonobo_ui_component_path_exists (popup_component, item_path, NULL)) {
+@@ -902,6 +902,8 @@
+ gdouble preset_duration;
+ gchar *preset_display_name;
+ gint preset_index;
++ gchar *verb;
++ BonoboUINode *node;
+
+ gtk_tree_model_get (GTK_TREE_MODEL (timer_presets_list), &iter,
+ PROFILE_NAME_COL, &preset_name,
+@@ -923,8 +925,8 @@
+ path = NULL;
+ }
+
+- gchar *verb = g_strdup_printf ("Preset_%d", preset_index);
+- BonoboUINode *node = bonobo_ui_node_new ("menuitem");
++ verb = g_strdup_printf ("Preset_%d", preset_index);
++ node = bonobo_ui_node_new ("menuitem");
+ bonobo_ui_node_set_attr (node, "name", verb);
+ bonobo_ui_node_set_attr (node, "verb", verb);
+ bonobo_ui_node_set_attr (node, "label", preset_display_name);
+@@ -1415,6 +1417,7 @@
+ on_presets_submenu_item_activate (BonoboUIComponent *uic, TimerApplet *timer_applet, const gchar *verb)
+ {
+ int preset_index;
++ GtkTreeIter iter;
+
+ g_assert (timer_applet);
+
+@@ -1423,7 +1426,6 @@
+ return;
+ }
+
+- GtkTreeIter iter;
+ {
+ GtkTreePath *path = gtk_tree_path_new_from_indices (preset_index, -1);
+ gboolean iter_set = gtk_tree_model_get_iter (GTK_TREE_MODEL (timer_presets_list), &iter, path);
diff --git a/deskutils/timer-applet/pkg-plist b/deskutils/timer-applet/pkg-plist
index 639b746b440c..0f7bac22a852 100644
--- a/deskutils/timer-applet/pkg-plist
+++ b/deskutils/timer-applet/pkg-plist
@@ -14,11 +14,8 @@ share/locale/eu/LC_MESSAGES/timer-applet.mo
share/locale/fr/LC_MESSAGES/timer-applet.mo
share/locale/pl/LC_MESSAGES/timer-applet.mo
share/locale/sv/LC_MESSAGES/timer-applet.mo
-@exec mkdir -p %D/share/gnome/help/timer-applet/C/figures
-@exec mkdir -p %D/share/gnome/help/timer-applet/fr/figures
-@dirrm share/gnome/help/timer-applet/C/figures
+share/locale/tr/LC_MESSAGES/timer-applet.mo
@dirrm share/gnome/help/timer-applet/C
-@dirrm share/gnome/help/timer-applet/fr/figures
@dirrm share/gnome/help/timer-applet/fr
@dirrm share/gnome/help/timer-applet
@dirrm share/gnome/omf/timer-applet