From 598c96de7e549712a760a3d4c862692989879c5f Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 27 Jun 2007 11:56:52 +0000
Subject: minimo_cvs.bb : keymap fix for #2326, ssr patch from familiar, and
moved MOZDATE onwards as it seems to compile and work.
---
.../minimo/minimo-components-ssr-only.patch | 36 ++++++++++++++++++++++
.../minimo/minimo-disable-mode-switch.patch | 11 +++++++
packages/mozilla/minimo_cvs.bb | 4 ++-
3 files changed, 50 insertions(+), 1 deletion(-)
create mode 100644 packages/mozilla/minimo/minimo-components-ssr-only.patch
create mode 100644 packages/mozilla/minimo/minimo-disable-mode-switch.patch
(limited to 'packages/mozilla')
diff --git a/packages/mozilla/minimo/minimo-components-ssr-only.patch b/packages/mozilla/minimo/minimo-components-ssr-only.patch
new file mode 100644
index 0000000000..6fbc4de25e
--- /dev/null
+++ b/packages/mozilla/minimo/minimo-components-ssr-only.patch
@@ -0,0 +1,36 @@
+Index: mozilla/minimo/components/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/minimo/components/Makefile.in,v
+retrieving revision 1.1.2.2
+diff -u -r1.1.2.2 Makefile.in
+--- mozilla/minimo/components/Makefile.in 14 Jul 2006 16:04:33 -0000 1.1.2.2
++++ mozilla/minimo/components/Makefile.in 20 Sep 2006 12:55:08 -0000
+@@ -41,10 +41,10 @@
+
+ include $(DEPTH)/config/autoconf.mk
+
+-DIRS = phone softkb ssr device gps
++DIRS = ssr
+
+ ifdef WINCE
+-DIRS += ssl
++DIRS += ssl phone softkb device gps
+ endif
+
+ include $(topsrcdir)/config/rules.mk
+Index: mozilla/minimo/components/ssr/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/minimo/components/ssr/Makefile.in,v
+retrieving revision 1.1.2.1
+diff -u -r1.1.2.1 Makefile.in
+--- mozilla/minimo/components/ssr/Makefile.in 30 Jan 2006 18:47:01 -0000 1.1.2.1
++++ mozilla/minimo/components/ssr/Makefile.in 20 Sep 2006 14:52:46 -0000
+@@ -42,7 +42,7 @@
+
+ include $(DEPTH)/config/autoconf.mk
+
+-MODULE_NAME = ssr
++MODULE_NAME = SSRModule
+ MODULE = ssr
+ LIBRARY_NAME = ssr
+
diff --git a/packages/mozilla/minimo/minimo-disable-mode-switch.patch b/packages/mozilla/minimo/minimo-disable-mode-switch.patch
new file mode 100644
index 0000000000..50691efe0f
--- /dev/null
+++ b/packages/mozilla/minimo/minimo-disable-mode-switch.patch
@@ -0,0 +1,11 @@
+--- mozilla/widget/src/gtk2/nsWindow.cpp.orig 2007-06-12 22:19:35.000000000 +0900
++++ mozilla/widget/src/gtk2/nsWindow.cpp 2007-06-12 22:19:02.000000000 +0900
+@@ -1859,6 +1859,7 @@
+ || aEvent->keyval == GDK_Shift_R
+ || aEvent->keyval == GDK_Control_L
+ || aEvent->keyval == GDK_Control_R
++ || aEvent->keyval == GDK_Mode_switch
+ || aEvent->keyval == GDK_Alt_L
+ || aEvent->keyval == GDK_Alt_R
+ || aEvent->keyval == GDK_Meta_L
+
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index c0e8edc747..990068b41e 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -8,7 +8,7 @@ DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+
CVSSVR="cvs-mirror.mozilla.org"
BRTAG = "MOZILLA_1_8_BRANCH"
-MOZDATE = "20070510"
+MOZDATE = "20070626"
PV = "0.02+cvs${MOZDATE}"
PE = "1"
@@ -20,6 +20,8 @@ SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${
file://eabi-fix.patch;patch=1 \
file://eabi-fix2.patch;patch=1 \
file://eabi-fix3.patch;patch=1 \
+ file://minimo-components-ssr-only.patch;patch=1 \
+ file://minimo-disable-mode-switch.patch;patch=1 \
file://minimo.desktop file://minimo.png"
inherit autotools
--
cgit v1.2.3