[oe-commits] org.oe.dev merge of '3acc599523c89258a0e3bf8dd3a98c692ad3b555'
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Aug 2 16:45:58 UTC 2007
merge of '3acc599523c89258a0e3bf8dd3a98c692ad3b555'
and 'f1003174f8c7f99c993d4a46fe0221bdbf197e7d'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 30c86beb3ebb20fe401cc7edc4cac4531a2297a5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=30c86beb3ebb20fe401cc7edc4cac4531a2297a5
Files:
1
packages/ttf-fonts/ttf-dejavu_2.18.bb
packages/gpe-package/gpe-package_0.4.bb
conf/distro/include/preferred-gpe-versions-2.8.inc
packages/images/gpe-image.bb
packages/images/gpephone-image.bb
packages/tasks/task-gpe-base.bb
packages/tasks/task-gpephone.bb
packages/xorg-driver/xf86-video-nsc_2.8.2.bb
Diffs:
#
# mt diff -r3acc599523c89258a0e3bf8dd3a98c692ad3b555 -r30c86beb3ebb20fe401cc7edc4cac4531a2297a5
#
#
#
# patch "packages/ttf-fonts/ttf-dejavu_2.18.bb"
# from [3e7c69ee69d752d1a709105e277c51e691f01bd0]
# to [665c70fb6e7e241ecda05c4b6b6df295d101fc78]
#
============================================================
--- packages/ttf-fonts/ttf-dejavu_2.18.bb 3e7c69ee69d752d1a709105e277c51e691f01bd0
+++ packages/ttf-fonts/ttf-dejavu_2.18.bb 665c70fb6e7e241ecda05c4b6b6df295d101fc78
@@ -1,11 +1,11 @@ RDEPENDS_ttf-dejavu-common = ""
DESCRIPTION = "DejaVu font - TTF Edition"
LICENSE = "Bitstream Vera"
HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page"
RDEPENDS = "ttf-dejavu-common"
RDEPENDS_ttf-dejavu-common = ""
-SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2 \
- file://30-dejavu-aliases.conf"
+SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2"
+# file://30-dejavu-aliases.conf"
require ttf.inc
@@ -13,7 +13,7 @@ do_install_append () {
do_install_append () {
install -d ${D}${sysconfdir}/fonts/conf.d/
- install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
+# install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
}
PACKAGES = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \
#
# mt diff -rf1003174f8c7f99c993d4a46fe0221bdbf197e7d -r30c86beb3ebb20fe401cc7edc4cac4531a2297a5
#
#
#
# add_file "packages/gpe-package/gpe-package_0.4.bb"
# content [ac02803b23c91214af3324e6ca5d8d9d4c58e039]
#
# patch "conf/distro/include/preferred-gpe-versions-2.8.inc"
# from [4da9f57943c6dcb788c21e20c21df62d371ca70d]
# to [8e83ca18284fdaba2088bf9e7b5b1d5ce3990031]
#
# patch "packages/images/gpe-image.bb"
# from [2afcf7bd5400d5741f5783ab36b367b9c329ebb8]
# to [4cb5b4abe319688775fba3e25151dc345ce518a8]
#
# patch "packages/images/gpephone-image.bb"
# from [50aeb05926dde9c5bcb3d97fc044b8f9d6867f2b]
# to [8855d0036a5e84a843aafd5b38afd35843e4d76e]
#
# patch "packages/tasks/task-gpe-base.bb"
# from [9264743c4b162e9b8ea0dac22cf9b49c390817ec]
# to [acd8b6c0bf2a951e9fd9a6d317c666ff0d877199]
#
# patch "packages/tasks/task-gpephone.bb"
# from [24d6dfea8a81e1b13827adc65e9fe2414d7e98ed]
# to [f9f153b76c41d1c7cbdede4a6a036b023870ac83]
#
# patch "packages/xorg-driver/xf86-video-nsc_2.8.2.bb"
# from [207b3037b5bb94db18b3503ef88a00f163421b53]
# to [f814f53eaa15400ebdb1967e40cd36e73d001ea7]
#
============================================================
--- packages/gpe-package/gpe-package_0.4.bb ac02803b23c91214af3324e6ca5d8d9d4c58e039
+++ packages/gpe-package/gpe-package_0.4.bb ac02803b23c91214af3324e6ca5d8d9d4c58e039
@@ -0,0 +1,22 @@
+LICENSE = "GPL"
+PR = "r0"
+inherit gpe pkgconfig
+
+DESCRIPTION = "A package manager GUI for GPE"
+DEPENDS = "ipkg libpcre libgpewidget"
+RDEPENDS = "gpe-icons gpe-su"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += " file://sbin-and-no-suid-install.patch;patch=1 \
+ file://gpe-package"
+
+FILES_${PN} += " /usr/bin/gpe-package"
+
+CFLAGS += "-DENABLE_PCRE"
+LDFLAGS += "-lpcre"
+
+do_install_append() {
+ install -d ${D}${bindir}
+ install -m 0755 ${WORKDIR}/gpe-package ${D}${bindir}
+}
============================================================
--- conf/distro/include/preferred-gpe-versions-2.8.inc 4da9f57943c6dcb788c21e20c21df62d371ca70d
+++ conf/distro/include/preferred-gpe-versions-2.8.inc 8e83ca18284fdaba2088bf9e7b5b1d5ce3990031
@@ -8,5 +8,70 @@ PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco
PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
+#specify versions, as the header says :)
+PREFERRED_VERSION_glib-2.0 ?= "2.8.6"
+PREFERRED_VERSION_pango ?= "1.8.2"
+PREFERRED_VERSION_gtk+ ?= "2.6.10"
+PREFERRED_VERSION_gtk-engines ?= "2.6.5"
+PREFERRED_VERSION_librsvg ?= "2.16.1"
+
+PREFERRED_VERSION_libgpewidget ?= "0.115"
+PREFERRED_VERSION_libgpepimc ?= "0.9"
+PREFERRED_VERSION_libgpevtype ?= "0.50"
+PREFERRED_VERSION_libschedule ?= "0.17"
+PREFERRED_VERSION_libcontactsdb ?= "0.5"
+PREFERRED_VERSION_libtododb ?= "0.11"
+PREFERRED_VERSION_libhandoff ?= "0.1"
+PREFERRED_VERSION_libmimedir ?= "0.4.1"
+PREFERRED_VERSION_libsoundgen ?= "0.6"
+
+PREFERRED_VERSION_gpe-icons ?= "0.25"
+
+PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
+PREFERRED_VERSION_gpe-su ?= "0.19"
+PREFERRED_VERSION_keylaunch ?= "2.0.7"
+PREFERRED_VERSION_startup-monitor ?= "0.18-2"
+PREFERRED_VERSION_gpe-dm ?= "0.51"
+
+PREFERRED_VERSION_gpe-todo ?= "0.56"
+PREFERRED_VERSION_gpe-calendar ?= "0.91"
+PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9"
+PREFERRED_VERSION_gpe-contacts ?= "0.47"
+PREFERRED_VERSION_gpe-beam ?= "0.2.9"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.55"
+PREFERRED_VERSION_gpe-conf ?= "0.2.6"
+PREFERRED_VERSION_gpe-clock ?= "0.25"
+PREFERRED_VERSION_gpe-mininet ?= "0.7"
+PREFERRED_VERSION_gpe-mixer ?= "0.42"
+PREFERRED_VERSION_gpe-shield ?= "0.9"
+PREFERRED_VERSION_gpe-taskmanager ?= "0.20"
+PREFERRED_VERSION_minilite ?= "0.50"
+PREFERRED_VERSION_gpe-edit ?= "0.40"
+PREFERRED_VERSION_gpe-gallery ?= "0.97"
+PREFERRED_VERSION_gpe-calculator ?= "0.2"
+PREFERRED_VERSION_gpe-package ?= "0.4"
+PREFERRED_VERSION_gpe-soundbite ?= "1.0.6"
+PREFERRED_VERSION_gpe-terminal ?= "1.1"
+PREFERRED_VERSION_gpe-watch ?= "0.10"
+PREFERRED_VERSION_gpe-what ?= "0.43"
+PREFERRED_VERSION_gpe-filemanager ?= "0.30"
+PREFERRED_VERSION_gpe-mini-browser ?= "0.21"
+PREFERRED_VERSION_gpe-scap ?= "1.3"
+PREFERRED_VERSION_gpesyncd ?= "2.0"
+PREFERRED_VERSION_gpe-synctool ?= "0.2"
+PREFERRED_VERSION_gpe-announce ?= "0.13"
+PREFERRED_VERSION_gpe-timesheet ?= "0.32"
+PREFERRED_VERSION_gpe-irc ?= "0.08"
+PREFERRED_VERSION_starling ?= "0.2"
+
+PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-lights ?= "0.13"
+PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+PREFERRED_VERSION_gpe-plucker ?= "0.4"
+PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
+PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+PREFERRED_VERSION_xdemineur ?= "2.1.1"
+
+PREFERRED_VERSION_vlc-gpe ?= "0.8.4"
+PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
-# - the GPE roadmap doesn't state any versions for 2.8 yet
-# http://www.handhelds.org/moin/moin.cgi/GPERoadmap
============================================================
--- packages/images/gpe-image.bb 2afcf7bd5400d5741f5783ab36b367b9c329ebb8
+++ packages/images/gpe-image.bb 4cb5b4abe319688775fba3e25151dc345ce518a8
@@ -1,5 +1,5 @@
-PR = "r21"
+PR = "r22"
export IMAGE_BASENAME = "gpe-image"
@@ -23,7 +23,14 @@ XSERVER ?= "xserver-kdrive-fbdev"
XSERVER ?= "xserver-kdrive-fbdev"
-DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe-base task-gpe-apps task-gpe-pim task-gpe-settings task-gpe-games"
+DEPENDS = "${MACHINE_TASK_PROVIDER} \
+ task-gpe-base \
+ task-gpe-apps \
+ task-gpe-pim \
+ task-gpe-settings \
+ task-gpe-games \
+ virtual/xserver"
+
RDEPENDS = "${PACKAGE_INSTALL}"
export PACKAGE_INSTALL = "\
============================================================
--- packages/images/gpephone-image.bb 50aeb05926dde9c5bcb3d97fc044b8f9d6867f2b
+++ packages/images/gpephone-image.bb 8855d0036a5e84a843aafd5b38afd35843e4d76e
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
export IMAGE_BASENAME = "gpephone-image"
@@ -20,7 +20,7 @@ XSERVER ?= "xserver-kdrive-fbdev"
XSERVER ?= "xserver-kdrive-fbdev"
-DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone virtual/xserver"
RDEPENDS = "${PACKAGE_INSTALL}"
export PACKAGE_INSTALL = "\
============================================================
--- packages/tasks/task-gpe-base.bb 9264743c4b162e9b8ea0dac22cf9b49c390817ec
+++ packages/tasks/task-gpe-base.bb acd8b6c0bf2a951e9fd9a6d317c666ff0d877199
@@ -1,11 +1,10 @@ DESCRIPTION = "Base task package for GPE
DESCRIPTION = "Base task package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
RDEPENDS = "\
- diet-x11 \
- virtual/xserver \
+ virtual/libx11 \
gpe-bootsplash \
bluez-utils-dbus \
matchbox \
============================================================
--- packages/tasks/task-gpephone.bb 24d6dfea8a81e1b13827adc65e9fe2414d7e98ed
+++ packages/tasks/task-gpephone.bb f9f153b76c41d1c7cbdede4a6a036b023870ac83
@@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for GPE Pal
DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r6"
+PR = "r7"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
@@ -13,8 +13,7 @@ RDEPENDS_gpephone-base-depends = "\
gpephone-task-development"
RDEPENDS_gpephone-base-depends = "\
- diet-x11 \
- virtual/xserver"
+ virtual/libx11"
RDEPENDS_gpephone-task-development = "\
rxvt-unicode \
============================================================
--- packages/xorg-driver/xf86-video-nsc_2.8.2.bb 207b3037b5bb94db18b3503ef88a00f163421b53
+++ packages/xorg-driver/xf86-video-nsc_2.8.2.bb f814f53eaa15400ebdb1967e40cd36e73d001ea7
@@ -1,7 +1,9 @@ PE = "1"
require xorg-driver-video.inc
PE = "1"
+PR = "r2"
-#DESCRIPTION = ""
-
DEPENDS += " xf86dgaproto"
+# This driver is broken because it's seldom updated. It compiles
+# but fails to communicate with the card without this deprecated define.
+EXTRA_OEMAKE += "CFLAGS+=-DXFree86Server"
More information about the Openembedded-commits
mailing list