diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-09-11 21:42:05 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-09-11 21:42:05 +0200 |
| commit | d8260a6ce3beb4f6aa74e66f9f9b56995a36d79e (patch) | |
| tree | c9ce19741b0d33903ac7e6e267c5bcdeab17da8f /ubuntu/raring/dependencies/qt3/debian | |
| parent | d27e5e6838cded96c7f11370af49a74f5bab0aa8 (diff) | |
| parent | e52ee671cbb3dfd521892b659f54cb4e647aca3d (diff) | |
| download | tde-packaging-d8260a6ce3beb4f6aa74e66f9f9b56995a36d79e.tar.gz tde-packaging-d8260a6ce3beb4f6aa74e66f9f9b56995a36d79e.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/raring/dependencies/qt3/debian')
| -rw-r--r-- | ubuntu/raring/dependencies/qt3/debian/control | 2 | ||||
| -rw-r--r-- | ubuntu/raring/dependencies/qt3/debian/patches/06_disable_rpath.diff | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/ubuntu/raring/dependencies/qt3/debian/control b/ubuntu/raring/dependencies/qt3/debian/control index 4be146e7d..7641cffbf 100644 --- a/ubuntu/raring/dependencies/qt3/debian/control +++ b/ubuntu/raring/dependencies/qt3/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1- libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev, libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, - firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] + firebird-dev | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] Section: libs Priority: optional Standards-Version: 3.8.4 diff --git a/ubuntu/raring/dependencies/qt3/debian/patches/06_disable_rpath.diff b/ubuntu/raring/dependencies/qt3/debian/patches/06_disable_rpath.diff index 27fc1426c..a3d74ffce 100644 --- a/ubuntu/raring/dependencies/qt3/debian/patches/06_disable_rpath.diff +++ b/ubuntu/raring/dependencies/qt3/debian/patches/06_disable_rpath.diff @@ -2,25 +2,29 @@ author: Martin Loschwitz <madkiss@madkiss.org> Disables the rpath settings in qmake.conf +Index: b/mkspecs/linux-g++/qmake.conf +=================================================================== --- a/mkspecs/linux-g++/qmake.conf +++ b/mkspecs/linux-g++/qmake.conf -@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SHLIB = -shared +@@ -55,7 +55,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,-rpath, +QMAKE_RPATH = - QMAKE_LIBS = + QMAKE_LIBS = -luuid QMAKE_LIBS_DYNLOAD = -ldl +Index: b/mkspecs/linux-g++-64/qmake.conf +=================================================================== --- a/mkspecs/linux-g++-64/qmake.conf +++ b/mkspecs/linux-g++-64/qmake.conf -@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB = -shared +@@ -58,7 +58,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,-rpath, +QMAKE_RPATH = - QMAKE_LIBS = + QMAKE_LIBS = -luuid QMAKE_LIBS_DYNLOAD = -ldl |