rpms/libopensync-plugin-kdepim/devel libopensync-plugin-kdepim-0.22-kde4.patch, 1.1, 1.2

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11747/devel

Modified Files:
	libopensync-plugin-kdepim-0.22-kde4.patch 
Log Message:
Use RTLD_DEEPBIND to load the implementation plugin in an attempt to allow using the plugin with a KDE 3 KitchenSync.
Fix Makefile.am syntax error.

libopensync-plugin-kdepim-0.22-kde4.patch:

Index: libopensync-plugin-kdepim-0.22-kde4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim-0.22-kde4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-kdepim-0.22-kde4.patch	2 Apr 2009 06:18:11 -0000	1.1
+++ libopensync-plugin-kdepim-0.22-kde4.patch	2 Apr 2009 06:26:56 -0000	1.2
@@ -344,7 +344,16 @@
  		OSyncHashTable *mHashtable;
 diff -ur libopensync-plugin-kdepim-0.22/src/kdepim_sync.cpp libopensync-plugin-kdepim-0.22-kde4/src/kdepim_sync.cpp
 --- libopensync-plugin-kdepim-0.22/src/kdepim_sync.cpp	2007-03-27 13:49:57.000000000 +0200
-+++ libopensync-plugin-kdepim-0.22-kde4/src/kdepim_sync.cpp	2009-04-02 07:55:44.000000000 +0200
++++ libopensync-plugin-kdepim-0.22-kde4/src/kdepim_sync.cpp	2009-04-02 08:22:37.000000000 +0200
+@@ -49,7 +49,7 @@
+ 	osync_debug("kde", 3, "%s", __FUNCTION__);
+ 
+ 	osync_debug("kde", 3, "Loading implementation module");
+-	module = dlopen(KDEPIM_LIBDIR"/kdepim_lib.so", RTLD_NOW);
++	module = dlopen(KDEPIM_LIBDIR"/kdepim_lib.so", RTLD_NOW | RTLD_DEEPBIND);
+ 	if (!module) {
+ 		osync_error_set(e, OSYNC_ERROR_INITIALIZATION, "Can't load plugin implementation module from %s: %s",
+ 		                KDEPIM_LIBDIR"/kdepim_lib.so", dlerror());
 @@ -191,7 +191,7 @@
  		info->name = "kdepim-sync";
  		/*FIXME: i18n */
@@ -634,7 +643,7 @@
  #endif
 diff -ur libopensync-plugin-kdepim-0.22/src/Makefile.am libopensync-plugin-kdepim-0.22-kde4/src/Makefile.am
 --- libopensync-plugin-kdepim-0.22/src/Makefile.am	2007-03-27 13:49:57.000000000 +0200
-+++ libopensync-plugin-kdepim-0.22-kde4/src/Makefile.am	2009-04-02 08:11:04.000000000 +0200
++++ libopensync-plugin-kdepim-0.22-kde4/src/Makefile.am	2009-04-02 08:25:15.000000000 +0200
 @@ -1,12 +1,15 @@
  plugindir=@OPENSYNC_PLUGINDIR@
  configdir=@OPENSYNC_CONFIGDIR@
@@ -647,7 +656,7 @@
  AM_CXXFLAGS = -Wall
  
 -#FIXME: Is there a KDE macro to set this?
-+KDE_RPATH = -L/usr/lib`kde4-config --libsuffix`/kde4/devel
++KDE_LDFLAGS = -L/usr/lib`kde4-config --libsuffix`/kde4/devel
 +LIB_KABC = -lkabc
  LIB_KCAL = -lkcal