Attachment #173032 for bug #211297




# $FreeBSD$

PORTNAME=	workrave
PORTVERSION=	1.10.15
CATEGORIES=	x11
CATEGORIES=	x11 gnome
MASTER_SITES=	SF

MAINTAINER=	t@tobik.me
COMMENT=	RSI prevention tool

LICENSE=	GPLv3+

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah
LIB_DEPENDS=	libgdome.so:textproc/gdome2

USES=	autoreconf:build gettext gmake libtool pathfix pkgconfig
USE_XORG=	ice recordproto sm x11 xext xmu xscrnsaver xtst
USE_GNOME=	intltool intlhack introspection gtkmm30
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-silent-rules \
		--disable-gsettings \
		--disable-pulse \
		--disable-gconf \
		--disable-mate \
		--disable-gnome2 \
		--disable-gnome3 \
		--disable-xfce \
		--disable-indicator
INSTALLS_ICONS=	yes
USE_LDCONFIG=	yes

USE_GITHUB=	yes
GH_ACCOUNT=	rcaelers
GH_TAGNAME=	v${PORTVERSION:S/./_/g}

CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=		DBUS DISTRIBUTION GSTREAMER
OPTIONS_DEFAULT=	DBUS GSTREAMER
OPTIONS_SUB=		yes

DISTRIBUTION_DESC=	Build with networking support

DBUS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah
DBUS_CONFIGURE_ENABLE=	dbus
DBUS_USES=	python:2.7

DISTRIBUTION_CONFIGURE_ENABLE=	distribution

GSTREAMER_LIB_DEPENDS=	libgstreamer-1.0.so:multimedia/gstreamer1
GSTREAMER_CONFIGURE_ENABLE=	gstreamer
GSTREAMER_USE=		gstreamer1=good
PULSEAUDIO_CONFIGURE_ENABLE=	pulse

# Remove gnome-shell cinnamon subdirs from build, so it doesn't install
# unused files
post-patch:
	@${REINPLACE_CMD} -e 's| gnome-shell cinnamon | |' \
		${WRKSRC}/frontend/applets/Makefile.am
	@${REINPLACE_CMD} -e \
		's| gnome-shell$$||' ${WRKSRC}/frontend/applets/Makefile.in

# Run bundled autogen.sh instead of relying on USES=autoreconf which
# leads to errors like
# config.status: error: po/Makefile.in.in was not created by intltoolize.
pre-configure:
	@cd ${WRKSRC} && ./autogen.sh

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (workrave-1.10.1.tar.gz) = 6ef89aebd278e27d3b73896485e7d8aaef415e7d18318d3bb7ba0d0507bd48de	1	TIMESTAMP = 1469179894
2	SIZE (workrave-1.10.1.tar.gz) = 6800197	2	SHA256 (rcaelers-workrave-1.10.15-v1_10_15_GH0.tar.gz) = fa05bedbb32baae9d22ef2b1ac25e90bc9f1363ce588b396190b0240559f471c
		3	SIZE (rcaelers-workrave-1.10.15-v1_10_15_GH0.tar.gz) = 6375380




--- frontend/common/src/System.cc.old      2011-05-17 11:54:41.000000000 -0500
+++ frontend/common/src/System.cc   2011-05-17 11:55:13.000000000 -0500
@@ -41,15 +41,12 @@
 #include <X11/Xproto.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <sys/wait.h>
 #ifdef HAVE_APP_GTK
 #include <gdk/gdkx.h>
 #endif
 #endif
 
-#if defined(HAVE_UNIX)
-#include <sys/wait.h>
-#endif
-
 #ifdef PLATFORM_OS_WIN32
 #include <shlobj.h>
 #include <shldisp.h>


Lines 1-10 Link Here

(-)files/patch-backend__include__ICore.hh (-10 lines)
1	--- backend/include/ICore.hh.orig 2010-12-05 21:01:31.000000000 +0300
2	+++ backend/include/ICore.hh 2014-05-17 03:18:53.674936521 +0400
3	@@ -21,6 +21,7 @@
4	#define ICORE_HH
5
6	#include <string>
7	+#include <ctime>
8
9	#include "enum.h"
10

Lines 1-11 Link Here

(-)files/patch-backends__src__unix__Makefile.in (-11 lines)
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)




--- common/src/Locale.cc.orig	2016-05-11 16:14:20 UTC
+++ common/src/Locale.cc
@@ -258,22 +258,8 @@ Locale::get_week_start()
 
 #ifdef PLATFORM_OS_UNIX
   union { unsigned int word; char *string; } langinfo;
-  gint week_1stday = 0;
-  gint first_weekday = 1;
-  guint week_origin;
-  
-  langinfo.string = nl_langinfo(_NL_TIME_FIRST_WEEKDAY);
-  first_weekday = langinfo.string[0];
-  langinfo.string = nl_langinfo(_NL_TIME_WEEK_1STDAY);
-  week_origin = langinfo.word;
-  if (week_origin == 19971130) /* Sunday */
-    week_1stday = 0;
-  else if (week_origin == 19971201) /* Monday */
-    week_1stday = 1;
-  else
-    g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.\n");
-
-  week_start = (week_1stday + first_weekday - 1) % 7;
+  langinfo.string = nl_langinfo(DAY_1);
+  week_start = langinfo.string[0];
 #endif
 
   return week_start;




--- 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"




--- configure.ac.orig	2016-05-11 16:14:20 UTC
+++ configure.ac
@@ -417,8 +417,7 @@ then
     with_cxx11=no
     # Enable C++11 std if gtkmm >= 3.18.0
     PKG_CHECK_MODULES(GTKMM, gtkmm-3.0 >= 3.18.0,
-      [ AX_CXX_COMPILE_STDCXX_11([noext])
-        with_cxx11=yes
+      [ with_cxx11=yes
       ],
       []
     )
@@ -447,36 +446,6 @@ then
         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
-                   AC_MSG_ERROR([record activity monitor not supported.])
-               fi
-    	       ;;
-
-	   x11events)
-               ;;
-	   
-	   screensaver)
-	       if test "x$have_xscreensaver" != "xyes" ; then
-                   AC_MSG_ERROR([screensaver activity monitor not supported.])
-               fi
-	       ;;
-
-	   *)
-               AC_MSG_ERROR([unknown activity monitor: $monitor])
-	       ;;
-	   
-        esac
-    done
-
     AC_DEFINE_UNQUOTED(HAVE_MONITORS, "$enable_monitors", "Enabled activity monitors")
 
 fi
@@ -815,21 +784,11 @@ dnl
 dnl GConf
 dnl
 
+dnl Do not want
 config_gconf=no
-
-if test "x$enable_gconf" != "xno" -a "x$config_gnome3" != "xyes"
-then
-  PKG_CHECK_MODULES([GCONF],
-                    [gconf-2.0 >= 2.31.1],
-                    [config_gconf=yes
-                     AC_DEFINE([HAVE_GCONF], , [Define if GConf is available])],
-                    [if test "x$enable_gconf" = "xyes"; then
-                       AC_MSG_ERROR([GConf development headers not found.])
-                     fi])
-fi
-
-AM_CONDITIONAL(HAVE_GCONF, test "x$config_gconf" = "xyes")
-
+AC_SUBST([GCONF_CFLAGS], [])
+AC_SUBST([GCONF_LIBS], [])
+AM_CONDITIONAL(HAVE_GCONF, false)
 
 dnl
 dnl XML
@@ -892,13 +851,6 @@ config_gstreamer=no
 
 if test "x$enable_gstreamer" != "xno";
 then
-    PKG_CHECK_MODULES([GSTREAMER],
-                      [gstreamer-0.10],
-                      [config_gstreamer=yes
-                       AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])], [ ])
-		     
-    if test "x$config_gstreamer" != "xyes";
-    then
         PKG_CHECK_MODULES([GSTREAMER],
                       [gstreamer-1.0],
                       [config_gstreamer=yes
@@ -906,7 +858,6 @@ then
                          [if test "x$enable_gstreamer" = "xyes"; then
                            AC_MSG_ERROR([GStreamer development headers not found.])
                        fi])
-    fi
 fi
 
 

Lines 1-11 Link Here

(-)files/patch-frontend__common__src__Makefile.in (-11 lines)
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

Line 0 Link Here

(-)files/patch-frontend_common_src_ScreenLockCommandline.cc (+11 lines)
	1	--- frontend/common/src/ScreenLockCommandline.cc.orig 2016-05-11 16:14:20 UTC
	2	+++ frontend/common/src/ScreenLockCommandline.cc
	3	@@ -27,6 +27,8 @@
	4	#include <glib.h>
	5	#endif
	6
	7	+#include <sys/wait.h>
	8	+
	9	#include "ScreenLockCommandline.hh"
	10	#include "debug.hh"
	11

Lines 1-10 Link Here

(-)pkg-descr (-5 / +1 lines)
1	Workrave is a program that assists in the recovery and prevention of	1	Workrave is a program that assists in the recovery and prevention of
2	Repetitive Strain Injury (RSI). The program frequently alerts you to	2	Repetitive Strain Injury (RSI). The program frequently alerts you to
3	take micro-pauses, rest breaks and restricts you to your daily limit.	3	take micro-pauses, rest breaks and restricts you to your daily limit.
4	These can be customized and it stops the counter when you stop.	4	These can be customized and it stops the counter when you stop.
5		5
6	The program can be run distributed on one or more PCs. All connected
7	PCs share the same timing information. When you switch computers, you
8	will still be asked to pause on time.
9
10	WWW: http://www.workrave.org/	6	WWW: http://www.workrave.org/

Lines 1-9 Link Here

(-)pkg-plist (-6 / +10 lines)
1	%%NO_GNOME%%bin/workrave	1	bin/workrave
2	%%GNOME%%libdata/bonobo/servers/Workrave-Applet.server	2	lib/girepository-1.0/Workrave-1.0.typelib
3	%%GNOME%%libexec/workrave-applet	3	lib/libworkrave-private-1.0.a
4	%%NO_GNOME%%share/applications/workrave.desktop	4	lib/libworkrave-private-1.0.so
5	%%NO_GNOME%%share/dbus-1/services/org.workrave.Workrave.service	5	lib/libworkrave-private-1.0.so.0
6	%%GNOME%%share/gnome-2.0/ui/GNOME_WorkraveApplet.xml	6	lib/libworkrave-private-1.0.so.0.0.0
		7	share/appdata/workrave.appdata.xml
		8	share/applications/workrave.desktop
		9	%%DBUS%%share/dbus-1/services/org.workrave.Workrave.service
		10	share/gir-1.0/Workrave-1.0.gir
7	share/icons/hicolor/128x128/apps/workrave.png	11	share/icons/hicolor/128x128/apps/workrave.png
8	share/icons/hicolor/16x16/apps/workrave.png	12	share/icons/hicolor/16x16/apps/workrave.png
9	share/icons/hicolor/24x24/apps/workrave.png	13	share/icons/hicolor/24x24/apps/workrave.png

Return to bug 211297

Lines 2-47 Link Here

(-)Makefile (-24 / +45 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= workrave	4	PORTNAME= workrave
5	PORTVERSION= 1.10.1	5	PORTVERSION= 1.10.15
6	PORTREVISION= 2	6	CATEGORIES= x11
7	CATEGORIES= x11 gnome
8	MASTER_SITES= SF
9		7
10	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= t@tobik.me
11	COMMENT= RSI prevention tool	9	COMMENT= RSI prevention tool
12		10
13	LICENSE= GPLv3+	11	LICENSE= GPLv3+
14		12
15	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah
16	LIB_DEPENDS= libgdome.so:textproc/gdome2	13	LIB_DEPENDS= libgdome.so:textproc/gdome2
17		14
18	USES= gettext gmake pathfix pkgconfig python:2.7	15	USES= autoreconf:build gettext gmake libtool pathfix pkgconfig
19	USE_XORG= recordproto x11 xext xmu xscrnsaver xtst	16	USE_XORG= ice recordproto sm x11 xext xmu xscrnsaver xtst
20	USE_GNOME= intlhack gconf2 gtkmm24	17	USE_GNOME= intltool intlhack introspection gtkmm30
21	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
22	CONFIGURE_ARGS= --disable-silent-rules --enable-gconf --disable-gnome3 \	19	CONFIGURE_ARGS= --disable-silent-rules \
		20	--disable-gsettings \
		21	--disable-pulse \
		22	--disable-gconf \
		23	--disable-mate \
		24	--disable-gnome2 \
		25	--disable-gnome3 \
		26	--disable-xfce \
23	--disable-indicator	27	--disable-indicator
24	INSTALLS_ICONS= yes	28	INSTALLS_ICONS= yes
		29	USE_LDCONFIG= yes
25		30
26	CPPFLAGS+= -I${LOCALBASE}/include	31	USE_GITHUB= yes
27	LIBS+= -L${LOCALBASE}/lib	32	GH_ACCOUNT= rcaelers
		33	GH_TAGNAME= v${PORTVERSION:S/./_/g}
28		34
29	OPTIONS_DEFINE= GNOME GSTREAMER PULSEAUDIO	35	CFLAGS+= -I${LOCALBASE}/include
30	OPTIONS_DEFAULT= GSTREAMER	36	LDFLAGS+= -L${LOCALBASE}/lib
		37
		38	INSTALL_TARGET= install-strip
		39
		40	OPTIONS_DEFINE= DBUS DISTRIBUTION GSTREAMER
		41	OPTIONS_DEFAULT= DBUS GSTREAMER
31	OPTIONS_SUB= yes	42	OPTIONS_SUB= yes
32		43
33	GNOME_USE= gnome=gnomepanel	44	DISTRIBUTION_DESC= Build with networking support
34	GNOME_LIB_DEPENDS= libgnomeuimm-2.6.so:x11-toolkits/libgnomeuimm26	45
35	GNOME_CONFIGURE_ENABLE= gnome2	46	DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah
36	GSTREAMER_USE= gstreamer=good	47	DBUS_CONFIGURE_ENABLE= dbus
		48	DBUS_USES= python:2.7
		49
		50	DISTRIBUTION_CONFIGURE_ENABLE= distribution
		51
		52	GSTREAMER_LIB_DEPENDS= libgstreamer-1.0.so:multimedia/gstreamer1
37	GSTREAMER_CONFIGURE_ENABLE= gstreamer	53	GSTREAMER_CONFIGURE_ENABLE= gstreamer
38	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	54	GSTREAMER_USE= gstreamer1=good
39	PULSEAUDIO_CONFIGURE_ENABLE= pulse
40		55
		56	# Remove gnome-shell cinnamon subdirs from build, so it doesn't install
		57	# unused files
41	post-patch:	58	post-patch:
42	@${REINPLACE_CMD} -e \	59	@${REINPLACE_CMD} -e 's\| gnome-shell cinnamon \| \|' \
43	'/if test/s\|==\|=\|' ${WRKSRC}/configure	60	${WRKSRC}/frontend/applets/Makefile.am
44	@${REINPLACE_CMD} -e \
45	's\| gnome-shell$$\|\|' ${WRKSRC}/frontend/applets/Makefile.in
46		61
		62	# Run bundled autogen.sh instead of relying on USES=autoreconf which
		63	# leads to errors like
		64	# config.status: error: po/Makefile.in.in was not created by intltoolize.
		65	pre-configure:
		66	@cd ${WRKSRC} && ./autogen.sh
		67
47	.include <bsd.port.mk>	68	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)files/patch-System.cc (-20 lines)
1	--- frontend/common/src/System.cc.old 2011-05-17 11:54:41.000000000 -0500
2	+++ frontend/common/src/System.cc 2011-05-17 11:55:13.000000000 -0500
3	@@ -41,15 +41,12 @@
4	#include <X11/Xproto.h>
5	#include <X11/Xlib.h>
6	#include <X11/Xutil.h>
7	+#include <sys/wait.h>
8	#ifdef HAVE_APP_GTK
9	#include <gdk/gdkx.h>
10	#endif
11	#endif
12
13	-#if defined(HAVE_UNIX)
14	-#include <sys/wait.h>
15	-#endif
16	-
17	#ifdef PLATFORM_OS_WIN32
18	#include <shlobj.h>
19	#include <shldisp.h>
20

Line 0 Link Here

(-)files/patch-common_src_Locale.cc (+27 lines)
	1	--- common/src/Locale.cc.orig 2016-05-11 16:14:20 UTC
	2	+++ common/src/Locale.cc
	3	@@ -258,22 +258,8 @@ Locale::get_week_start()
	4
	5	#ifdef PLATFORM_OS_UNIX
	6	union { unsigned int word; char *string; } langinfo;
	7	- gint week_1stday = 0;
	8	- gint first_weekday = 1;
	9	- guint week_origin;
	10	-
	11	- langinfo.string = nl_langinfo(_NL_TIME_FIRST_WEEKDAY);
	12	- first_weekday = langinfo.string[0];
	13	- langinfo.string = nl_langinfo(_NL_TIME_WEEK_1STDAY);
	14	- week_origin = langinfo.word;
	15	- if (week_origin == 19971130) /* Sunday */
	16	- week_1stday = 0;
	17	- else if (week_origin == 19971201) /* Monday */
	18	- week_1stday = 1;
	19	- else
	20	- g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.\n");
	21	-
	22	- week_start = (week_1stday + first_weekday - 1) % 7;
	23	+ langinfo.string = nl_langinfo(DAY_1);
	24	+ week_start = langinfo.string[0];
	25	#endif
	26
	27	return week_start;

Lines 1-39 Link Here

(-)files/patch-configure (-39 lines)
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"

Line 0 Link Here

(-)files/patch-configure.ac (+97 lines)
		1	--- configure.ac.orig 2016-05-11 16:14:20 UTC
		2	+++ configure.ac
		3	@@ -417,8 +417,7 @@ then
		4	with_cxx11=no
		5	# Enable C++11 std if gtkmm >= 3.18.0
		6	PKG_CHECK_MODULES(GTKMM, gtkmm-3.0 >= 3.18.0,
		7	- [ AX_CXX_COMPILE_STDCXX_11([noext])
		8	- with_cxx11=yes
		9	+ [ with_cxx11=yes
		10	],
		11	[]
		12	)
		13	@@ -447,36 +446,6 @@ then
		14	enable_monitors="${enable_monitors}x11events"
		15	fi
		16
		17	- loop=${enable_monitors},
		18	-
		19	- while echo $loop \| grep \, &> /dev/null
		20	- do
		21	- monitor=${loop%%\,*}
		22	- loop=${loop#*\,}
		23	-
		24	- case "$monitor" in
		25	- record)
		26	- if test "x$have_xrecord" != "xyes" ; then
		27	- AC_MSG_ERROR([record activity monitor not supported.])
		28	- fi
		29	- ;;
		30	-
		31	- x11events)
		32	- ;;
		33	-
		34	- screensaver)
		35	- if test "x$have_xscreensaver" != "xyes" ; then
		36	- AC_MSG_ERROR([screensaver activity monitor not supported.])
		37	- fi
		38	- ;;
		39	-
		40	- *)
		41	- AC_MSG_ERROR([unknown activity monitor: $monitor])
		42	- ;;
		43	-
		44	- esac
		45	- done
		46	-
		47	AC_DEFINE_UNQUOTED(HAVE_MONITORS, "$enable_monitors", "Enabled activity monitors")
		48
		49	fi
		50	@@ -815,21 +784,11 @@ dnl
		51	dnl GConf
		52	dnl
		53
		54	+dnl Do not want
		55	config_gconf=no
		56	-
		57	-if test "x$enable_gconf" != "xno" -a "x$config_gnome3" != "xyes"
		58	-then
		59	- PKG_CHECK_MODULES([GCONF],
		60	- [gconf-2.0 >= 2.31.1],
		61	- [config_gconf=yes
		62	- AC_DEFINE([HAVE_GCONF], , [Define if GConf is available])],
		63	- [if test "x$enable_gconf" = "xyes"; then
		64	- AC_MSG_ERROR([GConf development headers not found.])
65	- fi])
66	-fi
67	-
68	-AM_CONDITIONAL(HAVE_GCONF, test "x$config_gconf" = "xyes")
69	-
70	+AC_SUBST([GCONF_CFLAGS], [])
71	+AC_SUBST([GCONF_LIBS], [])
72	+AM_CONDITIONAL(HAVE_GCONF, false)
73
74	dnl
75	dnl XML
76	@@ -892,13 +851,6 @@ config_gstreamer=no
77
78	if test "x$enable_gstreamer" != "xno";
79	then
80	- PKG_CHECK_MODULES([GSTREAMER],
81	- [gstreamer-0.10],
82	- [config_gstreamer=yes
83	- AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])], [ ])
84	-
85	- if test "x$config_gstreamer" != "xyes";
86	- then
87	PKG_CHECK_MODULES([GSTREAMER],
88	[gstreamer-1.0],
89	[config_gstreamer=yes
90	@@ -906,7 +858,6 @@ then
91	[if test "x$enable_gstreamer" = "xyes"; then
92	AC_MSG_ERROR([GStreamer development headers not found.])
93	fi])
94	- fi
95	fi
96
97