[Pkg-kde-commits] rev 1352 - in trunk/packages/qt-x11-free/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2005-07-22 23:05:20 +0000 (Fri, 22 Jul 2005)
New Revision: 1352

Added:
   trunk/packages/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch
Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/patches/00list
Log:
Fix buildkey when compiled with gcc4. From debian/changelog:
    + debian/patches/31_gcc4_buildkey.dpatch:
      - new patch picked from the Fedora Qt packages to ensure a stable
        buildkey accross compiler upgrades now that GCC 4 is the default.
        Kudos to Christopher Martin for finding about the existence of this
        patch.



Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-07-21 23:08:32 UTC (rev 1351)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-07-22 23:05:20 UTC (rev 1352)
@@ -31,6 +31,12 @@
     + debian/*.install, debian/*.links:
       - renamed as appropriate.
 
+    + debian/patches/31_gcc4_buildkey.dpatch:
+      - new patch picked from the Fedora Qt packages to ensure a stable
+        buildkey accross compiler upgrades now that GCC 4 is the default.
+        Kudos to Christopher Martin for finding about the existence of this
+        patch.
+
     The above solves trouble for users when using qt3-designer with g++ 4.0,
     so this upload closes: #317768.
 

Modified: trunk/packages/qt-x11-free/debian/patches/00list
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00list	2005-07-21 23:08:32 UTC (rev 1351)
+++ trunk/packages/qt-x11-free/debian/patches/00list	2005-07-22 23:05:20 UTC (rev 1352)
@@ -15,3 +15,4 @@
 26_qtc_qpixmap_constants
 27_qtc_qscrollview-windowactivate-fix
 28_qtc_png-gamma-fix
+31_gcc4_buildkey

Added: trunk/packages/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch	2005-07-21 23:08:32 UTC (rev 1351)
+++ trunk/packages/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch	2005-07-22 23:05:20 UTC (rev 1352)
@@ -0,0 +1,33 @@
+#! /bin/sh -e
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- qt.orig/configure
++++ qt.patched/configure
+@@ -3092,6 +3092,9 @@
+     *3.*)
+ 	COMPILER_VERSION="3.*"
+ 	;;
++    *4.*)
++        COMPILER_VERSION="4.*"
++        ;;
+     *)
+ 	;;
+     esac