diff options
Diffstat (limited to 'packages')
36 files changed, 1357 insertions, 174 deletions
diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb index 6f739c7b22..d750bf539d 100644 --- a/packages/abiword/abiword-plugins_2.5.2.bb +++ b/packages/abiword/abiword-plugins_2.5.2.bb @@ -20,7 +20,7 @@ PARALLEL_MAKE="" EXTRA_OECONF = " --without-libwmf \ --without-inter7eps \ --with-abiword=${WORKDIR}/abiword-${PV} \ - --with-boost=${STAGINC_INCDIR}/../ \ + --with-boost=${STAGING_INCDIR}/../ \ " PACKAGES_DYNAMIC = "abiword-plugin-*" diff --git a/packages/apmd/files/90-wifi-off b/packages/apmd/files/90-wifi-off index c54936c4be..645484b8cd 100644 --- a/packages/apmd/files/90-wifi-off +++ b/packages/apmd/files/90-wifi-off @@ -3,7 +3,7 @@ # # turn off wifi cards before suspend so they are fully reloaded upon resume -wifislot = `pccardctl ls|egrep '(hostap|orinoco)'|cut -f 2 -d " "` +wifislot = `pccardctl ls|egrep '(hostap|orinoco|libertas)'|cut -f 2 -d " "` if test $wifislot then for slot in $wifislot; do diff --git a/packages/glib-2.0/glib-2.0-2.15.6/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.15.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.15.6/.mtn2git_empty diff --git a/packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch new file mode 100644 index 0000000000..a52327c8c9 --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch @@ -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 diff --git a/packages/glib-2.0/glib-2.0_2.15.6.bb b/packages/glib-2.0/glib-2.0_2.15.6.bb new file mode 100644 index 0000000000..525a9d23de --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.15.6.bb @@ -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 \ + " diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc index 3fa6fe26ab..596b3bb90b 100644 --- a/packages/glib-2.0/glib.inc +++ b/packages/glib-2.0/glib.inc @@ -34,11 +34,7 @@ do_configure_prepend () { } do_stage () { - oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} - autotools_stage_includes + autotools_stage_all install -d ${STAGING_INCDIR}/glib-2.0/glib install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h install -d ${STAGING_DATADIR}/aclocal diff --git a/packages/gnome/epiphany_2.21.92.bb b/packages/gnome/epiphany_2.21.92.bb new file mode 100644 index 0000000000..c385c1d208 --- /dev/null +++ b/packages/gnome/epiphany_2.21.92.bb @@ -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" + + diff --git a/packages/gtk-webcore/midori-0.0.17/.mtn2git_empty b/packages/gtk-webcore/midori-0.0.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gtk-webcore/midori-0.0.17/.mtn2git_empty diff --git a/packages/gtk-webcore/midori-0.0.17/webkit-update.patch b/packages/gtk-webcore/midori-0.0.17/webkit-update.patch new file mode 100644 index 0000000000..d3d19123cf --- /dev/null +++ b/packages/gtk-webcore/midori-0.0.17/webkit-update.patch @@ -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@twotoasts.de> ++ Copyright (C) 2007-2008 Christian Dywan <christian@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@twotoasts.de> ++ Copyright (C) 2007-2008 Christian Dywan <christian@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->autoShrinkImages, "AutoShrinkImages", TRUE); + GET_INT(config->printBackgrounds, "PrintBackgrounds", FALSE); +@@ -143,7 +148,12 @@ + g_key_file_set_integer(keyFile, "browser", "NewPages", config->newPages); + g_key_file_set_integer(keyFile, "browser", "OpenTabsInTheBackground", config->openTabsInTheBackground); + g_key_file_set_integer(keyFile, "browser", "OpenPopupsInTabs", config->openPopupsInTabs); ++ g_key_file_set_integer(keyFile, "browser", "MiddleClickGoto", config->middleClickGoto); + ++ g_key_file_set_string (keyFile, "content", "DefaultFontFamily", config->defaultFontFamily); ++ g_key_file_set_integer(keyFile, "content", "DefaultFontSize", config->defaultFontSize); ++ g_key_file_set_integer(keyFile, "content", "MinimumFontSize", config->minimumFontSize); ++ g_key_file_set_string (keyFile, "content", "DefaultEncoding", config->defaultEncoding); + g_key_file_set_integer(keyFile, "content", "AutoLoadImages", config->autoLoadImages); + g_key_file_set_integer(keyFile, "content", "AutoShrinkImages", config->autoShrinkImages); + g_key_file_set_integer(keyFile, "content", "PrintBackgrounds", config->printBackgrounds); +diff -Nurd midori-0.0.17/src/conf.h midori/src/conf.h +--- midori-0.0.17/src/conf.h 2008-01-23 05:11:13.000000000 +0100 ++++ midori/src/conf.h 2008-03-05 10:43:08.028499025 +0100 +@@ -1,5 +1,5 @@ + /* +- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de> ++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -36,8 +36,12 @@ + guint newPages; // where to open new pages + gboolean openTabsInTheBackground; + gboolean openPopupsInTabs; ++ gboolean middleClickGoto; + +- ++ gchar* defaultFontFamily; ++ guint defaultFontSize; ++ guint minimumFontSize; ++ gchar* defaultEncoding; + gboolean autoLoadImages; + gboolean autoShrinkImages; + gboolean printBackgrounds; +diff -Nurd midori-0.0.17/src/global.h midori/src/global.h +--- midori-0.0.17/src/global.h 2008-01-23 03:13:40.000000000 +0100 ++++ midori/src/global.h 2008-03-05 10:43:08.028499025 +0100 +@@ -16,7 +16,7 @@ + #include "../katze/katze.h" + + #include <gtk/gtk.h> +-#include <webkit.h> ++#include <webkit/webkit.h> + + // -- globals + +@@ -81,5 +81,9 @@ + #if !GTK_CHECK_VERSION(2, 10, 0) + #define GTK_STOCK_SELECT_ALL "gtk-select-all" + #endif ++#if !GTK_CHECK_VERSION(2, 8, 0) ++#define GTK_STOCK_FULLSCREEN "gtk-fullscreen" ++#define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen" ++#endif + + #endif /* !__GLOBAL_H__ */ +diff -Nurd midori-0.0.17/src/helpers.c midori/src/helpers.c +--- midori-0.0.17/src/helpers.c 2008-01-20 17:46:16.000000000 +0100 ++++ midori/src/helpers.c 2008-03-05 10:43:08.028499025 +0100 +@@ -16,7 +16,7 @@ + #include "../katze/katze.h" + + #include <string.h> +-#include <webkit.h> ++#include <webkit/webkit.h> + + GtkIconTheme* get_icon_theme(GtkWidget* widget) + { +@@ -417,7 +417,7 @@ + if(!strstr(uri, "://")) + { + // Do we have a domain, ip address or localhost? +- if(strstr(uri, ".") != NULL || !strcmp(uri, "localhost")) ++ if(strchr(uri, '.') != NULL || !strcmp(uri, "localhost")) + return g_strconcat("http://", uri, NULL); + // We don't want to search? So return early. + if(!search) +diff -Nurd midori-0.0.17/src/main.c midori/src/main.c +--- midori-0.0.17/src/main.c 2008-01-23 05:13:21.000000000 +0100 ++++ midori/src/main.c 2008-03-05 10:43:08.031832796 +0100 +@@ -1,5 +1,5 @@ + /* +- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de> ++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -21,6 +21,7 @@ + + #include <string.h> + #include <gtk/gtk.h> ++#include <webkit/webkit.h> + + #include "config.h" + +@@ -58,6 +59,10 @@ + #if !GTK_CHECK_VERSION(2, 10, 0) + { GTK_STOCK_SELECT_ALL, "Select _All", 0, 0, (gchar*)"gtk20" }, + #endif ++ #if !GTK_CHECK_VERSION(2, 8, 0) ++ { GTK_STOCK_FULLSCREEN, "_Fullscreen", 0, 0, (gchar*)"gtk20" }, ++ { GTK_STOCK_FULLSCREEN, "_Leave Fullscreen", 0, 0, (gchar*)"gtk20" }, ++ #endif + }; + GtkIconFactory* factory = gtk_icon_factory_new(); + guint i; +@@ -244,8 +249,11 @@ + stock_items_init(); + browsers = NULL; + +- webSettings = webkit_web_settings_new(); +- g_object_set(webSettings ++ webSettings = g_object_new(WEBKIT_TYPE_WEB_SETTINGS ++ , "default-font-family" , config->defaultFontFamily ++ , "default-font-size" , config->defaultFontSize ++ , "minimum-font-size" , config->minimumFontSize ++ , "default-encoding" , config->defaultEncoding + , "auto-load-images" , config->autoLoadImages + , "auto-shrink-images" , config->autoShrinkImages + , "print-backgrounds" , config->printBackgrounds +diff -Nurd midori-0.0.17/src/prefs.c midori/src/prefs.c +--- midori-0.0.17/src/prefs.c 2008-01-23 05:10:45.000000000 +0100 ++++ midori/src/prefs.c 2008-03-05 10:43:08.031832796 +0100 +@@ -1,5 +1,5 @@ + /* +- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de> ++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -15,7 +15,8 @@ + #include "global.h" + #include "sokoke.h" + +-#include "string.h" ++#include <stdlib.h> ++#include <string.h> + + static gboolean on_prefs_homepage_focus_out(GtkWidget* widget + , GdkEventFocus event, CPrefs* prefs) +@@ -29,11 +30,65 @@ + config->startup = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + } + ++static void on_prefs_defaultFont_changed(GtkWidget* widget, CPrefs* prefs) ++{ ++ const gchar* font = gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget)); ++ gchar** components = g_strsplit(font, " ", 0); ++ guint i, n = g_strv_length(components) - 1; ++ GString* fontName = g_string_new(NULL); ++ for(i = 0; i < n; i++) ++ g_string_append_printf(fontName, "%s ", components[i]); ++ katze_assign(config->defaultFontFamily, g_string_free(fontName, FALSE)); ++ config->defaultFontSize = atoi(components[n]); ++ g_strfreev(components); ++ g_object_set(webSettings, "default-font-family", config->defaultFontFamily ++ , "default-font-size", config->defaultFontSize, NULL); ++} ++ ++static void on_prefs_minimumFontSize_changed(GtkWidget* widget, CPrefs* prefs) ++{ ++ config->minimumFontSize = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget)); ++ g_object_set(webSettings, "minimum-font-size", config->minimumFontSize, NULL); ++} ++ ++static void on_prefs_defaultEncoding_changed(GtkWidget* widget, CPrefs* prefs) ++{ ++ gchar* encoding; ++ switch(gtk_combo_box_get_active(GTK_COMBO_BOX(widget))) ++ { ++ case 0: ++ encoding = g_strdup("BIG5"); ++ break; ++ case 1: ++ encoding = g_strdup("SHIFT_JIS"); ++ break; ++ case 2: ++ encoding = g_strdup("KOI8-R"); ++ break; ++ case 3: ++ encoding = g_strdup("UTF-8"); ++ break; ++ case 4: ++ encoding = g_strdup("ISO-8859-1"); ++ break; ++ default: ++ encoding = g_strdup("UTF-8"); ++ g_warning("Invalid default encoding"); ++ } ++ katze_assign(config->defaultEncoding, encoding); ++ g_object_set(webSettings, "default-encoding", config->defaultEncoding, NULL); ++} ++ + static void on_prefs_newpages_changed(GtkWidget* widget, CPrefs* prefs) + { + config->newPages = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + } + ++void on_prefs_middleClickGoto_toggled(GtkWidget* widget, CPrefs* prefs) ++{ ++ config->middleClickGoto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); ++} ++ + void on_prefs_openTabsInTheBackground_toggled(GtkWidget* widget, CPrefs* prefs) + { + config->openTabsInTheBackground = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); +@@ -302,7 +357,7 @@ + #define WIDGET_ADD(__widget, __left, __right, __top, __bottom)\ + gtk_table_attach(GTK_TABLE(table), __widget\ + , __left, __right, __top, __bottom\ +- , 0, GTK_FILL, 8, 2) ++ , GTK_FILL, GTK_FILL, 8, 2) + #define FILLED_ADD(__widget, __left, __right, __top, __bottom)\ + gtk_table_attach(GTK_TABLE(table), __widget\ + , __left, __right, __top, __bottom\ +@@ -371,30 +426,42 @@ + PAGE_NEW("Appearance"); + FRAME_NEW("Font settings"); + TABLE_NEW(5, 2); +- INDENTED_ADD(gtk_label_new("Standard font"), 0, 1, 0, 1); +- button = gtk_font_button_new_with_font("Sans 10"/*config->sFontStandard*/); +- gtk_widget_set_sensitive(button, FALSE); //... ++ INDENTED_ADD(gtk_label_new_with_mnemonic("Default _font"), 0, 1, 0, 1); ++ gchar* defaultFont = g_strdup_printf("%s %d" ++ , config->defaultFontFamily, config->defaultFontSize); ++ button = gtk_font_button_new_with_font(defaultFont); ++ g_free(defaultFont); ++ g_signal_connect(button, "font-set", G_CALLBACK(on_prefs_defaultFont_changed), prefs); + FILLED_ADD(button, 1, 2, 0, 1); +- INDENTED_ADD(gtk_label_new("Minimum font size"), 0, 1, 1, 2); ++ INDENTED_ADD(gtk_label_new_with_mnemonic("_Minimum font size"), 0, 1, 1, 2); + hbox = gtk_hbox_new(FALSE, 4); +- spinbutton = gtk_spin_button_new_with_range(5, 12, 1); +- gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 5/*config->iFontSizeMin*/); +- gtk_widget_set_sensitive(spinbutton, FALSE); //... ++ spinbutton = gtk_spin_button_new_with_range(1, G_MAXINT, 1); ++ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->minimumFontSize); ++ g_signal_connect(spinbutton, "value-changed" ++ , G_CALLBACK(on_prefs_minimumFontSize_changed), prefs); + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + button = gtk_button_new_with_mnemonic("_Advanced"); + gtk_widget_set_sensitive(button, FALSE); //... + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4); + FILLED_ADD(hbox, 1, 2, 1, 2); +- INDENTED_ADD(gtk_label_new("Default encoding"), 0, 1, 2, 3); ++ INDENTED_ADD(gtk_label_new_with_mnemonic("Default _encoding"), 0, 1, 2, 3); + combobox = gtk_combo_box_new_text(); +- const gchar* encoding = NULL; g_get_charset(&encoding); +- // TODO: Fallback to utf-8 if the encoding is not sane (e.g. when lang=C) +- gchar* sEncodingDefault = g_strdup_printf("System (%s)", encoding); + sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) +- , sEncodingDefault, "Chinese", "Greek", "Japanese (SHIFT_JIS)" +- , "Korean", "Russian", "Unicode (UTF-8)", "Western (ISO-8859-1)", NULL); +- gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); //... +- gtk_widget_set_sensitive(combobox, FALSE); //... ++ , "Chinese (BIG5)", "Japanese (SHIFT_JIS)", "Russian (KOI8-R)" ++ , "Unicode (UTF-8)", "Western (ISO-8859-1)", NULL); ++ if(!strcmp(config->defaultEncoding, "BIG5")) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); ++ else if(!strcmp(config->defaultEncoding, "SHIFT_JIS")) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1); ++ else if(!strcmp(config->defaultEncoding, "KOI8-R")) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 2); ++ else if(!strcmp(config->defaultEncoding, "UTF-8")) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 3); ++ else if(!strcmp(config->defaultEncoding, "ISO-8859-1")) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 4); ++ // FIXME: Provide a 'Custom' item ++ g_signal_connect(combobox, "changed" ++ , G_CALLBACK(on_prefs_defaultEncoding_changed), prefs); + FILLED_ADD(combobox, 1, 2, 2, 3); + button = gtk_button_new_with_label("Advanced settings"); + gtk_widget_set_sensitive(button, FALSE); //... +@@ -427,15 +494,19 @@ + sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) + , "New tab", "New window", "Current tab", NULL); + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->newPages); +- g_signal_connect(combobox, "changed" +- , G_CALLBACK(on_prefs_newpages_changed), prefs); ++ g_signal_connect(combobox, "changed", G_CALLBACK(on_prefs_newpages_changed), prefs); + gtk_widget_set_sensitive(combobox, FALSE); //... + FILLED_ADD(combobox, 1, 2, 0, 1); ++ checkbutton = gtk_check_button_new_with_mnemonic("_Middle click goto"); ++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->middleClickGoto); ++ g_signal_connect(checkbutton, "toggled" ++ , G_CALLBACK(on_prefs_middleClickGoto_toggled), prefs); ++ INDENTED_ADD(checkbutton, 0, 1, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Open tabs in the _background"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openTabsInTheBackground); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_openTabsInTheBackground_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 2, 1, 2); ++ SPANNED_ADD(checkbutton, 1, 2, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Open popups in _tabs"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openPopupsInTabs); + g_signal_connect(checkbutton, "toggled" +@@ -448,7 +519,7 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoLoadImages); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_loadImagesAutomatically_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 1, 0, 1); ++ INDENTED_ADD(checkbutton, 0, 1, 0, 1); + checkbutton = gtk_check_button_new_with_mnemonic("_Shrink images to fit"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoShrinkImages); + g_signal_connect(checkbutton, "toggled" +@@ -458,7 +529,7 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->printBackgrounds); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_printBackgrounds_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 1, 1, 2); ++ INDENTED_ADD(checkbutton, 0, 1, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("_Resizable textareas"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->resizableTextAreas); + g_signal_connect(checkbutton, "toggled" +@@ -468,7 +539,7 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enableScripts); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_enableJavaScript_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 1, 2, 3); ++ INDENTED_ADD(checkbutton, 0, 1, 2, 3); + checkbutton = gtk_check_button_new_with_mnemonic("Enable _plugins"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enablePlugins); + g_signal_connect(checkbutton, "toggled" +@@ -504,7 +575,7 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarSmall); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_toolbarSmall_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 1, 1, 2); ++ INDENTED_ADD(checkbutton, 0, 1, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Show web_search"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarWebSearch); + g_signal_connect(checkbutton, "toggled" +@@ -514,42 +585,34 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarNewTab); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_toolbarNewTab_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 1, 2, 3); ++ INDENTED_ADD(checkbutton, 0, 1, 2, 3); + checkbutton = gtk_check_button_new_with_mnemonic("Show _closed tabs button"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarClosedTabs); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_toolbarClosedTabs_toggled), prefs); + SPANNED_ADD(checkbutton, 1, 2, 2, 3); + FRAME_NEW("Miscellaneous"); +- TABLE_NEW(3, 2); +- checkbutton = gtk_check_button_new_with_mnemonic +- ("Show close _buttons on tabs"); ++ TABLE_NEW(2, 2); ++ checkbutton = gtk_check_button_new_with_mnemonic("Close _buttons on tabs"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->tabClose); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_tabClose_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 1, 0, 1); ++ INDENTED_ADD(checkbutton, 0, 1, 0, 1); + hbox = gtk_hbox_new(FALSE, 4); + gtk_box_pack_start(GTK_BOX(hbox) +- , gtk_label_new_with_mnemonic("Tab Si_ze"), FALSE, FALSE, 0); ++ , gtk_label_new_with_mnemonic("Tab Si_ze"), FALSE, FALSE, 4); + spinbutton = gtk_spin_button_new_with_range(0, 36, 1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->tabSize); + g_signal_connect(spinbutton, "changed" + , G_CALLBACK(on_prefs_tabSize_changed), prefs); + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + FILLED_ADD(hbox, 1, 2, 0, 1); +- INDENTED_ADD(gtk_label_new_with_mnemonic("Tabbar _placement"), 0, 1, 1, 2); +- combobox = gtk_combo_box_new_text(); +- sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) +- , "Left", "Top", "Right", "Bottom", NULL); +- gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1); //... +- gtk_widget_set_sensitive(combobox, FALSE); //... +- FILLED_ADD(combobox, 1, 2, 1, 2); +- INDENTED_ADD(gtk_label_new_with_mnemonic("_Location search engine"), 0, 1, 2, 3); ++ INDENTED_ADD(gtk_label_new_with_mnemonic("_Location search engine"), 0, 1, 1, 2); + entry = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(entry), config->locationSearch); + g_signal_connect(entry, "focus-out-event" + , G_CALLBACK(on_prefs_locationsearch_focus_out), prefs); +- FILLED_ADD(entry, 1, 2, 2, 3); ++ FILLED_ADD(entry, 1, 2, 1, 2); + + // Page "Network" + PAGE_NEW("Network"); +diff -Nurd midori-0.0.17/src/ui.h midori/src/ui.h +--- midori-0.0.17/src/ui.h 2008-01-20 19:16:17.000000000 +0100 ++++ midori/src/ui.h 2008-03-05 10:43:08.071832738 +0100 +@@ -91,9 +91,8 @@ + "<menuitem action='ZoomOut'/>" + "<menuitem action='ZoomNormal'/>" + "<separator/>" +- "<menuitem action='BackgroundImage'/>" + "<menuitem action='SourceView'/>" +- "<menuitem action='Properties'/>" ++ "<menuitem action='Fullscreen'/>" + "</menu>" + "<menu action='Go'>" + "<menuitem action='Back'/>" +diff -Nurd midori-0.0.17/src/webSearch.h midori/src/webSearch.h +--- midori-0.0.17/src/webSearch.h 2007-12-15 04:09:47.000000000 +0100 ++++ midori/src/webSearch.h 2008-03-05 10:43:08.071832738 +0100 +@@ -16,7 +16,7 @@ + + #include <gtk/gtk.h> + #include <libsexy/sexy.h> +-#include <webkit.h> ++#include <webkit/webkit.h> + + // -- Types + +diff -Nurd midori-0.0.17/src/webView.c midori/src/webView.c +--- midori-0.0.17/src/webView.c 2008-01-13 02:47:38.000000000 +0100 ++++ midori/src/webView.c 2008-03-05 10:43:08.071832738 +0100 +@@ -1,5 +1,5 @@ + /* +- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de> ++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -251,6 +251,27 @@ + return FALSE; + } + ++gboolean on_webView_button_press_after(GtkWidget* webView, GdkEventButton* event ++ , CBrowser* browser) ++{ ++ if(event->button == 2 && config->middleClickGoto) ++ { ++ GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); ++ gchar* text = gtk_clipboard_wait_for_text(clipboard); ++ gchar* uri = NULL; ++ if(text && strchr(text, '.') && !strchr(text, ' ')) ++ uri = magic_uri(text, FALSE); ++ g_free(text); ++ if(uri) ++ { ++ webkit_web_view_open(WEBKIT_WEB_VIEW(browser->webView), uri); ++ g_free(uri); ++ return TRUE; ++ } ++ } ++ return FALSE; ++} ++ + void on_webView_popup(GtkWidget* webView, CBrowser* browser) + { + webView_popup(webView, NULL, browser); +diff -Nurd midori-0.0.17/src/webView.h midori/src/webView.h +--- midori-0.0.17/src/webView.h 2008-01-04 08:46:44.000000000 +0100 ++++ midori/src/webView.h 2008-03-05 10:43:08.071832738 +0100 +@@ -16,7 +16,7 @@ + #include "browser.h" + #include "debug.h" + +-#include <webkit.h> ++#include <webkit/webkit.h> + + WebKitNavigationResponse + on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame +@@ -60,6 +60,9 @@ + gboolean + on_webView_button_press(GtkWidget*, GdkEventButton*, CBrowser*); + ++gboolean ++on_webView_button_press_after(GtkWidget*, GdkEventButton*, CBrowser*); ++ + void + on_webView_popup(GtkWidget*, CBrowser*); + +--- midori-0.0.17/configure.in 2008-01-24 03:47:18.000000000 +0100 ++++ midori/configure.in 2008-03-05 10:43:08.025165254 +0100 +@@ -52,15 +52,15 @@ + GTK_VER=`pkg-config --modversion gtk+-2.0` + AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version]) + +-# Checks for WebKitGtk +-PKG_CHECK_MODULES(WEBKIT, WebKitGtk, have_webkit=true, have_webkit=false) ++# Checks for WebKit ++PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false) + if test "x${have_webkit}" = "xfalse" ; then +- AC_MSG_ERROR([No WebKitGtk package information found]) ++ AC_MSG_ERROR([No WebKit package information found]) + fi + AC_SUBST(WEBKIT_CFLAGS) + AC_SUBST(WEBKIT_LIBS) +-WEBKIT_VER=`pkg-config --modversion WebKitGtk` +-AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version]) ++WEBKIT_VER=`pkg-config --modversion webkit-1.0` ++AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKIT_VER", [WebKit version]) + + # Checks for libsexy + PKG_CHECK_MODULES(LIBSEXY, libsexy, have_libsexy=true, have_libsexy=false) diff --git a/packages/gypsy/gypsy.inc b/packages/gypsy/gypsy.inc index 6d78943bd5..57f88dc3bd 100644 --- a/packages/gypsy/gypsy.inc +++ b/packages/gypsy/gypsy.inc @@ -9,4 +9,8 @@ do_configure_prepend () { touch ${S}/gtk-doc.make } +do_stage() { + autotools_stage_all +} + FILES_${PN} += "${datadir}/dbus-1/services/" diff --git a/packages/gypsy/gypsy_svn.bb b/packages/gypsy/gypsy_svn.bb index 116d39bb4f..45e283b6b7 100644 --- a/packages/gypsy/gypsy_svn.bb +++ b/packages/gypsy/gypsy_svn.bb @@ -3,7 +3,7 @@ require gypsy.inc DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \ - file://fixups.patch;patch=1" + file://fixups.patch;patch=1;maxrev=107" PV = "0.0+svnr${SRCREV}" S = "${WORKDIR}/${PN}" diff --git a/packages/libsexy/files/.mtn2git_empty b/packages/libsexy/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libsexy/files/.mtn2git_empty diff --git a/packages/libsexy/files/libsexy-pkgconfig-fixes.patch b/packages/libsexy/files/libsexy-pkgconfig-fixes.patch new file mode 100644 index 0000000000..331b24bf1b --- /dev/null +++ b/packages/libsexy/files/libsexy-pkgconfig-fixes.patch @@ -0,0 +1,15 @@ +Index: libsexy-0.1.11/libsexy.pc.in +=================================================================== +--- libsexy-0.1.11.orig/libsexy.pc.in 2005-11-10 10:21:18.000000000 +0000 ++++ libsexy-0.1.11/libsexy.pc.in 2008-03-05 14:36:39.000000000 +0000 +@@ -6,7 +6,8 @@ + Name: libsexy + Description: Doing naughty things to good widgets + Version: @VERSION@ +-Libs: -L${libdir} -lsexy @PACKAGE_LIBS@ +-Cflags: -I${includedir} @PACKAGE_CFLAGS@ + ++Requires: pango glib-2.0 gtk+-2.0 libxml ++Libs: -L${libdir} -lsexy ++Cflags: -I${includedir} + diff --git a/packages/libsexy/libsexy.inc b/packages/libsexy/libsexy.inc index 522b7e0d63..27816c0800 100644 --- a/packages/libsexy/libsexy.inc +++ b/packages/libsexy/libsexy.inc @@ -5,7 +5,8 @@ SECTION = "x11/libs" DEPENDS = "gtk+ enchant libxml2" -SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz" +SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz \ + file://libsexy-pkgconfig-fixes.patch;patch=1" inherit autotools pkgconfig diff --git a/packages/libsexy/libsexy_0.1.11.bb b/packages/libsexy/libsexy_0.1.11.bb index 042ea757e9..91784ffb49 100644 --- a/packages/libsexy/libsexy_0.1.11.bb +++ b/packages/libsexy/libsexy_0.1.11.bb @@ -1,2 +1,2 @@ require libsexy.inc -PR = "r0" +PR = "r1" diff --git a/packages/libxslt/libxslt_1.1.22.bb b/packages/libxslt/libxslt_1.1.22.bb new file mode 100644 index 0000000000..53348becc9 --- /dev/null +++ b/packages/libxslt/libxslt_1.1.22.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "GNOME XSLT library" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libxml2 (>=2.6.27)" +LICENSE = "MIT" + +SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz" +S = "${WORKDIR}/libxslt-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" + +# Something is wrong inside configure.ac, so we need to resort to sed in this stage :( +# Koen - 20080305 +do_compile_append() { + sed -i -e s:-L${STAGING_LIBDIR}::g libexslt.pc + sed -i -e s:-L${STAGING_LIBDIR}::g libxslt.pc +} + +do_stage () { + autotools_stage_all +} + +PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" + +FILES_${PN}-dev += "${bindir}/xslt-config" +FILES_${PN}-utils += "${bindir}" diff --git a/packages/maemo4/libhildonfm.inc b/packages/maemo4/libhildonfm.inc index b6c20a4499..26c1555e52 100644 --- a/packages/maemo4/libhildonfm.inc +++ b/packages/maemo4/libhildonfm.inc @@ -16,6 +16,11 @@ PARALLEL_MAKE = "" do_stage() { autotools_stage_all + if [ ! -d ${STAGING_INCDIR}/hildon-widgets ] + then + mkdir -p ${STAGING_INCDIR}/hildon-widgets + fi + ln -sf ${STAGING_INCDIR}/hildon-fm-2/hildon/* ${STAGING_INCDIR}/hildon-widgets/ } diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb index 42d92edd9a..b325bb03d3 100644 --- a/packages/mtd/mtd-utils_1.0.0+git.bb +++ b/packages/mtd/mtd-utils_1.0.0+git.bb @@ -36,12 +36,12 @@ mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ do_install () { install -d ${D}${bindir} - install -d ${D}${includedir} + install -d ${D}${includedir}/mtd for binary in ${mtd_utils}; do install -m 0755 $binary ${D}${bindir} done for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${D}${includedir} + install -m 0644 $f ${D}${includedir}/mtd done } diff --git a/packages/mtd/mtd-utils_1.1.0.bb b/packages/mtd/mtd-utils_1.1.0.bb index 679fc7e79e..ed9a8b8441 100644 --- a/packages/mtd/mtd-utils_1.1.0.bb +++ b/packages/mtd/mtd-utils_1.1.0.bb @@ -33,12 +33,12 @@ mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ do_install () { install -d ${D}${bindir} - install -d ${D}${includedir} + install -d ${D}${includedir}/mtd for binary in ${mtd_utils}; do install -m 0755 $binary ${D}${bindir} done for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${D}${includedir} + install -m 0644 $f ${D}${includedir}/mtd done } diff --git a/packages/openmoko2/openmoko-browser2/webkit-update.patch b/packages/openmoko2/openmoko-browser2/webkit-update.patch new file mode 100644 index 0000000000..18e8a88e25 --- /dev/null +++ b/packages/openmoko2/openmoko-browser2/webkit-update.patch @@ -0,0 +1,99 @@ +diff -Nurd openmoko-browser2.orig/configure.ac openmoko-browser2/configure.ac +--- openmoko-browser2.orig/configure.ac 2007-10-02 09:00:38.000000000 +0200 ++++ openmoko-browser2/configure.ac 2008-03-05 12:12:32.954623867 +0100 +@@ -40,7 +40,7 @@ + # base deps + PKG_CHECK_MODULES(OPENMOKO, libmokoui2 >= 0.1.0) + PKG_CHECK_MODULES(GTHREAD, gthread-2.0 ) +-PKG_CHECK_MODULES(WEBKITGTK, WebKitGtk) ++PKG_CHECK_MODULES(WEBKITGTK, webkit-1.0) + + # glib-genmarshal + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` +diff -Nurd openmoko-browser2.orig/src/browser-data.h openmoko-browser2/src/browser-data.h +--- openmoko-browser2.orig/src/browser-data.h 2007-12-12 20:31:07.000000000 +0100 ++++ openmoko-browser2/src/browser-data.h 2008-03-05 12:12:50.497959252 +0100 +@@ -27,7 +27,7 @@ + #ifndef OPENMOKO_BROWSER_DATA_H + #define OPENMOKO_BROWSER_DATA_H + +-#include "webkitwebview.h" ++#include <webkit/webkitwebview.h> + + #include <glib.h> + #include <gtk/gtk.h> +diff -Nurd openmoko-browser2.orig/src/current-page.c openmoko-browser2/src/current-page.c +--- openmoko-browser2.orig/src/current-page.c 2007-12-12 20:31:07.000000000 +0100 ++++ openmoko-browser2/src/current-page.c 2008-03-05 12:13:56.032884030 +0100 +@@ -28,8 +28,8 @@ + #include "current-page.h" + + #include <moko-finger-scroll.h> +-#include <webkitwebframe.h> +-#include <webkitwebview.h> ++#include <webkit/webkitwebframe.h> ++#include <webkit/webkitwebview.h> + + /* + * From a list of BrowserPage's in BrowserData::currentPage show +@@ -42,7 +42,7 @@ + static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data) + { + g_return_if_fail (data->currentPage); +- webkit_web_view_go_backward(data->currentPage->webKitPage); ++ webkit_web_view_go_back(data->currentPage->webKitPage); + } + + static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data) +@@ -66,7 +66,7 @@ + g_assert (page == data->currentPage->webKitPage); + + if (prog == 100) { +- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (page)); ++ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (page)); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (page)); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (page)) != NULL); + } +@@ -176,7 +176,7 @@ + * Update the GtkToolItems + */ + /* XXX ### FIXME TODO check if we should show stop/reload */ +- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (data->currentPage->webKitPage)); ++ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (data->currentPage->webKitPage)); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (data->currentPage->webKitPage)); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (data->currentPage->webKitPage)) != NULL); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentClose), TRUE); +diff -Nurd openmoko-browser2.orig/src/main.c openmoko-browser2/src/main.c +--- openmoko-browser2.orig/src/main.c 2007-12-12 20:31:07.000000000 +0100 ++++ openmoko-browser2/src/main.c 2008-03-05 12:14:46.337942098 +0100 +@@ -33,7 +33,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + +-#include <webkit.h> ++#include <webkit/webkit.h> + + #include <moko-finger-scroll.h> + #include <moko-stock.h> +@@ -55,7 +55,6 @@ + gdk_threads_init (); + gdk_threads_enter (); + gtk_init (&argc, &argv); +- webkit_init (); + moko_stock_register (); + g_set_application_name (_("Browser")); + +diff -Nurd openmoko-browser2.orig/src/open-pages-page.c openmoko-browser2/src/open-pages-page.c +--- openmoko-browser2.orig/src/open-pages-page.c 2007-12-12 20:31:07.000000000 +0100 ++++ openmoko-browser2/src/open-pages-page.c 2008-03-05 12:13:37.671282983 +0100 +@@ -28,8 +28,8 @@ + #include "open-pages-page.h" + #include "current-page.h" + +-#include <webkitwebframe.h> +-#include <webkitwebview.h> ++#include <webkit/webkitwebframe.h> ++#include <webkit/webkitwebview.h> + #include <moko-finger-scroll.h> + + #include <glib/gi18n.h> diff --git a/packages/openmoko2/openmoko-browser2_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb index b9c7efed02..b0b56d3e71 100644 --- a/packages/openmoko2/openmoko-browser2_svn.bb +++ b/packages/openmoko2/openmoko-browser2_svn.bb @@ -2,10 +2,15 @@ DESCRIPTION = "The OpenMoko Webbrowser" SECTION = "openmoko/apps" DEPENDS += "intltool libmokoui2 check webkit-gtk" PV = "0.0.1+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit openmoko2 +SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171" + #SRC_URI += "file://fingerscroll.diff;patch=1" +do_compile_prepend() { + find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g +} diff --git a/packages/tasks/task-openmoko-pim.bb b/packages/tasks/task-openmoko-pim.bb index 1eea1a14a1..cef9a25931 100644 --- a/packages/tasks/task-openmoko-pim.bb +++ b/packages/tasks/task-openmoko-pim.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: PIM for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r71" +PR = "r72" inherit task @@ -14,7 +14,7 @@ RDEPENDS_task-openmoko-pim = "\ openmoko-calculator2 \ openmoko-contacts2 \ openmoko-dates2 \ - openmoko-feedreader2 \ +# openmoko-feedreader2 \ openmoko-browser2 \ openmoko-appmanager2 \ openmoko-tasks2 \ diff --git a/packages/vte/files/.mtn2git_empty b/packages/vte/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/vte/files/.mtn2git_empty diff --git a/packages/vte/files/vte-pkgconfig-fixes.patch b/packages/vte/files/vte-pkgconfig-fixes.patch new file mode 100644 index 0000000000..2acc7348e7 --- /dev/null +++ b/packages/vte/files/vte-pkgconfig-fixes.patch @@ -0,0 +1,47 @@ +Index: vte-0.16.9/configure.in +=================================================================== +--- vte-0.16.9.orig/configure.in 2007-09-17 23:07:18.000000000 +0100 ++++ vte-0.16.9/configure.in 2008-03-05 15:59:04.000000000 +0000 +@@ -381,8 +381,6 @@ + + # Search for the required modules. + PKG_CHECK_MODULES(VTE,[$wantedmodules]) +-NEEDEDPACKAGES="$wantedmodules" +-AC_SUBST(NEEDEDPACKAGES) + + # Check for various optional functions within those modules + save_CFLAGS="$CFLAGS" +@@ -403,10 +401,12 @@ + + # Require Freetype2. First see if there is suitable pkgconfig file... + PKG_CHECK_EXISTS(freetype2 >= 6.1.0, +- [PKG_CHECK_MODULES(FT2, freetype2)], [ ++ [PKG_CHECK_MODULES(FT2, freetype2) ++ wantedmodules="$wantedmodules freetype2 >= 6.1.0"], [ + # We use our local copy of the macro because packages of + # freetype's development files don't always include the proper macro. +- VTE_CHECK_FT2(6.1.0,, ++ VTE_CHECK_FT2(6.1.0,[ ++ wantedmodules="$wantedmodules freetype2 >= 6.1.0" ], + [AC_MSG_ERROR([You must have freetype 2.0.2 or later to build vte.])])]) + + # Temporarily pull in the Freetype cflags and libs for checking what's +@@ -508,6 +508,8 @@ + CFLAGS="$savecflags" + CPPFLAGS="$savecppflags" + ++NEEDEDPACKAGES="$wantedmodules" ++AC_SUBST(NEEDEDPACKAGES) + + wcs_funcs_includes=" + #ifdef HAVE_STRING_H +Index: vte-0.16.9/vte.pc.in +=================================================================== +--- vte-0.16.9.orig/vte.pc.in 2007-02-26 21:05:19.000000000 +0000 ++++ vte-0.16.9/vte.pc.in 2008-03-05 15:56:37.000000000 +0000 +@@ -11,4 +11,4 @@ + Requires: @NEEDEDPACKAGES@ + Libs: -L${libdir} -lvte @OTHERLIBS@ + Libs.private: @FT2_LIBS@ +-Cflags: -I${includedir} @FT2_CFLAGS@ @OTHERCFLAGS@ ++Cflags: -I${includedir} @OTHERCFLAGS@ diff --git a/packages/vte/vte.inc b/packages/vte/vte.inc index e575a5a3fb..e9313cd861 100644 --- a/packages/vte/vte.inc +++ b/packages/vte/vte.inc @@ -5,6 +5,8 @@ RDEPENDS = "termcap" inherit gnome +SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1" + EXTRA_OECONF = "--disable-gtk-doc" do_stage() { diff --git a/packages/vte/vte_0.16.9.bb b/packages/vte/vte_0.16.9.bb index f408632430..5875fd317f 100644 --- a/packages/vte/vte_0.16.9.bb +++ b/packages/vte/vte_0.16.9.bb @@ -1,2 +1,2 @@ require vte.inc -PR = "r3" +PR = "r4" diff --git a/packages/webkit/files/GNUmakefile.am b/packages/webkit/files/GNUmakefile.am index f3ec252ee8..977770a1ed 100644 --- a/packages/webkit/files/GNUmakefile.am +++ b/packages/webkit/files/GNUmakefile.am @@ -21,8 +21,10 @@ # # global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any # specific port -# global_cflags = CFLAGS and CXXFLAGS that apply to JSC, WebCore, and to +# global_cflags = CFLAGS that apply to JSC, WebCore, and to # any specific port +# global_cxxflags = CXXFLAGS that apply to JSC, WebCore, and to any +# specific port srcdir = @srcdir@ VPATH = @srcdir@ @@ -34,8 +36,6 @@ GENSOURCES := $(top_builddir)/DerivedSources CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table # Libraries and support components -noinst_LTLIBRARIES := - noinst_HEADERS := noinst_PROGRAMS := @@ -49,140 +49,203 @@ EXTRA_DIST := # # Global flags to CPP -global_cppflags := +global_cppflags := global_cppflags += \ - -I $(srcdir)/JavaScriptCore \ - -I $(srcdir)/JavaScriptCore/ForwardingHeaders \ - -I $(srcdir)/JavaScriptCore/wtf \ - -I $(srcdir)/JavaScriptCore/kjs \ - -I $(top_builddir)/DerivedSources + -I$(srcdir)/JavaScriptCore \ + -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ + -I$(srcdir)/JavaScriptCore/wtf \ + -I$(srcdir)/JavaScriptCore/kjs \ + -I$(top_builddir)/DerivedSources # Default compiler flags global_cflags := \ -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \ -Wformat -Wformat-security -Wno-format-y2k -Wundef \ -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ - -Wno-unused-parameter -fno-exceptions -fno-strict-aliasing + -Wno-unused-parameter -# Libraries -lib_LTLIBRARIES = libJavaScriptCore.la libWebKitGtk.la +global_cxxflags := \ + $(SYMBOL_VISIBILITY_INLINES) + +if !ENABLE_DEBUG +global_cflags += \ + -fno-exceptions \ + $(SYMBOL_VISIBILITY) + +global_cxxflags += \ + -fno-rtti +endif + +# Shared libraries +lib_LTLIBRARIES = \ + libwebkit-1.0.la + +# Convenience libraries +noinst_LTLIBRARIES = \ + libJavaScriptCore.la \ + libWebCore.la # # JavaScriptCore javascriptcore_h_api := javascriptcore_cppflags:= javascriptcore_sources := -javascriptcore_built_sources := +javascriptcore_built_sources := javascriptcore_built_nosources := # The variables above are already included below so no need to touch # these variables unless you really have to -libJavaScriptCore_ladir = $(prefix)/include/WebKit/JavaScriptCore -libJavaScriptCore_la_HEADERS := $(javascriptcore_h_api) +libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore +libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api) -libJavaScriptCore_la_SOURCES := \ +libJavaScriptCore_la_SOURCES = \ $(javascriptcore_built_sources) \ $(javascriptcore_sources) -libJavaScriptCore_la_LDFLAGS := -lpthread +libJavaScriptCore_la_LIBADD = \ + $(ICU_LIBS) \ + $(GLOBALDEPS_LIBS) \ + -lpthread -libJavaScriptCore_la_CXXFLAGS := $(global_cflags) +libJavaScriptCore_la_CXXFLAGS = \ + $(global_cxxflags) \ + $(global_cflags) \ + $(GLOBALDEPS_CFLAGS) \ + -fstrict-aliasing -libJavaScriptCore_la_CFLAGS := $(global_cflags) +libJavaScriptCore_la_CFLAGS = \ + $(global_cflags) \ + $(GLOBALDEPS_CFLAGS) \ + -fstrict-aliasing -libJavaScriptCore_la_CPPFLAGS := $(global_cppflags) $(javascriptcore_cppflags) +libJavaScriptCore_la_CPPFLAGS = \ + $(global_cppflags) \ + $(javascriptcore_cppflags) \ + $(ICU_CPPFLAGS) # # WebCore webcore_cppflags := webcore_sources := webcore_headers := +webcore_libadd := webcore_built_sources := webcore_built_nosources := -# WebKitGtk +webcore_cppflags += $(HILDON_CPPFLAGS) + +# WebKit webkitgtk_h_api := webkitgtk_headers := webkitgtk_sources := webkitgtk_cppflags := -webkitgtk_ldflags := webkitgtk_built_sources := webkitgtk_built_nosources := webkitgtk_cleanfiles := -# No need to touch the following variables unless you have to. If you need to change the values -# for the following variables, use the "webkitgtk_" variables above -libWebKitGtk_ladir := $(prefix)/include/WebKit - -libWebKitGtk_la_HEADERS := $(webkitgtk_h_api) - -libWebKitGtk_la_SOURCES := \ +libWebCore_la_SOURCES = \ $(webcore_built_sources) \ $(webcore_headers) \ - $(webcore_sources) \ - $(webkitgtk_built_sources) \ - $(webkitgtk_headers) \ - $(webkitgtk_sources) + $(webcore_sources) -libWebKitGtk_la_CXXFLAGS := \ - -fno-rtti \ +libWebCore_la_CXXFLAGS = \ + -fno-strict-aliasing \ + $(global_cxxflags) \ $(global_cflags) \ - $(DEPENDENCIES_CFLAGS) \ + $(GLOBALDEPS_CFLAGS) \ + $(WEBKITDEPS_CFLAGS) \ + $(LIBCURL_CFLAGS) \ $(SQLITE3_CFLAGS) \ $(GSTREAMER_CFLAGS) \ $(LIBXSLT_CFLAGS) \ - $(COVERAGE_CFLAGS) + $(COVERAGE_CFLAGS) \ + $(HILDON_CFLAGS) -libWebKitGtk_la_CFLAGS := \ +libWebCore_la_CFLAGS = \ + -fno-strict-aliasing \ $(global_cflags) \ - $(DEPENDENCIES_CFLAGS) \ + $(GLOBALDEPS_CFLAGS) \ + $(WEBKITDEPS_CFLAGS) \ + $(LIBCURL_CFLAGS) \ $(SQLITE3_CFLAGS) \ $(GSTREAMER_CFLAGS) \ $(LIBXSLT_CFLAGS) \ - $(COVERAGE_CFLAGS) + $(COVERAGE_CFLAGS) \ + $(HILDON_CFLAGS) -libWebKitGtk_la_CPPFLAGS := \ +libWebCore_la_CPPFLAGS = \ + $(ICU_CPPFLAGS) \ $(global_cppflags) \ $(webcore_cppflags) \ $(webkitgtk_cppflags) -libWebKitGtk_la_LIBADD := @LTLIBOBJS@ libJavaScriptCore.la - -libWebKitGtk_la_LDFLAGS := \ - $(webkitgtk_ldflags) \ - $(DEPENDENCIES_LIBS) \ +libWebCore_la_LIBADD = \ + libJavaScriptCore.la \ + $(webcore_libadd) \ + $(GLOBALDEPS_LIBS) \ + $(WEBKITDEPS_LIBS) \ + $(LIBCURL_LIBS) \ $(ICU_LIBS) \ $(SQLITE3_LIBS) \ $(GSTREAMER_LIBS) \ $(LIBXSLT_LIBS) \ - $(COVERAGE_LDFLAGS) \ + $(HILDON_LIBS) \ -lpthread \ - -ljpeg \ + -ljpeg + +libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit +libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api) + +libwebkit_1_0_la_SOURCES = \ + $(webkitgtk_built_sources) \ + $(webkitgtk_headers) \ + $(webkitgtk_sources) + +libwebkit_1_0_la_CXXFLAGS = \ + $(libWebCore_la_CXXFLAGS) + +libwebkit_1_0_la_CFLAGS = \ + $(libWebCore_la_CFLAGS) + +libwebkit_1_0_la_CPPFLAGS = \ + $(libWebCore_la_CPPFLAGS) + +libwebkit_1_0_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ -version-info @LIBWEBKITGTK_VERSION@ +libwebkit_1_0_la_LIBADD = \ + libWebCore.la + # # Extra checks and flags global_cppflags += \ -DBUILDING_GTK__=1 \ - -DUSE_SYSTEM_MALLOC \ -DWTF_CHANGES +if !ENABLE_FAST_MALLOC +global_cppflags += \ + -DUSE_SYSTEM_MALLOC +endif + if TARGET_X11 global_cppflags += -DXP_UNIX endif if !ENABLE_DEBUG global_cppflags += -DNDEBUG -else +else webkitgtk_cppflags += \ -DG_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ - -DPANGO_DISABLE_DEPRECATED \ - -DGDK_MULTIHEAD_SAFE \ - -DGTK_MULTIHEAD_SAFE + -DPANGO_DISABLE_DEPRECATED + +# Might be useful in the future +# -DGDK_MULTIHEAD_SAFE \ +# -DGTK_MULTIHEAD_SAFE endif if !ENABLE_DATABASE @@ -200,30 +263,30 @@ global_cppflags += \ endif if ENABLE_VIDEO -webkitgtk_ldflags += -lgstinterfaces-0.10 -lgstvideo-0.10 +webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10 endif -# -# WEBKIT GTK+ webkitgtk_cppflags += \ --I $(top_builddir)/WebKit/gtk/WebView \ +-I$(top_builddir)/WebKit/gtk/webkit \ -DBUILDING_CAIRO__=1 \ -DBUILD_WEBKIT webkitgtk_h_api += \ - WebKit/gtk/WebView/webkit.h \ - WebKit/gtk/WebView/webkitdefines.h \ - WebKit/gtk/WebView/webkitnetworkrequest.h \ - WebKit/gtk/WebView/webkitwebframe.h \ - WebKit/gtk/WebView/webkitwebview.h + WebKit/gtk/webkit/webkit.h \ + WebKit/gtk/webkit/webkitdefines.h \ + WebKit/gtk/webkit/webkitnetworkrequest.h \ + WebKit/gtk/webkit/webkitwebbackforwardlist.h \ + WebKit/gtk/webkit/webkitwebframe.h \ + WebKit/gtk/webkit/webkitwebhistoryitem.h \ + WebKit/gtk/webkit/webkitwebsettings.h \ + WebKit/gtk/webkit/webkitwebview.h webkitgtk_built_sources += \ - WebKit/gtk/WebView/webkit-marshal.h \ - WebKit/gtk/WebView/webkit-marshal.cpp + WebKit/gtk/webkit/webkit-marshal.h \ + WebKit/gtk/webkit/webkit-marshal.cpp webkitgtk_headers += \ - WebKit/gtk/WebView/webkitprivate.h \ - WebKit/gtk/WebView/webkitsettings.h \ + WebKit/gtk/webkit/webkitprivate.h \ WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ WebKit/gtk/WebCoreSupport/DragClientGtk.h \ @@ -233,37 +296,39 @@ webkitgtk_headers += \ WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h webkitgtk_sources += \ - WebKit/gtk/WebView/webkitnetworkrequest.cpp \ - WebKit/gtk/WebView/webkitprivate.cpp \ - WebKit/gtk/WebView/webkitsettings.cpp \ - WebKit/gtk/WebView/webkitwebframe.cpp \ - WebKit/gtk/WebView/webkitwebview.cpp \ + WebKit/gtk/webkit/webkitnetworkrequest.cpp \ + WebKit/gtk/webkit/webkitprivate.cpp \ + WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ + WebKit/gtk/webkit/webkitwebframe.cpp \ + WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ + WebKit/gtk/webkit/webkitwebsettings.cpp \ + WebKit/gtk/webkit/webkitwebview.cpp \ WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp webkitgtk_cleanfiles += \ $(top_builddir)/Programs/GtkLauncher \ - $(top_builddir)/WebKit/gtk/WebKitGtk.pc + $(top_builddir)/WebKit/gtk/webkit-1.0.pc pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc +pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc -WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/WebView/webkit-marshal -WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/WebView/webkit-marshal.list +WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal +WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list stamp_files := \ stamp-webkit-marshal.cpp \ stamp-webkit-marshal.h -WebKit/gtk/WebView/webkit-marshal.cpp: stamp-webkit-marshal.cpp +WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp @true -WebKit/gtk/WebView/webkit-marshal.h: stamp-webkit-marshal.h +WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h @true stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST) @@ -289,7 +354,7 @@ include WebKitTools/GNUmakefile.am # Autogenerated sources -BUILT_SOURCES := \ +BUILT_SOURCES = \ $(javascriptcore_built_sources) \ $(javascriptcore_built_nosources) \ $(webcore_built_sources) \ @@ -302,7 +367,6 @@ CLEANFILES += \ $(webkitgtk_cleanfiles) \ $(top_builddir)/Programs/DumpRenderTree \ $(top_builddir)/Programs/testkjs \ - $(top_builddir)/Programs/dftables \ $(GENSOURCES) MAINTAINERCLEANFILES += \ diff --git a/packages/webkit/files/Makefile b/packages/webkit/files/Makefile index 89344f7a58..fa7ea02426 100644 --- a/packages/webkit/files/Makefile +++ b/packages/webkit/files/Makefile @@ -7,16 +7,23 @@ all: debug d development dev develop: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done - + release r deployment dep deploy: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done - + universal u: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done -clean: +64: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done +64u: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +clean: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done diff --git a/packages/webkit/files/Makefile.shared b/packages/webkit/files/Makefile.shared index a036aacc50..096d32e948 100644 --- a/packages/webkit/files/Makefile.shared +++ b/packages/webkit/files/Makefile.shared @@ -15,6 +15,12 @@ release r deployment dep deploy: force universal u: force ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} ) +64: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} ) + +64u: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} ) + clean: ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri index 640fa34174..36404ac803 100644 --- a/packages/webkit/files/WebKit.pri +++ b/packages/webkit/files/WebKit.pri @@ -58,6 +58,11 @@ CONFIG(release) { DEFINES += NDEBUG } +gtk-port:CONFIG(debug) { + DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED +# maybe useful for debugging DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE +} + BASE_DIR = $$PWD qt-port:INCLUDEPATH += \ $$PWD/WebKit/qt/Api diff --git a/packages/webkit/files/autogen.sh b/packages/webkit/files/autogen.sh index b7f7d37b2f..1c0fc61156 100644 --- a/packages/webkit/files/autogen.sh +++ b/packages/webkit/files/autogen.sh @@ -1,8 +1,11 @@ #! /bin/sh +# Allow invocation from a separate build directory; in that case, we change +# to the source directory to run the auto*, then change back before running configure srcdir=`dirname $0` test -z "$srcdir" && srcdir=. +ORIGDIR=`pwd` cd $srcdir DIE=0 @@ -37,4 +40,6 @@ autoheader || exit $? automake --foreign --add-missing || exit $? autoconf || exit $? -./configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? +cd $ORIGDIR || exit 1 + +$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? diff --git a/packages/webkit/files/configure.ac b/packages/webkit/files/configure.ac index 05c25b94a8..404e5a0d6a 100644 --- a/packages/webkit/files/configure.ac +++ b/packages/webkit/files/configure.ac @@ -9,9 +9,7 @@ AC_CONFIG_SRCDIR([WebCore/config.h]) LIBWEBKITGTK_VERSION=1:0:0 AC_SUBST([LIBWEBKITGTK_VERSION]) -AM_INIT_AUTOMAKE([1.9 foreign tar-ustar subdir-objects]) - -AM_MAINTAINER_MODE +AM_INIT_AUTOMAKE([foreign subdir-objects]) AC_CANONICAL_HOST @@ -35,6 +33,9 @@ case "$host" in *-*-freebsd*) os_freebsd=yes ;; + *-*-darwin*) + os_darwin=yes + ;; esac # If CXXFLAGS and CFLAGS are unset, default to -O2 @@ -53,9 +54,20 @@ AM_PROG_LIBTOOL AC_PROG_INSTALL AM_PROG_CC_STDC AC_PROG_CXX -AC_PROG_CXX_C_O AM_PROG_CC_C_O +# check for -fvisibility=hidden compiler support (GCC >= 4) +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" +AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden]) +AC_COMPILE_IFELSE([char foo;], + [ AC_MSG_RESULT([yes]) + SYMBOL_VISIBILITY="-fvisibility=hidden" SYMBOL_VISIBILITY_INLINES="-fvisibility-inlines-hidden" ], + AC_MSG_RESULT([no])) +CFLAGS="$saved_CFLAGS" +AC_SUBST(SYMBOL_VISIBILITY) +AC_SUBST(SYMBOL_VISIBILITY_INLINES) + AC_PATH_PROG(PERL, perl) if test -z "$PERL"; then AC_MSG_ERROR([You need 'perl' to compile WebKit]) @@ -101,10 +113,12 @@ AC_C_VOLATILE AC_HEADER_STDC AC_HEADER_STDBOOL -# pthread +# pthread (not needed on Windows) +if test "$os_win32" = "no"; then AC_CHECK_HEADERS([pthread.h], AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exist]), AC_MSG_ERROR([pthread support is required to build WebKit])) +fi # libjpeg headers AC_CHECK_HEADERS([jpeglib.h]) @@ -116,75 +130,126 @@ if test "$PKG_CONFIG" = "no"; then fi # check for icu-config +if test "$os_darwin" = "yes"; then +ICU_CPPFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu" +ICU_LIBS="-licucore" +else AC_PATH_PROG(icu_config, icu-config, no) if test "$icu_config" = "no"; then AC_MSG_ERROR([Cannot find icu-config. ICU library is needed.]) fi -ICU_CFLAGS=`$icu_config --cflags` + +# We don't use --cflags as this gives us a lot of things that we don't +# necessarily want, like debugging and optimization flags +# See man (1) icu-config for more info. +ICU_CPPFLAGS=`$icu_config --cppflags` ICU_LIBS=`$icu_config --ldflags` -AC_SUBST([ICU_CFLAGS]) +AC_SUBST([ICU_CPPFLAGS]) AC_SUBST([ICU_LIBS]) +fi # determine the GDK/GTK+ target -AC_MSG_CHECKING([the target for WebKit GTK+]) -AC_ARG_WITH(webkit_target, - AC_HELP_STRING([--with-webkit-target=@<:@x11/win32/quartz/directfb@:>@], +AC_MSG_CHECKING([the target windowing system]) +AC_ARG_WITH(target, + AC_HELP_STRING([--with-target=@<:@x11/win32/quartz/directfb@:>@], [Select webkit target [default=x11]]), - [],[with_webkit_target="x11"]) + [],[with_target="x11"]) -case "$with_webkit_target" in +case "$with_target" in x11|win32|quartz|directfb) ;; *) AC_MSG_ERROR([Invalid target: must be x11, quartz, win32, or directfb.]) ;; esac -AC_MSG_RESULT([$with_webkit_target]) +AC_MSG_RESULT([$with_target]) + +AC_MSG_CHECKING([for Hildon UI extensions]) +AC_ARG_WITH(hildon, + AC_HELP_STRING([--with-hildon], + [Use Hildon UI extensions [default=no]]), + [],[with_hildon="no"]) +AC_MSG_RESULT([$with_hildon]) + +if test "$with_hildon" = "yes"; then + HILDON_CPPFLAGS="-DMAEMO_CHANGES" + PKG_CHECK_MODULES([HILDON], [hildon-1]) + AC_SUBST([HILDON_CPPFLAGS]) + AC_SUBST([HILDON_CFLAGS]) + AC_SUBST([HILDON_LIBS]) +fi + +# determine the http backend +AC_MSG_CHECKING([the HTTP backend to use]) +AC_ARG_WITH(http_backend, + AC_HELP_STRING([--with-http-backend=@<:@curl@:>@], + [Select HTTP backend [default=curl]]), + [],[http_backend="curl"]) + +case "$http_backend" in + curl) ;; + *) AC_MSG_ERROR([Invalid HTTP backend: must be curl.]) ;; +esac + +AC_MSG_RESULT([$http_backend]) # minimum base dependencies +CAIRO_REQUIRED_VERSION=1.4 +FONTCONFIG_REQUIRED_VERSION=2.4 +FREETYPE2_REQUIRED_VERSION=9.0 +LIBXML_REQUIRED_VERSION=2.6 + +# minimum GTK+ base dependencies GLIB_REQUIRED_VERSION=2.0 GOBJECT_REQUIRED_VERSION=2.0 GTHREAD_REQUIRED_VERSION=2.0 PANGO_REQUIRED_VERSION=1.0 -CAIRO_REQUIRED_VERSION=1.2 -FONTCONFIG_REQUIRED_VERSION=2.4 -FREETYPE2_REQUIRED_VERSION=9.0 -LIBCURL_REQUIRED_VERSION=7.15 -LIBXML_REQUIRED_VERSION=2.6 +GTK_REQUIRED_VERSION=2.8 # optional modules -GTK_REQUIRED_VERSION=2.0 +LIBCURL_REQUIRED_VERSION=7.15 LIBXSLT_REQUIRED_VERSION=1.1.7 SQLITE_REQUIRED_VERSION=3.0 GSTREAMER_REQUIRED_VERSION=0.10 GNOME_VFS_REQUIRED_VERSION=2.0 -PKG_CHECK_MODULES([DEPENDENCIES], +PKG_CHECK_MODULES([GLOBALDEPS], [glib-2.0 >= $GLIB_REQUIRED_VERSION gobject-2.0 >= $GOBJECT_REQUIRED_VERSION - gthread-2.0 >= $GTHREAD_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gthread-2.0 >= $GTHREAD_REQUIRED_VERSION]) +AC_SUBST([GLOBALDEPS_CFLAGS]) +AC_SUBST([GLOBALDEPS_LIBS]) + +PKG_CHECK_MODULES([WEBKITDEPS], + [gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION - libcurl >= $LIBCURL_REQUIRED_VERSION cairo >= $CAIRO_REQUIRED_VERSION cairo-ft, fontconfig >= $FONTCONFIG_REQUIRED_VERSION freetype2 >= $FREETYPE2_REQUIRED_VERSION libxml-2.0 >= $LIBXML_REQUIRED_VERSION]) -AC_SUBST([DEPENDENCIES_CFLAGS]) -AC_SUBST([DEPENDENCIES_LIBS]) +AC_SUBST([WEBKITDEPS_CFLAGS]) +AC_SUBST([WEBKITDEPS_LIBS]) # check whether to build with debugging enabled AC_MSG_CHECKING([whether to do a debug build]) AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [turn on debugging [default=no]]), - [enable_debug="yes"],[enable_debug="no"]) + [],[enable_debug="no"]) AC_MSG_RESULT([$enable_debug]) +# check whether to build with cross-document messaging support +AC_MSG_CHECKING([whether to enable HTML5 cross-document messaging support]) +AC_ARG_ENABLE(cross_document_messaging, + AC_HELP_STRING([--enable-cross-document-messaging], + [enable HTML5 cross-document messaging support [default=yes]]), + [],[enable_cross_document_messaging="yes"]) +AC_MSG_RESULT([$enable_cross_document_messaging]) + # check whether to build with database support AC_MSG_CHECKING([whether to enable HTML5 client-side storage support]) AC_ARG_ENABLE(database, AC_HELP_STRING([--enable-database], - [enable HTML5 client-side storage support [default=no]]), + [enable HTML5 client-side storage support [default=yes]]), [],[enable_database="yes"]) AC_MSG_RESULT([$enable_database]) @@ -201,14 +266,14 @@ AC_MSG_CHECKING([whether to enable HTML5 video support]) AC_ARG_ENABLE(video, AC_HELP_STRING([--enable-video], [enable HTML5 video support [default=no]]), - [enable_video="yes"],[enable_video="no"]) + [],[enable_video="no"]) AC_MSG_RESULT([$enable_video]) # check whether to enable XPath support AC_MSG_CHECKING([whether to enable XPath support]) AC_ARG_ENABLE(xpath, AC_HELP_STRING([--enable-xpath], - [enable support for XPath [default=no]]), + [enable support for XPath [default=yes]]), [],[enable_xpath="yes"]) AC_MSG_RESULT([$enable_xpath]) @@ -216,10 +281,29 @@ AC_MSG_RESULT([$enable_xpath]) AC_MSG_CHECKING([whether to enable XSLT support]) AC_ARG_ENABLE(xslt, AC_HELP_STRING([--enable-xslt], - [enable support for XSLT [default=no]]), + [enable support for XSLT [default=yes]]), [],[enable_xslt="yes"]) AC_MSG_RESULT([$enable_xslt]) +# check whether to enable SVG experimental features +# Enable all SVG if it is +AC_MSG_CHECKING([whether to enable SVG experimental features]) +AC_ARG_ENABLE(svg_experimental, + AC_HELP_STRING([--enable-svg-experimental], + [enable support for SVG experimental features [default=no]]), + [],[enable_svg_experimental="no"]) +AC_MSG_RESULT([$enable_svg_experimental]) + +if test "$enable_svg_experimental" = "yes"; then + enable_svg=yes + enable_svg_animation=yes +# enable_svg_filters=yes + enable_svg_fonts=yes + enable_svg_foreign_object=yes + enable_svg_as_image=yes + enable_svg_use_element=yes +fi + # check whether to enable SVG support AC_MSG_CHECKING([whether to enable SVG support]) AC_ARG_ENABLE(svg, @@ -229,10 +313,10 @@ AC_ARG_ENABLE(svg, AC_MSG_RESULT([$enable_svg]) # check whether to enable support for SVG animation -AC_MSG_CHECKING([whether to enable support for SVG animataion]) +AC_MSG_CHECKING([whether to enable support for SVG animation]) AC_ARG_ENABLE(svg_animation, AC_HELP_STRING([--enable-svg-animation], - [enable support for SVG animation feature (experimental) [default=no]]), + [enable support for SVG animation (experimental) [default=no]]), [],[enable_svg_animation="no"]) AC_MSG_RESULT([$enable_svg_animation]) @@ -252,6 +336,14 @@ AC_ARG_ENABLE(svg_fonts, [],[enable_svg_fonts="no"]) AC_MSG_RESULT([$enable_svg_fonts]) +# check whether to enable foreign objects support for SVG +AC_MSG_CHECKING([whether to enable support for SVG foreign objects]) +AC_ARG_ENABLE(svg_foreign_object, + AC_HELP_STRING([--enable-svg-foreign-object], + [enable support for SVG foreign objects (experimental) [default=no]]), + [],[enable_svg_foreign_object="no"]) +AC_MSG_RESULT([$enable_svg_foreign_object]) + # check whether to enable SVG As Image support AC_MSG_CHECKING([whether to enable SVG as Image support]) AC_ARG_ENABLE(svg_as_image, @@ -276,19 +368,35 @@ AC_ARG_ENABLE(coverage, [],[enable_coverage="no"]) AC_MSG_RESULT([$enable_coverage]) +# check whether to enable FastMalloc +AC_MSG_CHECKING([whether to enable optimized memory allocator]) +AC_ARG_ENABLE(fast_malloc, + AC_HELP_STRING([--enable-fast-malloc], + [enable optimized memory allocator default=yes, default=no for debug builds]), + [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi]) +AC_MSG_RESULT([$enable_fast_malloc]) + # Add '-g' flag to gcc if it's debug build if test "$enable_debug" = "yes"; then CXXFLAGS="$CXXFLAGS -g" CFLAGS="$CFLAGS -g" fi +# check if curl is available +if test "$http_backend" = "curl"; then + PKG_CHECK_MODULES([LIBCURL], + [libcurl >= $LIBCURL_REQUIRED_VERSION]) + AC_SUBST([LIBCURL_CFLAGS]) + AC_SUBST([LIBCURL_LIBS]) +fi + # check if sqlite 3 is available if test "$enable_icon_database" = "yes" || test "$enable_database" = "yes"; then PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION]) AC_SUBST([SQLITE3_CFLAGS]) AC_SUBST([SQLITE3_LIBS]) fi - + # check if libxslt is available if test "$enable_xslt" = "yes"; then PKG_CHECK_MODULES([LIBXSLT],[libxslt >= $LIBXSLT_REQUIRED_VERSION]) @@ -316,16 +424,17 @@ if test "$enable_coverage" = "yes"; then fi # check for SVG features, enabling SVG if necessary -if test "$enable_svg" = "no" && (\ - test "$enable_svg_animation" = "yes" || \ +if test "$enable_svg_animation" = "yes" || \ test "$enable_svg_filters" = "yes" || \ test "$enable_svg_fonts" = "yes" || \ + test "$enable_svg_foreign_object" = "yes" || \ test "$enable_svg_as_image" = "yes" || \ - test "$enable_svg_use_element" = "yes"); then - - AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support]) - enable_svg = yes - svg_flags = yes + test "$enable_svg_use_element" = "yes"; then + svg_flags=yes + if test "$enable_svg" = "no"; then + AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support]) + enable_svg=yes + fi fi # OS conditionals @@ -335,13 +444,17 @@ AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"]) AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"]) # target conditionals -AM_CONDITIONAL([TARGET_X11], [test "$with_webkit_target" = "x11"]) -AM_CONDITIONAL([TARGET_WIN32], [test "$with_webkit_target" = "win32"]) -AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_webkit_target" = "quartz"]) -AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_webkit_target" = "directfb"]) +AM_CONDITIONAL([TARGET_X11], [test "$with_target" = "x11"]) +AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"]) +AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"]) +AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"]) + +# HTTP backend conditionals +AM_CONDITIONAL([USE_CURL], [test "$http_backend" = "curl"]) # WebKit feature conditionals AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) +AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "yes"]) AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"]) AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) @@ -351,14 +464,16 @@ AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_FILTERS],[test "$enable_svg_filters" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"]) AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"]) +AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"]) AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"]) AC_CONFIG_FILES([ GNUmakefile -WebKit/gtk/WebKitGtk.pc:WebKit/gtk/WebKitGtk.pc.in +WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in ] ) @@ -367,9 +482,13 @@ AC_OUTPUT echo " WebKit was configured with the following options: - Target : $with_webkit_target - Enable debug : $enable_debug +Build configuration: + Enable debugging (slow) : $enable_debug Code coverage support : $enable_coverage + HTTP backend : $http_backend + Optimized memory allocator : $enable_fast_malloc +Features: + HTML5 cross-document messaging : $enable_cross_document_messaging HTML5 client-side storage support : $enable_database HTML5 video element support : $enable_video Icon database support : $enable_icon_database @@ -377,8 +496,12 @@ WebKit was configured with the following options: SVG animation support : $enable_svg_animation SVG filters support : $enable_svg_filters SVG fonts support : $enable_svg_fonts + SVG foreign object support : $enable_svg_foreign_object SVG as image support : $enable_svg_as_image SVG use element support : $enable_svg_use_element XPATH support : $enable_xpath XSLT support : $enable_xslt +GTK+ configuration: + GDK target : $with_target + Hildon UI extensions : $with_hildon " diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 6a99a96001..4fe9cb8a00 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -1,32 +1,59 @@ -DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+" +DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3" -# If you activate HTML5 media support (ENABLE_VIDEO=1) you'll need: -# DEPENDS += " gstreamer gst-plugins-base gnome-vfs " +SRCREV_FORMAT = "webcore-rwebkit" +# Yes, this is wrong... +PV = "0.1+svnr${SRCREV}" +PR = "r4" -WEBKIT_PORT = "gtk-port" -WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt" - -FILES_webkit-gtklauncher = "${bindir}/GtkLauncher" -FILES_webkit-gtklauncher-dbg += "${bindir}/.debug/GtkLauncher" - -require webkit.inc +SRC_URI = "\ + svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http;name=webcore \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \ + file://Makefile \ + file://Makefile.shared \ + file://autogen.sh \ + file://configure.ac \ + file://GNUmakefile.am \ + " + +S = "${WORKDIR}/" + +inherit autotools pkgconfig + +EXTRA_OECONF = "\ + --enable-debug=no \ + --enable-svg \ + --enable-icon-database=yes \ + " + +do_compile_prepend() { + mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ + mkdir -p ${S}/Programs/ + cd ${S}/JavaScriptCore/pcre + if test -e dftables.c + then + ${BUILD_CC} dftables.c -o dftables -I. -I../wtf + elif test -e dftables.cpp + then + ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf + fi + cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ + cp dftables ${S}/Programs/ + cd ${S} +} -SRC_URI += "file://autogen.sh \ - file://configure.ac \ - file://GNUmakefile.am \ - " +do_stage() { + autotools_stage_all +} -PR = "r4" +PACKAGES =+ "${PN}launcher-dbg ${PN}launcher libjavascriptcore" +FILES_${PN}launcher = "${bindir}/GtkLauncher" +FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" +FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*" -do_install() { - install -d ${D}${bindir} - install -d ${D}${libdir} - install -d ${D}${libdir}/pkgconfig - install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GtkLauncher/GtkLauncher ${D}${bindir} - cd ${S}/WebKitBuilds/Debug - PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro - oe_runmake install -} diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc index 81c2d91bf8..087115de09 100644 --- a/packages/webkit/webkit.inc +++ b/packages/webkit/webkit.inc @@ -1,3 +1,4 @@ +DESCRIPTION = "WebKit browser engine, GTK+ edition" DEPENDS += "flex-native gperf-native perl-native sqlite3" SRCREV_FORMAT = "webcore-rwebkit" diff --git a/packages/xoo/xoo_svn.bb b/packages/xoo/xoo_svn.bb index 231122194b..e9cd7ee9b7 100644 --- a/packages/xoo/xoo_svn.bb +++ b/packages/xoo/xoo_svn.bb @@ -3,7 +3,7 @@ It is intended for embedded developers that want to simulate a target device \ (with an accurate display size, working hardware buttons, etc) on a desktop machine." HOMEPAGE = "http://projects.o-hand.com/xoo" LICENSE = "GPL" -DEPENDS = "virtual/libx11 libxtst gtk+ libglade" +DEPENDS = "virtual/libx11 libxtst gtk+ libglade expat" PV = "0.7+svnr${SRCREV}" PR = "r1" diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb new file mode 100644 index 0000000000..a30a37c893 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.22.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" +PR = "r0" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh " + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} |