[oe-commits] org.oe.dev merge of '802e060fdcc7fa600a6f20b2de68a01d0e340e51'
mickeyl commit
openembedded-commits at lists.openembedded.org
Mon Jul 30 22:11:33 UTC 2007
merge of '802e060fdcc7fa600a6f20b2de68a01d0e340e51'
and 'b473108bc7e5f11f7f14d9c0c2842e1a2a91c0b9'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: c9dda3edc2296f84aaf065264d762162d1059b9a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c9dda3edc2296f84aaf065264d762162d1059b9a
Files:
1
packages/openmoko-base/openmoko-theme-standard_svn.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
packages/gpephone/gpe-applauncher_0.9.bb
packages/qemu/files/makefile.patch
packages/gpephone/machined_svn.bb
packages/gpephone/ptim-manager_svn.bb
packages/openmoko2/libmokogsmd2_svn.bb
packages/openmoko2/libmokojournal2_svn.bb
packages/openmoko2/libmokopanelui2_svn.bb
packages/openmoko2/libmokoui2_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/openmoko2/openmoko-today2_svn.bb
packages/qemu/qemu_cvs.bb
Diffs:
#
# mt diff -r802e060fdcc7fa600a6f20b2de68a01d0e340e51 -rc9dda3edc2296f84aaf065264d762162d1059b9a
#
#
#
# patch "packages/openmoko-base/openmoko-theme-standard_svn.bb"
# from [5943ed10b8995d9ed32c666193baa127c9f72b9a]
# to [ff0592bad5222f7d71a955c7e1708a1a5f1d9909]
#
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
# from [63e4490c76e470ecdf213580aa34e8a3c10d1da7]
# to [35b2127baed9a06ff6abae932dbd14077257dbde]
#
============================================================
--- packages/openmoko-base/openmoko-theme-standard_svn.bb 5943ed10b8995d9ed32c666193baa127c9f72b9a
+++ packages/openmoko-base/openmoko-theme-standard_svn.bb ff0592bad5222f7d71a955c7e1708a1a5f1d9909
@@ -1,7 +1,7 @@ PV = "0.0+svn${SRCDATE}"
DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
SECTION = "openmoko/base"
PV = "0.0+svn${SRCDATE}"
-PR = "r4"
+PR = "r5"
inherit openmoko-base
@@ -21,5 +21,7 @@ do_install() {
echo 'include "${datadir}/themes/openmoko-standard/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
}
+CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
+
PACKAGE_ARCH = "all"
FILES_${PN} = "${datadir} ${sysconfdir}"
============================================================
--- packages/openmoko2/openmoko-theme-standard2_svn.bb 63e4490c76e470ecdf213580aa34e8a3c10d1da7
+++ packages/openmoko2/openmoko-theme-standard2_svn.bb 35b2127baed9a06ff6abae932dbd14077257dbde
@@ -6,7 +6,7 @@ inherit openmoko2
inherit openmoko2
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2008/artwork/themes;module=openmoko-standard-2;proto=http"
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http"
S = "${WORKDIR}/openmoko-standard-2"
do_install() {
@@ -19,5 +19,7 @@ do_install() {
echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
}
+CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
+
PACKAGE_ARCH = "all"
FILES_${PN} = "${datadir} ${sysconfdir}"
#
# mt diff -rb473108bc7e5f11f7f14d9c0c2842e1a2a91c0b9 -rc9dda3edc2296f84aaf065264d762162d1059b9a
#
#
#
# add_file "packages/gpephone/gpe-applauncher_0.9.bb"
# content [fc172f9eabde581dd56130838da9ef7c15723ca3]
#
# add_file "packages/qemu/files/makefile.patch"
# content [7b6e4a3e609da907d4026cba1f49fec3b972603d]
#
# patch "packages/gpephone/machined_svn.bb"
# from [c192d49beecd4b546ada28a1e7cd67964213339b]
# to [b1aa2bc7c8b777a29ced8ae606722efa408e1301]
#
# patch "packages/gpephone/ptim-manager_svn.bb"
# from [4c3fe941a6e90ebc9e6e3297be02b3de9df72b1f]
# to [e0ddcec53b318d7b7301948e99d5a260791f538f]
#
# patch "packages/openmoko2/libmokogsmd2_svn.bb"
# from [f8860edb11d4b6aee70541f3231fa2250da792de]
# to [fdaa954512eb9af1f964483f9c2fc585cb677608]
#
# patch "packages/openmoko2/libmokojournal2_svn.bb"
# from [886c4dbe00581959f5bf6feda546d47aa3ddf820]
# to [15b332f5c75a6f64de12d666bf71409ae4ab8999]
#
# patch "packages/openmoko2/libmokopanelui2_svn.bb"
# from [8b96228fd79129db1ea92f280fe36d2eba4698d6]
# to [cae0414648cd159c9b09a353cb29019fdf139af7]
#
# patch "packages/openmoko2/libmokoui2_svn.bb"
# from [8b96228fd79129db1ea92f280fe36d2eba4698d6]
# to [fc8c35f6eb460dc277d372d31baffef3c4b04d52]
#
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
# from [9c9c5b84b31cad14cd854c1b181b95112ccf9e59]
# to [26f95f7ca147900b49432aadc380a147c5b707f2]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [dd2e822cb7ac9516ae79dfdf3c6221fb71113b34]
# to [9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c]
#
# patch "packages/openmoko2/openmoko-today2_svn.bb"
# from [a90fd3e6765138b5a903fceb4da5139bad2e8061]
# to [19b5a82e4b9df73c893f35975ee0e6717ea38027]
#
# patch "packages/qemu/qemu_cvs.bb"
# from [a1c43b431c24813b3186b20f390639c0b6b2fb4c]
# to [21c0eb8c52d75f5c8ad4e17a5a96056fc7c71835]
#
============================================================
--- packages/gpephone/gpe-applauncher_0.9.bb fc172f9eabde581dd56130838da9ef7c15723ca3
+++ packages/gpephone/gpe-applauncher_0.9.bb fc172f9eabde581dd56130838da9ef7c15723ca3
@@ -0,0 +1,12 @@
+LICENSE = "GPL"
+DESCRIPTION = "A cellphone application launcher."
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += '${datadir}/themes'
============================================================
--- packages/qemu/files/makefile.patch 7b6e4a3e609da907d4026cba1f49fec3b972603d
+++ packages/qemu/files/makefile.patch 7b6e4a3e609da907d4026cba1f49fec3b972603d
@@ -0,0 +1,37 @@
+Index: qemu/Makefile
+===================================================================
+--- qemu.orig/Makefile 2007-07-30 18:25:50.000000000 +0200
++++ qemu/Makefile 2007-07-30 18:26:13.000000000 +0200
+@@ -5,14 +5,14 @@
+ .PHONY: all clean distclean dvi info install install-doc tar tarbin \
+ speed test test2 html dvi info
+
+-CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
++CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I.
+ ifdef CONFIG_DARWIN
+ CFLAGS+= -mdynamic-no-pic
+ endif
+ ifeq ($(ARCH),sparc)
+ CFLAGS+=-mcpu=ultrasparc
+ endif
+-LDFLAGS=-g
++LDFLAGS+=-g
+ LIBS=
+ DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ TOOLS=qemu-img$(EXESUF)
+Index: qemu/Makefile.target
+===================================================================
+--- qemu.orig/Makefile.target 2007-07-30 18:27:17.000000000 +0200
++++ qemu/Makefile.target 2007-07-30 18:27:23.000000000 +0200
+@@ -17,9 +17,9 @@
+ VPATH+=:$(SRC_PATH)/linux-user
+ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
+ endif
+-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
++CFLAGS+=-Wall -O2 -g -fno-strict-aliasing
+ #CFLAGS+=-Werror
+-LDFLAGS=-g
++LDFLAGS+=-g
+ LIBS=
+ HELPER_CFLAGS=$(CFLAGS)
+ DYNGEN=../dyngen$(EXESUF)
============================================================
--- packages/gpephone/machined_svn.bb c192d49beecd4b546ada28a1e7cd67964213339b
+++ packages/gpephone/machined_svn.bb b1aa2bc7c8b777a29ced8ae606722efa408e1301
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "Device abstraction and support daemon"
SECTION = "gpephone"
PRIORITY = "required"
LICENSE = "GPL"
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 dbus-glib gtk+"
PV = "0.1+svn-${SRCDATE}"
PR = "r0"
@@ -13,6 +13,3 @@ S = "${WORKDIR}/${PN}"
SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=${PN}"
S = "${WORKDIR}/${PN}"
-
-#FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
-
============================================================
--- packages/gpephone/ptim-manager_svn.bb 4c3fe941a6e90ebc9e6e3297be02b3de9df72b1f
+++ packages/gpephone/ptim-manager_svn.bb e0ddcec53b318d7b7301948e99d5a260791f538f
@@ -1,17 +1,16 @@ PV = "0.1+svn-${SRCDATE}"
DESCRIPTION = "Phone input method manager module"
SECTION = "gpephone"
PRIORITY = "optional"
LICENSE = "LiPS"
DEPENDS = "gtk+ ptim-headers libiac"
PV = "0.1+svn-${SRCDATE}"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
inherit gpephone pkgconfig autotools
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager \
- file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager"
S = "${WORKDIR}/immanager"
============================================================
--- packages/openmoko2/libmokogsmd2_svn.bb f8860edb11d4b6aee70541f3231fa2250da792de
+++ packages/openmoko2/libmokogsmd2_svn.bb fdaa954512eb9af1f964483f9c2fc585cb677608
@@ -1,6 +1,11 @@ PV = "0.1.0+svn${SRCDATE}"
SECTION = "openmoko/libs"
DEPENDS = "libgsmd glib-2.0"
PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
inherit openmoko2
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/openmoko2/libmokojournal2_svn.bb 886c4dbe00581959f5bf6feda546d47aa3ddf820
+++ packages/openmoko2/libmokojournal2_svn.bb 15b332f5c75a6f64de12d666bf71409ae4ab8999
@@ -1,6 +1,10 @@ PV = "0.1.0+svn${SRCDATE}"
SECTION = "openmoko/libs"
DEPENDS = "eds-dbus"
PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
inherit openmoko2
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/openmoko2/libmokopanelui2_svn.bb 8b96228fd79129db1ea92f280fe36d2eba4698d6
+++ packages/openmoko2/libmokopanelui2_svn.bb cae0414648cd159c9b09a353cb29019fdf139af7
@@ -1,6 +1,11 @@ PV = "0.1.0+svn${SRCDATE}"
SECTION = "openmoko/libs"
DEPENDS = "gtk+"
PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
inherit openmoko2
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/openmoko2/libmokoui2_svn.bb 8b96228fd79129db1ea92f280fe36d2eba4698d6
+++ packages/openmoko2/libmokoui2_svn.bb fc8c35f6eb460dc277d372d31baffef3c4b04d52
@@ -1,6 +1,14 @@ PV = "0.1.0+svn${SRCDATE}"
SECTION = "openmoko/libs"
DEPENDS = "gtk+"
PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
inherit openmoko2
+do_stage() {
+ autotools_stage_all
+}
+
+
+
+
============================================================
--- packages/openmoko2/openmoko-session2/etc/matchbox/session 9c9c5b84b31cad14cd854c1b181b95112ccf9e59
+++ packages/openmoko2/openmoko-session2/etc/matchbox/session 26f95f7ca147900b49432aadc380a147c5b707f2
@@ -7,5 +7,5 @@ matchbox-window-manager -use_titlebar ye
matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
-exec matchbox-panel --start-applets showdesktop --end-applets clock,battery,systray,startup --titlebar
+exec matchbox-panel-2 --start-applets showdesktop --end-applets clock,battery,systray,startup --titlebar
============================================================
--- packages/openmoko2/openmoko-session2.bb dd2e822cb7ac9516ae79dfdf3c6221fb71113b34
+++ packages/openmoko2/openmoko-session2.bb 9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c
@@ -1,10 +1,9 @@ RDEPENDS = "matchbox-applet-startup-moni
DESCRIPTION = "Custom MB session files for poky"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
-# RDEPENDS = "matchbox-applet-startup-monitor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato"
-# RCONFLICTS = "matchbox-common matchbox-sato"
-PR = "r19"
+RCONFLICTS = "matchbox-common openmoko-session"
+PR = "r20"
SRC_URI = "file://etc file://matchbox-session"
S = ${WORKDIR}
============================================================
--- packages/openmoko2/openmoko-today2_svn.bb a90fd3e6765138b5a903fceb4da5139bad2e8061
+++ packages/openmoko2/openmoko-today2_svn.bb 19b5a82e4b9df73c893f35975ee0e6717ea38027
@@ -1,5 +1,7 @@ SECTION = "openmoko/pim"
DESCRIPTION = "The OpenMoko Application Launcher"
SECTION = "openmoko/pim"
-DEPENDS = "startup-notification dbus-glib libice libsm"
+DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm"
+PV = "0.1.0+srvn${SRCDATE}"
+
inherit openmoko2 gtk-icon-cache
============================================================
--- packages/qemu/qemu_cvs.bb a1c43b431c24813b3186b20f390639c0b6b2fb4c
+++ packages/qemu/qemu_cvs.bb 21c0eb8c52d75f5c8ad4e17a5a96056fc7c71835
@@ -1,12 +1,13 @@ PV = "0.8.2+cvs${SRCDATE}"
DESCRIPTION = "Qemu is an open source processor emulator."
HOMEPAGE = "http://fabrice.bellard.free.fr/qemu/"
SECTION = "devel"
LICENSE = "GPL"
PV = "0.8.2+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \
file://configure.patch;patch=1 \
+ file://makefile.patch;patch=1 \
file://qemu-sdl-cursor.patch;patch=1 \
file://arm_nptl.patch;patch=1 \
file://pl110_rgb-r0.patch;patch=1 \
More information about the Openembedded-commits
mailing list