From 30224312da542b11730e13c15c051a574ab49c84 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Wed, 15 Jun 2005 14:15:01 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into marsco.kalmiopsis:/home/nslu2/openembedded 2005/06/15 12:55:22+02:00 utwente.nl!koen sapwood_1.20-1.bb: extra install_append, courtesy Florian Boor osso-gnome-vfs2_2.8.4.4-1.bb: adjust depends, courtesy Florian Boor Many files: added, courtesy Florian Boor hildon-libs_0.9.6-2.bb: adjust staging, courtesy Florian Boor 2005/06/15 12:18:24+02:00 uni-frankfurt.de!mickeyl add mathomatic, a small, portable, general purpose CAS. Patch courtesy Simon Pickering 2005/06/15 11:58:18+02:00 utwente.nl!koen Many meamo files: source -> ., courtesy Florian Boor Add gconf-osso, part of the maemo.org suite, courtesy Florian Boor 2005/06/15 11:45:40+02:00 utwente.nl!koen base-files_3.0.14.bb: support nokia770, courtesy Florian Boor 2005/06/15 11:05:24+02:00 handhelds.org!CoreDump Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded 2005/06/15 11:05:02+02:00 handhelds.org!CoreDump altboot: Add a timeout on boot and only show the menu when requested 2005/06/15 10:29:53+02:00 mn-solutions.de!schurig assorted MNCI / RT3000 changes 2005/06/15 10:27:59+02:00 mn-solutions.de!schurig classes/rootfs_ipk.bbclass: allows to keep the Packages file (my own python script to create Packages is way faster :-) 2005/06/14 22:59:08+01:00 reciva.com!pb use mkdir -p, not install -d 2005/06/14 22:02:28+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/14 22:02:15+02:00 utwente.nl!koen xmame_0.95.bb: remove UNNECESSARY and BOGUS qpe crap. Can we please stop committing such nonsonse? virtual/libsdl exists for a reason 2005/06/14 21:01:19+01:00 reciva.com!pb apply PARALLEL_INSTALL_MODULES patch from Erik Hovland 2005/06/14 20:55:08+01:00 reciva.com!pb update xmame to 0.95, courtesy Erik Hovland 2005/06/14 20:52:19+01:00 reciva.com!pb update handhelds-pxa kernel to hh40, courtesy Erik Hovland 2005/06/14 19:10:13+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/06/14 19:00:35+02:00 uni-frankfurt.de!mickeyl Add tslib config files for omap5912osk. Patch courtesy philip@balister.org 2005/06/14 18:59:02+02:00 uni-frankfurt.de!mickeyl Fix Typo in xerces-c. Patch courtesy philip@balister.org 2005/06/14 13:45:03+02:00 local!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into marcinj.local:/home/hrw/zaurus/oe/openembedded 2005/06/14 13:44:34+02:00 local!hrw updated kdepimpi to 2.1.5 2005/06/14 13:16:38+02:00 handhelds.org!CoreDump Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded 2005/06/14 13:16:14+02:00 handhelds.org!CoreDump altboot: Update to latest version 2005/06/14 13:13:37+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/14 13:13:23+02:00 utwente.nl!koen Add tune-supersparc.conf for people who have v8 cpu's and want hardware integer multiply and divide. Makes ssh login approx. 30 times faster 2005/06/14 11:55:00+01:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mill.internal.reciva.com:/nexus/home/pb/oe/oe 2005/06/14 11:52:01+01:00 reciva.com!pb eliminate spare copy of sun4cdm kernel preference 2005/06/14 12:43:33+02:00 mn-solutions.de!schurig Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into mnz66.mn-solutions.de:/usr/src/mnci54/oe 2005/06/14 12:43:12+02:00 mn-solutions.de!schurig renamed MACHINE 'ramses' to 'mnci' added new MACHINE 'rt3000' renamed DISTRO 'openmnci' to 'openmn', which now is for both MNCI and RT3000 2005/06/14 09:52:19+02:00 mn-solutions.de!schurig Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into mnz66.mn-solutions.de:/usr/src/mnci54/oe 2005/06/10 09:37:26+02:00 mn-solutions.de!schurig Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into mnz66.mn-solutions.de:/usr/src/mnci54/oe 2005/06/08 10:05:02+02:00 mn-solutions.de!schurig Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into mnz66.mn-solutions.de:/usr/src/mnci54/oe 2005/06/08 09:16:06+02:00 mn-solutions.de!schurig icewm: use sourceforge mirror BKrev: 42b037e5CrddHepCs3gW5YAsfOQ7ng --- packages/qte/qte-2.3.10/mnci-touchscreen.patch | 0 packages/qte/qte-2.3.10/mnci.patch | 0 packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp | 0 packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h | 0 packages/qte/qte-2.3.10/ramses-touchscreen.patch | 0 packages/qte/qte-2.3.10/ramses.patch | 125 ----------------------- packages/qte/qte-2.3.10/ramses/qkeyboard_qws.cpp | 0 packages/qte/qte-2.3.10/ramses/qkeyboard_qws.h | 0 packages/qte/qte_2.3.10.bb | 14 +-- 9 files changed, 7 insertions(+), 132 deletions(-) create mode 100644 packages/qte/qte-2.3.10/mnci-touchscreen.patch create mode 100644 packages/qte/qte-2.3.10/mnci.patch create mode 100644 packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp create mode 100644 packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h delete mode 100644 packages/qte/qte-2.3.10/ramses-touchscreen.patch delete mode 100644 packages/qte/qte-2.3.10/ramses.patch delete mode 100644 packages/qte/qte-2.3.10/ramses/qkeyboard_qws.cpp delete mode 100644 packages/qte/qte-2.3.10/ramses/qkeyboard_qws.h (limited to 'packages/qte') diff --git a/packages/qte/qte-2.3.10/mnci-touchscreen.patch b/packages/qte/qte-2.3.10/mnci-touchscreen.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-2.3.10/mnci.patch b/packages/qte/qte-2.3.10/mnci.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp b/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h b/packages/qte/qte-2.3.10/openmn/qkeyboard_qws.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qte-2.3.10/ramses-touchscreen.patch b/packages/qte/qte-2.3.10/ramses-touchscreen.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/qte/qte-2.3.10/ramses.patch b/packages/qte/qte-2.3.10/ramses.patch deleted file mode 100644 index c2e0e079d9..0000000000 --- a/packages/qte/qte-2.3.10/ramses.patch +++ /dev/null @@ -1,125 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~ramses.patch -+++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp -@@ -249,20 +249,12 @@ - - static void writeTerm(const char* termctl, int sizeof_termctl) - { --#ifdef QT_QWS_DEVFS -- const char* tt[]={"/dev/vc/1","/dev/console","/dev/tty",0}; --#else -- const char* tt[]={"/dev/console","/dev/tty","/dev/tty0",0}; --#endif -- const char** dev=tt; -- while (*dev) { -- int tty=::open(*dev,O_WRONLY); -+qWarning("writeTerm"); -+ int tty=::open("/dev/vc/2", O_WRONLY); - if ( tty>=0 ) { - ::write(tty,termctl,sizeof_termctl); - ::close(tty); - } -- dev++; -- } - } - - /*! -@@ -275,6 +267,7 @@ - - bool QLinuxFbScreen::initDevice() - { -+qWarning("QLinuxFbScreen::initDevice"); - /* Setting up the VT parameters is done in qapplication_qws.cpp - const char termctl[]="\033[9;0]\033[?33l\033[?25l"; - writeTerm(termctl,sizeof(termctl)); */ -@@ -765,9 +758,12 @@ - } - */ - -+qWarning("QLinuxFbScreen::shutdownDevice"); -+/* - // Blankin' screen, blinkin' cursor! - const char termctl[] = "\033[9;15]\033[?33h\033[?25h\033[?0c"; - writeTerm(termctl,sizeof(termctl)); -+*/ - } - - /*! ---- qt-2.3.10/src/kernel/qapplication_qws.cpp~ramses.patch -+++ qt-2.3.10/src/kernel/qapplication_qws.cpp -@@ -1756,8 +1756,6 @@ - */ - if ( qws_daemon ) - { -- qWarning( "qt_init() - starting in daemon mode..." ); -- - int pid1 = fork(); - if ( pid1 == -1 ) - { -@@ -1791,7 +1789,6 @@ - } - if ( pid2 ) - { -- syslog( 4, "qt_init() [%d] - successfully entered daemon mode", pid2 ); - _exit( 0 ); // ok, second fork performed - } - } -@@ -1828,9 +1825,12 @@ - #if defined(_OS_LINUX_) - if ( qws_terminal_id ) - { -- qDebug( "qt_init() - terminal specification is '%d'.", qws_terminal_id ); - struct vt_stat console_stat; -+#ifdef QT_QWS_DEVFS -+ int console_fd = ::open( QString().sprintf( "/dev/vc/%d", qws_terminal_id ).latin1(), O_RDWR ); -+#else - int console_fd = ::open( QString().sprintf( "/dev/tty%d", qws_terminal_id ).latin1(), O_RDWR ); -+#endif - if ( console_fd == -1) - { - qWarning( "qt_init() - can't open tty: %s", strerror( errno ) ); -@@ -1927,7 +1927,11 @@ - { - qDebug( "qt_cleanup() - switching back to virtual terminal #%d", qws_terminal_old ); - -+#ifdef QT_QWS_DEVFS -+ int console_fd = ::open( "/dev/vc/0", O_RDWR ); -+#else - int console_fd = ::open( "/dev/tty0", O_RDWR ); -+#endif - if ( console_fd == -1) - { - qWarning( "qt_init() - can't open tty: %s", strerror( errno ) ); ---- qt-2.3.10/src/kernel/qwindowsystem_qws.cpp~ramses.patch -+++ qt-2.3.10/src/kernel/qwindowsystem_qws.cpp -@@ -1791,6 +1791,7 @@ - } - - #ifndef QT_NO_QWS_KEYBOARD -+#ifndef QT_QWS_RAMSES - static int keyUnicode(int keycode) - { - const QWSServer::KeyMap *km = QWSServer::keyMap(); -@@ -1803,6 +1804,7 @@ - return 0xffff; - } - #endif -+#endif - /*! - Send a key event. You can use this to send key events generated by - "virtual keyboards". -@@ -1845,8 +1847,10 @@ - - event.simpleData.unicode = - #ifndef QT_NO_QWS_KEYBOARD -+#ifndef QT_QWS_RAMSES - unicode < 0 ? keyUnicode(keycode) : - #endif -+#endif - unicode; - event.simpleData.keycode = keycode; - event.simpleData.modifiers = modifiers; diff --git a/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.cpp b/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.cpp deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.h b/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.h deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index f8b630cced..fb0df5c28d 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL QPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" -DEPENDS_ramses = "zlib libpng jpeg uicmoc-native" +DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" DEPENDS_append_c7x0 = " sharp-aticore-oss" PROVIDES = "virtual/qte virtual/libqte2" PR = "r17" @@ -39,9 +39,9 @@ SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap- SRC_URI_append_beagle = "file://beagle.patch;patch=1 " SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_ramses = "file://devfs.patch;patch=1 \ - file://ramses.patch;patch=1 \ - file://ramses-touchscreen.patch;patch=1 \ +SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ + file://mnci.patch;patch=1 \ + file://mnci-touchscreen.patch;patch=1 \ file://qkeyboard_qws.h \ file://qkeyboard_qws.cpp " SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " @@ -88,7 +88,7 @@ EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_S EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" EXTRA_DEFINES_beagle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_BEAGLE" -EXTRA_DEFINES_ramses = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" +EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" export SYSCONF_CC = "${CC}" export SYSCONF_CXX = "${CXX}" @@ -99,11 +99,11 @@ export SYSCONF_LINK_SHLIB = "${CCLD}" export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" #export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" export SYSCONF_LFLAGS = "${LDFLAGS} -lts" -export SYSCONF_LFLAGS_ramses = "${LDFLAGS}" +export SYSCONF_LFLAGS_mnci = "${LDFLAGS}" export SYSCONF_MOC = "${STAGING_BINDIR}/moc" export SYSCONF_UIC = "${STAGING_BINDIR}/uic" -do_configure_prepend_ramses() { +do_configure_prepend_mnci() { chmod -R a+w ${S}/src/kernel cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel -- cgit v1.2.3