From 81036f22323d2e6d13c6f1ed6a04959303b0aae5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 22 Sep 2008 23:40:17 +0000 Subject: libopie2: disable W100 driver for c7x0 (addresses oebug #4191) * Add a patch to disable the w100 driver for c7x0 which is currently disabled in qte. Fixes Opie not starting on c7x0 until the w100 driver is fixed and reenabled. --- packages/libopie/libopie2/c7x0_w100_disable.patch | 20 ++++++++++++++++++++ packages/libopie/libopie2_1.2.3.bb | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 packages/libopie/libopie2/c7x0_w100_disable.patch diff --git a/packages/libopie/libopie2/c7x0_w100_disable.patch b/packages/libopie/libopie2/c7x0_w100_disable.patch new file mode 100644 index 0000000000..959c56c443 --- /dev/null +++ b/packages/libopie/libopie2/c7x0_w100_disable.patch @@ -0,0 +1,20 @@ +--- libopie2/opiecore/device/odevice_zaurus.cpp 10 Aug 2008 09:07:32 -0000 1.55 ++++ libopie2/opiecore/device/odevice_zaurus.cpp 20 Sep 2008 23:56:20 -0000 +@@ -313,14 +313,14 @@ + } + + // set default qte driver +- switch( d->m_model ) ++/* switch( d->m_model ) + { + case Model_Zaurus_SLC7x0: + d->m_qteDriver = "W100"; + break; +- default: ++ default:*/ + d->m_qteDriver = "Transformed"; +- } ++// } + + m_leds[0] = Led_Off; + diff --git a/packages/libopie/libopie2_1.2.3.bb b/packages/libopie/libopie2_1.2.3.bb index 522fe55f7c..d0f9e9e17a 100644 --- a/packages/libopie/libopie2_1.2.3.bb +++ b/packages/libopie/libopie2_1.2.3.bb @@ -1,12 +1,13 @@ require ${PN}.inc -PR = "r5" +PR = "r6" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ file://include.pro \ file://gcc-syntax-fix.patch;patch=1 \ file://h4000_and_default_rot.patch;patch=1 \ file://ipaq_rotate_fix.patch;patch=1 \ - file://spitz_rotate_fix.patch;patch=1" + file://spitz_rotate_fix.patch;patch=1 \ + file://c7x0_w100_disable.patch;patch=1" SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" -- cgit v1.2.3 From 1f63c61b266653e80eac0c0db1cfb423ceda262e Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sun, 21 Sep 2008 14:01:04 +0000 Subject: leafpad: bump to 0.8.15 * use upstream desktop file and icon * seperate extra icons to ${PN}-icons --- packages/leafpad/leafpad_0.8.15.bb | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/packages/leafpad/leafpad_0.8.15.bb b/packages/leafpad/leafpad_0.8.15.bb index 3446b4f74e..ad6e7f8e75 100644 --- a/packages/leafpad/leafpad_0.8.15.bb +++ b/packages/leafpad/leafpad_0.8.15.bb @@ -1,25 +1,19 @@ DESCRIPTION = "GTK+ based simple text editor" +DESCRIPTION_${PN}-icons = "Extra icon files for leafpad text editor" HOMEPAGE = "http://tarot.freeshell.org/leafpad" AUTHOR = "Tarot Osuji " SECTION = "x11/applications" LICENSE = "GPLv2" DEPENDS = "gtk+" -SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \ - file://leafpad.desktop \ - file://leafpad.png" -PR = "r0" +SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz" + +PR = "r1" inherit autotools pkgconfig EXTRA_OECONF = " --enable-chooser --enable-emacs --disable-print" -do_install_append () { - install -d ${D}/${datadir} - install -d ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps/ - - install -m 0644 ${WORKDIR}/leafpad.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications -} +PACKAGES =+ "${PN}-icons" +FILES_${PN}-icons = "${datadir}/icons" FILES_${PN} += "${datadir}/applications ${datadir}/pixmaps ${datadir}/icons" -- cgit v1.2.3 From 6c2adc3fe62322636b3099ec6ff945d5c8534d55 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sun, 21 Sep 2008 14:27:52 +0000 Subject: leafpad: fix a regression in DEPENDS --- packages/leafpad/leafpad_0.8.15.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/leafpad/leafpad_0.8.15.bb b/packages/leafpad/leafpad_0.8.15.bb index ad6e7f8e75..9017c11dbf 100644 --- a/packages/leafpad/leafpad_0.8.15.bb +++ b/packages/leafpad/leafpad_0.8.15.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://tarot.freeshell.org/leafpad" AUTHOR = "Tarot Osuji " SECTION = "x11/applications" LICENSE = "GPLv2" -DEPENDS = "gtk+" +DEPENDS = "gtk+ intltool-native" SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz" PR = "r1" -- cgit v1.2.3 From 549fcd819a9e713e2ed2debb56e60afbdde0531c Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sun, 21 Sep 2008 15:47:00 +0000 Subject: tightvnc: bump to 1.3.9 * fix hard coded path and package name * note: only tightvnc-viewer is built and shipped --- packages/vnc/tightvnc_1.3.9.bb | 25 +++++++++++++++++++++++++ packages/vnc/tightvnc_1.3dev7.bb | 23 ----------------------- 2 files changed, 25 insertions(+), 23 deletions(-) create mode 100644 packages/vnc/tightvnc_1.3.9.bb delete mode 100644 packages/vnc/tightvnc_1.3dev7.bb diff --git a/packages/vnc/tightvnc_1.3.9.bb b/packages/vnc/tightvnc_1.3.9.bb new file mode 100644 index 0000000000..ec6a7057d9 --- /dev/null +++ b/packages/vnc/tightvnc_1.3.9.bb @@ -0,0 +1,25 @@ +DESCRIPTION-${PN}-viewer = "A lightweight VNC viewer" +HOMEPAGE = "http://www.tightvnc.com/" +DEPENDS = "virtual/libx11 zlib libxmu libxaw" +LICENSE = "GPL" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/vnc-tight/${PN}-${PV}_unixsrc.tar.gz \ + file://Makefile" + +S = "${WORKDIR}/vnc_unixsrc/vncviewer/" + +PACKAGES = "${PN}-viewer-dbg ${PN}-viewer" +FILES_${PN}-viewer-dbg = "${bindir}/.debug" +FILES_${PN}-viewer = "${bindir}/${PN}viewer" + +do_compile () { + install ${WORKDIR}/Makefile ${S} + oe_runmake +} + +do_install () { + install -d ${D}${bindir} + install ${PN}viewer ${D}${bindir} +} diff --git a/packages/vnc/tightvnc_1.3dev7.bb b/packages/vnc/tightvnc_1.3dev7.bb deleted file mode 100644 index 64d9748755..0000000000 --- a/packages/vnc/tightvnc_1.3dev7.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "A Unix VNC client" -HOMEPAGE = "http://www.tightvnc.com/" -DEPENDS = "virtual/libx11 zlib libxmu libxaw" -LICENSE = "GPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/vnc-tight/tightvnc-1.3dev7_unixsrc.tar.gz \ - file://Makefile" - -S = "${WORKDIR}/vnc_unixsrc/vncviewer/" - -PACKAGES = "tightvncviewer-dbg tightvncviewer" -FILES_tightvncviewer = "/usr/bin/tightvncviewer" - -do_compile () { - install ${WORKDIR}/Makefile ${S} - oe_runmake -} - -do_install () { - install -d ${D}${bindir} - install tightvncviewer ${D}${bindir} -} - -- cgit v1.2.3 From 7eca1e39786d8ac76d53e6afd9780592ce7f1a33 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sun, 21 Sep 2008 16:29:25 +0000 Subject: abiword-embedded: add 2.6.4 --- packages/abiword/abiword-embedded_2.6.4.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/abiword/abiword-embedded_2.6.4.bb diff --git a/packages/abiword/abiword-embedded_2.6.4.bb b/packages/abiword/abiword-embedded_2.6.4.bb new file mode 100644 index 0000000000..98e69515fa --- /dev/null +++ b/packages/abiword/abiword-embedded_2.6.4.bb @@ -0,0 +1,8 @@ +require abiword-2.5.inc + +EXTRA_OECONF += "--enable-embedded" + +S = "${WORKDIR}/abiword-${PV}" + +RCONFLICTS = "abiword" +RPROVIDES += "abiword" -- cgit v1.2.3 From f516c58e1c27be7a1d195cc43b2febff86d2f93e Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sun, 21 Sep 2008 16:51:49 +0000 Subject: gnumeric: disable PARALLEL_MAKE close bug# 3500 * the 1.6.x and 1.8.x branches are not thread safe --- packages/gnumeric/gnumeric_1.8.2.bb | 2 ++ packages/gnumeric/gnumeric_1.8.3.bb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/gnumeric/gnumeric_1.8.2.bb b/packages/gnumeric/gnumeric_1.8.2.bb index f7654117d7..8d3b1b5fb7 100644 --- a/packages/gnumeric/gnumeric_1.8.2.bb +++ b/packages/gnumeric/gnumeric_1.8.2.bb @@ -6,6 +6,8 @@ DESCRIPTION = "Gnumeric spreadsheet for GNOME" PR = "r1" +PARALLEL_MAKE = "" + inherit gnome flow-lossage SRC_URI += "file://remove-docs.patch;patch=1" diff --git a/packages/gnumeric/gnumeric_1.8.3.bb b/packages/gnumeric/gnumeric_1.8.3.bb index 9fa01408f6..0f70e37d5c 100644 --- a/packages/gnumeric/gnumeric_1.8.3.bb +++ b/packages/gnumeric/gnumeric_1.8.3.bb @@ -6,6 +6,8 @@ DESCRIPTION = "Gnumeric spreadsheet for GNOME" PR = "r0" +PARALLEL_MAKE = "" + inherit gnome flow-lossage SRC_URI += "file://remove-docs.patch;patch=1" -- cgit v1.2.3