[med-svn] r4697 - in trunk/packages/freediams/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2010-03-29 12:57:19 +0000 (Mon, 29 Mar 2010)
New Revision: 4697

Added:
   trunk/packages/freediams/trunk/debian/patches/series
Modified:
   trunk/packages/freediams/trunk/debian/changelog
   trunk/packages/freediams/trunk/debian/patches/20_no_rpath.patch
Log:
Work around RPATH issue


Modified: trunk/packages/freediams/trunk/debian/changelog
===================================================================
--- trunk/packages/freediams/trunk/debian/changelog	2010-03-29 12:03:19 UTC (rev 4696)
+++ trunk/packages/freediams/trunk/debian/changelog	2010-03-29 12:57:19 UTC (rev 4697)
@@ -1,4 +1,4 @@
-freediams (0.3.0) UNRELEASED; urgency=low
+freediams (0.3.0-1) UNRELEASED; urgency=low
 
   [ Eric Maeker ]
   * Drugs : AFSSAPS - 29/01/2010

Modified: trunk/packages/freediams/trunk/debian/patches/20_no_rpath.patch
===================================================================
--- trunk/packages/freediams/trunk/debian/patches/20_no_rpath.patch	2010-03-29 12:03:19 UTC (rev 4696)
+++ trunk/packages/freediams/trunk/debian/patches/20_no_rpath.patch	2010-03-29 12:57:19 UTC (rev 4697)
@@ -1,11 +1,38 @@
 --- freediams-0.3.0.orig/buildspecs/config_linux.pri
 +++ freediams-0.3.0/buildspecs/config_linux.pri
-@@ -22,8 +22,6 @@
-     RPATH_LIBS_BIN     = plugins/
+@@ -17,12 +17,10 @@
+ 
+     DEFINES *= "LIBRARY_BASENAME=\"\\\"$$LIBRARY_BASENAME\\\"\"" \
+                "LINUX_PLUGIN_PATH=\"\\\"$$RPATH_LIBS_BIN\\\"\""
+-
+-  } else {
+-    RPATH_LIBS_BIN     = plugins/
    }
  
 -  RPATH_LIBS_BIN     = plugins/
--
++## Removing entry RPATH_LIBS_BIN     = plugins/ finally does not help so we are rather
++## patching file libs/rpath.pri and plugins/fmf_plugins.pri
+ 
    CONFIG( debug, debug|release ) {
      CONFIG      += console
-   }
+--- freediams-0.3.0.orig/libs/rpath.pri
++++ freediams-0.3.0/libs/rpath.pri
+@@ -23,7 +23,7 @@
+    }
+ 
+     PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
+-    QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${PLUGIN_RPATH}\'
++    QMAKE_LFLAGS += -Wl,-z,origin
+     QMAKE_RPATHDIR =
+ }
+ 
+--- freediams-0.3.0.orig/plugins/fmf_plugins.pri
++++ freediams-0.3.0/plugins/fmf_plugins.pri
+@@ -30,6 +30,6 @@
+ #    QMAKE_RPATHDIR += \$\$ORIGIN/../..
+ #    QMAKE_RPATHDIR += \$\$ORIGIN/$${RPATH_LIBS_BIN}/
+     IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
+-    QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
++    QMAKE_LFLAGS += -Wl,-z,origin
+     QMAKE_RPATHDIR =
+ }

Added: trunk/packages/freediams/trunk/debian/patches/series
===================================================================
--- trunk/packages/freediams/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/freediams/trunk/debian/patches/series	2010-03-29 12:57:19 UTC (rev 4697)
@@ -0,0 +1 @@
+20_no_rpath.patch