[Pkg-kde-commits] rev 1674 -
trunk/packages/qt-x11-free/debian/patches
Adeodato Simó
adeodato at costa.debian.org
Sun Sep 4 23:00:25 UTC 2005
Author: adeodato
Date: 2005-09-04 23:00:24 +0000 (Sun, 04 Sep 2005)
New Revision: 1674
Modified:
trunk/packages/qt-x11-free/debian/patches/02_various_fixes.dpatch
trunk/packages/qt-x11-free/debian/patches/03_qt_fontlist_fix.dpatch
trunk/packages/qt-x11-free/debian/patches/04_qsql_odbc.dpatch
trunk/packages/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch
trunk/packages/qt-x11-free/debian/patches/06_disable_rpath.dpatch
trunk/packages/qt-x11-free/debian/patches/14_fix_kmenu.dpatch
trunk/packages/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.dpatch
Log:
More patch headers.
Modified: trunk/packages/qt-x11-free/debian/patches/02_various_fixes.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/02_various_fixes.dpatch 2005-09-04 22:56:46 UTC (rev 1673)
+++ trunk/packages/qt-x11-free/debian/patches/02_various_fixes.dpatch 2005-09-04 23:00:24 UTC (rev 1674)
@@ -4,20 +4,25 @@
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fixes various smaller mistakes
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+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 -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
+ at DPATCH@
--- qt-x11-free-3.2.3.old/tools/designer/integration/designer.el 2003-10-03 13:32:02.000000000 +0200
+++ qt-x11-free-3.2.3/tools/designer/integration/designer.el 2003-12-19 13:28:14.000000000 +0100
@@ -1,9 +1,9 @@
Modified: trunk/packages/qt-x11-free/debian/patches/03_qt_fontlist_fix.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/03_qt_fontlist_fix.dpatch 2005-09-04 22:56:46 UTC (rev 1673)
+++ trunk/packages/qt-x11-free/debian/patches/03_qt_fontlist_fix.dpatch 2005-09-04 23:00:24 UTC (rev 1674)
@@ -4,20 +4,25 @@
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix fonts list to show only the fonts we can use
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+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 -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
+ at DPATCH@
diff -ruN qt-x11-free-3.2.1.old/src/kernel/qfontdatabase_x11.cpp qt-x11-free-3.2.1/src/kernel/qfontdatabase_x11.cpp
--- qt-x11-free-3.2.1.old/src/kernel/qfontdatabase_x11.cpp 2003-08-20 15:07:34.000000000 +0200
+++ qt-x11-free-3.2.1/src/kernel/qfontdatabase_x11.cpp 2003-09-03 11:08:05.000000000 +0200
Modified: trunk/packages/qt-x11-free/debian/patches/04_qsql_odbc.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/04_qsql_odbc.dpatch 2005-09-04 22:56:46 UTC (rev 1673)
+++ trunk/packages/qt-x11-free/debian/patches/04_qsql_odbc.dpatch 2005-09-04 23:00:24 UTC (rev 1674)
@@ -4,21 +4,25 @@
## All lines beginning with `## DP:' are a description of the patch.
## DP: Make the package build with libiodbc2-dev instead of unixodbc-dev
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+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 -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
+ at DPATCH@
diff -ruN qt-x11-free-3.2.1.old/plugins/src/sqldrivers/odbc/odbc.pro qt-x11-free-3.2.1/plugins/src/sqldrivers/odbc/odbc.pro
--- qt-x11-free-3.2.1.old/plugins/src/sqldrivers/odbc/odbc.pro 2003-06-19 22:07:43.000000000 +0200
+++ qt-x11-free-3.2.1/plugins/src/sqldrivers/odbc/odbc.pro 2003-08-29 16:15:21.000000000 +0200
Modified: trunk/packages/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch 2005-09-04 22:56:46 UTC (rev 1673)
+++ trunk/packages/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch 2005-09-04 23:00:24 UTC (rev 1674)
@@ -1,24 +1,24 @@
#! /bin/sh -e
-## 05_qvfb_cpp.dpatch by Simon Hausmann <simon at kde.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix qvfb to obey our standards
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+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 -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
+ at DPATCH@
diff -ruN qt-x11-free-3.1.1+cvs.20030123-old/tools/qvfb/pda.skin qt-x11-free-3.1.1+cvs.20030123/tools/qvfb/pda.skin
--- qt-x11-free-3.1.1+cvs.20030123-old/tools/qvfb/pda.skin 2002-09-06 14:32:46.000000000 +0200
+++ qt-x11-free-3.1.1+cvs.20030123/tools/qvfb/pda.skin 2003-01-26 20:46:30.000000000 +0100
Modified: trunk/packages/qt-x11-free/debian/patches/06_disable_rpath.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/06_disable_rpath.dpatch 2005-09-04 22:56:46 UTC (rev 1673)
+++ trunk/packages/qt-x11-free/debian/patches/06_disable_rpath.dpatch 2005-09-04 23:00:24 UTC (rev 1674)
@@ -4,23 +4,27 @@
## All lines beginning with `## DP:' are a description of the patch.
## DP: Disables the rpath settings in qmake.conf
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+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 -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
-diff -ruN qt-x11-free-3.1.1.old/mkspecs/linux-g++/qmake.conf qt-x11-free-3.1.1/mkspecs/linux-g++/qmake.conf
---- qt-x11-free-3.1.1.old/mkspecs/linux-g++/qmake.conf 2002-12-09 10:41:32.000000000 +0100
-+++ qt-x11-free-3.1.1/mkspecs/linux-g++/qmake.conf 2003-02-18 19:07:18.000000000 +0100
+ at DPATCH@
+--- qt.orig/mkspecs/linux-g++/qmake.conf
++++ qt.patched/mkspecs/linux-g++/qmake.conf
@@ -53,7 +53,7 @@
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
Modified: trunk/packages/qt-x11-free/debian/patches/14_fix_kmenu.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/14_fix_kmenu.dpatch 2005-09-04 22:56:46 UTC (rev 1673)
+++ trunk/packages/qt-x11-free/debian/patches/14_fix_kmenu.dpatch 2005-09-04 23:00:24 UTC (rev 1674)
@@ -1,23 +1,25 @@
#! /bin/sh -e
-## 14_fix_kmenu.dpatch by Martin Loschwitz <madkiss at madkiss.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix kmenu displaying
+# Qt-Copy patch #47
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+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 -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
+ at DPATCH@
--- a/src/widgets/qpopupmenu.cpp 29 Apr 2004 22:31:28 -0000 1.60
+++ a/src/widgets/qpopupmenu.cpp 30 Apr 2004 01:11:59 -0000
@@ -2531,7 +2531,7 @@ QSize QPopupMenu::sizeHint() const
Modified: trunk/packages/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.dpatch 2005-09-04 22:56:46 UTC (rev 1673)
+++ trunk/packages/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.dpatch 2005-09-04 23:00:24 UTC (rev 1674)
@@ -4,21 +4,25 @@
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix makeqpf by make it not use stuff defined in Qt embedded
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+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 -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ -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@
diff -ruN qt-x11-free-3.3.3.old/tools/makeqpf/main.cpp qt-x11-free-3.3.3/tools/makeqpf/main.cpp
--- qt-x11-free-3.3.3.old/tools/makeqpf/main.cpp 2004-06-23 14:13:52.000000000 +0000
+++ qt-x11-free-3.3.3/tools/makeqpf/main.cpp 2004-08-14 08:53:01.000000000 +0000
More information about the pkg-kde-commits
mailing list