[Pkg-kde-commits] rev 1672 -
trunk/packages/qt-x11-free/debian/patches
Adeodato Simó
adeodato at costa.debian.org
Sun Sep 4 22:50:50 UTC 2005
Author: adeodato
Date: 2005-09-04 22:50:49 +0000 (Sun, 04 Sep 2005)
New Revision: 1672
Modified:
trunk/packages/qt-x11-free/debian/patches/21_fix_mips_mipsel.dpatch
trunk/packages/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch
trunk/packages/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch
trunk/packages/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch
trunk/packages/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch
trunk/packages/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch
trunk/packages/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch
trunk/packages/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch
Log:
Use Chris' headers from these patches.
Modified: trunk/packages/qt-x11-free/debian/patches/21_fix_mips_mipsel.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/21_fix_mips_mipsel.dpatch 2005-09-04 22:45:55 UTC (rev 1671)
+++ trunk/packages/qt-x11-free/debian/patches/21_fix_mips_mipsel.dpatch 2005-09-04 22:50:49 UTC (rev 1672)
@@ -23,7 +23,6 @@
exit 0
@DPATCH@
-
diff -ruN qt-x11-free-3.3.3.old/src/qt.pro qt-x11-free-3.3.3/src/qt.pro
--- qt-x11-free-3.3.3.old/src/qt.pro 2004-05-14 13:55:30.000000000 +0000
+++ qt-x11-free-3.3.3/src/qt.pro 2004-11-14 17:34:27.000000000 +0000
Modified: trunk/packages/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch 2005-09-04 22:45:55 UTC (rev 1671)
+++ trunk/packages/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch 2005-09-04 22:50:49 UTC (rev 1672)
@@ -1,8 +1,4 @@
#! /bin/sh -e
-## 22_fix_ftbfs_amd64.dpatch by Andreas Jochens
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix FTBFS on amd64
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
@@ -23,7 +19,6 @@
exit 0
@DPATCH@
-
diff -urN qt-x11-free-3.3.3/tools/qvfb/qvfbview.cpp ./tools/qvfb/qvfbview.cpp
--- qt-x11-free-3.3.3/tools/qvfb/qvfbview.cpp 2004-04-15 14:53:25.000000000 +0200
+++ ./tools/qvfb/qvfbview.cpp 2005-01-03 11:32:45.000000000 +0100
Modified: trunk/packages/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch 2005-09-04 22:45:55 UTC (rev 1671)
+++ trunk/packages/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch 2005-09-04 22:50:49 UTC (rev 1672)
@@ -1,8 +1,5 @@
#! /bin/sh -e
-## 23_qtc_qclipboard_hack.dpatch by Lubos Lunak
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix qclipboard
+# Qt-Copy patch #48
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
@@ -23,7 +20,6 @@
exit 0
@DPATCH@
-
--- bla/src/kernel/qclipboard_x11.cpp.sav 2004-04-30 12:00:06.000000000 +0200
+++ bla/src/kernel/qclipboard_x11.cpp 2004-05-09 21:18:10.269264304 +0200
@@ -109,6 +109,7 @@ static int pending_timer_id = 0;
Modified: trunk/packages/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch 2005-09-04 22:45:55 UTC (rev 1671)
+++ trunk/packages/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch 2005-09-04 22:50:49 UTC (rev 1672)
@@ -1,8 +1,5 @@
#! /bin/sh -e
-## 24_qtc_qscrollview.dpatch by Germain Garand <germain at ebooksfrance.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix the qscrollview stuff
+# Qt-Copy patch #61
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
@@ -23,7 +20,6 @@
exit 0
@DPATCH@
-
diff -u -3 -p -r1.65 qscrollview.cpp
--- bla/src/widgets/qscrollview.cpp 29 Apr 2004 22:31:28 -0000 1.65
+++ bla/src/widgets/qscrollview.cpp 25 Jan 2005 12:07:04 -0000
Modified: trunk/packages/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch 2005-09-04 22:45:55 UTC (rev 1671)
+++ trunk/packages/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch 2005-09-04 22:50:49 UTC (rev 1672)
@@ -1,8 +1,5 @@
#! /bin/sh -e
-## 24_qtc_qscrollview.dpatch by Germain Garand <germain at ebooksfrance.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix the qscrollview stuff
+# Qt-Copy patch #5
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Modified: trunk/packages/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch 2005-09-04 22:45:55 UTC (rev 1671)
+++ trunk/packages/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch 2005-09-04 22:50:49 UTC (rev 1672)
@@ -1,8 +1,5 @@
#! /bin/sh -e
-## 24_qtc_qscrollview.dpatch by Germain Garand <germain at ebooksfrance.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix the qscrollview stuff
+# Qt-Copy patch #7
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Modified: trunk/packages/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch 2005-09-04 22:45:55 UTC (rev 1671)
+++ trunk/packages/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch 2005-09-04 22:50:49 UTC (rev 1672)
@@ -1,8 +1,5 @@
#! /bin/sh -e
-## 24_qtc_qscrollview.dpatch by Germain Garand <germain at ebooksfrance.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix the qscrollview stuff
+# Qt-Copy patch #44
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Modified: trunk/packages/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch 2005-09-04 22:45:55 UTC (rev 1671)
+++ trunk/packages/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch 2005-09-04 22:50:49 UTC (rev 1672)
@@ -1,8 +1,5 @@
#! /bin/sh -e
-## 24_qtc_qscrollview.dpatch by Germain Garand <germain at ebooksfrance.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix the qscrollview stuff
+# Qt-Copy patch #53
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
More information about the pkg-kde-commits
mailing list