cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to workrave-1.9.3.

Browse Source
This commit is contained in:
ajacoutot 2011-01-16 20:34:40 +00:00
parent afc833bde0
commit cd5851538c
10 changed files with 62 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
productivity/workrave/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.22 2010/11/20 09:48:40 espie Exp $
# $OpenBSD: Makefile,v 1.23 2011/01/16 20:34:40 ajacoutot Exp $
COMMENT= reminder program for prevention of RSI
DISTNAME= workrave-1.9.1
REVISION = 3
DISTNAME= workrave-1.9.3
CATEGORIES= productivity x11
HOMEPAGE= http://www.workrave.org/
@ -16,23 +15,23 @@ PERMIT_DISTFILES_FTP= Yes
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 += Xrender Xtst art_lgpl_2 atk-1.0
WANTLIB += 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 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 atkmm-1.6
WANTLIB += gnet-2.0 gstreamer-0.10 panel-applet-2 gdkmm-2.4 gtkmm-2.4
WANTLIB += sigc-2.0 ssl stdc++ util xcb xcb-render
WANTLIB += xml2 z atkmm-1.6 xcb-shm
WANTLIB += gstreamer-0.10 panel-applet-2 gdkmm-2.4 gtkmm-2.4
WANTLIB += GL Xxf86vm canberra drm ltdl ogg vorbis vorbisfile
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=workrave/}
BUILD_DEPENDS= devel/py-cheetah
LIB_DEPENDS= multimedia/gstreamer-0.10/core \
net/gnet \
x11/gnome/panel \
x11/gtk2mm
@ -47,6 +46,7 @@ CFLAGS+= -DNDEBUG
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-xml \
--disable-pulse \
--enable-dbus
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"

10
productivity/workrave/distinfo
View File

@ -1,5 +1,5 @@
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
MD5 (workrave-1.9.3.tar.gz) = 0ZkvVHUPMkF5eqgJ3loHUw==
RMD160 (workrave-1.9.3.tar.gz) = ADOyInku9KCICeLObmVmyB9sHHs=
SHA1 (workrave-1.9.3.tar.gz) = ny6rCnAz2d6Whpkh5wlYTGqHvcU=
SHA256 (workrave-1.9.3.tar.gz) = zRwHS9nRWmJHW9BK0enBdud47STkN/i9Ee7Xb+AW7Hc=
SIZE (workrave-1.9.3.tar.gz) = 6703225

30
productivity/workrave/patches/patch-configure
View File

@ -1,20 +1,20 @@
$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"
$OpenBSD: patch-configure,v 1.5 2011/01/16 20:34:40 ajacoutot Exp $
--- configure.orig Sat Dec 11 18:05:26 2010
+++ configure Sat Jan 15 00:01:32 2011
@@ -16954,9 +16954,9 @@ then
else
- CFLAGS="${CFLAGS} -Os -g -DNDEBUG"
- CXXFLAGS="${CXXFLAGS} -Os -g -DNDEBUG"
OPT=2
- CFLAGS="${CFLAGS} -O${OPT} -g -DNDEBUG"
- CXXFLAGS="${CXXFLAGS} -O${OPT} -g -DNDEBUG"
- LDFLAGS="${LDFLAGS} -g"
+ CFLAGS="${CFLAGS}"
+ CXXFLAGS="${CXXFLAGS}"
+ LDFLAGS="${LDFLAGS}"
fi
@@ -20423,13 +20423,13 @@ fi
if test "x$config_tracing" = "xyes"
@@ -20661,13 +20661,13 @@ fi
fi
if test -z "$LIBPTHREAD"; then
@ -31,7 +31,7 @@ $OpenBSD: patch-configure,v 1.4 2010/05/13 12:29:26 jasper Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20460,7 +20460,7 @@ fi
@@ -20698,7 +20698,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 :
@ -40,7 +40,7 @@ $OpenBSD: patch-configure,v 1.4 2010/05/13 12:29:26 jasper Exp $
fi
fi
@@ -25994,13 +25994,13 @@ rm -f core conftest.err conftest.$ac_objext \
@@ -26608,13 +26608,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.
@ -57,7 +57,7 @@ $OpenBSD: patch-configure,v 1.4 2010/05/13 12:29:26 jasper Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -26031,7 +26031,7 @@ fi
@@ -26645,7 +26645,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 :
@ -66,7 +66,7 @@ $OpenBSD: patch-configure,v 1.4 2010/05/13 12:29:26 jasper Exp $
# 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
@@ -26661,13 +26661,13 @@ fi
else
# Some library is needed. Try libpthread and libc_r.
@ -83,7 +83,7 @@ $OpenBSD: patch-configure,v 1.4 2010/05/13 12:29:26 jasper Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -26085,8 +26085,8 @@ fi
@@ -26699,8 +26699,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

10
productivity/workrave/patches/patch-frontend_common_share_sounds_Makefile_in
View File

@ -1,7 +1,7 @@
$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:
$OpenBSD: patch-frontend_common_share_sounds_Makefile_in,v 1.4 2011/01/16 20:34:40 ajacoutot Exp $
--- frontend/common/share/sounds/Makefile.in.orig Sat Dec 11 18:05:21 2010
+++ frontend/common/share/sounds/Makefile.in Sat Jan 15 00:00:35 2011
@@ -549,17 +549,6 @@ uninstall-rcDATA:
echo " ( cd '$(DESTDIR)$(rcdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(rcdir)" && rm -f $$files
install-utilsDATA: $(utils_DATA)
@ -19,7 +19,7 @@ $OpenBSD: patch-frontend_common_share_sounds_Makefile_in,v 1.3 2010/05/13 12:29:
uninstall-utilsDATA:
@$(NORMAL_UNINSTALL)
@@ -756,7 +745,7 @@ check: check-recursive
@@ -767,7 +756,7 @@ check: check-recursive
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:

15
productivity/workrave/patches/patch-frontend_common_src_SoundPlayer_cc Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-frontend_common_src_SoundPlayer_cc,v 1.1 2011/01/16 20:34:40 ajacoutot Exp $
Our realpath(3) does not support resolved to be specified as NULL.
--- frontend/common/src/SoundPlayer.cc.orig Sat Jan 15 10:28:46 2011
+++ frontend/common/src/SoundPlayer.cc Sat Jan 15 10:29:27 2011
@@ -522,7 +522,7 @@ SoundPlayer::load_sound_theme(const string &themefilen
gchar *pathname = g_build_filename(themedir, filename, NULL);
if (pathname != NULL)
{
-#ifdef HAVE_REALPATH
+#if defined HAVE_REALPATH && !defined __OpenBSD__
sound_pathname = realpath(pathname, NULL);
if (sound_pathname == NULL)
{

10
productivity/workrave/patches/patch-frontend_gtkmm_src_Makefile_in
View File

@ -1,7 +1,7 @@
$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 \
$OpenBSD: patch-frontend_gtkmm_src_Makefile_in,v 1.2 2011/01/16 20:34:40 ajacoutot Exp $
--- frontend/gtkmm/src/Makefile.in.orig Sat Dec 11 18:05:22 2010
+++ frontend/gtkmm/src/Makefile.in Sat Jan 15 00:00:35 2011
@@ -2137,7 +2137,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
@ -10,7 +10,7 @@ $OpenBSD: patch-frontend_gtkmm_src_Makefile_in,v 1.1 2010/05/13 12:29:26 jasper
DBusGnomeApplet.hh: DBusGnomeApplet.cc
GnomeAppletWindow.cc: DBusGnomeApplet.hh
@@ -2133,7 +2133,7 @@ GnomeAppletWindow.cc: DBusGnomeApplet.hh
@@ -2160,7 +2160,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

8
productivity/workrave/patches/patch-frontend_gtkmm_src_gnome_applet_Makefile_in
View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-frontend_gtkmm_src_gnome_applet_Makefile_in,v 1.3 2011/01/16 20:34:40 ajacoutot Exp $
--- frontend/gtkmm/src/gnome_applet/Makefile.in.orig Sat Dec 11 18:05:22 2010
+++ frontend/gtkmm/src/gnome_applet/Makefile.in Sat Jan 15 00:00:35 2011
@@ -1027,10 +1027,10 @@ uninstall-am: uninstall-libexecPROGRAMS uninstall-serv
@HAVE_GNOMEAPPLET_TRUE@ dbus-binding-tool --prefix=workrave --mode=glib-client $<> $@
DBusGUI.xml: $(top_srcdir)/frontend/gtkmm/src/workrave-gui.xml

12
productivity/workrave/patches/patch-frontend_plugin_exercises_gtkmm_src_ExercisesPanel_cc
View File

@ -1,12 +0,0 @@
$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;
-ExercisesPanel::ExercisesPanel(Gtk::HButtonBox *dialog_action_area)
+ExercisesPanel::ExercisesPanel(Gtk::ButtonBox *dialog_action_area)
: Gtk::HBox(false, 6),
exercises(Exercise::get_exercises())
{

12
productivity/workrave/patches/patch-frontend_plugin_exercises_gtkmm_src_ExercisesPanel_hh
View File

@ -1,12 +0,0 @@
$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:
- ExercisesPanel(Gtk::HButtonBox *dialog_action_area);
+ ExercisesPanel(Gtk::ButtonBox *dialog_action_area);
~ExercisesPanel();
void set_exercise_count(int num);

5
productivity/workrave/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2010/05/13 12:29:26 jasper Exp $
@comment $OpenBSD: PLIST,v 1.5 2011/01/16 20:34:40 ajacoutot Exp $
@bin bin/workrave
lib/bonobo/servers/Workrave-Applet.server
@bin libexec/workrave-applet
@ -24,10 +24,12 @@ 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/ga/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/ko/LC_MESSAGES/workrave.mo
share/locale/lt/LC_MESSAGES/workrave.mo
share/locale/nb/LC_MESSAGES/workrave.mo
share/locale/nl/LC_MESSAGES/workrave.mo
@ -38,6 +40,7 @@ share/locale/ru/LC_MESSAGES/workrave.mo
share/locale/sk/LC_MESSAGES/workrave.mo
share/locale/sl/LC_MESSAGES/workrave.mo
share/locale/sv/LC_MESSAGES/workrave.mo
share/locale/te/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