- updated for 0.4.2

Changed files:
    ddccontrol-gnome.patch -> 1.2

diff --git a/ddccontrol-gnome.patch b/ddccontrol-gnome.patch
index 3e5ff9a3a9e438833f4bc4945a1b4dd02da7fa04..f2dc057b40e0a3c2f974578ab664b85bd2445a31 100644 (file)
--- a/ddccontrol-gnome.patch
+++ b/ddccontrol-gnome.patch
@@ -1,35 +1,35 @@
---- ddccontrol-0.4.1/src/gnome-ddcc-applet/Makefile.am.orig    2005-11-19 14:12:51.000000000 +0100
-+++ ddccontrol-0.4.1/src/gnome-ddcc-applet/Makefile.am 2006-05-16 19:51:52.198126500 +0200
+--- ddccontrol-0.4.2/src/gnome-ddcc-applet/Makefile.am.orig    2006-06-15 18:45:19.000000000 +0200
++++ ddccontrol-0.4.2/src/gnome-ddcc-applet/Makefile.am 2006-08-24 23:46:30.204199000 +0200
 @@ -9,8 +9,8 @@
  pkglib_PROGRAMS = ddcc-applet
  ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
  
--ddcc_applet_LDADD = $(GNOME_LIBS) $(DDCC_LDADD)
+-ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD)
 -AM_CFLAGS = $(GNOME_CFLAGS) '-DPKGDATADIR="$(pkgdatadir)"'
-+ddcc_applet_LDADD = $(GNOME_APPLET_LIBS) $(DDCC_LDADD)
++ddcc_applet_LDADD = $(GNOME_APPLET_LDFLAGS) $(DDCC_LDADD)
 +AM_CFLAGS = $(GNOME_APPLET_CFLAGS) '-DPKGDATADIR="$(pkgdatadir)"'
  
  pkgdata_DATA = GNOME_ddcc-applet.xml
  
---- ddccontrol-0.4.1/configure.ac.orig 2006-03-09 21:33:20.000000000 +0100
-+++ ddccontrol-0.4.1/configure.ac      2006-05-16 19:51:32.024865750 +0200
-@@ -133,14 +133,16 @@
- GNOME_APPLET=
+--- ddccontrol-0.4.2/configure.ac.orig 2006-07-27 22:45:07.000000000 +0200
++++ ddccontrol-0.4.2/configure.ac      2006-08-24 23:47:16.771109250 +0200
+@@ -150,8 +150,8 @@
  if test x$support_gnome_applet = xyes; then
-       GNOME_APPLET="gnome-ddcc-applet"
--      PKG_CHECK_MODULES(GNOME, libpanelapplet-2.0 >= 2.10,,GNOME_APPLET="")
--    GNOME_LDFLAGS="$LIBXML2_LDFLAGS `pkg-config --libs gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
--    GNOME_CFLAGS="$LIBXML2_CFLAGS `pkg-config --cflags gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
-+      PKG_CHECK_MODULES(GNOME_APPL, libpanelapplet-2.0 >= 2.10,,GNOME_APPLET="")
-+    GNOME_APPLET_LDFLAGS="$LIBXML2_LDFLAGS `pkg-config --libs gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
-+    GNOME_APPLET_CFLAGS="$LIBXML2_CFLAGS `pkg-config --cflags gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
+       if pkg-config --atleast-version=2.10 libpanelapplet-2.0 ; then
+               GNOME_APPLET="gnome-ddcc-applet"
+-          GNOME_LDFLAGS="$LIBXML2_LDFLAGS `pkg-config --libs gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
+-          GNOME_CFLAGS="$LIBXML2_CFLAGS `pkg-config --cflags gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
++          GNOME_APPLET_LDFLAGS="$LIBXML2_LDFLAGS `pkg-config --libs gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
++          GNOME_APPLET_CFLAGS="$LIBXML2_CFLAGS `pkg-config --cflags gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
+       fi
  fi
  
- 
- AC_SUBST([GNOME_LDFLAGS])
+@@ -160,6 +160,8 @@
  AC_SUBST([GNOME_CFLAGS])
-+AC_SUBST([GNOME_APPLET_LDFLAGS])
-+AC_SUBST([GNOME_APPLET_CFLAGS])
  AC_SUBST([GDDCCONTROL])
  AC_SUBST([GNOME_APPLET])
++AC_SUBST([GNOME_APPLET_LDFLAGS])
++AC_SUBST([GNOME_APPLET_CFLAGS])
  
+ # Doc check
+ support_doc=no