diff options
| author | Mike Westerhof <mwester@dls.net> | 2008-09-08 06:07:20 +0000 |
|---|---|---|
| committer | Mike Westerhof <mwester@dls.net> | 2008-09-08 06:07:20 +0000 |
| commit | 078763a440425b9b9a0862e6ecabdf1c1af35def (patch) | |
| tree | 80e4caca405a3b94eb893b462312e41708ba0659 /packages | |
| parent | fbe2d6775362947d2aa59f27c3ab190997d10c02 (diff) | |
| parent | 313ea062889aba322b75726d8bb7276665aa4ea3 (diff) | |
merge of '79b90d4ef7df69035b001466908501f67f8aac76'
and '81a14649e513b12b58d75276170ffa386580f244'
Diffstat (limited to 'packages')
29 files changed, 2012 insertions, 199 deletions
diff --git a/packages/angstrom/angstrom-led-config.bb b/packages/angstrom/angstrom-led-config.bb index 36585f0b00..6a4f26240e 100644 --- a/packages/angstrom/angstrom-led-config.bb +++ b/packages/angstrom/angstrom-led-config.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Configuration files for runtime LED configuration" #PV = "${DISTRO_VERSION}" -PR = "r2" +PR = "r3" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit update-rc.d diff --git a/packages/opie-console/files/.mtn2git_empty b/packages/angstrom/angstrom-led-config/at32stk1000/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-console/files/.mtn2git_empty +++ b/packages/angstrom/angstrom-led-config/at32stk1000/.mtn2git_empty diff --git a/packages/angstrom/angstrom-led-config/at32stk1000/leds b/packages/angstrom/angstrom-led-config/at32stk1000/leds new file mode 100644 index 0000000000..5adb04da5d --- /dev/null +++ b/packages/angstrom/angstrom-led-config/at32stk1000/leds @@ -0,0 +1,9 @@ +#file format: name trigger +led0:amber nand-disk +led1:amber mmc0 +led2:amber none +led3:amber none +led4:amber none +led5:amber none +led6:amber none +led7:amber heartbeat diff --git a/packages/curl/curl.inc b/packages/curl/curl.inc new file mode 100644 index 0000000000..d3edaef20a --- /dev/null +++ b/packages/curl/curl.inc @@ -0,0 +1,80 @@ +DESCRIPTION = "Command line tool and library for client-side URL transfers." +LICENSE = "MIT" +SECTION = "console/network" + +SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ + file://pkgconfig_fix.patch;patch=1" +S = "${WORKDIR}/curl-${PV}" + +CURL_FEATURES ?= "zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp" +# other allowed features: ipv6, ares + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = " \ + --without-libssh2 \ + --with-random=/dev/urandom \ + --without-libidn \ + --without-ssl \ + " + +python __anonymous() { + f = bb.data.getVar("CURL_FEATURES", d, True).split(",") + oeconf = bb.data.getVar("EXTRA_OECONF", d, False) + deps = bb.data.getVar("DEPENDS", d, False).split() + for x in [ 'cookies', 'crypto-auth', 'dict', 'file', 'ftp', 'http', 'telnet', 'tftp', 'ipv6' ]: + if x in f: + oeconf += " --enable-%s" % x + else: + oeconf += " --disable-%s" % x + if 'zlib' in f: + oeconf += " --with-zlib=${STAGING_LIBDIR}/../" + deps.append("zlib") + else: + oeconf += " --without-zlib" + if 'gnutls' in f: + oeconf += " --with-gnutls=${STAGING_BINDIR_CROSS}" + deps.append("gnutls") + else: + oeconf += " --without-gnutls" + if 'ares' in f: + oeconf += " --enable-ares" + deps.append("c-ares") + else: + oeconf += " --disable-ares" + bb.data.setVar('EXTRA_OECONF', oeconf, d) + bb.data.setVar('DEPENDS', " ".join(deps), d) +} + +do_configure_prepend() { + sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac +} + +do_stage () { + install -d ${STAGING_INCDIR}/curl + install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ + oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} +} + +PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc" + +FILES_${PN} = "${bindir}/curl" + +FILES_${PN}-certs = "${datadir}/curl/curl-*" +PACKAGE_ARCH_${PN}-certs = "all" + +FILES_${PN}-doc = "${mandir}/man1/curl.1" + +FILES_lib${PN} = "${libdir}/lib*.so.*" +RRECOMMENDS_lib${PN} += "${PN}-certs" +FILES_lib${PN}-dev = "${includedir} \ + ${libdir}/lib*.so \ + ${libdir}/lib*.a \ + ${libdir}/lib*.la \ + ${libdir}/pkgconfig \ + ${datadir}/aclocal \ + ${bindir}/*-config" + +FILES_lib${PN}-doc = "${mandir}/man3 \ + ${mandir}/man1/curl-config.1" + diff --git a/packages/curl/curl_7.18.2.bb b/packages/curl/curl_7.18.2.bb index ae2cff6e10..2c3ec415f5 100644 --- a/packages/curl/curl_7.18.2.bb +++ b/packages/curl/curl_7.18.2.bb @@ -1,52 +1,2 @@ -DESCRIPTION = "Command line tool and library for client-side URL transfers." -LICENSE = "MIT" -DEPENDS = "zlib gnutls" -SECTION = "console/network" - -SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ - file://pkgconfig_fix.patch;patch=1" -S = "${WORKDIR}/curl-${PV}" - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ - --with-gnutls=${STAGING_BINDIR_CROSS}/ \ - --without-ssl \ - --without-libssh2 \ - --with-random=/dev/urandom \ - --without-libidn \ - --enable-crypto-auth \ - " - -do_configure_prepend() { - sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac -} - -do_stage () { - install -d ${STAGING_INCDIR}/curl - install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ - oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} -} - -PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc" - -FILES_${PN} = "${bindir}/curl" - -FILES_${PN}-certs = "${datadir}/curl/curl-*" -PACKAGE_ARCH_${PN}-certs = "all" - -FILES_${PN}-doc = "${mandir}/man1/curl.1" - -FILES_lib${PN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${PN} += "${PN}-certs" -FILES_lib${PN}-dev = "${includedir} \ - ${libdir}/lib*.so \ - ${libdir}/lib*.a \ - ${libdir}/lib*.la \ - ${libdir}/pkgconfig \ - ${datadir}/aclocal \ - ${bindir}/*-config" - -FILES_lib${PN}-doc = "${mandir}/man3 \ - ${mandir}/man1/curl-config.1" +require curl.inc diff --git a/packages/curl/curl_7.19.0.bb b/packages/curl/curl_7.19.0.bb new file mode 100644 index 0000000000..2c3ec415f5 --- /dev/null +++ b/packages/curl/curl_7.19.0.bb @@ -0,0 +1,2 @@ +require curl.inc + diff --git a/packages/libqpe/libqpe-opie/argv.patch b/packages/libqpe/libqpe-opie/argv.patch deleted file mode 100644 index 5926a8d000..0000000000 --- a/packages/libqpe/libqpe-opie/argv.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: library/qpeapplication.h -=================================================================== ---- library.orig/qpeapplication.h 2008-06-12 01:18:24.548201862 +0200 -+++ library/qpeapplication.h 2008-06-12 01:18:30.861635469 +0200 -@@ -127,7 +127,7 @@ - static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; - /* Merge setTempScreenSaverMode */ - #ifdef QTOPIA_INTERNAL_INITAPP -- void initApp( int argv, char **argv ); -+ void initApp( int argc, char **argv ); - #endif - - static void setKeepRunning(); diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index 7c69904cd2..d3b17ac7ee 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -7,6 +7,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1 \ file://unbreak-logging.patch;patch=1 \ file://citytime-path-2.patch;patch=1 \ - file://argv.patch;patch=1 \ " diff --git a/packages/linux/linux-2.6.25/at32stk1000/defconfig b/packages/linux/linux-2.6.25/at32stk1000/defconfig index 66a1a789b3..c5f75a04d6 100644 --- a/packages/linux/linux-2.6.25/at32stk1000/defconfig +++ b/packages/linux/linux-2.6.25/at32stk1000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25 -# Sat Jul 5 12:40:54 2008 +# Sun Sep 7 18:10:04 2008 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y @@ -136,8 +136,8 @@ CONFIG_BOARD_ATSTK1002=y # CONFIG_BOARD_ATSTK1006 is not set # CONFIG_BOARD_ATSTK100X_CUSTOM is not set # CONFIG_BOARD_ATSTK100X_SPI1 is not set -# CONFIG_BOARD_ATSTK1000_J2_LED is not set -# CONFIG_BOARD_ATSTK1000_J2_LED8 is not set +CONFIG_BOARD_ATSTK1000_J2_LED=y +CONFIG_BOARD_ATSTK1000_J2_LED8=y # CONFIG_BOARD_ATSTK1000_J2_RGB is not set CONFIG_BOARD_ATSTK1000_EXTDAC=y # CONFIG_BOARD_ATSTK100X_ENABLE_AC97 is not set @@ -199,7 +199,8 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set -# CONFIG_CPU_FREQ_STAT is not set +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=n CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set @@ -592,6 +593,7 @@ CONFIG_INPUT_POLLDEV=y # Userland interfaces # CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_VMS=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 @@ -1366,7 +1368,7 @@ CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_SOFTLOCKUP=y CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set -# CONFIG_TIMER_STATS is not set +CONFIG_TIMER_STATS=y # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_RT_MUTEXES is not set diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb index 41f11d2c87..c84cbe8180 100644 --- a/packages/linux/linux_2.6.25.bb +++ b/packages/linux/linux_2.6.25.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r4" +PR = "r5" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" diff --git a/packages/mozilla/fennec/jsautocfg-dontoverwrite.patch b/packages/mozilla/fennec/jsautocfg-dontoverwrite.patch new file mode 100644 index 0000000000..39978cfd11 --- /dev/null +++ b/packages/mozilla/fennec/jsautocfg-dontoverwrite.patch @@ -0,0 +1,23 @@ +--- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 ++++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 +@@ -319,20 +319,8 @@ + + jsopcode.h jsopcode.c: jsopcode.tbl + +-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) + jsautocfg.h: + touch $@ +-else +-ifeq ($(OS_ARCH),WINCE) +-jsautocfg.h: +- touch $@ +-else +-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) +- @rm -f $@ jsautocfg.tmp +- ./jscpucfg > jsautocfg.tmp +- mv jsautocfg.tmp $@ +-endif +-endif + + # jscpucfg is a strange target + # Needs to be built with the host compiler but needs to include diff --git a/packages/mozilla/fennec/mozilla-fennec.desktop b/packages/mozilla/fennec/mozilla-fennec.desktop new file mode 100644 index 0000000000..5c56d1d21d --- /dev/null +++ b/packages/mozilla/fennec/mozilla-fennec.desktop @@ -0,0 +1,17 @@ +[Desktop Entry] +Version=0.7 +Encoding=UTF-8 +Name=Fennec +Comment=Fennec mobile browser +GenericName=Fennec +Exec=/usr/lib/fennec/fennec +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=mozilla-fennec +Categories=Application;Network; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png; +StartupWMClass=Fennec +StartupNotify=true +X-Osso-Service=Mozilla.Fennec + diff --git a/packages/mozilla/fennec/mozilla-fennec.png b/packages/mozilla/fennec/mozilla-fennec.png Binary files differnew file mode 100644 index 0000000000..b940df9b1e --- /dev/null +++ b/packages/mozilla/fennec/mozilla-fennec.png diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb index 24ff40dd2e..cb56c949d0 100644 --- a/packages/mozilla/fennec_hg.bb +++ b/packages/mozilla/fennec_hg.bb @@ -1,11 +1,12 @@ DEPENDS += "cairo alsa-lib " PV = "0.7" -PR = "r1" +PR = "r2" SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=7352ef83055a \ hg://hg.mozilla.org/;module=mobile-browser;rev=767c0315369c \ file://jsautocfg.h \ + file://jsautocfg-dontoverwrite.patch;patch=1 \ " S = "${WORKDIR}/mozilla-central" @@ -49,7 +50,16 @@ do_install() { tar xjf ${S}/objdir/mobile/dist/fennec-${PV}*.tar.bz2 -C ${D}/${libdir} # remove x86 binary rm ${D}/${libdir}/fennec/xulrunner/nsinstall + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/mozilla-${PN}.desktop ${D}${datadir}/applications/ + install -m 0644 ${WORKDIR}/mozilla-${PN}.png ${D}${datadir}/pixmaps/ } +do_stage() { + : +} + + FILES_${PN} += "${libdir}/fennec" diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc index 76f12df365..5b9acf9580 100644 --- a/packages/mozilla/firefox.inc +++ b/packages/mozilla/firefox.inc @@ -1,4 +1,4 @@ -SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop" +SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop" PACKAGES =+ "${PN}-inspector" diff --git a/packages/nxproxy/nxproxy_3.2.0-1.bb b/packages/nxproxy/nxproxy_3.2.0-1.bb index 162945f0d3..ca543ef05c 100644 --- a/packages/nxproxy/nxproxy_3.2.0-1.bb +++ b/packages/nxproxy/nxproxy_3.2.0-1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The binary which uses libxcomp from nomachine" HOMEPAGE = "http://www.nomachine.com/" LICENSE = "GPL" -PR = "r0" +PR = "r1" DEPENDS = "libxcomp" @@ -14,5 +14,5 @@ S = "${WORKDIR}/nxproxy" do_install () { install -d ${D}${bindir}/ - install -s -m 0644 nxproxy ${D}${bindir}/ + install -s -m 0755 nxproxy ${D}${bindir}/ } diff --git a/packages/opie-console/files/double_name.patch b/packages/opie-console/files/double_name.patch deleted file mode 100644 index 47e127e160..0000000000 --- a/packages/opie-console/files/double_name.patch +++ /dev/null @@ -1,118 +0,0 @@ -Index: opie-console/profiledialogwidget.h -=================================================================== ---- opie-console.orig/profiledialogwidget.h 2002-10-21 23:43:44.000000000 +0200 -+++ opie-console/profiledialogwidget.h 2008-08-26 16:22:31.618071081 +0200 -@@ -13,7 +13,7 @@ - Terminal, - Keyboard - }; -- ProfileDialogWidget( const QString& name, QWidget* parent, const char* name = 0l); -+ ProfileDialogWidget( const QString& name, QWidget* parent, const char* na = 0l); - ~ProfileDialogWidget(); - - /* -@@ -34,7 +34,7 @@ - Q_OBJECT - public: - ProfileDialogTerminalWidget( const QString& name, QWidget* widget, -- const char* name =0l); -+ const char* na =0l); - ~ProfileDialogTerminalWidget(); - Type type()const; - }; -@@ -42,7 +42,7 @@ - Q_OBJECT - public: - ProfileDialogConnectionWidget( const QString& name, QWidget* parent, -- const char* name =0l); -+ const char* na =0l); - ~ProfileDialogConnectionWidget(); - Type type() const; - -@@ -51,7 +51,7 @@ - Q_OBJECT - public: - ProfileDialogKeyWidget( const QString &name, QWidget* parent, -- const char *name =0l); -+ const char *na =0l); - ~ProfileDialogKeyWidget(); - Type type() const; - }; -Index: opie-console/function_keyboard.h -=================================================================== ---- opie-console.orig/function_keyboard.h 2007-08-27 01:49:15.000000000 +0200 -+++ opie-console/function_keyboard.h 2008-08-26 16:22:31.618071081 +0200 -@@ -86,7 +86,7 @@ - Q_OBJECT - - public: -- FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* name = 0l ); -+ FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* na = 0l ); - ~FunctionKeyboardConfig(); - - void load(const Profile&); -Index: opie-console/serialconfigwidget.h -=================================================================== ---- opie-console.orig/serialconfigwidget.h 2002-10-09 01:13:17.000000000 +0200 -+++ opie-console/serialconfigwidget.h 2008-08-26 16:22:31.618071081 +0200 -@@ -10,7 +10,7 @@ - class SerialConfigWidget : public ProfileDialogConnectionWidget { - Q_OBJECT - public: -- SerialConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); -+ SerialConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); - ~SerialConfigWidget(); - - void load( const Profile& ); -Index: opie-console/irdaconfigwidget.h -=================================================================== ---- opie-console.orig/irdaconfigwidget.h 2002-10-09 18:33:36.000000000 +0200 -+++ opie-console/irdaconfigwidget.h 2008-08-26 16:22:31.618071081 +0200 -@@ -12,7 +12,7 @@ - Q_OBJECT - - public: -- IrdaConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); -+ IrdaConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); - ~IrdaConfigWidget(); - - void load( const Profile& ); -Index: opie-console/btconfigwidget.h -=================================================================== ---- opie-console.orig/btconfigwidget.h 2002-10-17 16:16:03.000000000 +0200 -+++ opie-console/btconfigwidget.h 2008-08-26 16:22:31.618071081 +0200 -@@ -14,7 +14,7 @@ - Q_OBJECT - - public: -- BTConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); -+ BTConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); - ~BTConfigWidget(); - - void load( const Profile& ); -Index: opie-console/modemconfigwidget.h -=================================================================== ---- opie-console.orig/modemconfigwidget.h 2002-10-13 23:10:15.000000000 +0200 -+++ opie-console/modemconfigwidget.h 2008-08-26 16:22:31.618071081 +0200 -@@ -15,7 +15,7 @@ - Q_OBJECT - - public: -- ModemConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); -+ ModemConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); - ~ModemConfigWidget(); - - void load( const Profile& ); -Index: opie-console/consoleconfigwidget.h -=================================================================== ---- opie-console.orig/consoleconfigwidget.h 2008-08-26 16:23:08.198065869 +0200 -+++ opie-console/consoleconfigwidget.h 2008-08-26 16:23:12.938066770 +0200 -@@ -11,7 +11,7 @@ - class ConsoleConfigWidget : public ProfileDialogConnectionWidget { - Q_OBJECT - public: -- ConsoleConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); -+ ConsoleConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); - ~ConsoleConfigWidget(); - - void load( const Profile& ); diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb index 00f8a284a3..857f6d10a1 100644 --- a/packages/opie-console/opie-console_cvs.bb +++ b/packages/opie-console/opie-console_cvs.bb @@ -6,5 +6,4 @@ PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/apps \ - file://double_name.patch;patch=1 \ " diff --git a/packages/popt/popt_1.14.bb b/packages/popt/popt_1.14.bb index d78d8dc337..240ac52275 100644 --- a/packages/popt/popt_1.14.bb +++ b/packages/popt/popt_1.14.bb @@ -1,6 +1,6 @@ require popt.inc -DEPENDS = "gettext virtual/libintl" +DEPENDS = "gettext-native virtual/libintl" PR = "r1" diff --git a/packages/powertop/powertop_1.10.bb b/packages/powertop/powertop_1.10.bb index 0b2d4ffa05..4a429d68ba 100644 --- a/packages/powertop/powertop_1.10.bb +++ b/packages/powertop/powertop_1.10.bb @@ -1,7 +1,7 @@ DESCRIPTION = "PowerTOP, a tool that helps you find what software is using the most power." HOMEPAGE = "http://www.linuxpowertop.org/" LICENSE = "GPLv2" -DEPENDS = "ncurses" +DEPENDS = "virtual/libintl ncurses" SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz" diff --git a/packages/qtnx/.mtn2git_empty b/packages/qtnx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qtnx/.mtn2git_empty diff --git a/packages/qtnx/files/.mtn2git_empty b/packages/qtnx/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qtnx/files/.mtn2git_empty diff --git a/packages/qtnx/files/id-path.patch b/packages/qtnx/files/id-path.patch new file mode 100644 index 0000000000..e6b75cac9b --- /dev/null +++ b/packages/qtnx/files/id-path.patch @@ -0,0 +1,24 @@ +fix from latest debian unstable package + + +Index: qtnx-0.9/qtnxwindow.cpp +=================================================================== +--- qtnx-0.9.orig/qtnxwindow.cpp 2008-09-02 22:11:45.015711881 +0200 ++++ qtnx-0.9/qtnxwindow.cpp 2008-09-02 22:24:27.168968002 +0200 +@@ -290,7 +290,7 @@ + + m_NXClient->setDepth(getDepth()); + +- QString keyPath = "id.key"; ++ QString keyPath = "/usr/share/qtnx/id.key"; + + #ifdef Q_WS_MAC + keyPath = binaryPath + "/id.key"; +@@ -405,6 +405,7 @@ + + connect(settingsDialog, SIGNAL(closing(QString)), this, SLOT(configureClosed(QString))); + ++ + settingsDialog->show(); + } + diff --git a/packages/qtnx/files/pro.patch b/packages/qtnx/files/pro.patch new file mode 100644 index 0000000000..2e1b10ca3a --- /dev/null +++ b/packages/qtnx/files/pro.patch @@ -0,0 +1,27 @@ +patch by Henning Heinold + +Index: qtnx-0.9/qtnx.pro +=================================================================== +--- qtnx-0.9.orig/qtnx.pro 2008-09-04 11:42:19.000000000 +0200 ++++ qtnx-0.9/qtnx.pro 2008-09-04 11:42:32.000000000 +0200 +@@ -24,6 +24,6 @@ + DEPENDPATH += $(QTDIR)/include + + +-QT += ui xml ++QT += gui xml + + TARGET = qtnx +Index: qtnx-0.9/qtnxwin32.pro +=================================================================== +--- qtnx-0.9.orig/qtnxwin32.pro 2008-03-07 12:13:15.000000000 +0100 ++++ qtnx-0.9/qtnxwin32.pro 2008-09-04 11:42:41.000000000 +0200 +@@ -14,7 +14,7 @@ + + QMAKE_LFLAGS += -Wl,-subsystem,windows + +-QT += ui xml ++QT += gui xml + + TARGET = qtnx + diff --git a/packages/qtnx/files/scroll.patch b/packages/qtnx/files/scroll.patch new file mode 100644 index 0000000000..107c7177c6 --- /dev/null +++ b/packages/qtnx/files/scroll.patch @@ -0,0 +1,1695 @@ +patch by Henning Heinold, so the configure-widget is +scrollable + +Index: qtnx-0.9/settingsdialog.ui +=================================================================== +--- qtnx-0.9.orig/settingsdialog.ui 2008-09-03 21:32:51.716503112 +0200 ++++ qtnx-0.9/settingsdialog.ui 2008-09-03 21:34:56.943160459 +0200 +@@ -5,8 +5,8 @@ + <rect> + <x>0</x> + <y>0</y> +- <width>468</width> +- <height>546</height> ++ <width>480</width> ++ <height>543</height> + </rect> + </property> + <property name="windowTitle" > +@@ -19,923 +19,787 @@ + <property name="spacing" > + <number>6</number> + </property> +- <property name="leftMargin" > +- <number>9</number> +- </property> +- <property name="topMargin" > +- <number>9</number> +- </property> +- <property name="rightMargin" > +- <number>9</number> +- </property> +- <property name="bottomMargin" > ++ <property name="margin" > + <number>9</number> + </property> + <item> +- <widget class="QTabWidget" name="layoutTabs" > +- <property name="currentIndex" > +- <number>0</number> ++ <widget class="QScrollArea" name="scrollArea" > ++ <property name="widgetResizable" > ++ <bool>true</bool> + </property> +- <widget class="QWidget" name="basicTab" > +- <attribute name="title" > +- <string>Basic</string> +- </attribute> +- <layout class="QVBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>9</number> +- </property> +- <property name="topMargin" > +- <number>9</number> +- </property> +- <property name="rightMargin" > +- <number>9</number> +- </property> +- <property name="bottomMargin" > +- <number>9</number> +- </property> +- <item> +- <widget class="QGroupBox" name="generalGroup" > +- <property name="title" > +- <string>General</string> +- </property> +- <layout class="QVBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>9</number> +- </property> +- <property name="topMargin" > +- <number>9</number> +- </property> +- <property name="rightMargin" > +- <number>9</number> +- </property> +- <property name="bottomMargin" > +- <number>9</number> +- </property> +- <item> +- <layout class="QHBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>0</number> +- </property> +- <property name="topMargin" > +- <number>0</number> +- </property> +- <property name="rightMargin" > +- <number>0</number> +- </property> +- <property name="bottomMargin" > +- <number>0</number> +- </property> +- <item> +- <widget class="QLabel" name="sessionNameLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>Session Name:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QLineEdit" name="sessionName" /> +- </item> +- </layout> +- </item> +- </layout> +- </widget> +- </item> +- <item> +- <widget class="QGroupBox" name="serverGroup" > +- <property name="title" > +- <string>Server</string> +- </property> +- <layout class="QVBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>9</number> +- </property> +- <property name="topMargin" > +- <number>9</number> +- </property> +- <property name="rightMargin" > +- <number>9</number> +- </property> +- <property name="bottomMargin" > +- <number>9</number> +- </property> +- <item> +- <layout class="QHBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>0</number> +- </property> +- <property name="topMargin" > +- <number>0</number> +- </property> +- <property name="rightMargin" > +- <number>0</number> +- </property> +- <property name="bottomMargin" > +- <number>0</number> +- </property> +- <item> +- <widget class="QLabel" name="hostnameLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>Hostname:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QLineEdit" name="hostname" /> +- </item> +- <item> +- <widget class="QLabel" name="portLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>Port:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QSpinBox" name="port" > +- <property name="minimum" > +- <number>1</number> +- </property> +- <property name="maximum" > +- <number>65535</number> +- </property> +- <property name="value" > +- <number>22</number> +- </property> +- </widget> +- </item> +- </layout> +- </item> +- <item> +- <layout class="QHBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>0</number> +- </property> +- <property name="topMargin" > +- <number>0</number> +- </property> +- <property name="rightMargin" > +- <number>0</number> +- </property> +- <property name="bottomMargin" > +- <number>0</number> +- </property> +- <item> +- <widget class="QCheckBox" name="defaultKey" > +- <property name="text" > +- <string>Use default key</string> +- </property> +- <property name="checked" > +- <bool>true</bool> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QPushButton" name="setAuthKeyButton" > +- <property name="enabled" > +- <bool>false</bool> +- </property> +- <property name="text" > +- <string>&Set Authentication Key...</string> +- </property> +- </widget> +- </item> +- </layout> +- </item> +- </layout> +- </widget> +- </item> +- <item> +- <widget class="QGroupBox" name="desktopGroup" > +- <property name="title" > +- <string>Desktop</string> +- </property> +- <layout class="QVBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>9</number> +- </property> +- <property name="topMargin" > +- <number>9</number> +- </property> +- <property name="rightMargin" > +- <number>9</number> +- </property> +- <property name="bottomMargin" > +- <number>9</number> +- </property> +- <item> +- <layout class="QHBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>0</number> +- </property> +- <property name="topMargin" > +- <number>0</number> +- </property> +- <property name="rightMargin" > +- <number>0</number> +- </property> +- <property name="bottomMargin" > +- <number>0</number> +- </property> +- <item> +- <widget class="QLabel" name="platformLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>Platform:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QComboBox" name="platform" > +- <item> +- <property name="text" > +- <string>UNIX</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>Windows</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>VNC Proxy</string> +- </property> +- </item> +- </widget> +- </item> +- <item> +- <widget class="QLabel" name="typeLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>Type:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QComboBox" name="type" > +- <item> +- <property name="text" > +- <string>KDE</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>GNOME</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>CDE</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>XDM</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>Custom</string> +- </property> +- </item> +- </widget> +- </item> +- <item> +- <widget class="QLabel" name="linkLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>Link:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QComboBox" name="link" > +- <item> +- <property name="text" > +- <string>Modem</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>ISDN</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>ADSL</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>WAN</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>LAN</string> +- </property> +- </item> +- </widget> +- </item> +- </layout> +- </item> +- <item> +- <layout class="QHBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>0</number> +- </property> +- <property name="topMargin" > +- <number>0</number> +- </property> +- <property name="rightMargin" > +- <number>0</number> +- </property> +- <property name="bottomMargin" > +- <number>0</number> +- </property> +- <item> +- <spacer> +- <property name="orientation" > +- <enum>Qt::Horizontal</enum> +- </property> +- <property name="sizeHint" > +- <size> +- <width>173</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- </item> +- <item> +- <widget class="QPushButton" name="desktopSettingButton" > +- <property name="enabled" > +- <bool>false</bool> +- </property> +- <property name="text" > +- <string>&Settings...</string> +- </property> +- </widget> +- </item> +- </layout> +- </item> +- </layout> +- </widget> +- </item> ++ <widget class="QWidget" name="scrollAreaWidgetContents" > ++ <property name="geometry" > ++ <rect> ++ <x>0</x> ++ <y>0</y> ++ <width>458</width> ++ <height>521</height> ++ </rect> ++ </property> ++ <layout class="QVBoxLayout" name="verticalLayout" > + <item> +- <widget class="QGroupBox" name="groupBox" > +- <property name="title" > +- <string>Geometry</string> ++ <widget class="QTabWidget" name="layoutTabs" > ++ <property name="currentIndex" > ++ <number>0</number> + </property> +- <layout class="QVBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>9</number> +- </property> +- <property name="topMargin" > +- <number>9</number> +- </property> +- <property name="rightMargin" > +- <number>9</number> +- </property> +- <property name="bottomMargin" > +- <number>9</number> +- </property> +- <item> +- <layout class="QHBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>0</number> +- </property> +- <property name="topMargin" > +- <number>0</number> +- </property> +- <property name="rightMargin" > +- <number>0</number> +- </property> +- <property name="bottomMargin" > +- <number>0</number> +- </property> +- <item> +- <widget class="QLabel" name="resolutionLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>Resolution:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QComboBox" name="resolution" > +- <item> +- <property name="text" > +- <string>640x480</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>800x600</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>1024x768</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>Fullscreen</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>Custom</string> +- </property> +- </item> +- </widget> +- </item> +- <item> +- <widget class="QLabel" name="compressionLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>Compression:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QComboBox" name="imageCompressionType" > +- <item> +- <property name="text" > +- <string>PNG</string> +- </property> +- </item> +- <item> +- <property name="text" > +- <string>JPEG</string> +- </property> +- </item> ++ <widget class="QWidget" name="basicTab" > ++ <property name="geometry" > ++ <rect> ++ <x>0</x> ++ <y>0</y> ++ <width>436</width> ++ <height>439</height> ++ </rect> ++ </property> ++ <attribute name="title" > ++ <string>Basic</string> ++ </attribute> ++ <layout class="QVBoxLayout" name="_2" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > ++ <number>9</number> ++ </property> ++ <item> ++ <widget class="QGroupBox" name="generalGroup" > ++ <property name="title" > ++ <string>General</string> ++ </property> ++ <layout class="QVBoxLayout" name="_3" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > ++ <number>9</number> ++ </property> + <item> +- <property name="text" > +- <string>Raw X11</string> +- </property> +- </item> +- </widget> +- </item> +- </layout> +- </item> +- <item> +- <layout class="QHBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>0</number> +- </property> +- <property name="topMargin" > +- <number>0</number> +- </property> +- <property name="rightMargin" > +- <number>0</number> +- </property> +- <property name="bottomMargin" > +- <number>0</number> +- </property> +- <item> +- <widget class="QLabel" name="qualityLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>JPEG Quality:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QSlider" name="imageQualityLevel" > +- <property name="enabled" > +- <bool>false</bool> ++ <layout class="QHBoxLayout" name="_4" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QLabel" name="sessionNameLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>Session Name:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLineEdit" name="sessionName" /> ++ </item> ++ </layout> ++ </item> ++ </layout> ++ </widget> ++ </item> ++ <item> ++ <widget class="QGroupBox" name="serverGroup" > ++ <property name="title" > ++ <string>Server</string> ++ </property> ++ <layout class="QVBoxLayout" name="_5" > ++ <property name="spacing" > ++ <number>6</number> + </property> +- <property name="minimum" > +- <number>1</number> ++ <property name="margin" > ++ <number>9</number> + </property> +- <property name="maximum" > ++ <item> ++ <layout class="QHBoxLayout" name="_6" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QLabel" name="hostnameLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>Hostname:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLineEdit" name="hostname" /> ++ </item> ++ <item> ++ <widget class="QLabel" name="portLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>Port:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QSpinBox" name="port" > ++ <property name="minimum" > ++ <number>1</number> ++ </property> ++ <property name="maximum" > ++ <number>65535</number> ++ </property> ++ <property name="value" > ++ <number>22</number> ++ </property> ++ </widget> ++ </item> ++ </layout> ++ </item> ++ <item> ++ <layout class="QHBoxLayout" name="_7" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QCheckBox" name="defaultKey" > ++ <property name="text" > ++ <string>Use default key</string> ++ </property> ++ <property name="checked" > ++ <bool>true</bool> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QPushButton" name="setAuthKeyButton" > ++ <property name="enabled" > ++ <bool>false</bool> ++ </property> ++ <property name="text" > ++ <string>&Set Authentication Key...</string> ++ </property> ++ </widget> ++ </item> ++ </layout> ++ </item> ++ </layout> ++ </widget> ++ </item> ++ <item> ++ <widget class="QGroupBox" name="desktopGroup" > ++ <property name="title" > ++ <string>Desktop</string> ++ </property> ++ <layout class="QVBoxLayout" name="_8" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > + <number>9</number> + </property> +- <property name="pageStep" > ++ <item> ++ <layout class="QHBoxLayout" name="_9" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QLabel" name="platformLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>Platform:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QComboBox" name="platform" > ++ <item> ++ <property name="text" > ++ <string>UNIX</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>Windows</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>VNC Proxy</string> ++ </property> ++ </item> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLabel" name="typeLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>Type:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QComboBox" name="type" > ++ <item> ++ <property name="text" > ++ <string>KDE</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>GNOME</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>CDE</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>XDM</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>Custom</string> ++ </property> ++ </item> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLabel" name="linkLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>Link:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QComboBox" name="link" > ++ <item> ++ <property name="text" > ++ <string>Modem</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>ISDN</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>ADSL</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>WAN</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>LAN</string> ++ </property> ++ </item> ++ </widget> ++ </item> ++ </layout> ++ </item> ++ <item> ++ <layout class="QHBoxLayout" name="_10" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > ++ <number>0</number> ++ </property> ++ <item> ++ <spacer> ++ <property name="orientation" > ++ <enum>Qt::Horizontal</enum> ++ </property> ++ <property name="sizeHint" stdset="0" > ++ <size> ++ <width>173</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ </item> ++ <item> ++ <widget class="QPushButton" name="desktopSettingButton" > ++ <property name="enabled" > ++ <bool>false</bool> ++ </property> ++ <property name="text" > ++ <string>&Settings...</string> ++ </property> ++ </widget> ++ </item> ++ </layout> ++ </item> ++ </layout> ++ </widget> ++ </item> ++ <item> ++ <widget class="QGroupBox" name="groupBox" > ++ <property name="title" > ++ <string>Geometry</string> ++ </property> ++ <layout class="QVBoxLayout" name="_11" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > + <number>9</number> + </property> +- <property name="value" > ++ <item> ++ <layout class="QHBoxLayout" name="_12" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QLabel" name="resolutionLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>Resolution:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QComboBox" name="resolution" > ++ <item> ++ <property name="text" > ++ <string>640x480</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>800x600</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>1024x768</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>Fullscreen</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>Custom</string> ++ </property> ++ </item> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLabel" name="compressionLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>Compression:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QComboBox" name="imageCompressionType" > ++ <item> ++ <property name="text" > ++ <string>PNG</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>JPEG</string> ++ </property> ++ </item> ++ <item> ++ <property name="text" > ++ <string>Raw X11</string> ++ </property> ++ </item> ++ </widget> ++ </item> ++ </layout> ++ </item> ++ <item> ++ <layout class="QHBoxLayout" name="_13" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QLabel" name="qualityLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>JPEG Quality:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QSlider" name="imageQualityLevel" > ++ <property name="enabled" > ++ <bool>false</bool> ++ </property> ++ <property name="minimum" > ++ <number>1</number> ++ </property> ++ <property name="maximum" > ++ <number>9</number> ++ </property> ++ <property name="pageStep" > ++ <number>9</number> ++ </property> ++ <property name="value" > ++ <number>6</number> ++ </property> ++ <property name="orientation" > ++ <enum>Qt::Horizontal</enum> ++ </property> ++ <property name="tickPosition" > ++ <enum>QSlider::TicksBelow</enum> ++ </property> ++ <property name="tickInterval" > ++ <number>1</number> ++ </property> ++ </widget> ++ </item> ++ </layout> ++ </item> ++ <item> ++ <layout class="QHBoxLayout" name="_14" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QCheckBox" name="render" > ++ <property name="text" > ++ <string>Use RENDER Extension</string> ++ </property> ++ <property name="checked" > ++ <bool>true</bool> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLabel" name="widthLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>Width:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QSpinBox" name="width" > ++ <property name="enabled" > ++ <bool>false</bool> ++ </property> ++ <property name="maximum" > ++ <number>9999</number> ++ </property> ++ <property name="value" > ++ <number>800</number> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLabel" name="heightLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>Height:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QSpinBox" name="height" > ++ <property name="enabled" > ++ <bool>false</bool> ++ </property> ++ <property name="maximum" > ++ <number>9999</number> ++ </property> ++ <property name="value" > ++ <number>600</number> ++ </property> ++ </widget> ++ </item> ++ </layout> ++ </item> ++ </layout> ++ </widget> ++ </item> ++ </layout> ++ </widget> ++ <widget class="QWidget" name="advancedTab" > ++ <property name="geometry" > ++ <rect> ++ <x>0</x> ++ <y>0</y> ++ <width>624</width> ++ <height>496</height> ++ </rect> ++ </property> ++ <attribute name="title" > ++ <string>Advanced</string> ++ </attribute> ++ <layout class="QVBoxLayout" name="_15" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > ++ <number>9</number> ++ </property> ++ <item> ++ <widget class="QGroupBox" name="networkGroup" > ++ <property name="title" > ++ <string>Network</string> ++ </property> ++ <layout class="QVBoxLayout" name="_16" > ++ <property name="spacing" > + <number>6</number> + </property> +- <property name="orientation" > +- <enum>Qt::Horizontal</enum> ++ <property name="margin" > ++ <number>9</number> + </property> +- <property name="tickPosition" > +- <enum>QSlider::TicksBelow</enum> ++ <item> ++ <widget class="QCheckBox" name="encryption" > ++ <property name="text" > ++ <string>Use SSH Tunneling</string> ++ </property> ++ <property name="checked" > ++ <bool>true</bool> ++ </property> ++ </widget> ++ </item> ++ </layout> ++ </widget> ++ </item> ++ <item> ++ <widget class="QGroupBox" name="cacheGroup" > ++ <property name="title" > ++ <string>Cache</string> ++ </property> ++ <layout class="QVBoxLayout" name="_17" > ++ <property name="spacing" > ++ <number>6</number> + </property> +- <property name="tickInterval" > +- <number>1</number> ++ <property name="margin" > ++ <number>9</number> + </property> +- </widget> +- </item> +- </layout> +- </item> +- <item> +- <layout class="QHBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>0</number> +- </property> +- <property name="topMargin" > +- <number>0</number> +- </property> +- <property name="rightMargin" > +- <number>0</number> +- </property> +- <property name="bottomMargin" > +- <number>0</number> +- </property> +- <item> +- <widget class="QCheckBox" name="render" > +- <property name="text" > +- <string>Use RENDER Extension</string> +- </property> +- <property name="checked" > +- <bool>true</bool> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QLabel" name="widthLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>Width:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QSpinBox" name="width" > +- <property name="enabled" > +- <bool>false</bool> +- </property> +- <property name="maximum" > +- <number>9999</number> +- </property> +- <property name="value" > +- <number>800</number> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QLabel" name="heightLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>Height:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QSpinBox" name="height" > +- <property name="enabled" > +- <bool>false</bool> +- </property> +- <property name="maximum" > +- <number>9999</number> +- </property> +- <property name="value" > +- <number>600</number> +- </property> +- </widget> +- </item> +- </layout> +- </item> +- </layout> +- </widget> +- </item> +- </layout> +- </widget> +- <widget class="QWidget" name="advancedTab" > +- <attribute name="title" > +- <string>Advanced</string> +- </attribute> +- <layout class="QVBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>9</number> +- </property> +- <property name="topMargin" > +- <number>9</number> +- </property> +- <property name="rightMargin" > +- <number>9</number> +- </property> +- <property name="bottomMargin" > +- <number>9</number> +- </property> +- <item> +- <widget class="QGroupBox" name="networkGroup" > +- <property name="title" > +- <string>Network</string> +- </property> +- <layout class="QVBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>9</number> +- </property> +- <property name="topMargin" > +- <number>9</number> +- </property> +- <property name="rightMargin" > +- <number>9</number> +- </property> +- <property name="bottomMargin" > +- <number>9</number> +- </property> +- <item> +- <widget class="QCheckBox" name="encryption" > +- <property name="text" > +- <string>Use SSH Tunneling</string> +- </property> +- <property name="checked" > +- <bool>true</bool> +- </property> +- </widget> +- </item> +- </layout> +- </widget> +- </item> +- <item> +- <widget class="QGroupBox" name="cacheGroup" > +- <property name="title" > +- <string>Cache</string> +- </property> +- <layout class="QVBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>9</number> +- </property> +- <property name="topMargin" > +- <number>9</number> +- </property> +- <property name="rightMargin" > +- <number>9</number> +- </property> +- <property name="bottomMargin" > +- <number>9</number> +- </property> +- <item> +- <layout class="QHBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>0</number> +- </property> +- <property name="topMargin" > +- <number>0</number> +- </property> +- <property name="rightMargin" > +- <number>0</number> +- </property> +- <property name="bottomMargin" > +- <number>0</number> +- </property> +- <item> +- <widget class="QLabel" name="memoryLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>Memory:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QSpinBox" name="memoryCache" > +- <property name="maximum" > +- <number>128</number> +- </property> +- <property name="value" > +- <number>8</number> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QLabel" name="memoryMBLabel" > +- <property name="text" > +- <string>MB</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QLabel" name="diskLabel" > +- <property name="sizePolicy" > +- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text" > +- <string>Disk:</string> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QSpinBox" name="diskCache" > +- <property name="maximum" > +- <number>128</number> +- </property> +- <property name="value" > +- <number>32</number> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QLabel" name="diskMBLabel" > +- <property name="text" > +- <string>MB</string> +- </property> +- </widget> +- </item> +- </layout> +- </item> +- </layout> ++ <item> ++ <layout class="QHBoxLayout" name="_18" > ++ <property name="spacing" > ++ <number>6</number> ++ </property> ++ <property name="margin" > ++ <number>0</number> ++ </property> ++ <item> ++ <widget class="QLabel" name="memoryLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>Memory:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QSpinBox" name="memoryCache" > ++ <property name="maximum" > ++ <number>128</number> ++ </property> ++ <property name="value" > ++ <number>8</number> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLabel" name="memoryMBLabel" > ++ <property name="text" > ++ <string>MB</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLabel" name="diskLabel" > ++ <property name="sizePolicy" > ++ <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text" > ++ <string>Disk:</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QSpinBox" name="diskCache" > ++ <property name="maximum" > ++ <number>128</number> ++ </property> ++ <property name="value" > ++ <number>32</number> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QLabel" name="diskMBLabel" > ++ <property name="text" > ++ <string>MB</string> ++ </property> ++ </widget> ++ </item> ++ </layout> ++ </item> ++ </layout> ++ </widget> ++ </item> ++ <item> ++ <spacer> ++ <property name="orientation" > ++ <enum>Qt::Vertical</enum> ++ </property> ++ <property name="sizeHint" stdset="0" > ++ <size> ++ <width>20</width> ++ <height>40</height> ++ </size> ++ </property> ++ </spacer> ++ </item> ++ </layout> ++ </widget> + </widget> + </item> + <item> +- <spacer> +- <property name="orientation" > +- <enum>Qt::Vertical</enum> ++ <layout class="QHBoxLayout" name="bottomLayout" > ++ <property name="spacing" > ++ <number>6</number> + </property> +- <property name="sizeHint" > +- <size> +- <width>20</width> +- <height>40</height> +- </size> ++ <property name="margin" > ++ <number>0</number> + </property> +- </spacer> ++ <item> ++ <widget class="QPushButton" name="cancelButton" > ++ <property name="text" > ++ <string>&Cancel</string> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <spacer name="spacer" > ++ <property name="orientation" > ++ <enum>Qt::Horizontal</enum> ++ </property> ++ <property name="sizeHint" stdset="0" > ++ <size> ++ <width>40</width> ++ <height>20</height> ++ </size> ++ </property> ++ </spacer> ++ </item> ++ <item> ++ <widget class="QPushButton" name="okButton" > ++ <property name="text" > ++ <string>&OK</string> ++ </property> ++ <property name="autoDefault" > ++ <bool>false</bool> ++ </property> ++ <property name="default" > ++ <bool>true</bool> ++ </property> ++ </widget> ++ </item> ++ <item> ++ <widget class="QPushButton" name="applyButton" > ++ <property name="text" > ++ <string>&Apply</string> ++ </property> ++ <property name="autoDefault" > ++ <bool>false</bool> ++ </property> ++ </widget> ++ </item> ++ </layout> + </item> + </layout> + </widget> + </widget> + </item> +- <item> +- <layout class="QHBoxLayout" > +- <property name="spacing" > +- <number>6</number> +- </property> +- <property name="leftMargin" > +- <number>0</number> +- </property> +- <property name="topMargin" > +- <number>0</number> +- </property> +- <property name="rightMargin" > +- <number>0</number> +- </property> +- <property name="bottomMargin" > +- <number>0</number> +- </property> +- <item> +- <widget class="QPushButton" name="cancelButton" > +- <property name="text" > +- <string>&Cancel</string> +- </property> +- </widget> +- </item> +- <item> +- <spacer> +- <property name="orientation" > +- <enum>Qt::Horizontal</enum> +- </property> +- <property name="sizeHint" > +- <size> +- <width>40</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- </item> +- <item> +- <widget class="QPushButton" name="okButton" > +- <property name="text" > +- <string>&OK</string> +- </property> +- <property name="autoDefault" > +- <bool>false</bool> +- </property> +- <property name="default" > +- <bool>true</bool> +- </property> +- </widget> +- </item> +- <item> +- <widget class="QPushButton" name="applyButton" > +- <property name="text" > +- <string>&Apply</string> +- </property> +- <property name="autoDefault" > +- <bool>false</bool> +- </property> +- </widget> +- </item> +- </layout> +- </item> + </layout> + </widget> + <resources/> diff --git a/packages/qtnx/qtnx_0.9.bb b/packages/qtnx/qtnx_0.9.bb new file mode 100644 index 0000000000..d0ed565b36 --- /dev/null +++ b/packages/qtnx/qtnx_0.9.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "This a the freesource nx client, build with qt" +HOMEPAGE = "http://freenx.berlios.de/" +SECTION = "libs" +LICENSE = "GPL" +PR = "r0" + +DEPENDS = "libnxcl" + +SRC_URI = "http://download.berlios.de/freenx/freenx-client-${PV}.tar.bz2 \ + file://pro.patch;patch=1 \ + file://id-path.patch;patch=1 \ + file://scroll.patch;patch=1 \ + " + +S = "${WORKDIR}/freenx-client-${PV}/qtnx" + +inherit qtopia4core + + +FILES_${PN} += ${datadir}/id.key + +do_configure_prepend () { + + rm ${S}/qtnxwin32.pro + +} + +do_install () { + install -d ${D}${bindir}/ + install -s -m 0755 qtnx ${D}${bindir}/ + install -d ${D}${datadir}/ + install -m 0644 id.key ${D}${datadir}/ +} + diff --git a/packages/xorg-lib/pixman/pixman-x888-565.patch b/packages/xorg-lib/pixman/pixman-x888-565.patch new file mode 100644 index 0000000000..a458e045b8 --- /dev/null +++ b/packages/xorg-lib/pixman/pixman-x888-565.patch @@ -0,0 +1,68 @@ +commit 8507756d8868b8d8c7a149bd2427a04262638156 +Author: Vladimir Vukicevic <vladimir@slide.(none)> +Date: Sat Sep 6 17:46:52 2008 -0700 + + Add SRC x888x0565 C fast path + +diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c +index eeefa33..b5fb0ff 100644 +--- a/pixman/pixman-pict.c ++++ b/pixman/pixman-pict.c +@@ -759,6 +759,46 @@ fbCompositeSrc_8888x0565 (pixman_op_t op, + } + } + ++ ++void ++fbCompositeSrc_x888x0565 (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height) ++{ ++ uint16_t *dstLine, *dst; ++ uint32_t *srcLine, *src, s; ++ int dstStride, srcStride; ++ uint16_t w; ++ ++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); ++ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); ++ ++ while (height--) ++ { ++ dst = dstLine; ++ dstLine += dstStride; ++ src = srcLine; ++ srcLine += srcStride; ++ w = width; ++ ++ while (w--) ++ { ++ s = READ(pSrc, src++); ++ WRITE(pDst, dst, cvt8888to0565(s)); ++ dst++; ++ } ++ } ++} ++ + void + fbCompositeSrcAdd_8000x8000 (pixman_op_t op, + pixman_image_t * pSrc, +@@ -1568,6 +1608,10 @@ static const FastPathInfo c_fast_paths[] = + { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrcSrc_nxn, 0 }, + { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrcSrc_nxn, 0 }, + #endif ++ { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 }, ++ { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 }, ++ { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 }, ++ { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 }, + { PIXMAN_OP_IN, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcIn_8x8, 0 }, + { PIXMAN_OP_IN, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fbCompositeSolidMaskIn_nx8x8, 0 }, + { PIXMAN_OP_NONE }, diff --git a/packages/xorg-lib/pixman_0.11.8.bb b/packages/xorg-lib/pixman_0.11.8.bb index a66041da74..239684e71f 100644 --- a/packages/xorg-lib/pixman_0.11.8.bb +++ b/packages/xorg-lib/pixman_0.11.8.bb @@ -3,10 +3,11 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" -PR = "r3" +PR = "r4" SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \ file://pixman-arm.patch;patch=1 \ + file://pixman-x888-565.patch;patch=1 \ " inherit autotools diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb index 3fc071ec28..c2673edfc6 100644 --- a/packages/xqt/xqt_0.0.9.bb +++ b/packages/xqt/xqt_0.0.9.bb @@ -2,6 +2,8 @@ HOMEPAGE = "http://xqt.sourceforge.jp" LICENSE = "GPL" SECTION = "x11" +PR = "r1" + SRCDATE = "20041111" DEPENDS = "freetype libxi libxmu flex-native virtual/libqte2 libqpe-opie" @@ -9,6 +11,8 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xc;method=pserv file://imake-staging.patch;patch=1 \ file://moc_call.patch;patch=1 " +inherit palmtop + S = "${WORKDIR}/xc" do_configure() { @@ -28,7 +32,7 @@ do_configure() { # Qt defines echo "#define QtCmnDefs -fno-exceptions -fno-rtti" >> config/cf/host.def echo "#define QtDir ${QTDIR}" >> config/cf/host.def - echo "#define QtLibs -lqpe -lqte -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def + echo "#define QtLibs -lqpe -l${QT_LIBRARY} -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def echo "#define MocBin ${STAGING_BINDIR_NATIVE}/moc" >> config/cf/host.def echo "#define QtDefs -DQWS -DOPIE_NEW_MALLOC -DOPIE_NO_ERASE_RECT_HACKFIX QtCmnDefs" >> config/cf/host.def |
