Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/

into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/06 16:08:29+01:00 (none)!cwiiis
Small changes to default gpe settings (removed shortcut to terminal in default panel, fixed small error).

2005/04/06 16:06:48+01:00 (none)!cwiiis
Fix typo in dgen-sdl_1.23.bb

BKrev: 4253fba55k9KLccBD4Dpk6HBA3yWMA

diff --git a/packages/dgen/dgen-sdl_1.23.bb b/packages/dgen/dgen-sdl_1.23.bb
index e69de29..00a39f9 100644 (file)
--- a/packages/dgen/dgen-sdl_1.23.bb
+++ b/packages/dgen/dgen-sdl_1.23.bb
@@ -0,0 +1,15 @@
+inherit autotools
+
+DEFAULT_PREFERENCE = "-1"
+
+SECTION = "x11/games"
+DESCRIPTION = "DGen/SDL is a Sega Genesis/Mega-drive emulator."
+DEPENDS = "virtual/libsdl"
+SRC_URI = "http://pknet.com/~joe/${PN}-${PV}.tar.gz \
+          file://fix-configure-and-make.patch;patch=1"
+
+EXTRA_OECONF = " --disable-sdltest --without-x --without-opengl --without-nasm --without-mmx --without-star"
+
+do_compile () {
+       oe_runmake 'HOSTCC=${BUILD_CC}'
+}

diff --git a/packages/gpe-session-scripts/files/change-default-applets.patch b/packages/gpe-session-scripts/files/change-default-applets.patch
index e69de29..04b1fe1 100644 (file)
--- a/packages/gpe-session-scripts/files/change-default-applets.patch
+++ b/packages/gpe-session-scripts/files/change-default-applets.patch
@@ -0,0 +1,18 @@
+diff -urNd ../gpe-session-scripts-0.61-r4/gpe-session-scripts-0.61/standard.mbdock gpe-session-scripts-0.61/standard.mbdock
+--- ../gpe-session-scripts-0.61-r4/gpe-session-scripts-0.61/standard.mbdock    2004-02-14 20:00:02.000000000 +0000
++++ gpe-session-scripts-0.61/standard.mbdock   2004-09-16 11:26:19.000000000 +0100
+@@ -1,11 +1,11 @@
+ mb-applet-menu-launcher
+ mbinputmgr
+ xstroke
+-minivol
+-minilite
+-minibat
+       
+ gpe-clock
++mb-applet-battery
++mb-applet-launcher -na -l --title 'Screen Rotator' /usr/share/pixmaps/xrandr.png xrandr-panelapp.sh
+ gpe-auto-bluetooth
+ gpe-what
++minilite
+       

diff --git a/packages/gpe-session-scripts/files/change-default-xsettings.patch b/packages/gpe-session-scripts/files/change-default-xsettings.patch
index e69de29..a41afe7 100644 (file)
--- a/packages/gpe-session-scripts/files/change-default-xsettings.patch
+++ b/packages/gpe-session-scripts/files/change-default-xsettings.patch
@@ -0,0 +1,12 @@
+--- gpe-session-scripts-0.62/X11/xsettings.default.old 2005-04-05 23:50:57 +01:00
++++ gpe-session-scripts-0.62/X11/xsettings.default     2005-04-05 23:56:38 +01:00
+@@ -1,5 +1,6 @@
+-Gtk/FontName:S:Sans 8
+-Net/ThemeName:S:Angelistic
++Gtk/FontName:S:Sans 7
++MATCHBOX/Desktop/Font:S:Sans 7
++Net/ThemeName:S:Default
+ Gtk/IconSizes:S:gtk-dialog=30,30:gtk-button=16,16
+-Gtk/ToolbarIconSize:I:2
++Gtk/ToolbarIconSize:I:1
+ Gtk/ToolbarStyle:I:2

diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
index bd3aa36..b9178ac 100644 (file)
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-PR = "r13"
+PR = "r14"
 
 inherit gpe