diff options
Diffstat (limited to 'ubuntu/maverick/dependencies/qt3/debian/patches')
5 files changed, 128 insertions, 0 deletions
diff --git a/ubuntu/maverick/dependencies/qt3/debian/patches/06_disable_rpath.diff b/ubuntu/maverick/dependencies/qt3/debian/patches/06_disable_rpath.diff new file mode 100644 index 000000000..27fc1426c --- /dev/null +++ b/ubuntu/maverick/dependencies/qt3/debian/patches/06_disable_rpath.diff @@ -0,0 +1,26 @@ +author: Martin Loschwitz <madkiss@madkiss.org> + +Disables the rpath settings in qmake.conf + +--- a/mkspecs/linux-g++/qmake.conf ++++ b/mkspecs/linux-g++/qmake.conf +@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SHLIB = -shared + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +--- a/mkspecs/linux-g++-64/qmake.conf ++++ b/mkspecs/linux-g++-64/qmake.conf +@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB = -shared + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl diff --git a/ubuntu/maverick/dependencies/qt3/debian/patches/09_amd64_lib64.diff b/ubuntu/maverick/dependencies/qt3/debian/patches/09_amd64_lib64.diff new file mode 100644 index 000000000..71b2b65e1 --- /dev/null +++ b/ubuntu/maverick/dependencies/qt3/debian/patches/09_amd64_lib64.diff @@ -0,0 +1,16 @@ +--- 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)/lib + 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/maverick/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff b/ubuntu/maverick/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff new file mode 100644 index 000000000..b4e71d35b --- /dev/null +++ b/ubuntu/maverick/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff @@ -0,0 +1,50 @@ +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/maverick/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/ubuntu/maverick/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff new file mode 100644 index 000000000..3c6394f33 --- /dev/null +++ b/ubuntu/maverick/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## kubuntu_06_fglrx_0_size_screen.diff.dpatch by <jr@pechin3> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp +--- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:06:28.000000000 +0100 ++++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:12:10.000000000 +0100 +@@ -526,11 +526,16 @@ + Q_CHECK_PTR( dpisX ); + Q_CHECK_PTR( dpisY ); + for ( i = 0; i < screens; i++ ) { +- dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) +- +- / (DisplayWidthMM(dpy,i)*10); +- dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) +- / (DisplayHeightMM(dpy,i)*10); ++ if (DisplayWidthMM(dpy,i) < 1) ++ dpisX[ i ] = 75; // default the dpi to 75. ++ else ++ dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) ++ / (DisplayWidthMM(dpy,i)*10); ++ if (DisplayHeightMM(dpy,i) < 1) ++ dpisY[ i ] = 75; // default the dpi to 75. ++ else ++ dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) ++ / (DisplayHeightMM(dpy,i)*10); + } + } + diff --git a/ubuntu/maverick/dependencies/qt3/debian/patches/series b/ubuntu/maverick/dependencies/qt3/debian/patches/series new file mode 100644 index 000000000..7377c84c1 --- /dev/null +++ b/ubuntu/maverick/dependencies/qt3/debian/patches/series @@ -0,0 +1,4 @@ +06_disable_rpath.diff +09_amd64_lib64.diff +72_dont_trust_uname-m_use_dpkg-arch_instead.diff +kubuntu_06_fglrx_0_size_screen.diff |