- update workrave to 1.9.1

This commit is contained in:
jasper 2010-05-13 12:29:25 +00:00
parent b32faf9b96
commit c4c448e31e
11 changed files with 206 additions and 164 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2010/05/13 08:20:09 jasper Exp $
# $OpenBSD: Makefile,v 1.15 2010/05/13 12:29:25 jasper Exp $
COMMENT= reminder program for prevention of RSI
DISTNAME= workrave-1.8.5
PKGNAME= ${DISTNAME}p10
DISTNAME= workrave-1.9.1
CATEGORIES= productivity x11
HOMEPAGE= http://www.workrave.org/
@ -14,29 +13,30 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xmu Xrandr \
Xrender Xt Xtst art_lgpl_2 atk-1.0 atkmm-1.6 \
bonobo-2 bonobo-activation bonoboui-2 c cairo cairomm-1.0 \
crypto dbus-1 dbus-glib-1 expat fontconfig freetype \
gailutil gconf-2 gconfmm-2.6 gdk-x11-2.0 gdk_pixbuf-2.0 \
gdkmm-2.4 gio-2.0 giomm-2.4 glade-2.0 glademm-2.4 glib-2.0 \
glibmm-2.4 glitz gmodule-2.0 gnome-2 gnome-keyring \
gnomecanvas-2 gnomecanvasmm-2.6 gnomemm-2.6 gnomeui-2 \
gnomevfs-2 gnomevfsmm-2.6 gobject-2.0 gthread-2.0 gtk-x11-2.0 \
gtkmm-2.4 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pangomm-1.4 pcre pixman-1 png popt pthread sigc-2.0 ssl \
stdc++ util xml2 z avahi-client avahi-common avahi-glib \
pthread-stubs xcb eggdbus-1 gcrypt gpg-error xcb-render \
xcb-render-util
WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite
WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
WANTLIB += Xrender Xtst art_lgpl_2 atk-1.0 avahi-client avahi-common
WANTLIB += avahi-glib bonobo-2 bonobo-activation bonoboui-2 c
WANTLIB += cairo cairomm-1.0 crypto dbus-1 dbus-glib-1 expat fontconfig
WANTLIB += freetype gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 glitz gmodule-2.0
WANTLIB += gnome-2 gnomecanvas-2 gnomevfs-2 gobject-2.0 gthread-2.0
WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pangomm-1.4 pcre pixman-1 png popt pthread pthread-stubs
WANTLIB += sigc-2.0 ssl stdc++ util xcb xcb-render xcb-render-util
WANTLIB += xml2 z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=workrave/}
LIB_DEPENDS= gnet-2.0::net/gnet \
gnomeuimm-2.6::x11/gnome/libgnomeuimm \
panel-applet-2::x11/gnome/panel
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ::devel/py-cheetah
LIB_DEPENDS= gstreamer-0.10::multimedia/gstreamer-0.10/core \
gnet-2.0::net/gnet \
panel-applet-2::x11/gnome/panel \
atkmm-1.6,gdkmm-2.4,gtkmm-2.4::x11/gtk2mm
MODULES= devel/gettext \
lang/python \
textproc/intltool
USE_X11= Yes
@ -46,17 +46,21 @@ USE_GMAKE= Yes
CFLAGS+= -DNDEBUG
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-xml \
--enable-dbus
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
pre-configure:
perl -pi -e 's|#include <sigc\+\+\/compatibility\.h>||g ; \
s|SigC::Signal|sigc::signal|g ; \
s|SigC::slot_class|sigc::mem_fun|g ; \
s|SigC::Connection|sigc::connection|g ; \
s|SigC::Slot|sigc::slot|g ; \
s|SigC::Object|sigc::trackable|g ; \
s|SigC::slot|sigc::mem_fun|g' \
${SUBST_CMD} ${WRKSRC}/frontend/gtkmm/src/Makefile.in \
${WRKSRC}/frontend/gtkmm/src/gnome_applet/Makefile.in
perl -pi -e 's,#include <sigc\+\+\/compatibility\.h>,,g ; \
s,SigC::Signal,sigc::signal,g ; \
s,SigC::slot_class,sigc::mem_fun,g ; \
s,SigC::Connection,sigc::connection,g ; \
s,SigC::Slot,sigc::slot,g ; \
s,SigC::Object,sigc::trackable,g ; \
s,SigC::slot,sigc::mem_fun,g' \
${WRKSRC}/frontend/gtkmm/src/*.* \
${WRKSRC}/frontend/plugin/*/gtkmm/src/*.*

View File

@ -1,5 +1,5 @@
MD5 (workrave-1.8.5.tar.gz) = PfSKtWACVvrcEal28VvMeg==
RMD160 (workrave-1.8.5.tar.gz) = MGNky64qGkJwy9Ykhk3BEbJ+84g=
SHA1 (workrave-1.8.5.tar.gz) = 1Aw9U28aN7hJ/PjR56ZZHgQ88Z0=
SHA256 (workrave-1.8.5.tar.gz) = Si+PFvAV/OxERpU0IcjhLNtBORptoOY9BNF7MFNKDFY=
SIZE (workrave-1.8.5.tar.gz) = 1940651
MD5 (workrave-1.9.1.tar.gz) = Bld17k/bPiHhLL8JB9MbiA==
RMD160 (workrave-1.9.1.tar.gz) = GhIVNYsPR6arNTXKqap0bc8HGr8=
SHA1 (workrave-1.9.1.tar.gz) = qvCTvU2/qvZhtconegHpFdOjPPs=
SHA256 (workrave-1.9.1.tar.gz) = XCOvSzb8bdJ7DxtYNzho2SX7keyf9At8e7zsUqGyirk=
SIZE (workrave-1.9.1.tar.gz) = 6594737

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-configure,v 1.3 2010/04/27 20:20:55 ajacoutot Exp $
--- configure.orig Fri Sep 14 22:25:06 2007
+++ configure Tue Apr 27 20:22:39 2010
@@ -2953,9 +2953,9 @@ if test "x$config_debug" = "xyes"; then
CXXFLAGS="${CXXFLAGS} -g -Wall -DGLIBCXX_FORCE_NEW -DGLIBCPP_FORCE_NEW"
$OpenBSD: patch-configure,v 1.4 2010/05/13 12:29:26 jasper Exp $
--- configure.orig Thu May 13 13:15:24 2010
+++ configure Thu May 13 13:19:55 2010
@@ -16563,9 +16563,9 @@ then
CXXFLAGS="${CXXFLAGS} -O0 -g -Wall -DGLIBCXX_FORCE_NEW -DGLIBCPP_FORCE_NEW"
LDFLAGS="${LDFLAGS} -g"
else
- CFLAGS="${CFLAGS} -Os -g -DNDEBUG"
@ -13,79 +13,84 @@ $OpenBSD: patch-configure,v 1.3 2010/04/27 20:20:55 ajacoutot Exp $
+ LDFLAGS="${LDFLAGS}"
fi
{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -31596,13 +31596,13 @@ fi
@@ -20423,13 +20423,13 @@ fi
fi
if test -z "$LIBPTHREAD"; then
- { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -31658,7 +31658,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
if test $ac_cv_lib_pthread_pthread_create = yes; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20460,7 +20460,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
- LIBPTHREAD="-lpthread"
+ LIBPTHREAD="-pthread"
fi
fi
@@ -41289,13 +41289,13 @@ fi
rm -f conftest*
if test "x$PTHREAD_LIBS" = xerror; then
- { echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthread" >&5
-echo $ECHO_N "checking for pthread_attr_init in -lpthread... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for pthread_attr_init in -pthread" >&5
+echo $ECHO_N "checking for pthread_attr_init in -pthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25994,13 +25994,13 @@ rm -f core conftest.err conftest.$ac_objext \
if test -n "$gl_have_pthread"; then
# The program links fine without libpthread. But it may actually
# need to link with libpthread in order to create multiple threads.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
-$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -pthread" >&5
+$as_echo_n "checking for pthread_kill in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -41351,18 +41351,18 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_attr_init" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_attr_init" >&6; }
if test $ac_cv_lib_pthread_pthread_attr_init = yes; then
- PTHREAD_LIBS="-lpthread"
+ PTHREAD_LIBS="-pthread"
fi
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
fi
if test "x$PTHREAD_LIBS" = xerror; then
- { echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthreads" >&5
-echo $ECHO_N "checking for pthread_attr_init in -lpthreads... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for pthread_attr_init in -pthreads" >&5
+echo $ECHO_N "checking for pthread_attr_init in -pthreads... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthreads_pthread_attr_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26031,7 +26031,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+ LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
# On Solaris and HP-UX, most pthread functions exist also in libc.
# Therefore pthread_in_use() needs to actually try to create a
# thread: pthread_create from libc will fail, whereas
@@ -26047,13 +26047,13 @@ fi
else
# Some library is needed. Try libpthread and libc_r.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
-$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -pthread" >&5
+$as_echo_n "checking for pthread_kill in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthreads $LIBS"
+LIBS="-pthreads $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -41418,7 +41418,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5
echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_attr_init" >&6; }
if test $ac_cv_lib_pthreads_pthread_attr_init = yes; then
- PTHREAD_LIBS="-lpthreads"
+ PTHREAD_LIBS="-pthreads"
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -26085,8 +26085,8 @@ fi
$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
gl_have_pthread=yes
- LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+ LIBTHREAD=-pthread LTLIBTHREAD=-pthread
+ LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
fi
fi
if test -z "$gl_have_pthread"; then

View File

@ -1,27 +1,30 @@
$OpenBSD: patch-frontend_common_share_sounds_Makefile_in,v 1.2 2007/11/12 22:05:41 jasper Exp $
--- frontend/common/share/sounds/Makefile.in.orig Fri Sep 14 22:24:19 2007
+++ frontend/common/share/sounds/Makefile.in Thu Nov 8 20:48:27 2007
@@ -554,14 +554,6 @@ uninstall-soundsDATA:
rm -f "$(DESTDIR)$(soundsdir)/$$f"; \
done
$OpenBSD: patch-frontend_common_share_sounds_Makefile_in,v 1.3 2010/05/13 12:29:26 jasper Exp $
--- frontend/common/share/sounds/Makefile.in.orig Thu May 13 13:20:44 2010
+++ frontend/common/share/sounds/Makefile.in Thu May 13 13:21:23 2010
@@ -538,17 +538,6 @@ uninstall-rcDATA:
echo " ( cd '$(DESTDIR)$(rcdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(rcdir)" && rm -f $$files
install-utilsDATA: $(utils_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(utilsdir)" || $(mkdir_p) "$(DESTDIR)$(utilsdir)"
- @list='$(utils_DATA)'; for p in $$list; do \
- test -z "$(utilsdir)" || $(MKDIR_P) "$(DESTDIR)$(utilsdir)"
- @list='$(utils_DATA)'; test -n "$(utilsdir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(utilsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(utilsdir)/$$f'"; \
- $(utilsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(utilsdir)/$$f"; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(utilsdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(utilsdir)" || exit $$?; \
- done
uninstall-utilsDATA:
@$(NORMAL_UNINSTALL)
@@ -608,7 +600,7 @@ check-am: all-am
check: check-am
@@ -756,7 +745,7 @@ check: check-recursive
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(kdesoundsdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(soundsdir)" "$(DESTDIR)$(utilsdir)"; do \
+ for dir in "$(DESTDIR)$(kdesoundsdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(soundsdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(kdesoundsdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(utilsdir)"; do \
+ for dir in "$(DESTDIR)$(kdesoundsdir)" "$(DESTDIR)$(rcdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install: install-recursive

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-frontend_common_src_System_cc,v 1.1 2007/11/12 22:05:41 jasper Exp $
--- frontend/common/src/System.cc.orig Thu Nov 8 20:51:08 2007
+++ frontend/common/src/System.cc Thu Nov 8 20:51:34 2007
@@ -24,6 +24,8 @@
$OpenBSD: patch-frontend_common_src_System_cc,v 1.2 2010/05/13 12:29:26 jasper Exp $
--- frontend/common/src/System.cc.orig Thu May 28 21:04:02 2009
+++ frontend/common/src/System.cc Thu May 13 13:22:40 2010
@@ -25,6 +25,8 @@
#include <glib.h>
#endif

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-frontend_gtkmm_src_Makefile_in,v 1.1 2010/05/13 12:29:26 jasper Exp $
--- frontend/gtkmm/src/Makefile.in.orig Thu May 13 13:55:31 2010
+++ frontend/gtkmm/src/Makefile.in Thu May 13 13:55:47 2010
@@ -2116,7 +2116,7 @@ DBusGnomeApplet.cc: gnome_applet/gnome-applet.xml \
$(top_srcdir)/common/bin/dbusgen.py \
$(top_srcdir)/common/bin/DBus-client-template.cc \
$(top_srcdir)/common/bin/DBus-client-template.hh
- python $(top_srcdir)/common/bin/dbusgen.py --language=C++ -c gnome_applet/gnome-applet.xml DBUSGnomeApplet
+ ${MODPY_BIN} $(top_srcdir)/common/bin/dbusgen.py --language=C++ -c gnome_applet/gnome-applet.xml DBUSGnomeApplet
DBusGnomeApplet.hh: DBusGnomeApplet.cc
GnomeAppletWindow.cc: DBusGnomeApplet.hh
@@ -2133,7 +2133,7 @@ GnomeAppletWindow.cc: DBusGnomeApplet.hh
@HAVE_APP_GTKMM_TRUE@@HAVE_DBUS_TRUE@ $(top_srcdir)/common/bin/dbusgen.py \
@HAVE_APP_GTKMM_TRUE@@HAVE_DBUS_TRUE@ $(top_srcdir)/common/bin/DBus-template.cc \
@HAVE_APP_GTKMM_TRUE@@HAVE_DBUS_TRUE@ $(top_srcdir)/common/bin/DBus-template.hh
-@HAVE_APP_GTKMM_TRUE@@HAVE_DBUS_TRUE@ python $(top_srcdir)/common/bin/dbusgen.py --language=C++ -s workrave-gui.xml DBusGUI
+@HAVE_APP_GTKMM_TRUE@@HAVE_DBUS_TRUE@ ${MODPY_BIN} $(top_srcdir)/common/bin/dbusgen.py --language=C++ -s workrave-gui.xml DBusGUI
@HAVE_APP_GTKMM_TRUE@@HAVE_DBUS_TRUE@DBusGUI.hh: DBusGUI.cc

View File

@ -1,19 +1,16 @@
$OpenBSD: patch-frontend_gtkmm_src_gnome_applet_Makefile_in,v 1.1 2009/10/16 00:58:43 ajacoutot Exp $
Fix compilation with GNOME 2.28.
--- frontend/gtkmm/src/gnome_applet/Makefile.in.orig Fri Oct 16 02:55:34 2009
+++ frontend/gtkmm/src/gnome_applet/Makefile.in Fri Oct 16 02:54:46 2009
@@ -516,9 +516,9 @@ SUBDIRS =
$OpenBSD: patch-frontend_gtkmm_src_gnome_applet_Makefile_in,v 1.2 2010/05/13 12:29:26 jasper Exp $
--- frontend/gtkmm/src/gnome_applet/Makefile.in.orig Thu May 13 13:41:10 2010
+++ frontend/gtkmm/src/gnome_applet/Makefile.in Thu May 13 13:41:27 2010
@@ -1016,10 +1016,10 @@ uninstall-am: uninstall-libexecPROGRAMS uninstall-serv
@HAVE_GNOMEAPPLET_TRUE@ dbus-binding-tool --prefix=workrave --mode=glib-client $<> $@
@HAVE_GNOME_TRUE@workrave_applet_SOURCES = WorkraveApplet.c
@HAVE_GNOME_TRUE@nodist_workrave_applet_SOURCES = $(IDL_C_GENERATED) $(IDL_A_GENERATED)
-@HAVE_GNOME_TRUE@workrave_applet_LDADD = @APPLET_LIBS@
-@HAVE_GNOME_TRUE@workrave_applet_CXXFLAGS = ${FLAGS}
-@HAVE_GNOME_TRUE@workrave_applet_CFLAGS = ${FLAGS}
+@HAVE_GNOME_TRUE@workrave_applet_LDADD = @APPLET_LIBS@ `pkg-config --libs libgnomeui-2.0`
+@HAVE_GNOME_TRUE@workrave_applet_CXXFLAGS = ${FLAGS} `pkg-config --cflags libgnomeui-2.0
+@HAVE_GNOME_TRUE@workrave_applet_CFLAGS = ${FLAGS} `pkg-config --cflags libgnomeui-2.0`
all: all-recursive
DBusGUI.xml: $(top_srcdir)/frontend/gtkmm/src/workrave-gui.xml
- python $(top_srcdir)/common/bin/dbusgen.py --language=dbus-glib ../workrave-gui.xml DBusGUI
+ ${MODPY_BIN} $(top_srcdir)/common/bin/dbusgen.py --language=dbus-glib ../workrave-gui.xml DBusGUI
.SUFFIXES:
DBusGnomeApplet.xml: gnome-applet.xml
- python $(top_srcdir)/common/bin/dbusgen.py --language=dbus-glib gnome-applet.xml DBusGnomeApplet
+ ${MODPY_BIN} $(top_srcdir)/common/bin/dbusgen.py --language=dbus-glib gnome-applet.xml DBusGnomeApplet
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-frontend_plugin_exercises_gtkmm_src_ExercisesPanel_cc,v 1.1 2010/04/27 20:20:55 ajacoutot Exp $
--- frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc.orig Fri Sep 14 20:50:32 2007
+++ frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc Tue Apr 27 22:13:03 2010
@@ -206,7 +206,7 @@ text_buffer_set_markup (GtkTextBuffer *buffer,
$OpenBSD: patch-frontend_plugin_exercises_gtkmm_src_ExercisesPanel_cc,v 1.2 2010/05/13 12:29:26 jasper Exp $
--- frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc.orig Fri Sep 18 20:46:22 2009
+++ frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc Thu May 13 13:22:40 2010
@@ -210,7 +210,7 @@ text_buffer_set_markup (GtkTextBuffer *buffer,
int ExercisesPanel::exercises_pointer = 0;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-frontend_plugin_exercises_gtkmm_src_ExercisesPanel_hh,v 1.1 2010/04/27 20:20:55 ajacoutot Exp $
--- frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh.orig Fri Sep 14 20:50:32 2007
+++ frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh Tue Apr 27 22:13:00 2010
@@ -42,7 +42,7 @@
$OpenBSD: patch-frontend_plugin_exercises_gtkmm_src_ExercisesPanel_hh,v 1.2 2010/05/13 12:29:26 jasper Exp $
--- frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh.orig Thu May 28 21:04:02 2009
+++ frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh Thu May 13 13:22:40 2010
@@ -43,7 +43,7 @@
class ExercisesPanel : public Gtk::HBox
{
public:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.2 2007/11/19 01:01:45 okan Exp $
--- po/Makefile.in.in.orig Fri Sep 14 22:23:25 2007
+++ po/Makefile.in.in Sat Nov 17 22:53:43 2007
@@ -142,7 +142,7 @@ uninstall:
$OpenBSD: patch-po_Makefile_in_in,v 1.3 2010/05/13 12:29:26 jasper Exp $
--- po/Makefile.in.in.orig Sun Oct 25 12:14:51 2009
+++ po/Makefile.in.in Thu May 13 13:22:40 2010
@@ -141,7 +141,7 @@ uninstall:
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done

View File

@ -1,10 +1,9 @@
@comment $OpenBSD: PLIST,v 1.3 2008/07/15 08:39:50 bernd Exp $
@comment $OpenBSD: PLIST,v 1.4 2010/05/13 12:29:26 jasper Exp $
@bin bin/workrave
lib/bonobo/
lib/bonobo/servers/
lib/bonobo/servers/Workrave-Applet.server
lib/bonobo/servers/Workrave-Control.server
@bin libexec/workrave-applet
share/applications/workrave.desktop
share/dbus-1/services/org.workrave.Workrave.service
share/examples/workrave/
@sample ${SYSCONFDIR}/gnome/
share/examples/workrave/sound/
@ -13,8 +12,6 @@ share/examples/workrave/sound/events/
@sample ${SYSCONFDIR}/gnome/sound/events/
share/examples/workrave/sound/events/workrave.soundlist
@sample ${SYSCONFDIR}/gnome/sound/events/workrave.soundlist
share/gnome-2.0/
share/gnome-2.0/ui/
share/gnome-2.0/ui/GNOME_WorkraveApplet.xml
share/locale/bg/LC_MESSAGES/workrave.mo
share/locale/ca/LC_MESSAGES/workrave.mo
@ -24,19 +21,19 @@ share/locale/de/LC_MESSAGES/workrave.mo
share/locale/el/LC_MESSAGES/workrave.mo
share/locale/eo/LC_MESSAGES/workrave.mo
share/locale/es/LC_MESSAGES/workrave.mo
share/locale/et/LC_MESSAGES/workrave.mo
share/locale/eu/LC_MESSAGES/workrave.mo
share/locale/fr/LC_MESSAGES/workrave.mo
share/locale/he/LC_MESSAGES/workrave.mo
share/locale/hu/LC_MESSAGES/workrave.mo
share/locale/it/LC_MESSAGES/workrave.mo
share/locale/ja/LC_MESSAGES/workrave.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/workrave.mo
share/locale/nb/LC_MESSAGES/workrave.mo
share/locale/nl/LC_MESSAGES/workrave.mo
share/locale/no/LC_MESSAGES/workrave.mo
share/locale/pl/LC_MESSAGES/workrave.mo
share/locale/pt_BR/LC_MESSAGES/workrave.mo
share/locale/ro/LC_MESSAGES/workrave.mo
share/locale/ru/LC_MESSAGES/workrave.mo
share/locale/sk/LC_MESSAGES/workrave.mo
share/locale/sl/LC_MESSAGES/workrave.mo
@ -44,20 +41,34 @@ share/locale/sv/LC_MESSAGES/workrave.mo
share/locale/tr/LC_MESSAGES/workrave.mo
share/locale/zh_CN/LC_MESSAGES/workrave.mo
share/locale/zh_TW/LC_MESSAGES/workrave.mo
share/pixmaps/
share/pixmaps/workrave/
share/pixmaps/workrave/workrave-icon-huge.png
share/sounds/
share/pixmaps/workrave/workrave.xpm
share/sounds/workrave/
share/sounds/workrave/break-ignored.wav
share/sounds/workrave/break-prelude.wav
share/sounds/workrave/daily-limit.wav
share/sounds/workrave/exercise-ended.wav
share/sounds/workrave/exercises-ended.wav
share/sounds/workrave/micro-break-ended.wav
share/sounds/workrave/micro-break-started.wav
share/sounds/workrave/rest-break-ended.wav
share/sounds/workrave/rest-break-started.wav
share/sounds/workrave/default/
share/sounds/workrave/default/break-ignored.wav
share/sounds/workrave/default/break-prelude.wav
share/sounds/workrave/default/daily-limit.wav
share/sounds/workrave/default/exercise-ended.wav
share/sounds/workrave/default/exercise-step.wav
share/sounds/workrave/default/exercises-ended.wav
share/sounds/workrave/default/micro-break-ended.wav
share/sounds/workrave/default/micro-break-started.wav
share/sounds/workrave/default/rest-break-ended.wav
share/sounds/workrave/default/rest-break-started.wav
share/sounds/workrave/default/soundtheme
share/sounds/workrave/subtle/
share/sounds/workrave/subtle/break-ignored.wav
share/sounds/workrave/subtle/break-prelude.wav
share/sounds/workrave/subtle/daily-limit.wav
share/sounds/workrave/subtle/exercise-ended.wav
share/sounds/workrave/subtle/exercise-step.wav
share/sounds/workrave/subtle/exercises-ended.wav
share/sounds/workrave/subtle/micro-break-ended.wav
share/sounds/workrave/subtle/micro-break-started.wav
share/sounds/workrave/subtle/rest-break-ended.wav
share/sounds/workrave/subtle/rest-break-started.wav
share/sounds/workrave/subtle/soundtheme
share/workrave/
share/workrave/exercises/
share/workrave/exercises/backward-shoulder-stretch.png
@ -104,3 +115,4 @@ share/workrave/images/workrave-icon-small.png
share/workrave/images/workrave-quiet-icon-medium.png
share/workrave/images/workrave-suspended-icon-medium.png
share/workrave/images/workrave.png
share/workrave/images/workrave.xpm