packages: kdelibs/kdelibs-3.5.10-LDFLAG_fix-1.patch - update

glen glen at pld-linux.org
Mon Feb 15 15:15:38 CET 2010


Author: glen                         Date: Mon Feb 15 14:15:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update

---- Files affected:
packages/kdelibs:
   kdelibs-3.5.10-LDFLAG_fix-1.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/kdelibs/kdelibs-3.5.10-LDFLAG_fix-1.patch
diff -u packages/kdelibs/kdelibs-3.5.10-LDFLAG_fix-1.patch:1.1 packages/kdelibs/kdelibs-3.5.10-LDFLAG_fix-1.patch:1.2
--- packages/kdelibs/kdelibs-3.5.10-LDFLAG_fix-1.patch:1.1	Mon Feb 15 15:14:32 2010
+++ packages/kdelibs/kdelibs-3.5.10-LDFLAG_fix-1.patch	Mon Feb 15 15:15:33 2010
@@ -5,27 +5,25 @@
 Origin: zippo zippo at oppiz.net
 Description: Fixes a LDFLAGS and RPATH issued in locating the QT library.
 
-diff -Naur kdelibs-3.5.8/dcop/dcopidl/Makefile.am kdelibs-3.5.8-mod/dcop/dcopidl/Makefile.am
---- kdelibs-3.5.8/dcop/dcopidl/Makefile.am	2005-09-10 08:27:23.000000000 +0000
-+++ kdelibs-3.5.8-mod/dcop/dcopidl/Makefile.am	2007-12-29 20:43:54.000000000 +0000
+--- kdelibs-3.5.10/dcop/dcopidl/Makefile.am~	2008-08-19 21:18:18.000000000 +0300
++++ kdelibs-3.5.10/dcop/dcopidl/Makefile.am	2010-02-15 16:13:22.596733866 +0200
 @@ -11,7 +11,7 @@
  noinst_HEADERS = yacc.cc.h
  
  dcopidl_LDADD = $(LIB_QT)
--dcopidl_LDFLAGS = $(KDE_RPATH)
-+dcopidl_LDFLAGS = $(KDE_LDFLAGS) $(QT_LDFLAGS)
+-dcopidl_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
++dcopidl_LDFLAGS = $(KDE_LDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS)
  
  ####### Build rules
  
-diff -Naur kdelibs-3.5.8/dcop/dcopidl2cpp/Makefile.am kdelibs-3.5.8-mod/dcop/dcopidl2cpp/Makefile.am
---- kdelibs-3.5.8/dcop/dcopidl2cpp/Makefile.am	2005-09-10 08:27:22.000000000 +0000
-+++ kdelibs-3.5.8-mod/dcop/dcopidl2cpp/Makefile.am	2007-12-29 20:44:12.000000000 +0000
+--- kdelibs-3.5.10/dcop/dcopidl2cpp/Makefile.am~	2008-08-19 21:18:18.000000000 +0300
++++ kdelibs-3.5.10/dcop/dcopidl2cpp/Makefile.am	2010-02-15 16:13:56.370163020 +0200
 @@ -10,7 +10,7 @@
  noinst_HEADERS = main.h
  
  dcopidl2cpp_LDADD = $(LIB_QT)
--dcopidl2cpp_LDFLAGS = $(KDE_RPATH)
-+dcopidl2cpp_LDFLAGS = $(KDE_LDFLAGS) $(QT_LDFLAGS)
+-dcopidl2cpp_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
++dcopidl2cpp_LDFLAGS = $(KDE_LDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS)
  
  dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h
  	../dcopidl/dcopidl $(srcdir)/dcopidl_test.h > dcopidl_output.kidl
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdelibs/kdelibs-3.5.10-LDFLAG_fix-1.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list