[oe-commits] org.oe.dev merge of '05ad3485b42ecb00f88755641322f85ba7842784'
mickeyl commit
openembedded-commits at lists.openembedded.org
Wed Mar 5 17:24:34 UTC 2008
merge of '05ad3485b42ecb00f88755641322f85ba7842784'
and 'db7e324079b29569e9e6a52a22576a281140b12a'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9160d7f92f10358826bd1786462b50ec19927fa7
ViewMTN: http://monotone.openembedded.org/revision/info/9160d7f92f10358826bd1786462b50ec19927fa7
Files:
1
packages/dropbear/dropbear/chansession-security-fix.patch
packages/dropbear/dropbear_0.45.bb
packages/dropbear/dropbear_0.46.bb
packages/dropbear/dropbear_0.47.bb
packages/dropbear/dropbear_0.48.1.bb
packages/dropbear/dropbear-0.50
packages/dropbear/dropbear-0.50/configure.patch
packages/dropbear/dropbear-0.50/fix-2kb-keys.patch
packages/dropbear/dropbear-0.50/urandom-xauth-changes-to-options.h.patch
packages/dropbear/dropbear_0.50.bb
packages/opkg/opkg_svn.bb
packages/glib-2.0/glib-2.0-2.15.6
packages/gtk-webcore/midori-0.0.17
packages/libsexy/files
packages/vte/files
packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch
packages/glib-2.0/glib-2.0_2.15.6.bb
packages/gnome/epiphany_2.21.92.bb
packages/gtk-webcore/midori-0.0.17/webkit-update.patch
packages/libsexy/files/libsexy-pkgconfig-fixes.patch
packages/libxslt/libxslt_1.1.22.bb
packages/openmoko2/openmoko-browser2/webkit-update.patch
packages/vte/files/vte-pkgconfig-fixes.patch
packages/xserver-common/xserver-common_1.22.bb
classes/base.bbclass
classes/packaged-staging.bbclass
conf/distro/chinook-compat.conf
conf/distro/include/angstrom-2007-for-openmoko-versions.inc
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/include/sane-srcrevs.inc
contrib/angstrom/build-release.sh
packages/abiword/abiword-plugins_2.5.2.bb
packages/apmd/files/90-wifi-off
packages/glib-2.0/glib.inc
packages/gypsy/gypsy.inc
packages/gypsy/gypsy_svn.bb
packages/libsexy/libsexy.inc
packages/libsexy/libsexy_0.1.11.bb
packages/maemo4/libhildonfm.inc
packages/mtd/mtd-utils_1.0.0+git.bb
packages/mtd/mtd-utils_1.1.0.bb
packages/openmoko2/openmoko-browser2_svn.bb
packages/tasks/task-openmoko-pim.bb
packages/vte/vte.inc
packages/vte/vte_0.16.9.bb
packages/webkit/files/GNUmakefile.am
packages/webkit/files/Makefile
packages/webkit/files/Makefile.shared
packages/webkit/files/WebKit.pri
packages/webkit/files/autogen.sh
packages/webkit/files/configure.ac
packages/webkit/webkit-gtk_svn.bb
packages/webkit/webkit.inc
packages/xoo/xoo_svn.bb
site/arm-linux-uclibc
Diffs:
#
# mt diff -r05ad3485b42ecb00f88755641322f85ba7842784 -r9160d7f92f10358826bd1786462b50ec19927fa7
#
#
#
# delete "packages/dropbear/dropbear/chansession-security-fix.patch"
#
# delete "packages/dropbear/dropbear_0.45.bb"
#
# delete "packages/dropbear/dropbear_0.46.bb"
#
# delete "packages/dropbear/dropbear_0.47.bb"
#
# delete "packages/dropbear/dropbear_0.48.1.bb"
#
# add_dir "packages/dropbear/dropbear-0.50"
#
# add_file "packages/dropbear/dropbear-0.50/configure.patch"
# content [f17f3641877c46418a59c050c7ab967197419ef1]
#
# add_file "packages/dropbear/dropbear-0.50/fix-2kb-keys.patch"
# content [70e46d6cfac63121e36c03ac424dc738264fcdab]
#
# add_file "packages/dropbear/dropbear-0.50/urandom-xauth-changes-to-options.h.patch"
# content [b91c9e2eef48185fee78c4c9ec3bedfaca5e3d5c]
#
# add_file "packages/dropbear/dropbear_0.50.bb"
# content [1f1e5b54696006b7f8484bd48dff9fa684992830]
#
# patch "packages/opkg/opkg_svn.bb"
# from [13f09ac580bee79985c15dcece8824d84ff9c8fc]
# to [e08f111c50f9d0c56d5ae1b3b8f42777af3e65dc]
#
============================================================
--- packages/dropbear/dropbear-0.50/configure.patch f17f3641877c46418a59c050c7ab967197419ef1
+++ packages/dropbear/dropbear-0.50/configure.patch f17f3641877c46418a59c050c7ab967197419ef1
@@ -0,0 +1,27 @@
+Index: dropbear-0.50/configure.in
+===================================================================
+--- dropbear-0.50.orig/configure.in
++++ dropbear-0.50/configure.in
+@@ -164,14 +164,20 @@ AC_ARG_ENABLE(openpty,
+ AC_MSG_NOTICE(Not using openpty)
+ else
+ AC_MSG_NOTICE(Using openpty if available)
+- AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)])
++ AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes])
+ fi
+ ],
+ [
+ AC_MSG_NOTICE(Using openpty if available)
+- AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY)])
++ AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes])
+ ]
+ )
++
++if test "x$dropbear_cv_func_have_openpty" = "xyes"; then
++ AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)
++ no_ptc_check=yes
++ no_ptmx_check=yes
++fi
+
+
+ AC_ARG_ENABLE(syslog,
============================================================
--- packages/dropbear/dropbear-0.50/fix-2kb-keys.patch 70e46d6cfac63121e36c03ac424dc738264fcdab
+++ packages/dropbear/dropbear-0.50/fix-2kb-keys.patch 70e46d6cfac63121e36c03ac424dc738264fcdab
@@ -0,0 +1,12 @@
+Index: dropbear-0.50/kex.h
+===================================================================
+--- dropbear-0.50.orig/kex.h
++++ dropbear-0.50/kex.h
+@@ -59,6 +59,6 @@ struct KEXState {
+
+ };
+
+-#define MAX_KEXHASHBUF 2000
++#define MAX_KEXHASHBUF 3000
+
+ #endif /* _KEX_H_ */
============================================================
--- packages/dropbear/dropbear-0.50/urandom-xauth-changes-to-options.h.patch b91c9e2eef48185fee78c4c9ec3bedfaca5e3d5c
+++ packages/dropbear/dropbear-0.50/urandom-xauth-changes-to-options.h.patch b91c9e2eef48185fee78c4c9ec3bedfaca5e3d5c
@@ -0,0 +1,13 @@
+Index: dropbear-0.50/options.h
+===================================================================
+--- dropbear-0.50.orig/options.h
++++ dropbear-0.50/options.h
+@@ -197,7 +197,7 @@ etc) slower (perhaps by 50%). Recommende
+ /* The command to invoke for xauth when using X11 forwarding.
+ * "-q" for quiet */
+ #ifndef XAUTH_COMMAND
+-#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q"
++#define XAUTH_COMMAND "xauth -q"
+ #endif
+
+ /* if you want to enable running an sftp server (such as the one included with
============================================================
--- packages/dropbear/dropbear_0.50.bb 1f1e5b54696006b7f8484bd48dff9fa684992830
+++ packages/dropbear/dropbear_0.50.bb 1f1e5b54696006b7f8484bd48dff9fa684992830
@@ -0,0 +1,6 @@
+PR = "r0"
+
+require dropbear.inc
+
+# testing
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/opkg/opkg_svn.bb 13f09ac580bee79985c15dcece8824d84ff9c8fc
+++ packages/opkg/opkg_svn.bb e08f111c50f9d0c56d5ae1b3b8f42777af3e65dc
@@ -1,26 +1,21 @@ DESCRIPTION = "Open Package Manager"
DESCRIPTION = "Open Package Manager"
-DESCRIPTION_libipkg = "Open Package Manager Library"
+DESCRIPTION_libopkg = "Open Package Manager Library"
SECTION = "base"
LICENSE = "GPL"
DEPENDS = "curl gpgme"
PV = "0.0+svnr${SRCREV}"
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http"
+PR = "r1"
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http"
S = "${WORKDIR}/opkg"
inherit autotools pkgconfig
do_stage() {
- oe_libinstall -so libopkg ${STAGING_LIBDIR}
- install -d ${STAGING_INCDIR}/libopkg/
- for f in *.h
- do
- install -m 0644 $f ${STAGING_INCDIR}/libopkg/
- done
+ autotools_stage_all
}
PACKAGES =+ "libopkg-dev libopkg"
FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
FILES_libopkg = "${libdir}/*.so.*"
-
#
# mt diff -rdb7e324079b29569e9e6a52a22576a281140b12a -r9160d7f92f10358826bd1786462b50ec19927fa7
#
#
#
# add_dir "packages/glib-2.0/glib-2.0-2.15.6"
#
# add_dir "packages/gtk-webcore/midori-0.0.17"
#
# add_dir "packages/libsexy/files"
#
# add_dir "packages/vte/files"
#
# add_file "packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch"
# content [2e9bdca6abde5498601df5b513b4ed387f00d49e]
#
# add_file "packages/glib-2.0/glib-2.0_2.15.6.bb"
# content [c13c859de167ff242477ffe86356620ae601725f]
#
# add_file "packages/gnome/epiphany_2.21.92.bb"
# content [ebcda8cfb1fc16f85faabd662abdb7fe65ebe0fc]
#
# add_file "packages/gtk-webcore/midori-0.0.17/webkit-update.patch"
# content [fc9c69acae8925452a177401fef7812c146b9268]
#
# add_file "packages/libsexy/files/libsexy-pkgconfig-fixes.patch"
# content [e5931663a5d7b15ab427404822b3ef7e492a63ed]
#
# add_file "packages/libxslt/libxslt_1.1.22.bb"
# content [79128c5d67c70cbfa31d1f46637bcb63e408194e]
#
# add_file "packages/openmoko2/openmoko-browser2/webkit-update.patch"
# content [ebbd065da1bb887850fd838ad6d006fe4db2d38e]
#
# add_file "packages/vte/files/vte-pkgconfig-fixes.patch"
# content [c3812437766ebd9403b28e7a4c06406c02369202]
#
# add_file "packages/xserver-common/xserver-common_1.22.bb"
# content [14f7d103bf373a302fc67211bc1c91f71605d7fb]
#
# patch "classes/base.bbclass"
# from [b37f42836fc2adcb03d14179319ac508313a2b86]
# to [1288ed5512b85cb9b059f144d7e8bd8975cbcbe5]
#
# patch "classes/packaged-staging.bbclass"
# from [59a91d125afea47071a318c45a9942ffd3d8111b]
# to [ec2561490be2fcdce7651e0ee01cb5bc8dbecf19]
#
# patch "conf/distro/chinook-compat.conf"
# from [cc908008b4aa26b9b4c0e937044d55dd7905f01d]
# to [ef075089c0bffc9cb8f4e103e1aaccbb75ac73de]
#
# patch "conf/distro/include/angstrom-2007-for-openmoko-versions.inc"
# from [340506c9f1360260d8ad4ca3914b04642d150348]
# to [6d3aaaaa7a79cacb60e353fc0bd6e8a27dc724c3]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [66432a75530815dc67cbefefa5709c66ca453cf9]
# to [4df38dd4bd7877c6cda9662121aa501342783f9b]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [9672ca64d633aa0e5cbf26a1e1080ffa11590147]
# to [cee3f2f2e6478f02a5022c31afb8da91f4680f4a]
#
# patch "contrib/angstrom/build-release.sh"
# from [b708ec70fd4e4e0c2756d122aa95b1d653019a9e]
# to [ba8f992bfe8e6c725b91b12fbe667c9f9423659b]
#
# patch "packages/abiword/abiword-plugins_2.5.2.bb"
# from [39b5723ec0757262378d7f9ea18236861fbbface]
# to [b02d055a699a18d721d373c5bcbe26e5d8a5f882]
#
# patch "packages/apmd/files/90-wifi-off"
# from [dd2b60322fc6d9136495d7c41f7c1f9e73ed8937]
# to [e98ddd9efd82319c1c9c5b627403f60431827290]
#
# patch "packages/glib-2.0/glib.inc"
# from [29039e156a12c5bbeada136e27b7e662b1928c8c]
# to [9d096372748e2153368c140454bc117272939805]
#
# patch "packages/gypsy/gypsy.inc"
# from [816a8a3e7c95ea800fd63fba2e778e93cd84bbef]
# to [85b5dc8a1cf38b17b7eae3af2cd38122493263fa]
#
# patch "packages/gypsy/gypsy_svn.bb"
# from [079cf68a5fae747fa3a2080dd75e0b659a566f08]
# to [7c8bebbab2c817b985ad6679a088c571ea02dbb1]
#
# patch "packages/libsexy/libsexy.inc"
# from [424dc70640ac7ef7e37a4ade193b1b68ee41b529]
# to [bb7627ce4dd6e965c92b807b73ce50885842782e]
#
# patch "packages/libsexy/libsexy_0.1.11.bb"
# from [fea8d167b7e7ad5419021a08a604bf8d7af3166f]
# to [a76f7dce9c8ab42df42de99cb8a9b523bb2f18a2]
#
# patch "packages/maemo4/libhildonfm.inc"
# from [702ae68cf109a6449b217f12b2a3a9ae5b0ce95c]
# to [de522fbf4f35d5ed4566913669b9c22bd1e7657b]
#
# patch "packages/mtd/mtd-utils_1.0.0+git.bb"
# from [7eddd005976dfff21ab5df1d7f4010a0cb36c45a]
# to [84c980d81b31831e212ab06f383190f75f5c49f6]
#
# patch "packages/mtd/mtd-utils_1.1.0.bb"
# from [55322b9b44a9887ed3b3f6a0dc04916c921b45f7]
# to [62670e998ad85120543b4c4d96eb8c4d85363ab3]
#
# patch "packages/openmoko2/openmoko-browser2_svn.bb"
# from [016c86c36cb562d257129d41a9c1748e40475fd3]
# to [379c73a55ef74a90c7ef612d5b2ad20d187189d3]
#
# patch "packages/tasks/task-openmoko-pim.bb"
# from [650e8d1fe3553a63baeaef2a70d3d930c02348f8]
# to [1d7f4e8ddb2c15eb09243e56856f6b74b6cdbe82]
#
# patch "packages/vte/vte.inc"
# from [695b3ba40c29481f179d025379ad74da6577664b]
# to [863acadee923ffdfe020719fff0419292035e52e]
#
# patch "packages/vte/vte_0.16.9.bb"
# from [c930d8d34a3c5132f815de63792d7e7cea7195ee]
# to [71f52484bb2f0ca15b87f47ffa57f655d4fb08b2]
#
# patch "packages/webkit/files/GNUmakefile.am"
# from [1405c30a670778ad477a10c30a1b572b4b4b248c]
# to [8556a83aa4c1fdae91e3e777e3092fd07b5dd83b]
#
# patch "packages/webkit/files/Makefile"
# from [d626884d98a0c3175d0d5321c4a47986f2c0c19a]
# to [45c43d087d496c1ad06572aa5f3a45d0d522bf49]
#
# patch "packages/webkit/files/Makefile.shared"
# from [4571aedc66a52b2d05fcb37b50ee169ffdc1b721]
# to [6471460e37c6e8eed41ccd49669e398ae773b44d]
#
# patch "packages/webkit/files/WebKit.pri"
# from [0e5c15ab2a6b4b986f311f4e0c55573ebf80191e]
# to [fd53e0bf98b68fce203d07770736c2aaa6b8b6bb]
#
# patch "packages/webkit/files/autogen.sh"
# from [4c1b8c78cb4a028f0b02454d4d31826719d46e70]
# to [8eabc60e96af596bdd80383f8f68222b9aec5aaf]
#
# patch "packages/webkit/files/configure.ac"
# from [70fcd958d25c14bab5be08366359f409c77d0b14]
# to [4fb7336ff014fc035bb051db697963cbf5338ee6]
#
# patch "packages/webkit/webkit-gtk_svn.bb"
# from [95b2bc44d2a31432bef47e5953ed31f4c1cd49c7]
# to [68fe5f795ffe7d3ccd3257b4536bdb9b292655dd]
#
# patch "packages/webkit/webkit.inc"
# from [1b435431285f60a2f3bb6f118ed12807b76bee80]
# to [2dcc6cfb42608a0d9226339b9fa50ecfc7feb2af]
#
# patch "packages/xoo/xoo_svn.bb"
# from [f8b0b32f636f02a8b0d654f47abc6342070b8da4]
# to [35f551e76ef5e61eb58905109dfd8a57d676dcbf]
#
# patch "site/arm-linux-uclibc"
# from [94f267f4c0c4331759de49a8fee575984350b930]
# to [ec92512a83b5986fb0052e62aec4fd766fe519c7]
#
============================================================
--- packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch 2e9bdca6abde5498601df5b513b4ed387f00d49e
+++ packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch 2e9bdca6abde5498601df5b513b4ed387f00d49e
@@ -0,0 +1,29 @@
+--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100
++++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100
+@@ -1174,7 +1174,7 @@
+ G_MODULE_LDFLAGS=
+ else
+ export SED
+- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1265,7 +1265,7 @@
+ LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+ echo "void glib_plugin_test(void) { }" > plugin.c
+- ${SHELL} ./libtool --mode=compile ${CC} -shared \
++ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
+ -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+ AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+ glib_cv_rtldglobal_broken,[
+@@ -1339,7 +1339,7 @@
+
+ AC_MSG_CHECKING(for the suffix of shared libraries)
+ export SED
+-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
++shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
+ eval $shrext_cmds
+ module=yes eval std_shrext=$shrext_cmds
+ # chop the initial dot
============================================================
--- packages/glib-2.0/glib-2.0_2.15.6.bb c13c859de167ff242477ffe86356620ae601725f
+++ packages/glib-2.0/glib-2.0_2.15.6.bb c13c859de167ff242477ffe86356620ae601725f
@@ -0,0 +1,6 @@
+require glib.inc
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.15/glib-${PV}.tar.bz2 \
+ file://glibconfig-sysdefs.h \
+ file://configure-libtool.patch;patch=1 \
+ "
============================================================
--- packages/gnome/epiphany_2.21.92.bb ebcda8cfb1fc16f85faabd662abdb7fe65ebe0fc
+++ packages/gnome/epiphany_2.21.92.bb ebcda8cfb1fc16f85faabd662abdb7fe65ebe0fc
@@ -0,0 +1,16 @@
+DESCRIPTION = "GNOME default webbrowser"
+DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
+RDEPENDS = "gnome-vfs-plugin-http"
+
+inherit gnome
+
+EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}"
+
+do_configure_prepend() {
+ touch ${S}/gnome-doc-utils.make
+ sed -i -e s:help::g Makefile.am
+}
+
+FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
+
+
============================================================
--- packages/gtk-webcore/midori-0.0.17/webkit-update.patch fc9c69acae8925452a177401fef7812c146b9268
+++ packages/gtk-webcore/midori-0.0.17/webkit-update.patch fc9c69acae8925452a177401fef7812c146b9268
@@ -0,0 +1,676 @@
+Update midori 0.17 to the new pkgconfig and header location. Taken from upstream git
+
+diff -Nurd midori-0.0.17/src/browser.c midori/src/browser.c
+--- midori-0.0.17/src/browser.c 2008-01-23 02:20:22.000000000 +0100
++++ midori/src/browser.c 2008-03-05 10:43:08.028499025 +0100
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (C) 2007 Christian Dywan <christian at twotoasts.de>
++ Copyright (C) 2007-2008 Christian Dywan <christian at twotoasts.de>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+@@ -290,6 +290,15 @@
+ g_free(source);*/
+ }
+
++void on_action_fullscreen_activate(GtkAction* action, CBrowser* browser)
++{
++ GdkWindowState state = gdk_window_get_state(browser->window->window);
++ if(state & GDK_WINDOW_STATE_FULLSCREEN)
++ gtk_window_unfullscreen(GTK_WINDOW(browser->window));
++ else
++ gtk_window_fullscreen(GTK_WINDOW(browser->window));
++}
++
+ void on_action_back_activate(GtkAction* action, CBrowser* browser)
+ {
+ webkit_web_view_go_back(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser)));
+@@ -1125,13 +1134,35 @@
+ update_search_engines(browser);
+ }
+
++static void on_window_state_changed(GtkWidget* widget
++ , GdkEventWindowState* event, CBrowser* browser)
++{
++ if(event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
++ {
++ if(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
++ {
++ gtk_widget_hide(browser->menubar);
++ g_object_set(browser->fullscreen, "stock-id"
++ , GTK_STOCK_LEAVE_FULLSCREEN, NULL);
++ gtk_widget_show(browser->fullscreen);
++ }
++ else
++ {
++ gtk_widget_show(browser->menubar);
++ gtk_widget_hide(browser->fullscreen);
++ g_object_set(browser->fullscreen, "stock-id"
++ , GTK_STOCK_FULLSCREEN, NULL);
++ }
++ }
++}
++
+ static void on_window_size_allocate(GtkWidget* widget, GtkAllocation* allocation
+ , CBrowser* browser)
+ {
+ if(GTK_WIDGET_REALIZED(widget))
+ {
+- if(!(gdk_window_get_state(widget->window)
+- & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)))
++ GdkWindowState state = gdk_window_get_state(widget->window);
++ if(!(state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)))
+ {
+ config->winWidth = allocation->width;
+ config->winHeight = allocation->height;
+@@ -1180,6 +1211,8 @@
+
+ // Setup the window metrics
+ browser->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
++ g_signal_connect(browser->window, "window-state-event"
++ , G_CALLBACK(on_window_state_changed), browser);
+ GdkScreen* screen = gtk_window_get_screen(GTK_WINDOW(browser->window));
+ const gint defaultWidth = (gint)gdk_screen_get_width(screen) / 1.7;
+ const gint defaultHeight = (gint)gdk_screen_get_height(screen) / 1.7;
+@@ -1351,6 +1384,13 @@
+ gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar)
+ , GTK_TOOL_ITEM(browser->closedTabs), -1);
+ sokoke_container_show_children(GTK_CONTAINER(browser->navibar));
++ action = gtk_action_group_get_action(browser->actiongroup, "Fullscreen");
++ browser->fullscreen = gtk_action_create_tool_item(action);
++ gtk_widget_hide(browser->fullscreen);
++ g_signal_connect(browser->fullscreen, "clicked"
++ , G_CALLBACK(on_action_fullscreen_activate), browser);
++ gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar)
++ , GTK_TOOL_ITEM(browser->fullscreen), -1);
+ action_set_active("ToolbarNavigation", config->toolbarNavigation, browser);
+
+ // Bookmarkbar
+@@ -1605,6 +1645,7 @@
+ browser->location = oldBrowser->location;
+ browser->webSearch = oldBrowser->webSearch;
+ browser->closedTabs = oldBrowser->closedTabs;
++ browser->fullscreen = oldBrowser->fullscreen;
+ browser->bookmarkbar = oldBrowser->bookmarkbar;
+ browser->panels = oldBrowser->panels;
+ browser->panels_notebook = oldBrowser->panels_notebook;
+@@ -1691,7 +1732,9 @@
+
+ // Connect signals
+ #define DOC_CONNECT(__sig, __func) g_signal_connect \
+- (G_OBJECT(browser->webView), __sig, G_CALLBACK(__func), browser);
++ (browser->webView, __sig, G_CALLBACK(__func), browser);
++ #define DOC_CONNECTA(__sig, __func) g_signal_connect_after \
++ (browser->webView, __sig, G_CALLBACK(__func), browser);
+ DOC_CONNECT ("navigation-requested" , on_webView_navigation_requested)
+ DOC_CONNECT ("title-changed" , on_webView_title_changed)
+ DOC_CONNECT ("icon-loaded" , on_webView_icon_changed)
+@@ -1704,11 +1747,13 @@
+ DOC_CONNECT ("console-message" , on_webView_console_message)
+
+ DOC_CONNECT ("button-press-event" , on_webView_button_press)
++ DOC_CONNECTA ("button-press-event" , on_webView_button_press_after)
+ DOC_CONNECT ("popup-menu" , on_webView_popup);
+ DOC_CONNECT ("scroll-event" , on_webView_scroll);
+ DOC_CONNECT ("leave-notify-event" , on_webView_leave)
+ DOC_CONNECT ("destroy" , on_webView_destroy)
+ #undef DOC_CONNECT
++ #undef DOC_CONNECTA
+
+ webkit_web_view_set_settings(WEBKIT_WEB_VIEW(browser->webView), webSettings);
+
+diff -Nurd midori-0.0.17/src/browser.h midori/src/browser.h
+--- midori-0.0.17/src/browser.h 2008-01-20 19:16:17.000000000 +0100
++++ midori/src/browser.h 2008-03-05 10:43:08.028499025 +0100
+@@ -39,6 +39,7 @@
+ GtkWidget* location;
+ GtkWidget* webSearch;
+ GtkWidget* closedTabs;
++ GtkWidget* fullscreen;
+ GtkWidget* bookmarkbar;
+ // panels
+ GtkWidget* panels;
+@@ -161,6 +162,9 @@
+ on_action_source_view_activate(GtkAction*, CBrowser*);
+
+ void
++on_action_fullscreen_activate(GtkAction*, CBrowser*);
++
++void
+ on_action_back_activate(GtkAction*, CBrowser*);
+
+ void
+@@ -364,6 +368,9 @@
+ { "Properties", GTK_STOCK_PROPERTIES
+ , NULL, ""
+ , "hm?", NULL/*G_CALLBACK(on_action_properties_activate)*/ },
++ { "Fullscreen", GTK_STOCK_FULLSCREEN
++ , NULL, "F11"
++ , "Toggle fullscreen view", G_CALLBACK(on_action_fullscreen_activate) },
+
+ { "Go", NULL, "_Go" },
+ { "Back", GTK_STOCK_GO_BACK
+diff -Nurd midori-0.0.17/src/conf.c midori/src/conf.c
+--- midori-0.0.17/src/conf.c 2008-01-23 05:12:24.000000000 +0100
++++ midori/src/conf.c 2008-03-05 10:43:08.028499025 +0100
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (C) 2007 Christian Dywan <christian at twotoasts.de>
++ Copyright (C) 2007-2008 Christian Dywan <christian at twotoasts.de>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+@@ -64,6 +64,7 @@
+ GET_INT(config->newPages, "NewPages", CONFIG_NEWPAGES_TAB_NEW);
+ GET_INT(config->openTabsInTheBackground, "OpenTabsInTheBackground", FALSE);
+ GET_INT(config->openPopupsInTabs, "OpenPopupsInTabs", FALSE);
++ GET_INT(config->middleClickGoto, "MiddleClickGoto", FALSE);
+ #undef GET_INT
+ #undef GET_STR
+
+@@ -73,6 +74,10 @@
+ #define GET_STR(var, key, default) \
+ var = sokoke_key_file_get_string_default( \
+ keyFile, "content", key, default, NULL)
++ GET_STR(config->defaultFontFamily, "DefaultFontFamily", "Sans");
++ GET_INT(config->defaultFontSize, "DefaultFontSize", 10);
++ GET_INT(config->minimumFontSize, "MinimumFontSize", 5);
++ GET_STR(config->defaultEncoding, "DefaultEncoding", "UTF-8");
+ GET_INT(config->autoLoadImages, "AutoLoadImages", TRUE);
+ GET_INT(config->autoShrinkIma%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list