[oe-commits] org.oe.dev merge of '3d49f3c12ce537f3ff8637c42ffd33a7b7afb27f'
pfalcon commit
openembedded-commits at lists.openembedded.org
Thu Jan 17 21:07:19 UTC 2008
merge of '3d49f3c12ce537f3ff8637c42ffd33a7b7afb27f'
and 'bc07881d61476e6cb24c670f87e81bdda9ebc462'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 7ad76ecbd444ac268a23a5a0252c64650fd4b290
ViewMTN: http://monotone.openembedded.org/revision/info/7ad76ecbd444ac268a23a5a0252c64650fd4b290
Files:
1
packages/xcursor-transparent-theme/xcursor-watchonly-theme
packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent
packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch
packages/gpe-session-scripts/files/angstrom/matchbox-session
packages/gpe-session-scripts/files/matchbox-session
packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
mtn:execute
true
packages/gpe-scap/gpe-scap-1.3
packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch
packages/gpe-scap/gpe-scap_1.3.bb
Diffs:
#
# mt diff -r3d49f3c12ce537f3ff8637c42ffd33a7b7afb27f -r7ad76ecbd444ac268a23a5a0252c64650fd4b290
#
#
#
# add_dir "packages/xcursor-transparent-theme/xcursor-watchonly-theme"
#
# add_file "packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent"
# content [a5b22f1aa71c4d2079e2875c22ecfb1735d68612]
#
# add_file "packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch"
# content [6b2c049ef8e46368a7a8c9d7cfac98a1eff1c03c]
#
# patch "packages/gpe-session-scripts/files/angstrom/matchbox-session"
# from [5f2775906eeda8b22303d2452c158ba979a9595d]
# to [cd7ffc92541caae372d21de0550aacc7d535d533]
#
# patch "packages/gpe-session-scripts/files/matchbox-session"
# from [5c0f9302bc62e8b8612888f54ec5d2c9300d75ab]
# to [864395d7fb408233687a04db272c51799b6d5d5d]
#
# patch "packages/gpe-session-scripts/gpe-session-scripts_0.67.bb"
# from [e886f9c3d56e6dba00f20b02fdb8cff205713397]
# to [b9030ecb91f1a88e063dc31e35f8a61d905d29eb]
#
# patch "packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb"
# from [83636847e2f3799d184bc0748eee686270a61c79]
# to [d0ff8b4ceeb0e382d68cfb2d7c93a44c3c848ed8]
#
# patch "packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb"
# from [96f40a33b74048e73d3054500e402469dc47f737]
# to [ecb7bdd88141efe8406a5d86de1c5c26340090c9]
#
# set "packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent a5b22f1aa71c4d2079e2875c22ecfb1735d68612
+++ packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent a5b22f1aa71c4d2079e2875c22ecfb1735d68612
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Only if there's no mouse at all, we use use transparent cursors
+# for stylus use comfort.
+if ! ls /dev/input/mouse* >/dev/null 2>&1; then
+ echo "Xcursor.theme: xcursor-transparent" | xrdb -merge -nocpp
+fi
============================================================
--- packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch 6b2c049ef8e46368a7a8c9d7cfac98a1eff1c03c
+++ packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch 6b2c049ef8e46368a7a8c9d7cfac98a1eff1c03c
@@ -0,0 +1,23 @@
+diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am
+--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am 2003-10-30 13:13:59.000000000 +0100
++++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2005-12-20 23:35:17.000000000 +0100
+@@ -79,7 +79,6 @@
+ ul_angle \
+ ur_angle \
+ v_double_arrow \
+- watcha \
+ xterm
+
+ CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
+diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in xcursor-transparent-theme-0.1.1/cursors/Makefile.in
+--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in 2003-10-31 15:31:13.000000000 +0100
++++ xcursor-transparent-theme-0.1.1/cursors/Makefile.in 2005-12-20 23:35:36.000000000 +0100
+@@ -67,7 +67,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+
+-CURSOR_NAMES = 00008160000006810000408080010102 028006030e0e7ebffc7f7070c0600140 03b6e0fcb3499374a867c041f52298f0 08e8e1c95fe2fc01f976f1e063a24ccd 14fef782d02440884392942c11205230 2870a09082c103050810ffdffffe0204 3ecb610c1bf2410f44200f48c40d3599 4498f0e0c1937ffe01fd06f973665830 9d800788f1b08800ae810202380a0822 c7088f0f3e6c8088236ef8e1e3e70000 d9ce0ab605698f320427677b458ad60b e29285e634086352946a0e7090d73106 fcf1c3c7cd4491d801f1e1c78f100000 X_cursor arrow base_arrow_down base_arrow_up based_arrow_down based_arrow_up bd_double_arrow boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross cross_reverse crossed_circle crosshair dot dot_box_mask dotbox double_arrow draft_large draft_small draped_box exchange fd_double_arrow fleur gumby h_double_arrow hand hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle move pencil pirate plus question_arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target tcross top_left_arrow top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle v_double_arrow watcha xterm
++CURSOR_NAMES = 00008160000006810000408080010102 028006030e0e7ebffc7f7070c0600140 03b6e0fcb3499374a867c041f52298f0 08e8e1c95fe2fc01f976f1e063a24ccd 14fef782d02440884392942c11205230 2870a09082c103050810ffdffffe0204 3ecb610c1bf2410f44200f48c40d3599 4498f0e0c1937ffe01fd06f973665830 9d800788f1b08800ae810202380a0822 c7088f0f3e6c8088236ef8e1e3e70000 d9ce0ab605698f320427677b458ad60b e29285e634086352946a0e7090d73106 fcf1c3c7cd4491d801f1e1c78f100000 X_cursor arrow base_arrow_down base_arrow_up based_arrow_down based_arrow_up bd_double_arrow boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross cross_reverse crossed_circle crosshair dot dot_box_mask dotbox double_arrow draft_large draft_small draped_box exchange fd_double_arrow fleur gumby h_double_arrow hand hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle move pencil pirate plus question_arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target tcross top_left_arrow top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle v_double_arrow xterm
+
+
+ CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
============================================================
--- packages/gpe-session-scripts/files/angstrom/matchbox-session 5f2775906eeda8b22303d2452c158ba979a9595d
+++ packages/gpe-session-scripts/files/angstrom/matchbox-session cd7ffc92541caae372d21de0550aacc7d535d533
@@ -1,8 +1,6 @@
#!/bin/sh
-XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
+#XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
+matchbox-desktop &
+matchbox-panel --no-flip --orientation south &
- matchbox-desktop &
-
-matchbox-panel --no-flip --orientation south &
-
============================================================
--- packages/gpe-session-scripts/files/matchbox-session 5c0f9302bc62e8b8612888f54ec5d2c9300d75ab
+++ packages/gpe-session-scripts/files/matchbox-session 864395d7fb408233687a04db272c51799b6d5d5d
@@ -1,8 +1,6 @@
#!/bin/sh
-XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
+#XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
+matchbox-desktop &
+MB_MENU_PANEL_DISABLED=1 matchbox-panel --orientation south &
- matchbox-desktop &
-
-MB_MENU_PANEL_DISABLED=1 matchbox-panel --orientation south &
-
============================================================
--- packages/gpe-session-scripts/gpe-session-scripts_0.67.bb e886f9c3d56e6dba00f20b02fdb8cff205713397
+++ packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b9030ecb91f1a88e063dc31e35f8a61d905d29eb
@@ -11,7 +11,7 @@ SRC_URI += "file://matchbox-session \
SRC_URI += "file://matchbox-session \
file://disable-composite.xsettings"
-PR = "r10"
+PR = "r11"
#apply a patch to set the fontsize for bigdpi (200+) devices to 5
SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
============================================================
--- packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb 83636847e2f3799d184bc0748eee686270a61c79
+++ packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb d0ff8b4ceeb0e382d68cfb2d7c93a44c3c848ed8
@@ -1,7 +1,7 @@ SECTION = "x11/base"
LICENSE = "GPL"
DESCRIPTION = "Transparent xcursor theme for handheld systems"
SECTION = "x11/base"
-PR="r1"
+PR="r2"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
file://use-relative-symlinks.patch;patch=1 \
@@ -9,3 +9,5 @@ inherit autotools
FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
inherit autotools
+
+PACKAGE_ARCH = "all"
============================================================
--- packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb 96f40a33b74048e73d3054500e402469dc47f737
+++ packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb ecb7bdd88141efe8406a5d86de1c5c26340090c9
@@ -1,15 +1,23 @@ RPROVIDES = "xcursor-transparent-theme"
LICENSE = "GPL"
DESCRIPTION = "Transparent xcursor theme for handheld systems with visible watch cursor"
SECTION = "x11/base"
RREPLACES = "xcursor-transparent-theme"
RPROVIDES = "xcursor-transparent-theme"
-PR="r2"
+PR="r4"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
file://use-relative-symlinks.patch;patch=1 \
- file://skip_watch_cursor.patch;patch=1"
+ file://skip_watch_cursor.patch;patch=1 \
+ file://20xcursor-transparent"
S = "${WORKDIR}/xcursor-transparent-theme-${PV}"
-FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
+FILES_${PN} += "${datadir}/icons/xcursor-transparent/cursors/*"
inherit autotools
+
+do_install_append () {
+ install -d ${D}${sysconfdir}/X11/Xsession.d
+ install -m 0755 ${WORKDIR}/20xcursor-transparent ${D}${sysconfdir}/X11/Xsession.d
+}
+
+PACKAGE_ARCH = "all"
#
# mt diff -rbc07881d61476e6cb24c670f87e81bdda9ebc462 -r7ad76ecbd444ac268a23a5a0252c64650fd4b290
#
#
#
# add_dir "packages/gpe-scap/gpe-scap-1.3"
#
# add_file "packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch"
# content [3fca637842d4f56756161b44d99ea894218489ab]
#
# patch "packages/gpe-scap/gpe-scap_1.3.bb"
# from [ea05f8ee476d853b1883d58d4bc62e8d23ba9041]
# to [73e961b984f8eaea1c3a6678341b1484dd688c22]
#
============================================================
--- packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch 3fca637842d4f56756161b44d99ea894218489ab
+++ packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch 3fca637842d4f56756161b44d99ea894218489ab
@@ -0,0 +1,26 @@
+Index: gpe-scap-1.3/configure
+===================================================================
+--- gpe-scap-1.3.orig/configure 2008-01-17 17:01:49.000000000 +0100
++++ gpe-scap-1.3/configure 2008-01-17 17:03:01.000000000 +0100
+@@ -6327,7 +6327,7 @@
+
+
+
+-GLADE_MODULES="libglade-2.0 >= 2.4.2"
++GLADE_MODULES="libglade-2.0 >= 2.4.0"
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GLADE" >&5
+Index: gpe-scap-1.3/configure.ac
+===================================================================
+--- gpe-scap-1.3.orig/configure.ac 2008-01-17 17:35:15.000000000 +0100
++++ gpe-scap-1.3/configure.ac 2008-01-17 17:35:20.000000000 +0100
+@@ -29,7 +29,7 @@
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+
+-GLADE_MODULES="libglade-2.0 >= 2.4.2"
++GLADE_MODULES="libglade-2.0 >= 2.4.0"
+ PKG_CHECK_MODULES(GLADE, $GLADE_MODULES)
+ AC_SUBST(GLADE_CFLAGS)
+ AC_SUBST(GLADE_LIBS)
============================================================
--- packages/gpe-scap/gpe-scap_1.3.bb ea05f8ee476d853b1883d58d4bc62e8d23ba9041
+++ packages/gpe-scap/gpe-scap_1.3.bb 73e961b984f8eaea1c3a6678341b1484dd688c22
@@ -11,3 +11,5 @@ inherit gpe autotools
GPE_TARBALL_SUFFIX = "bz2"
inherit gpe autotools
+
+SRC_URI += " file://allow-glade-2.4.0.patch;patch=1"
More information about the Openembedded-commits
mailing list