[pkg-kde-commits] rev 2904 - trunk/packages/kdenetwork/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-01-16 18:33:35 +0000 (Mon, 16 Jan 2006)
New Revision: 2904

Modified:
   trunk/packages/kdenetwork/debian/patches/12_kopete_meanwhile.diff
Log:
The meanwhile update ripped out the glib check (update oops, now fixed).

Replace it, thus re-enabling the MSN webcam build.


Modified: trunk/packages/kdenetwork/debian/patches/12_kopete_meanwhile.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/12_kopete_meanwhile.diff	2006-01-16 17:40:08 UTC (rev 2903)
+++ trunk/packages/kdenetwork/debian/patches/12_kopete_meanwhile.diff	2006-01-16 18:33:35 UTC (rev 2904)
@@ -3398,7 +3398,7 @@
              <widget class="QWidget">
 --- kde.orig/kopete/protocols/configure.in.in
 +++ kde.patched/kopete/protocols/configure.in.in
-@@ -179,55 +179,44 @@
+@@ -167,28 +167,32 @@
  AC_SUBST(IDN_CPPFLAGS)
  AC_SUBST(IDN_LIBS)
  
@@ -3446,15 +3446,10 @@
  AC_SUBST(MEANWHILE_CFLAGS)
  AC_SUBST(MEANWHILE_LIBS)
  
--# Check and setup for GLib library
--KDE_PKG_CHECK_MODULES(GLIB,
--      [glib-2.0 >= 2.0.0],
--      [have_glib=yes],
--      [have_glib=no]
--      )
--AC_SUBST(GLIB_CFLAGS)
--AC_SUBST(GLIB_LIBS)
--
+@@ -201,21 +205,15 @@
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 
 -# Do we everything we need to compile the plugin
 -if test "x$have_meanwhile" != "xyes" || test "x$have_glib" != "xyes"; then
 -    compile_meanwhile=no