From 2685ca76fd11c9bc2b1e96b1e4c40fc3b9763691 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2011 11:53:21 -0700 Subject: 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 Signed-off-by: Koen Kooi --- recipes/xqt2/files/KeyMap.patch | 4 ++-- recipes/xqt2/files/fix_qtscreen_HACK.patch | 6 +++--- recipes/xqt2/files/fix_seqfault_qtscreen.patch | 4 ++-- recipes/xqt2/files/moc_call.patch | 4 ++-- recipes/xqt2/xqt2_20060509.bb | 22 +++++++++++++++++----- 5 files changed, 26 insertions(+), 14 deletions(-) (limited to 'recipes/xqt2') 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 diff --git a/recipes/xqt2/xqt2_20060509.bb b/recipes/xqt2/xqt2_20060509.bb index 034d756d28..627c9179a8 100644 --- a/recipes/xqt2/xqt2_20060509.bb +++ b/recipes/xqt2/xqt2_20060509.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" SECTION = "opie/applications" APPTYPE = "binary" APPNAME = "Xqt" -PR = "r4" +PR = "r5" inherit palmtop @@ -15,21 +15,33 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xqt2;method=pse ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz;name=archive3 \ ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-4.tgz;name=archive4 \ ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-5.tgz;name=archive5 \ - file://KeyMap.patch \ - file://moc_call.patch \ file://imake-staging.patch \ file://cross.patch \ file://fephack.patch \ file://xchar2b.patch \ file://xqt-make.patch \ - file://fix_qtscreen_HACK.patch \ - file://fix_seqfault_qtscreen.patch " + file://KeyMap.patch;apply=false \ + file://moc_call.patch;apply=false \ + file://fix_qtscreen_HACK.patch;apply=false \ + file://fix_seqfault_qtscreen.patch;apply=false" S = "${WORKDIR}/xc" QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' QT_LIBRARY_append_c7x0 = " -laticore" +do_patch_xqt2() { + # Apply xqt2 patches. + cd ${WORKDIR}/xqt2 + patch -p1 -i ${WORKDIR}/KeyMap.patch + patch -p1 -i ${WORKDIR}/moc_call.patch + patch -p1 -i ${WORKDIR}/fix_qtscreen_HACK.patch + patch -p1 -i ${WORKDIR}/fix_seqfault_qtscreen.patch +} + +addtask patch_xqt2 after do_unpack before do_configure + do_configure() { + #general config echo "#define BuildServersOnly YES" > config/cf/host.def echo "#define ProjectRoot /usr" >> config/cf/host.def -- cgit 1.2.3-korg