[patch] quark-3.21-build.patch

quark-3.21-build.patch (text/plain), 1.31 KB, created by Michael Palimaka (kensington) on 2012-01-18 15:36:31 UTC

Drop DEPRECATED flags for bug #387823.
Fix underlinking for bug #367859.
Don't force CFLAGS when using debug, and disable it by default.
--- quark/Makefile.am
+++ quark/Makefile.am
@@ -1,7 +1,6 @@
 localedir=$(datadir)/locale
 
 AM_CPPFLAGS=$(GLIB_CFLAGS) $(GTHREAD_CFLAGS) $(GNOMEVFS_CFLAGS) $(GCONF_CFLAGS) $(XINE_CFLAGS) \
-  -DG_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED \
   -DLOCALEDIR=\"$(localedir)\"
 
 bin_PROGRAMS = quark
--- strange-quark/Makefile.am
+++ strange-quark/Makefile.am
@@ -6,15 +6,13 @@
   $(GTK_CFLAGS) \
   $(GCONF_CFLAGS) \
   $(GDK_PIXBUF_CFLAGS) \
-  -DGTK_DISABLE_DEPRECATED \
-  -DG_DISABLE_DEPRECATED \
   -DG_LOG_DOMAIN=\"strange-quark\" \
   -DPIXMAPDIR=\"$(pixmapdir)\" \
   -DLOCALEDIR=\"$(localedir)\"
 
 bin_PROGRAMS = strange-quark
 
-strange_quark_LDADD = $(GTK_LIBS) $(GCONF_LIBS)
+strange_quark_LDADD = $(GTK_LIBS) $(GCONF_LIBS) -lX11
 strange_quark_SOURCES = \
   gettext.h \
   main.c \
--- configure.ac
+++ configure.ac
@@ -79,12 +79,7 @@
 
 AC_ARG_ENABLE([debug],
   [  --enable-debug          enable debugging shit],
-  [], [enable_debug="yes"])
-if test "$enable_debug" = "yes"; then
-  CFLAGS="-g -fno-inline"
-  CFLAGS="$CFLAGS -Wall -Wsign-compare -Waggregate-return"
-  CFLAGS="$CFLAGS -Wcast-qual -Wbad-function-cast -Wpointer-arith"
-fi
+  [], [enable_debug="no"])
 
 AC_OUTPUT