summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/dependencies/qt3/debian/patches
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-04-17 13:57:20 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-04-17 13:57:20 +0900
commit2d59086b104acd7b4711fd067c9bb4480158e6ab (patch)
tree7d3d9aff90930e65a491c055510aba94debc6da9 /ubuntu/precise/dependencies/qt3/debian/patches
parent55b519366b1dcd7ab5b2f1f720d275b33fc4bd49 (diff)
downloadtde-packaging-2d59086b104acd7b4711fd067c9bb4480158e6ab.tar.gz
tde-packaging-2d59086b104acd7b4711fd067c9bb4480158e6ab.zip
Removed Ubuntu/precise folder
Diffstat (limited to 'ubuntu/precise/dependencies/qt3/debian/patches')
-rw-r--r--ubuntu/precise/dependencies/qt3/debian/patches/06_disable_rpath.diff30
-rw-r--r--ubuntu/precise/dependencies/qt3/debian/patches/09_amd64_lib64.diff16
-rw-r--r--ubuntu/precise/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff50
-rw-r--r--ubuntu/precise/dependencies/qt3/debian/patches/series3
4 files changed, 0 insertions, 99 deletions
diff --git a/ubuntu/precise/dependencies/qt3/debian/patches/06_disable_rpath.diff b/ubuntu/precise/dependencies/qt3/debian/patches/06_disable_rpath.diff
deleted file mode 100644
index a3d74ffce..000000000
--- a/ubuntu/precise/dependencies/qt3/debian/patches/06_disable_rpath.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-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_PLUGIN = $$QMAKE_LFLAGS_SHLIB
- QMAKE_LFLAGS_SONAME = -Wl,-soname,
- QMAKE_LFLAGS_THREAD =
--QMAKE_RPATH = -Wl,-rpath,
-+QMAKE_RPATH =
-
- 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_PLUGIN = $$QMAKE_LFLAGS_SHLIB
- QMAKE_LFLAGS_SONAME = -Wl,-soname,
- QMAKE_LFLAGS_THREAD =
--QMAKE_RPATH = -Wl,-rpath,
-+QMAKE_RPATH =
-
- QMAKE_LIBS = -luuid
- QMAKE_LIBS_DYNLOAD = -ldl
diff --git a/ubuntu/precise/dependencies/qt3/debian/patches/09_amd64_lib64.diff b/ubuntu/precise/dependencies/qt3/debian/patches/09_amd64_lib64.diff
deleted file mode 100644
index 538e93044..000000000
--- a/ubuntu/precise/dependencies/qt3/debian/patches/09_amd64_lib64.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/mkspecs/linux-g++-64/qmake.conf
-+++ b/mkspecs/linux-g++-64/qmake.conf
-@@ -43,11 +43,11 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T
- QMAKE_INCDIR =
- QMAKE_LIBDIR =
- QMAKE_INCDIR_X11 = /usr/X11R6/include
--QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
-+QMAKE_LIBDIR_X11 = /usr/X11R6/lib
- QMAKE_INCDIR_QT = $(QTDIR)/include
- QMAKE_LIBDIR_QT = $(QTDIR)/lib64
- QMAKE_INCDIR_OPENGL = /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
-+QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
-
- QMAKE_LINK = g++
- QMAKE_LINK_SHLIB = g++
diff --git a/ubuntu/precise/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff b/ubuntu/precise/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
deleted file mode 100644
index b4e71d35b..000000000
--- a/ubuntu/precise/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-author: Sune Vuorela <debian@pusling.com>
-
---- a/configure
-+++ b/configure
-@@ -34,7 +34,44 @@ SUPPORTED=
- #-------------------------------------------------------------------------------
-
- # need that throughout the script
--UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-+DPKG_ARCH=`(dpkg-architecture -qDEB_HOST_ARCH) 2>/dev/null` || UNAME_MACHINE=unknown
-+case $DPKG_ARCH in
-+ amd64)
-+ UNAME_MACHINE="x86_64"
-+ ;;
-+ arm)
-+ UNAME_MACHINE="armv4l"
-+ ;;
-+ armel)
-+ UNAME_MACHINE="armv5tel"
-+ ;;
-+ hppa)
-+ UNAME_MACHINE="parisc64"
-+ ;;
-+ hurd-i386)
-+ UNAME_MACHINE="i686-AT386"
-+ ;;
-+ i386)
-+ UNAME_MACHINE="i686"
-+ ;;
-+ kfreebsd-amd64)
-+ UNAME_MACHINE="x86_64"
-+ ;;
-+ kfreebsd-i386)
-+ UNAME_MACHINE="i586"
-+ ;;
-+ mipsel)
-+ UNAME_MACHINE="mips"
-+ ;;
-+ powerpc)
-+ UNAME_MACHINE="ppc"
-+ ;;
-+ *)
-+ UNAME_MACHINE="$DPKG_ARCH"
-+ ;;
-+
-+
-+esac
- UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
- UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
diff --git a/ubuntu/precise/dependencies/qt3/debian/patches/series b/ubuntu/precise/dependencies/qt3/debian/patches/series
deleted file mode 100644
index e6bdb92af..000000000
--- a/ubuntu/precise/dependencies/qt3/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-06_disable_rpath.diff
-09_amd64_lib64.diff
-72_dont_trust_uname-m_use_dpkg-arch_instead.diff