aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/xqt2/files
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-03-16 11:53:21 -0700
committerSteffen Sledz <sledz@dresearch-fe.de>2011-04-29 14:08:38 +0200
commit2685ca76fd11c9bc2b1e96b1e4c40fc3b9763691 (patch)
treef0f10358a7a1418c2325d2b209835164c2ecb0a6 /recipes/xqt2/files
parent2e62b57f6ffedd7acad434f62a49a7933e62b812 (diff)
downloadopenembedded-2685ca76fd11c9bc2b1e96b1e4c40fc3b9763691.tar.gz
openembedded-2685ca76fd11c9bc2b1e96b1e4c40fc3b9763691.tar.bz2
openembedded-2685ca76fd11c9bc2b1e96b1e4c40fc3b9763691.zip
xqt2: Rework the patches for xqt2 (vs the core part).
The way this package builds, xqt2 isn't the main place for ${S}. So we add in another task to apply the patches in that directory (as there's 4 of them). Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes/xqt2/files')
-rw-r--r--recipes/xqt2/files/KeyMap.patch4
-rw-r--r--recipes/xqt2/files/fix_qtscreen_HACK.patch6
-rw-r--r--recipes/xqt2/files/fix_seqfault_qtscreen.patch4
-rw-r--r--recipes/xqt2/files/moc_call.patch4
4 files changed, 9 insertions, 9 deletions
diff --git a/recipes/xqt2/files/KeyMap.patch b/recipes/xqt2/files/KeyMap.patch
index 62564cf248..2b00dcad18 100644
--- a/recipes/xqt2/files/KeyMap.patch
+++ b/recipes/xqt2/files/KeyMap.patch
@@ -1,5 +1,5 @@
---- xc/../xqt2/xfree86/xqt-driver/KeyMap.h 2004-10-16 08:06:07.000000000 +0200
-+++ xc/../xqt2/xfree86/xqt-driver/KeyMap~.h 2006-05-10 19:41:16.000000000 +0200
+--- xqt2/xfree86/xqt-driver/KeyMap.h 2004-10-16 08:06:07.000000000 +0200
++++ xqt2/xfree86/xqt-driver/KeyMap~.h 2006-05-10 19:41:16.000000000 +0200
@@ -75,6 +75,7 @@
/* [ */ K(BracketLeft, XK_bracketleft, XK_braceleft) // Fn+T
/* { */ K(BraceLeft, XK_braceleft, NoSymbol) // ???
diff --git a/recipes/xqt2/files/fix_qtscreen_HACK.patch b/recipes/xqt2/files/fix_qtscreen_HACK.patch
index 7e4b2c658a..be7a26ec67 100644
--- a/recipes/xqt2/files/fix_qtscreen_HACK.patch
+++ b/recipes/xqt2/files/fix_qtscreen_HACK.patch
@@ -1,6 +1,6 @@
-diff -Nur xc/../xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc xc/../xqt2/xfree86/xqt-driver/qtscreen.cc
---- xc/../xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc 2008-09-25 14:18:44.000000000 +0200
-+++ xc/../xqt2/xfree86/xqt-driver/qtscreen.cc 2008-09-25 14:28:30.000000000 +0200
+diff -Nur xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc xqt2/xfree86/xqt-driver/qtscreen.cc
+--- xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc 2008-09-25 14:18:44.000000000 +0200
++++ xqt2/xfree86/xqt-driver/qtscreen.cc 2008-09-25 14:28:30.000000000 +0200
@@ -109,6 +109,7 @@
desktopSize = newSize;
fullScrSize = desktopSize;
diff --git a/recipes/xqt2/files/fix_seqfault_qtscreen.patch b/recipes/xqt2/files/fix_seqfault_qtscreen.patch
index 43b97f4bdb..72c1e6edf8 100644
--- a/recipes/xqt2/files/fix_seqfault_qtscreen.patch
+++ b/recipes/xqt2/files/fix_seqfault_qtscreen.patch
@@ -1,5 +1,5 @@
---- xc/../xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc 2009-02-08 15:47:33.000000000 +0100
-+++ xc/../xqt2/xfree86/xqt-driver/qtscreen.cc 2009-02-08 15:52:09.000000000 +0100
+--- xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc 2009-02-08 15:47:33.000000000 +0100
++++ xqt2/xfree86/xqt-driver/qtscreen.cc 2009-02-08 15:52:09.000000000 +0100
@@ -406,7 +406,9 @@
//
void qtScreen::keyPressEvent(QKeyEvent *ev)
diff --git a/recipes/xqt2/files/moc_call.patch b/recipes/xqt2/files/moc_call.patch
index 6e150e201a..b86df1dcad 100644
--- a/recipes/xqt2/files/moc_call.patch
+++ b/recipes/xqt2/files/moc_call.patch
@@ -1,5 +1,5 @@
---- xc/../xqt2/xfree86/xqt-driver/Imakefile 2006-05-09 11:59:07.000000000 +0200
-+++ xc/../xqt2/xfree86/xqt-driver/Imakefile 2004-09-16 12:40:30.000000000 +0200
+--- xqt2/xfree86/xqt-driver/Imakefile 2006-05-09 11:59:07.000000000 +0200
++++ xqt2/xfree86/xqt-driver/Imakefile 2004-09-16 12:40:30.000000000 +0200
@@ -12,7 +12,7 @@
QTDIR = QtDir