Attachment 143649 Details for Bug 190906 – x11_workrave.diff

[patch] x11_workrave.diff

x11_workrave.diff (text/plain), 11.76 KB, created by tkato432 on 2014-06-10 18:54:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-06-10 18:54:39 UTC

Size: 11.76 KB

patch

obsolete

>diff -urN /usr/ports/x11/workrave/Makefile x11/workrave/Makefile
>--- /usr/ports/x11/workrave/Makefile	2014-06-07 04:16:20.000000000 +0900
>+++ x11/workrave/Makefile	2014-06-11 00:00:00.000000000 +0900
>@@ -2,60 +2,46 @@
> # $FreeBSD: head/x11/workrave/Makefile 356785 2014-06-06 13:21:59Z amdmi3 $
> 
> PORTNAME=	workrave
>-PORTVERSION=	1.9.4
>-PORTREVISION=	3
>+PORTVERSION=	1.10.1
> CATEGORIES=	x11 gnome
> MASTER_SITES=	SF
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	RSI prevention tool
> 
>-BUILD_DEPENDS=	gdome-config:${PORTSDIR}/textproc/gdome2
>+LICENSE=	GPLv3 # (or later)
> 
>-OPTIONS_DEFINE=	GNOME NETWORK NLS
>-NETWORK_DESC=	Build with network support
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>0:${PORTSDIR}/devel/py-cheetah
>+LIB_DEPENDS=	libgdome.so:${PORTSDIR}/textproc/gdome2
> 
>-INSTALLS_ICONS=	yes
>-DESKTOP_ENTRIES="Workrave" "RSI prevention tool" \
>-		"${DATADIR}/images/workrave-icon-small.png" \
>-		"workrave" \
>-		"Utility;" \
>-		false
>-
>-USE_XORG=	x11 xmu recordproto xtst xext
>-USES=		pathfix pkgconfig  gmake
>-USE_GNOME=	gnomeprefix intlhack gconf2 intltool
>-USE_GSTREAMER=	good
>+USES=		gettext gmake pathfix pkgconfig
>+USE_XORG=	recordproto x11 xext xmu xscrnsaver xtst
>+USE_GNOME=	intlhack gconf2 gnomehier gtkmm24
>+USE_PYTHON=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	LIBS="`pkg-config --libs libgnomeui-2.0`"
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-CONFIGURE_ARGS=	--enable-gconf --disable-pulse
>+CONFIGURE_ARGS=	--disable-silent-rules --enable-gconf --disable-gnome3 \
>+		--disable-indicator
>+INSTALLS_ICONS=	yes
> 
>-.include <bsd.port.options.mk>
>-LIB_DEPENDS+=	libgdome.so:${PORTSDIR}/textproc/gdome2
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-.if ${PORT_OPTIONS:MGNOME}
>-LIB_DEPENDS+=	libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26
>-USE_GNOME+=	gnomepanel
>-PLIST_SUB+=	GNOME=""
>-.else
>-LIB_DEPENDS+=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
>-CONFIGURE_ARGS+=--disable-gnome
>-PLIST_SUB+=	GNOME="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MNETWORK}
>-LIB_DEPENDS+=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
>-.else
>-CONFIGURE_ARGS+=--disable-distribution
>-.endif
>-
>-.if ${PORT_OPTIONS:MNLS}
>-USES+=		gettext
>-PLIST_SUB+=	NLS=""
>-.else
>-CONFIGURE_ARGS+=--disable-nls
>-PLIST_SUB+=	NLS="@comment "
>-.endif
>+OPTIONS_DEFINE=		GNOME GSTREAMER PULSEAUDIO
>+OPTIONS_DEFAULT=	GSTREAMER
>+OPTIONS_SUB=		yes
>+
>+GNOME_USE=		gnome=gnomepanel
>+GNOME_LIB_DEPENDS=	libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26
>+GNOME_CONFIGURE_ENABLE=	gnome2
>+GSTREAMER_USE=		gstreamer=good
>+GSTREAMER_CONFIGURE_ENABLE=	gstreamer
>+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
>+PULSEAUDIO_CONFIGURE_ENABLE=	pulse
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e \
>+		'/if test/s|==|=|' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
>+		's| gnome-shell$$||' ${WRKSRC}/frontend/applets/Makefile.in
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/x11/workrave/distinfo x11/workrave/distinfo
>--- /usr/ports/x11/workrave/distinfo	2014-01-23 04:38:11.000000000 +0900
>+++ x11/workrave/distinfo	2014-06-11 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (workrave-1.9.4.tar.gz) = ce1efa57a37192029c4dcbe8a0ac2b893b2286c42828f19b0fb86867cbbcde1a
>-SIZE (workrave-1.9.4.tar.gz) = 6748495
>+SHA256 (workrave-1.10.1.tar.gz) = 6ef89aebd278e27d3b73896485e7d8aaef415e7d18318d3bb7ba0d0507bd48de
>+SIZE (workrave-1.10.1.tar.gz) = 6800197
>diff -urN /usr/ports/x11/workrave/files/patch-backend__include__ICore.hh x11/workrave/files/patch-backend__include__ICore.hh
>--- /usr/ports/x11/workrave/files/patch-backend__include__ICore.hh	2014-06-06 05:13:01.000000000 +0900
>+++ x11/workrave/files/patch-backend__include__ICore.hh	2014-06-11 00:00:00.000000000 +0900
>@@ -6,5 +6,5 @@
>  #include <string>
> +#include <ctime>
>  
>- namespace workrave {
>+ #include "enum.h"
>  
>diff -urN /usr/ports/x11/workrave/files/patch-backends__src__unix__Makefile.in x11/workrave/files/patch-backends__src__unix__Makefile.in
>--- /usr/ports/x11/workrave/files/patch-backends__src__unix__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ x11/workrave/files/patch-backends__src__unix__Makefile.in	2014-06-11 00:00:00.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- backend/src/unix/Makefile.in.orig
>++++ backend/src/unix/Makefile.in
>+@@ -388,7 +388,7 @@
>+ 			-DWORKRAVE_PKGDATADIR="\"${pkgdatadir}\"" \
>+ 			-D_XOPEN_SOURCE=600 \
>+ 			@WR_COMMON_INCLUDES@ \
>+-			@GLIB_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@
>++			@GLIB_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @GNOME2_CFLAGS@
>+ 
>+ EXTRA_DIST = $(wildcard $(srcdir)/*.cc) $(wildcard $(srcdir)/*.rc)\
>+ 			$(wildcard $(srcdir)/*.hh) $(wildcard $(srcdir)/*.h) $(wildcard $(srcdir)/*.icc)
>diff -urN /usr/ports/x11/workrave/files/patch-configure x11/workrave/files/patch-configure
>--- /usr/ports/x11/workrave/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
>+++ x11/workrave/files/patch-configure	2014-06-11 00:00:00.000000000 +0900
>@@ -0,0 +1,39 @@
>+--- configure.orig
>++++ configure
>+@@ -19237,36 +19237,6 @@
>+         enable_monitors="${enable_monitors}x11events"
>+     fi
>+ 
>+-    loop=${enable_monitors},
>+-
>+-    while echo $loop | grep \, &> /dev/null
>+-    do
>+-        monitor=${loop%%\,*}
>+-        loop=${loop#*\,}
>+-
>+-        case "$monitor" in
>+-           record)
>+-	       if test "x$have_xrecord" != "xyes" ; then
>+-                   as_fn_error $? "record activity monitor not supported." "$LINENO" 5
>+-               fi
>+-    	       ;;
>+-
>+-	   x11events)
>+-               ;;
>+-
>+-	   screensaver)
>+-	       if test "x$have_xscreensaver" != "xyes" ; then
>+-                   as_fn_error $? "screensaver activity monitor not supported." "$LINENO" 5
>+-               fi
>+-	       ;;
>+-
>+-	   *)
>+-               as_fn_error $? "unknown activity monitor: $monitor" "$LINENO" 5
>+-	       ;;
>+-
>+-        esac
>+-    done
>+-
>+ 
>+ cat >>confdefs.h <<_ACEOF
>+ #define HAVE_MONITORS "$enable_monitors"
>diff -urN /usr/ports/x11/workrave/files/patch-frontend__common__src__Makefile.in x11/workrave/files/patch-frontend__common__src__Makefile.in
>--- /usr/ports/x11/workrave/files/patch-frontend__common__src__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ x11/workrave/files/patch-frontend__common__src__Makefile.in	2014-06-11 00:00:00.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- frontend/common/src/Makefile.in.orig
>++++ frontend/common/src/Makefile.in
>+@@ -418,7 +418,7 @@
>+ 			-I$(top_srcdir)/frontend/common/src/win32 \
>+ 			-I$(top_srcdir)/frontend/common/src/osx \
>+ 			@WR_COMMON_INCLUDES@ @WR_BACKEND_INCLUDES@ @PULSE_CFLAGS@ \
>+-			@GTK_CFLAGS@ @GLIB_CFLAGS@ @GSTREAMER_CFLAGS@ \
>++			@GTK_CFLAGS@ @GLIB_CFLAGS@ @GSTREAMER_CFLAGS@ @GNOME2_CFLAGS@ \
>+ 			-I$(top_srcdir)/common/win32/harpoon/include
>+ 
>+ all: all-recursive
>diff -urN /usr/ports/x11/workrave/pkg-plist x11/workrave/pkg-plist
>--- /usr/ports/x11/workrave/pkg-plist	2014-06-06 05:13:01.000000000 +0900
>+++ x11/workrave/pkg-plist	2014-06-11 00:00:00.000000000 +0900
>@@ -1,15 +1,54 @@
>-bin/workrave
>-%%GNOME%%etc/sound/events/workrave.soundlist
>+%%NO_GNOME%%bin/workrave
>+%%GNOME%%libdata/bonobo/servers/Workrave-Applet.server
> %%GNOME%%libexec/workrave-applet
>-share/dbus-1/services/org.workrave.Workrave.service
>-%%GNOME%%share/dbus-1/services/org.workrave.WorkraveAppletFactory.service
>-%%GNOME%%share/gnome-panel/applets/org.workrave.WorkraveApplet.panel-applet
>-%%GNOME%%share/gnome-panel/ui/workrave-applet-menu.xml
>-share/icons/hicolor/48x48/apps/workrave-icon-huge.png
>-share/icons/hicolor/scalable/apps/workrave-sheep.svg
>+%%NO_GNOME%%share/applications/workrave.desktop
>+%%NO_GNOME%%share/dbus-1/services/org.workrave.Workrave.service
>+%%GNOME%%share/gnome-2.0/ui/GNOME_WorkraveApplet.xml
>+share/icons/hicolor/128x128/apps/workrave.png
>+share/icons/hicolor/16x16/apps/workrave.png
>+share/icons/hicolor/24x24/apps/workrave.png
>+share/icons/hicolor/32x32/apps/workrave.png
>+share/icons/hicolor/48x48/apps/workrave.png
>+share/icons/hicolor/64x64/apps/workrave.png
>+share/icons/hicolor/96x96/apps/workrave.png
>+share/icons/hicolor/scalable/apps/workrave.svg
>+share/icons/hicolor/scalable/workrave-sheep.svg
>+share/locale/bg/LC_MESSAGES/workrave.mo
>+share/locale/ca/LC_MESSAGES/workrave.mo
>+share/locale/cs/LC_MESSAGES/workrave.mo
>+share/locale/da/LC_MESSAGES/workrave.mo
>+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/fa/LC_MESSAGES/workrave.mo
>+share/locale/fi/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/hr/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
>+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
>+share/locale/sr@latin/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/uk/LC_MESSAGES/workrave.mo
>+share/locale/zh_CN/LC_MESSAGES/workrave.mo
>+share/locale/zh_TW/LC_MESSAGES/workrave.mo
> share/sounds/workrave/default/break-ignored.wav
> share/sounds/workrave/default/break-prelude.wav
> share/sounds/workrave/default/daily-limit.wav
>@@ -32,7 +71,6 @@
> share/sounds/workrave/subtle/rest-break-ended.wav
> share/sounds/workrave/subtle/rest-break-started.wav
> share/sounds/workrave/subtle/soundtheme
>-share/workrave/images/workrave.xpm
> %%DATADIR%%/exercises/backward-shoulder-stretch.png
> %%DATADIR%%/exercises/chair-pushup-1.png
> %%DATADIR%%/exercises/chair-pushup-2.png
>@@ -69,44 +107,14 @@
> %%DATADIR%%/images/timer-daily.png
> %%DATADIR%%/images/timer-micro-break.png
> %%DATADIR%%/images/timer-rest-break.png
>-%%DATADIR%%/images/workrave-icon-huge.png
>-%%DATADIR%%/images/workrave-icon-large.png
> %%DATADIR%%/images/workrave-icon-medium.png
>-%%DATADIR%%/images/workrave-icon-small.png
> %%DATADIR%%/images/workrave-quiet-icon-medium.png
> %%DATADIR%%/images/workrave-suspended-icon-medium.png
> %%DATADIR%%/images/workrave.png
>-%%NLS%%share/locale/bg/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/ca/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/cs/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/da/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/de/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/el/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/eo/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/es/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/et/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/eu/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/fr/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/he/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/hu/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/it/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/ja/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/lt/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/nb/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/nl/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/pl/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/pt_BR/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/ro/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/ru/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/sk/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/sl/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/sv/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/tr/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/zh_CN/LC_MESSAGES/workrave.mo
>-%%NLS%%share/locale/zh_TW/LC_MESSAGES/workrave.mo
>+%%DATADIR%%/images/workrave.xpm
> @dirrm %%DATADIR%%/images
> @dirrm %%DATADIR%%/exercises
> @dirrm %%DATADIR%%
>-@dirrm share/sounds/workrave/default
> @dirrm share/sounds/workrave/subtle
>+@dirrm share/sounds/workrave/default
> @dirrm share/sounds/workrave

Actions: View | Diff

Attachments on bug 190906: 143649 | 143717