[kdebase3] really fix samba4 patch

Kevin Kofler kkofler at fedoraproject.org
Fri Mar 8 21:51:37 UTC 2013


commit afa86eb66ff0871e9048649700ab5b106619037e
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Fri Mar 8 22:51:23 2013 +0100

    really fix samba4 patch
    
    Let's just add the flags to INCLUDES, that's used for sure.

 kdebase-3.5.10-samba4.patch |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/kdebase-3.5.10-samba4.patch b/kdebase-3.5.10-samba4.patch
index c736093..1638846 100644
--- a/kdebase-3.5.10-samba4.patch
+++ b/kdebase-3.5.10-samba4.patch
@@ -15,14 +15,20 @@ diff -ur kdebase-3.5.10/kioslave/smb/configure.in.in kdebase-3.5.10-samba4/kiosl
    AC_CHECK_FUNC(yp_get_default_domain, [],
 diff -ur kdebase-3.5.10/kioslave/smb/Makefile.am kdebase-3.5.10-samba4/kioslave/smb/Makefile.am
 --- kdebase-3.5.10/kioslave/smb/Makefile.am	2008-08-19 20:17:00.000000000 +0200
-+++ kdebase-3.5.10-samba4/kioslave/smb/Makefile.am	2013-03-08 19:10:50.000000000 +0100
-@@ -12,7 +12,9 @@
++++ kdebase-3.5.10-samba4/kioslave/smb/Makefile.am	2013-03-08 22:47:44.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Makefile.am of kdebase/kioslave/man
+ 
+-INCLUDES=$(all_includes)
++INCLUDES=$(all_includes) $(SMBCLIENT_CFLAGS)
+ 
+ kde_module_LTLIBRARIES = kio_smb.la
+ kio_smb_la_SOURCES = kio_smb.cpp \
+@@ -12,7 +12,7 @@
               kio_smb_internal.cpp \
  	     kio_smb_mount.cpp
  
 -kio_smb_la_LIBADD = -lkio -lsmbclient $(SMBCLIENT_EXTRA_LIBS)
-+kio_smb_la_CXXFLAGS = $(AM_CXXFLAGS) $(SMBCLIENT_CFLAGS)
-+
 +kio_smb_la_LIBADD = -lkio $(SMBCLIENT_LIBS) $(SMBCLIENT_EXTRA_LIBS)
  
  kio_smb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)


More information about the scm-commits mailing list