View | Details | Raw Unified | Return to bug 190906 | Differences between
and this patch

Collapse All | Expand All

(-)x11/workrave/Makefile (-44 / +30 lines)
Lines 2-61 Link Here
2
# $FreeBSD: head/x11/workrave/Makefile 356785 2014-06-06 13:21:59Z amdmi3 $
2
# $FreeBSD: head/x11/workrave/Makefile 356785 2014-06-06 13:21:59Z amdmi3 $
3
3
4
PORTNAME=	workrave
4
PORTNAME=	workrave
5
PORTVERSION=	1.9.4
5
PORTVERSION=	1.10.1
6
PORTREVISION=	3
7
CATEGORIES=	x11 gnome
6
CATEGORIES=	x11 gnome
8
MASTER_SITES=	SF
7
MASTER_SITES=	SF
9
8
10
MAINTAINER=	ports@FreeBSD.org
9
MAINTAINER=	ports@FreeBSD.org
11
COMMENT=	RSI prevention tool
10
COMMENT=	RSI prevention tool
12
11
13
BUILD_DEPENDS=	gdome-config:${PORTSDIR}/textproc/gdome2
12
LICENSE=	GPLv3 # (or later)
14
13
15
OPTIONS_DEFINE=	GNOME NETWORK NLS
14
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>0:${PORTSDIR}/devel/py-cheetah
16
NETWORK_DESC=	Build with network support
15
LIB_DEPENDS=	libgdome.so:${PORTSDIR}/textproc/gdome2
17
16
18
INSTALLS_ICONS=	yes
17
USES=		gettext gmake pathfix pkgconfig
19
DESKTOP_ENTRIES="Workrave" "RSI prevention tool" \
18
USE_XORG=	recordproto x11 xext xmu xscrnsaver xtst
20
		"${DATADIR}/images/workrave-icon-small.png" \
19
USE_GNOME=	intlhack gconf2 gnomehier gtkmm24
21
		"workrave" \
20
USE_PYTHON=	yes
22
		"Utility;" \
23
		false
24
25
USE_XORG=	x11 xmu recordproto xtst xext
26
USES=		pathfix pkgconfig  gmake
27
USE_GNOME=	gnomeprefix intlhack gconf2 intltool
28
USE_GSTREAMER=	good
29
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
30
CONFIGURE_ENV=	LIBS="`pkg-config --libs libgnomeui-2.0`"
22
CONFIGURE_ARGS=	--disable-silent-rules --enable-gconf --disable-gnome3 \
31
LDFLAGS+=	-L${LOCALBASE}/lib
23
		--disable-indicator
32
CONFIGURE_ARGS=	--enable-gconf --disable-pulse
24
INSTALLS_ICONS=	yes
33
25
34
.include <bsd.port.options.mk>
26
CPPFLAGS+=	-I${LOCALBASE}/include
35
LIB_DEPENDS+=	libgdome.so:${PORTSDIR}/textproc/gdome2
27
LDFLAGS+=	-L${LOCALBASE}/lib
36
28
37
.if ${PORT_OPTIONS:MGNOME}
29
OPTIONS_DEFINE=		GNOME GSTREAMER PULSEAUDIO
38
LIB_DEPENDS+=	libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26
30
OPTIONS_DEFAULT=	GSTREAMER
39
USE_GNOME+=	gnomepanel
31
OPTIONS_SUB=		yes
40
PLIST_SUB+=	GNOME=""
32
41
.else
33
GNOME_USE=		gnome=gnomepanel
42
LIB_DEPENDS+=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
34
GNOME_LIB_DEPENDS=	libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26
43
CONFIGURE_ARGS+=--disable-gnome
35
GNOME_CONFIGURE_ENABLE=	gnome2
44
PLIST_SUB+=	GNOME="@comment "
36
GSTREAMER_USE=		gstreamer=good
45
.endif
37
GSTREAMER_CONFIGURE_ENABLE=	gstreamer
46
38
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
47
.if ${PORT_OPTIONS:MNETWORK}
39
PULSEAUDIO_CONFIGURE_ENABLE=	pulse
48
LIB_DEPENDS+=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
40
49
.else
41
post-patch:
50
CONFIGURE_ARGS+=--disable-distribution
42
	@${REINPLACE_CMD} -e \
51
.endif
43
		'/if test/s|==|=|' ${WRKSRC}/configure
52
44
	@${REINPLACE_CMD} -e \
53
.if ${PORT_OPTIONS:MNLS}
45
		's| gnome-shell$$||' ${WRKSRC}/frontend/applets/Makefile.in
54
USES+=		gettext
55
PLIST_SUB+=	NLS=""
56
.else
57
CONFIGURE_ARGS+=--disable-nls
58
PLIST_SUB+=	NLS="@comment "
59
.endif
60
46
61
.include <bsd.port.mk>
47
.include <bsd.port.mk>
(-)x11/workrave/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (workrave-1.9.4.tar.gz) = ce1efa57a37192029c4dcbe8a0ac2b893b2286c42828f19b0fb86867cbbcde1a
1
SHA256 (workrave-1.10.1.tar.gz) = 6ef89aebd278e27d3b73896485e7d8aaef415e7d18318d3bb7ba0d0507bd48de
2
SIZE (workrave-1.9.4.tar.gz) = 6748495
2
SIZE (workrave-1.10.1.tar.gz) = 6800197
(-)x11/workrave/files/patch-backend__include__ICore.hh (-1 / +1 lines)
Lines 6-10 Link Here
6
 #include <string>
6
 #include <string>
7
+#include <ctime>
7
+#include <ctime>
8
 
8
 
9
 namespace workrave {
9
 #include "enum.h"
10
 
10
 
(-)x11/workrave/files/patch-backends__src__unix__Makefile.in (+11 lines)
Line 0 Link Here
1
--- backend/src/unix/Makefile.in.orig
2
+++ backend/src/unix/Makefile.in
3
@@ -388,7 +388,7 @@
4
 			-DWORKRAVE_PKGDATADIR="\"${pkgdatadir}\"" \
5
 			-D_XOPEN_SOURCE=600 \
6
 			@WR_COMMON_INCLUDES@ \
7
-			@GLIB_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@
8
+			@GLIB_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @GNOME2_CFLAGS@
9
 
10
 EXTRA_DIST = $(wildcard $(srcdir)/*.cc) $(wildcard $(srcdir)/*.rc)\
11
 			$(wildcard $(srcdir)/*.hh) $(wildcard $(srcdir)/*.h) $(wildcard $(srcdir)/*.icc)
(-)x11/workrave/files/patch-configure (+39 lines)
Line 0 Link Here
1
--- configure.orig
2
+++ configure
3
@@ -19237,36 +19237,6 @@
4
         enable_monitors="${enable_monitors}x11events"
5
     fi
6
 
7
-    loop=${enable_monitors},
8
-
9
-    while echo $loop | grep \, &> /dev/null
10
-    do
11
-        monitor=${loop%%\,*}
12
-        loop=${loop#*\,}
13
-
14
-        case "$monitor" in
15
-           record)
16
-	       if test "x$have_xrecord" != "xyes" ; then
17
-                   as_fn_error $? "record activity monitor not supported." "$LINENO" 5
18
-               fi
19
-    	       ;;
20
-
21
-	   x11events)
22
-               ;;
23
-
24
-	   screensaver)
25
-	       if test "x$have_xscreensaver" != "xyes" ; then
26
-                   as_fn_error $? "screensaver activity monitor not supported." "$LINENO" 5
27
-               fi
28
-	       ;;
29
-
30
-	   *)
31
-               as_fn_error $? "unknown activity monitor: $monitor" "$LINENO" 5
32
-	       ;;
33
-
34
-        esac
35
-    done
36
-
37
 
38
 cat >>confdefs.h <<_ACEOF
39
 #define HAVE_MONITORS "$enable_monitors"
(-)x11/workrave/files/patch-frontend__common__src__Makefile.in (+11 lines)
Line 0 Link Here
1
--- frontend/common/src/Makefile.in.orig
2
+++ frontend/common/src/Makefile.in
3
@@ -418,7 +418,7 @@
4
 			-I$(top_srcdir)/frontend/common/src/win32 \
5
 			-I$(top_srcdir)/frontend/common/src/osx \
6
 			@WR_COMMON_INCLUDES@ @WR_BACKEND_INCLUDES@ @PULSE_CFLAGS@ \
7
-			@GTK_CFLAGS@ @GLIB_CFLAGS@ @GSTREAMER_CFLAGS@ \
8
+			@GTK_CFLAGS@ @GLIB_CFLAGS@ @GSTREAMER_CFLAGS@ @GNOME2_CFLAGS@ \
9
 			-I$(top_srcdir)/common/win32/harpoon/include
10
 
11
 all: all-recursive
(-)x11/workrave/pkg-plist (-41 / +49 lines)
Lines 1-15 Link Here
1
bin/workrave
1
%%NO_GNOME%%bin/workrave
2
%%GNOME%%etc/sound/events/workrave.soundlist
2
%%GNOME%%libdata/bonobo/servers/Workrave-Applet.server
3
%%GNOME%%libexec/workrave-applet
3
%%GNOME%%libexec/workrave-applet
4
share/dbus-1/services/org.workrave.Workrave.service
4
%%NO_GNOME%%share/applications/workrave.desktop
5
%%GNOME%%share/dbus-1/services/org.workrave.WorkraveAppletFactory.service
5
%%NO_GNOME%%share/dbus-1/services/org.workrave.Workrave.service
6
%%GNOME%%share/gnome-panel/applets/org.workrave.WorkraveApplet.panel-applet
6
%%GNOME%%share/gnome-2.0/ui/GNOME_WorkraveApplet.xml
7
%%GNOME%%share/gnome-panel/ui/workrave-applet-menu.xml
7
share/icons/hicolor/128x128/apps/workrave.png
8
share/icons/hicolor/48x48/apps/workrave-icon-huge.png
8
share/icons/hicolor/16x16/apps/workrave.png
9
share/icons/hicolor/scalable/apps/workrave-sheep.svg
9
share/icons/hicolor/24x24/apps/workrave.png
10
share/icons/hicolor/32x32/apps/workrave.png
11
share/icons/hicolor/48x48/apps/workrave.png
12
share/icons/hicolor/64x64/apps/workrave.png
13
share/icons/hicolor/96x96/apps/workrave.png
14
share/icons/hicolor/scalable/apps/workrave.svg
15
share/icons/hicolor/scalable/workrave-sheep.svg
16
share/locale/bg/LC_MESSAGES/workrave.mo
17
share/locale/ca/LC_MESSAGES/workrave.mo
18
share/locale/cs/LC_MESSAGES/workrave.mo
19
share/locale/da/LC_MESSAGES/workrave.mo
20
share/locale/de/LC_MESSAGES/workrave.mo
21
share/locale/el/LC_MESSAGES/workrave.mo
22
share/locale/eo/LC_MESSAGES/workrave.mo
23
share/locale/es/LC_MESSAGES/workrave.mo
24
share/locale/et/LC_MESSAGES/workrave.mo
25
share/locale/eu/LC_MESSAGES/workrave.mo
26
share/locale/fa/LC_MESSAGES/workrave.mo
27
share/locale/fi/LC_MESSAGES/workrave.mo
28
share/locale/fr/LC_MESSAGES/workrave.mo
10
share/locale/ga/LC_MESSAGES/workrave.mo
29
share/locale/ga/LC_MESSAGES/workrave.mo
30
share/locale/he/LC_MESSAGES/workrave.mo
31
share/locale/hr/LC_MESSAGES/workrave.mo
32
share/locale/hu/LC_MESSAGES/workrave.mo
33
share/locale/it/LC_MESSAGES/workrave.mo
34
share/locale/ja/LC_MESSAGES/workrave.mo
11
share/locale/ko/LC_MESSAGES/workrave.mo
35
share/locale/ko/LC_MESSAGES/workrave.mo
36
share/locale/lt/LC_MESSAGES/workrave.mo
37
share/locale/nb/LC_MESSAGES/workrave.mo
38
share/locale/nl/LC_MESSAGES/workrave.mo
39
share/locale/pl/LC_MESSAGES/workrave.mo
40
share/locale/pt_BR/LC_MESSAGES/workrave.mo
41
share/locale/ro/LC_MESSAGES/workrave.mo
42
share/locale/ru/LC_MESSAGES/workrave.mo
43
share/locale/sk/LC_MESSAGES/workrave.mo
44
share/locale/sl/LC_MESSAGES/workrave.mo
45
share/locale/sr@latin/LC_MESSAGES/workrave.mo
46
share/locale/sv/LC_MESSAGES/workrave.mo
12
share/locale/te/LC_MESSAGES/workrave.mo
47
share/locale/te/LC_MESSAGES/workrave.mo
48
share/locale/tr/LC_MESSAGES/workrave.mo
49
share/locale/uk/LC_MESSAGES/workrave.mo
50
share/locale/zh_CN/LC_MESSAGES/workrave.mo
51
share/locale/zh_TW/LC_MESSAGES/workrave.mo
13
share/sounds/workrave/default/break-ignored.wav
52
share/sounds/workrave/default/break-ignored.wav
14
share/sounds/workrave/default/break-prelude.wav
53
share/sounds/workrave/default/break-prelude.wav
15
share/sounds/workrave/default/daily-limit.wav
54
share/sounds/workrave/default/daily-limit.wav
Lines 32-38 Link Here
32
share/sounds/workrave/subtle/rest-break-ended.wav
71
share/sounds/workrave/subtle/rest-break-ended.wav
33
share/sounds/workrave/subtle/rest-break-started.wav
72
share/sounds/workrave/subtle/rest-break-started.wav
34
share/sounds/workrave/subtle/soundtheme
73
share/sounds/workrave/subtle/soundtheme
35
share/workrave/images/workrave.xpm
36
%%DATADIR%%/exercises/backward-shoulder-stretch.png
74
%%DATADIR%%/exercises/backward-shoulder-stretch.png
37
%%DATADIR%%/exercises/chair-pushup-1.png
75
%%DATADIR%%/exercises/chair-pushup-1.png
38
%%DATADIR%%/exercises/chair-pushup-2.png
76
%%DATADIR%%/exercises/chair-pushup-2.png
Lines 69-112 Link Here
69
%%DATADIR%%/images/timer-daily.png
107
%%DATADIR%%/images/timer-daily.png
70
%%DATADIR%%/images/timer-micro-break.png
108
%%DATADIR%%/images/timer-micro-break.png
71
%%DATADIR%%/images/timer-rest-break.png
109
%%DATADIR%%/images/timer-rest-break.png
72
%%DATADIR%%/images/workrave-icon-huge.png
73
%%DATADIR%%/images/workrave-icon-large.png
74
%%DATADIR%%/images/workrave-icon-medium.png
110
%%DATADIR%%/images/workrave-icon-medium.png
75
%%DATADIR%%/images/workrave-icon-small.png
76
%%DATADIR%%/images/workrave-quiet-icon-medium.png
111
%%DATADIR%%/images/workrave-quiet-icon-medium.png
77
%%DATADIR%%/images/workrave-suspended-icon-medium.png
112
%%DATADIR%%/images/workrave-suspended-icon-medium.png
78
%%DATADIR%%/images/workrave.png
113
%%DATADIR%%/images/workrave.png
79
%%NLS%%share/locale/bg/LC_MESSAGES/workrave.mo
114
%%DATADIR%%/images/workrave.xpm
80
%%NLS%%share/locale/ca/LC_MESSAGES/workrave.mo
81
%%NLS%%share/locale/cs/LC_MESSAGES/workrave.mo
82
%%NLS%%share/locale/da/LC_MESSAGES/workrave.mo
83
%%NLS%%share/locale/de/LC_MESSAGES/workrave.mo
84
%%NLS%%share/locale/el/LC_MESSAGES/workrave.mo
85
%%NLS%%share/locale/eo/LC_MESSAGES/workrave.mo
86
%%NLS%%share/locale/es/LC_MESSAGES/workrave.mo
87
%%NLS%%share/locale/et/LC_MESSAGES/workrave.mo
88
%%NLS%%share/locale/eu/LC_MESSAGES/workrave.mo
89
%%NLS%%share/locale/fr/LC_MESSAGES/workrave.mo
90
%%NLS%%share/locale/he/LC_MESSAGES/workrave.mo
91
%%NLS%%share/locale/hu/LC_MESSAGES/workrave.mo
92
%%NLS%%share/locale/it/LC_MESSAGES/workrave.mo
93
%%NLS%%share/locale/ja/LC_MESSAGES/workrave.mo
94
%%NLS%%share/locale/lt/LC_MESSAGES/workrave.mo
95
%%NLS%%share/locale/nb/LC_MESSAGES/workrave.mo
96
%%NLS%%share/locale/nl/LC_MESSAGES/workrave.mo
97
%%NLS%%share/locale/pl/LC_MESSAGES/workrave.mo
98
%%NLS%%share/locale/pt_BR/LC_MESSAGES/workrave.mo
99
%%NLS%%share/locale/ro/LC_MESSAGES/workrave.mo
100
%%NLS%%share/locale/ru/LC_MESSAGES/workrave.mo
101
%%NLS%%share/locale/sk/LC_MESSAGES/workrave.mo
102
%%NLS%%share/locale/sl/LC_MESSAGES/workrave.mo
103
%%NLS%%share/locale/sv/LC_MESSAGES/workrave.mo
104
%%NLS%%share/locale/tr/LC_MESSAGES/workrave.mo
105
%%NLS%%share/locale/zh_CN/LC_MESSAGES/workrave.mo
106
%%NLS%%share/locale/zh_TW/LC_MESSAGES/workrave.mo
107
@dirrm %%DATADIR%%/images
115
@dirrm %%DATADIR%%/images
108
@dirrm %%DATADIR%%/exercises
116
@dirrm %%DATADIR%%/exercises
109
@dirrm %%DATADIR%%
117
@dirrm %%DATADIR%%
110
@dirrm share/sounds/workrave/default
111
@dirrm share/sounds/workrave/subtle
118
@dirrm share/sounds/workrave/subtle
119
@dirrm share/sounds/workrave/default
112
@dirrm share/sounds/workrave
120
@dirrm share/sounds/workrave

Return to bug 190906