diff options
Diffstat (limited to 'meta/recipes-sato')
28 files changed, 4660 insertions, 0 deletions
diff --git a/meta/recipes-sato/claws-mail/claws-mail.inc b/meta/recipes-sato/claws-mail/claws-mail.inc new file mode 100644 index 0000000000..04401df2f5 --- /dev/null +++ b/meta/recipes-sato/claws-mail/claws-mail.inc @@ -0,0 +1,57 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent" +#DEPENDS = "gtk+ gpgme libetpan libgnomeprint aspell openssl" +DEPENDS = "gtk+ libetpan openssl libowl" +LICENSE = "GPL" +PR = "r6" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2 \ + file://desktop.patch;patch=1 \ + file://streamline-ui.patch;patch=1 \ + file://owl-window-menu.patch;patch=1 \ + file://fix-build.patch;patch=1 \ + " + +FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" + +#EXTRA_OECONF = "--disable-aspell-test \ +# --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${prefix} \ +# --enable-aspell" + +EXTRA_OECONF = "--disable-aspell-test \ + --disable-aspell \ + --disable-manual \ +# --disable-openssl \ + --disable-crash-dialog \ + --disable-jpilot \ + --disable-trayicon-plugin \ + --disable-spamassassin-plugin \ + --disable-bogofilter-plugin \ + --disable-pgpcore-plugin \ + --disable-pgpmime-plugin \ + --disable-pgpinline-plugin \ + --disable-dillo-viewer-plugin \ + --disable-clamav-plugin \ +# --disable-libetpan \ + --disable-gnomeprint \ + --disable-valgrind \ + --disable-static \ + " + +CFLAGS += "-D_GNU_SOURCE" + +inherit autotools pkgconfig gettext + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 claws-mail.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps + install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/ +} + +#python populate_packages_prepend () { +# abiword_libdir = bb.data.expand('${libdir}/claws-mail/plugins', d) +# +# do_split_packages(d, abiword_libdir, '^(.*)\.so$', 'claws-mail-plugin-%s', 'Claws plugin for %s', extra_depends='') +#} diff --git a/meta/recipes-sato/claws-mail/claws-mail_2.9.1.bb b/meta/recipes-sato/claws-mail/claws-mail_2.9.1.bb new file mode 100644 index 0000000000..f8a8396b95 --- /dev/null +++ b/meta/recipes-sato/claws-mail/claws-mail_2.9.1.bb @@ -0,0 +1 @@ +require claws-mail.inc diff --git a/meta/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb b/meta/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb new file mode 100644 index 0000000000..82918173e4 --- /dev/null +++ b/meta/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb @@ -0,0 +1,14 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent plugins" +DEPENDS = "claws-mail gtkhtml2 curl" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-${PV}.tar.gz" + +inherit autotools pkgconfig gettext + +S = "${WORKDIR}/gtkhtml2_viewer-${PV}" + +FILES_${PN} = "${libdir}/claws-mail/plugins/*.so" + diff --git a/meta/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb b/meta/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb new file mode 100644 index 0000000000..4351d1e5de --- /dev/null +++ b/meta/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb @@ -0,0 +1,14 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent plugins" +DEPENDS = "claws-mail db" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://www.claws-mail.org/downloads/plugins/maildir-${PV}.tar.gz" + +inherit autotools pkgconfig + +S = "${WORKDIR}/maildir-${PV}" + +FILES_${PN} = "${libdir}/claws-mail/plugins/*.so" + diff --git a/meta/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb b/meta/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb new file mode 100644 index 0000000000..fe7041494f --- /dev/null +++ b/meta/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb @@ -0,0 +1,14 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent plugins" +DEPENDS = "claws-mail" +LICENSE = "GPL" +PR = "r2" + +SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz" + +inherit autotools pkgconfig + +S = "${WORKDIR}/mailmbox-${PV}" + +FILES_${PN} = "${libdir}/claws-mail/plugins/*.so" +FILES_${PN}-dbg = "${libdir}/claws-mail/plugins/.debug" diff --git a/meta/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb b/meta/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb new file mode 100644 index 0000000000..de0705c7fd --- /dev/null +++ b/meta/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb @@ -0,0 +1,14 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent plugins" +DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz" + +inherit autotools pkgconfig gettext + +S = "${WORKDIR}/rssyl-${PV}" + +FILES_${PN} = "${libdir}/claws-mail/plugins/*.so" + diff --git a/meta/recipes-sato/claws-mail/files/desktop.patch b/meta/recipes-sato/claws-mail/files/desktop.patch new file mode 100644 index 0000000000..c5ed7a9c7d --- /dev/null +++ b/meta/recipes-sato/claws-mail/files/desktop.patch @@ -0,0 +1,19 @@ +Index: claws-mail-2.9.1/claws-mail.desktop +=================================================================== +--- claws-mail-2.9.1.orig/claws-mail.desktop 2007-04-24 17:40:20.000000000 +0100 ++++ claws-mail-2.9.1/claws-mail.desktop 2007-04-25 07:08:36.000000000 +0100 +@@ -1,11 +1,11 @@ + [Desktop Entry] + Encoding=UTF-8 +-Name=Claws Mail ++Name=Mail + Exec=claws-mail + Icon=claws-mail +-Info="Claws Mail" ++Info=Email Application + Categories=GTK;Network;Email; +-Comment="Gtk+ based Mail Client" ++Comment=Email Application + Terminal=false + Type=Application + StartupNotify=true diff --git a/meta/recipes-sato/claws-mail/files/fix-build.patch b/meta/recipes-sato/claws-mail/files/fix-build.patch new file mode 100644 index 0000000000..2f30899fe1 --- /dev/null +++ b/meta/recipes-sato/claws-mail/files/fix-build.patch @@ -0,0 +1,24 @@ +Remove duplicate file entries as this breaks install with new Automake + +JL 19/03/10 + +Index: claws-mail-2.9.1/src/gtk/Makefile.am +=================================================================== +--- claws-mail-2.9.1.orig/src/gtk/Makefile.am 2007-03-22 07:52:47.000000000 +0000 ++++ claws-mail-2.9.1/src/gtk/Makefile.am 2010-03-19 14:54:06.565828281 +0000 +@@ -44,7 +44,6 @@ + filesel.h \ + foldersort.h \ + gtkaspell.h \ +- gtksctree.h \ + gtkshruler.h \ + gtksctree.h \ + gtksourceprintjob.h \ +@@ -57,7 +56,6 @@ + menu.h \ + pluginwindow.h \ + prefswindow.h \ +- gtkvscrollbutton.h \ + progressdialog.h \ + quicksearch.h \ + sslcertwindow.h \ diff --git a/meta/recipes-sato/claws-mail/files/owl-window-menu.patch b/meta/recipes-sato/claws-mail/files/owl-window-menu.patch new file mode 100644 index 0000000000..54c61668a9 --- /dev/null +++ b/meta/recipes-sato/claws-mail/files/owl-window-menu.patch @@ -0,0 +1,1009 @@ +Index: claws-mail-2.9.1/src/addressbook.c +=================================================================== +--- claws-mail-2.9.1.orig/src/addressbook.c 2007-04-25 10:18:13.000000000 +0100 ++++ claws-mail-2.9.1/src/addressbook.c 2007-04-25 10:30:23.000000000 +0100 +@@ -941,7 +941,6 @@ + sizeof(addressbook_entries[0]); + menubar = menubar_create(window, addressbook_entries, n_entries, + "<AddressBook>", NULL); +- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); + menu_factory = gtk_item_factory_from_widget(menubar); + + vbox2 = gtk_vbox_new(FALSE, BORDER_WIDTH); +Index: claws-mail-2.9.1/src/gtk/menu.c +=================================================================== +--- claws-mail-2.9.1.orig/src/gtk/menu.c 2007-04-25 10:18:13.000000000 +0100 ++++ claws-mail-2.9.1/src/gtk/menu.c 2007-04-25 10:30:23.000000000 +0100 +@@ -35,10 +35,7 @@ + #include "menu.h" + #include "utils.h" + +-#ifdef MAEMO +-#include <hildon-widgets/hildon-program.h> +-#include <gtk/gtkmain.h> +-#endif ++#include <libowl/owlwindowmenu.h> + + static void connect_accel_change_signals(GtkWidget* widget, GtkWidget *wid2) ; + +@@ -49,20 +46,14 @@ + GtkItemFactory *factory; + GtkWidget *menubar; + +-#ifdef MAEMO + factory = gtk_item_factory_new(GTK_TYPE_MENU, path, NULL); +-#else +- factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, path, NULL); +-#endif + gtk_item_factory_set_translate_func(factory, menu_translate, + NULL, NULL); + gtk_item_factory_create_items(factory, n_entries, entries, data); + gtk_window_add_accel_group (GTK_WINDOW (window), factory->accel_group); + + menubar = gtk_item_factory_get_widget(factory, path); +-#ifdef MAEMO +- hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar)); +-#endif ++ owl_set_window_menu(GTK_WINDOW(window), GTK_MENU(menubar)); + return menubar; + } + +Index: claws-mail-2.9.1/src/mainwindow.c +=================================================================== +--- claws-mail-2.9.1.orig/src/mainwindow.c 2007-04-25 10:26:40.000000000 +0100 ++++ claws-mail-2.9.1/src/mainwindow.c 2007-04-25 10:30:23.000000000 +0100 +@@ -1094,8 +1094,6 @@ + n_menu_entries = sizeof(mainwin_entries) / sizeof(mainwin_entries[0]); + menubar = menubar_create(window, mainwin_entries, + n_menu_entries, "<Main>", mainwin); +- gtk_widget_show(menubar); +- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); + ifactory = gtk_item_factory_from_widget(menubar); + + /* gtk_widget_show(gtk_item_factory_get_item(ifactory,"/Message/Mailing-List")); +Index: claws-mail-2.9.1/src/messageview.c +=================================================================== +--- claws-mail-2.9.1.orig/src/messageview.c 2007-04-25 10:18:13.000000000 +0100 ++++ claws-mail-2.9.1/src/messageview.c 2007-04-25 10:30:23.000000000 +0100 +@@ -414,8 +414,6 @@ + n_menu_entries = sizeof(msgview_entries) / sizeof(msgview_entries[0]); + menubar = menubar_create(window, msgview_entries, + n_menu_entries, "<MessageView>", msgview); +- gtk_widget_show(menubar); +- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); + + if (prefs_common.toolbar_detachable) { + handlebox = gtk_handle_box_new(); +@@ -478,6 +476,7 @@ + g_signal_connect(G_OBJECT(window), "key_press_event", + G_CALLBACK(key_pressed), msgview); + #endif ++ gtk_widget_realize(window); + messageview_add_toolbar(msgview, window); + + if (show) { +Index: claws-mail-2.9.1/configure.ac +=================================================================== +--- claws-mail-2.9.1.orig/configure.ac 2007-04-25 10:18:13.000000000 +0100 ++++ claws-mail-2.9.1/configure.ac 2007-04-25 10:30:23.000000000 +0100 +@@ -406,6 +406,11 @@ + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + ++OWL_CFLAGS="" ++OWL_LIBS="-lowl" ++AC_SUBST(OWL_CFLAGS) ++AC_SUBST(OWL_LIBS) ++ + dnl GNU/Aspell is used for spell checking + AC_ARG_ENABLE(aspell, + [ --disable-aspell Disable GNU/aspell support [default=yes]], +Index: claws-mail-2.9.1/src/Makefile.am +=================================================================== +--- claws-mail-2.9.1.orig/src/Makefile.am 2007-04-25 10:18:13.000000000 +0100 ++++ claws-mail-2.9.1/src/Makefile.am 2007-04-25 10:30:23.000000000 +0100 +@@ -471,7 +471,8 @@ + $(LIBICONV) \ + $(STARTUP_NOTIFICATION_LIBS) \ + $(LIBETPAN_LIBS) \ +- $(MAEMO_LIBS) ++ $(MAEMO_LIBS) \ ++ $(OWL_LIBS) + + AM_CPPFLAGS = \ + -DG_LOG_DOMAIN=\"Claws-Mail\" \ +@@ -489,6 +490,7 @@ + $(LIBETPAN_CPPFLAGS) \ + $(STARTUP_NOTIFICATION_CFLAGS) \ + $(MAEMO_CFLAGS) \ ++ $(OWL_CFLAGS) \ + -Wno-unused-function + + #no-unused-function is there because of bison stuff +Index: claws-mail-2.9.1/configure +=================================================================== +--- claws-mail-2.9.1.orig/configure 2007-04-25 10:18:13.000000000 +0100 ++++ claws-mail-2.9.1/configure 2007-04-25 10:30:23.000000000 +0100 +@@ -769,7 +769,6 @@ + # include <unistd.h> + #endif" + +-gt_needs= + ac_subst_vars='SHELL + PATH_SEPARATOR + PACKAGE_NAME +@@ -942,6 +941,8 @@ + PASSCRYPT_KEY + GTK_CFLAGS + GTK_LIBS ++OWL_LIBS ++OWL_CFLAGS + ASPELL + ASPELL_CFLAGS + ASPELL_LIBS +@@ -2063,7 +2064,6 @@ + >$cache_file + fi + +-gt_needs="$gt_needs " + # Check that the precious variables saved in the cache have kept the same + # value. + ac_cache_corrupted=false +@@ -3001,9 +3001,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$GNOME2_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- ac_enable_gnome2=no ++ ac_enable_gnome2=no + elif test $pkg_failed = untried; then + ac_enable_gnome2=no + else +@@ -4147,14 +4145,12 @@ + + + +- +- { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 +-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; } +-if test "${ac_cv_lib_cposix_strerror+set}" = set; then ++{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 ++echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } ++if test "${ac_cv_search_strerror+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lcposix $LIBS" ++ ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -4177,7 +4173,14 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext ++for ac_lib in '' cposix; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +@@ -4195,25 +4198,35 @@ + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then +- ac_cv_lib_cposix_strerror=yes ++ ac_cv_search_strerror=$ac_res + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_cposix_strerror=no ++ + fi + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS ++ conftest$ac_exeext ++ if test "${ac_cv_search_strerror+set}" = set; then ++ break ++fi ++done ++if test "${ac_cv_search_strerror+set}" = set; then ++ : ++else ++ ac_cv_search_strerror=no + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 +-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; } +-if test $ac_cv_lib_cposix_strerror = yes; then +- LIBS="$LIBS -lcposix" ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 ++echo "${ECHO_T}$ac_cv_search_strerror" >&6; } ++ac_res=$ac_cv_search_strerror ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +- ++fi + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -5769,7 +5782,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5772 "configure"' > conftest.$ac_ext ++ echo '#line 5785 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -8555,11 +8568,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8558: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8571: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8562: \$? = $ac_status" >&5 ++ echo "$as_me:8575: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8823,11 +8836,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8826: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8839: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8830: \$? = $ac_status" >&5 ++ echo "$as_me:8843: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8927,11 +8940,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8930: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8943: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8934: \$? = $ac_status" >&5 ++ echo "$as_me:8947: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -11224,7 +11237,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 11227 "configure" ++#line 11240 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11324,7 +11337,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 11327 "configure" ++#line 11340 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -13660,11 +13673,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13663: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13676: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13667: \$? = $ac_status" >&5 ++ echo "$as_me:13680: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -13764,11 +13777,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13767: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13780: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13771: \$? = $ac_status" >&5 ++ echo "$as_me:13784: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15325,11 +15338,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15328: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15341: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15332: \$? = $ac_status" >&5 ++ echo "$as_me:15345: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -15429,11 +15442,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15432: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15445: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15436: \$? = $ac_status" >&5 ++ echo "$as_me:15449: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -17616,11 +17629,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17619: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17632: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17623: \$? = $ac_status" >&5 ++ echo "$as_me:17636: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17884,11 +17897,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17887: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17900: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17891: \$? = $ac_status" >&5 ++ echo "$as_me:17904: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17988,11 +18001,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17991: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18004: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17995: \$? = $ac_status" >&5 ++ echo "$as_me:18008: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -20960,16 +20973,9 @@ + found_so= + found_a= + if test $use_additional = yes; then +- if test -n "$shlibext" \ +- && { test -f "$additional_libdir/lib$name.$shlibext" \ +- || { test "$shlibext" = dll \ +- && test -f "$additional_libdir/lib$name.dll.a"; }; }; then ++ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" +- if test -f "$additional_libdir/lib$name.$shlibext"; then +- found_so="$additional_libdir/lib$name.$shlibext" +- else +- found_so="$additional_libdir/lib$name.dll.a" +- fi ++ found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi +@@ -20997,16 +21003,9 @@ + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` +- if test -n "$shlibext" \ +- && { test -f "$dir/lib$name.$shlibext" \ +- || { test "$shlibext" = dll \ +- && test -f "$dir/lib$name.dll.a"; }; }; then ++ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" +- if test -f "$dir/lib$name.$shlibext"; then +- found_so="$dir/lib$name.$shlibext" +- else +- found_so="$dir/lib$name.dll.a" +- fi ++ found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi +@@ -21927,13 +21926,6 @@ + + + +- +- +- +- +- +- +- + { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5 + echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; } + if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then +@@ -22070,37 +22062,17 @@ + LTLIBINTL= + POSUB= + +- case " $gt_needs " in +- *" need-formatstring-macros "*) gt_api_version=3 ;; +- *" need-ngettext "*) gt_api_version=2 ;; +- *) gt_api_version=1 ;; +- esac +- gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" +- gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" +- + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + + +- if test $gt_api_version -ge 3; then +- gt_revision_test_code=' +-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +-#endif +-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +-' +- else +- gt_revision_test_code= +- fi +- if test $gt_api_version -ge 2; then +- gt_expression_test_code=' + * ngettext ("", "", 0)' +- else +- gt_expression_test_code= +- fi ++ ++ ++ + + { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 + echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; } +-if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then ++if test "${gt_cv_func_gnugettext1_libc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -22110,14 +22082,13 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <libintl.h> +-$gt_revision_test_code + extern int _nl_msg_cat_cntr; + extern int *_nl_domain_bindings; + int + main () + { + bindtextdomain ("", ""); +-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings ++return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + ; + return 0; + } +@@ -22140,22 +22111,21 @@ + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then +- eval "$gt_func_gnugettext_libc=yes" ++ gt_cv_func_gnugettext1_libc=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$gt_func_gnugettext_libc=no" ++ gt_cv_func_gnugettext1_libc=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval echo '${'$gt_func_gnugettext_libc'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } ++{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 ++echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; } + +- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then ++ if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + + + +@@ -22398,16 +22368,9 @@ + found_so= + found_a= + if test $use_additional = yes; then +- if test -n "$shlibext" \ +- && { test -f "$additional_libdir/lib$name.$shlibext" \ +- || { test "$shlibext" = dll \ +- && test -f "$additional_libdir/lib$name.dll.a"; }; }; then ++ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" +- if test -f "$additional_libdir/lib$name.$shlibext"; then +- found_so="$additional_libdir/lib$name.$shlibext" +- else +- found_so="$additional_libdir/lib$name.dll.a" +- fi ++ found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi +@@ -22435,16 +22398,9 @@ + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` +- if test -n "$shlibext" \ +- && { test -f "$dir/lib$name.$shlibext" \ +- || { test "$shlibext" = dll \ +- && test -f "$dir/lib$name.dll.a"; }; }; then ++ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" +- if test -f "$dir/lib$name.$shlibext"; then +- found_so="$dir/lib$name.$shlibext" +- else +- found_so="$dir/lib$name.dll.a" +- fi ++ found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi +@@ -22712,7 +22668,7 @@ + + { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 + echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; } +-if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then ++if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + gt_save_CPPFLAGS="$CPPFLAGS" +@@ -22726,7 +22682,6 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <libintl.h> +-$gt_revision_test_code + extern int _nl_msg_cat_cntr; + extern + #ifdef __cplusplus +@@ -22737,7 +22692,7 @@ + main () + { + bindtextdomain ("", ""); +-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") ++return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ; + return 0; + } +@@ -22760,17 +22715,17 @@ + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then +- eval "$gt_func_gnugettext_libintl=yes" ++ gt_cv_func_gnugettext1_libintl=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$gt_func_gnugettext_libintl=no" ++ gt_cv_func_gnugettext1_libintl=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then ++ if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -22779,7 +22734,6 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <libintl.h> +-$gt_revision_test_code + extern int _nl_msg_cat_cntr; + extern + #ifdef __cplusplus +@@ -22790,7 +22744,7 @@ + main () + { + bindtextdomain ("", ""); +-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") ++return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ; + return 0; + } +@@ -22815,7 +22769,7 @@ + $as_test_x conftest$ac_exeext; then + LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" +- eval "$gt_func_gnugettext_libintl=yes" ++ gt_cv_func_gnugettext1_libintl=yes + + else + echo "$as_me: failed program was:" >&5 +@@ -22830,13 +22784,12 @@ + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS" + fi +-ac_res=`eval echo '${'$gt_func_gnugettext_libintl'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } ++{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 ++echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; } + fi + +- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ +- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ ++ if test "$gt_cv_func_gnugettext1_libc" = "yes" \ ++ || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes +@@ -22876,7 +22829,7 @@ + { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5 + echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; } + if test "$gt_use_preinstalled_gnugettext" = "yes"; then +- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then ++ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + gt_source="external libintl" + else + gt_source="libc" +@@ -22891,7 +22844,7 @@ + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then +- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then ++ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + { echo "$as_me:$LINENO: checking how to link with libintl" >&5 + echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: $LIBINTL" >&5 +@@ -26592,12 +26545,8 @@ + esac + done + +- +- +-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +@@ -26623,6 +26572,7 @@ + done + IFS=$as_save_IFS + ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; + esac + fi +@@ -26636,88 +26586,19 @@ + fi + + +-fi +-if test -z "$ac_cv_path_PKG_CONFIG"; then +- ac_pt_PKG_CONFIG=$PKG_CONFIG +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $ac_pt_PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +-if test -n "$ac_pt_PKG_CONFIG"; then +- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- if test "x$ac_pt_PKG_CONFIG" = x; then +- PKG_CONFIG="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} +-ac_tool_warned=yes ;; +-esac +- PKG_CONFIG=$ac_pt_PKG_CONFIG +- fi +-else +- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +-fi +- +-fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=0.7 +- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- PKG_CONFIG="" +- fi +- +-fi + + no_glib="" + +- if test "x$PKG_CONFIG" = x ; then ++ if test x$PKG_CONFIG != xno ; then ++ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then ++ : ++ else ++ echo *** pkg-config too old; version 0.7 or better required. ++ no_glib=yes ++ PKG_CONFIG=no ++ fi ++ else + no_glib=yes +- PKG_CONFIG=no + fi + + min_glib_version=2.6.0 +@@ -27223,9 +27104,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$OPENSSL_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- ac_cv_enable_openssl=no ++ ac_cv_enable_openssl=no + elif test $pkg_failed = untried; then + ac_cv_enable_openssl=no + else +@@ -27793,6 +27672,11 @@ + + + ++OWL_LIBS="-lowl" ++OLS_CFLAGS="" ++ ++ ++ + # Check whether --enable-aspell was given. + if test "${enable_aspell+set}" = set; then + enableval=$enable_aspell; ac_cv_enable_aspell=$enableval +@@ -28242,9 +28126,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$MAEMO_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- ac_cv_enable_maemo=no ++ ac_cv_enable_maemo=no + elif test $pkg_failed = untried; then + ac_cv_enable_maemo=no + else +@@ -29796,8 +29678,6 @@ + # Put the nasty error message in config.log where it belongs + echo "$STARTUP_NOTIFICATION_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } + + echo "Building without libstartup-notification" + enable_startup_notification=no +@@ -31300,9 +31180,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$CLAMAV_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- ac_cv_enable_clamav_plugin=no ++ ac_cv_enable_clamav_plugin=no + elif test $pkg_failed = untried; then + ac_cv_enable_clamav_plugin=no + else +@@ -31684,9 +31562,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$GNOMEPRINT_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- ac_cv_enable_gnomeprint=no ++ ac_cv_enable_gnomeprint=no + elif test $pkg_failed = untried; then + ac_cv_enable_gnomeprint=no + else +@@ -31794,9 +31670,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$VALGRIND_PKG_ERRORS" >&5 + +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- ac_cv_enable_valgrind=no ++ ac_cv_enable_valgrind=no + elif test $pkg_failed = untried; then + ac_cv_enable_valgrind=no + else +@@ -32884,6 +32758,8 @@ + PASSCRYPT_KEY!$PASSCRYPT_KEY$ac_delim + GTK_CFLAGS!$GTK_CFLAGS$ac_delim + GTK_LIBS!$GTK_LIBS$ac_delim ++OWL_LIBS!$OWL_LIBS$ac_delim ++OWL_CFLAGS!$OWL_CFLAGS$ac_delim + ASPELL!$ASPELL$ac_delim + ASPELL_CFLAGS!$ASPELL_CFLAGS$ac_delim + ASPELL_LIBS!$ASPELL_LIBS$ac_delim +@@ -32904,8 +32780,6 @@ + BUILD_SPAMASSASSIN_PLUGIN_FALSE!$BUILD_SPAMASSASSIN_PLUGIN_FALSE$ac_delim + BUILD_BOGOFILTER_PLUGIN_TRUE!$BUILD_BOGOFILTER_PLUGIN_TRUE$ac_delim + BUILD_BOGOFILTER_PLUGIN_FALSE!$BUILD_BOGOFILTER_PLUGIN_FALSE$ac_delim +-GPGME_CONFIG!$GPGME_CONFIG$ac_delim +-GPGME_CFLAGS!$GPGME_CFLAGS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -32947,6 +32821,8 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++GPGME_CONFIG!$GPGME_CONFIG$ac_delim ++GPGME_CFLAGS!$GPGME_CFLAGS$ac_delim + GPGME_LIBS!$GPGME_LIBS$ac_delim + BUILD_PGPCORE_PLUGIN_TRUE!$BUILD_PGPCORE_PLUGIN_TRUE$ac_delim + BUILD_PGPCORE_PLUGIN_FALSE!$BUILD_PGPCORE_PLUGIN_FALSE$ac_delim +@@ -32979,7 +32855,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +Index: claws-mail-2.9.1/src/Makefile.in +=================================================================== +--- claws-mail-2.9.1.orig/src/Makefile.in 2007-04-25 10:18:13.000000000 +0100 ++++ claws-mail-2.9.1/src/Makefile.in 2007-04-25 10:30:23.000000000 +0100 +@@ -45,8 +45,7 @@ + $(top_srcdir)/m4/aspell.m4 $(top_srcdir)/m4/check-type.m4 \ + $(top_srcdir)/m4/gnupg-check-typedef.m4 \ + $(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \ +- $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +@@ -122,7 +121,7 @@ + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \ +- $(am__DEPENDENCIES_2) ++ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) + claws_mail_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(claws_mail_LDFLAGS) $(LDFLAGS) -o $@ +@@ -272,6 +271,8 @@ + OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ++OWL_CFLAGS = @OWL_CFLAGS@ ++OWL_LIBS = @OWL_LIBS@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -815,7 +816,8 @@ + $(LIBICONV) \ + $(STARTUP_NOTIFICATION_LIBS) \ + $(LIBETPAN_LIBS) \ +- $(MAEMO_LIBS) ++ $(MAEMO_LIBS) \ ++ $(OWL_LIBS) + + AM_CPPFLAGS = \ + -DG_LOG_DOMAIN=\"Claws-Mail\" \ +@@ -833,7 +835,7 @@ + $(LIBETPAN_CPPFLAGS) \ + $(STARTUP_NOTIFICATION_CFLAGS) \ + $(MAEMO_CFLAGS) \ +- -Wno-unused-function ++ $(OWL_CFLAGS) + + + #no-unused-function is there because of bison stuff +@@ -1406,6 +1408,7 @@ + install-exec-hook: + @rm -f $(DESTDIR)$(bindir)/sylpheed-claws + @ln -s claws-mail $(DESTDIR)$(bindir)/sylpheed-claws ++ -Wno-unused-function + + @CYGWIN_TRUE@claws-mail$(EXEEXT): $(claws_mail_OBJECTS) $(claws_mail_DEPENDENCIES) + @CYGWIN_TRUE@ @rm -f claws-mail$(EXEEXT) +Index: claws-mail-2.9.1/autogen.sh +=================================================================== +--- claws-mail-2.9.1.orig/autogen.sh 2007-04-25 10:18:13.000000000 +0100 ++++ claws-mail-2.9.1/autogen.sh 2007-04-25 10:30:23.000000000 +0100 +@@ -74,5 +74,4 @@ + && libtoolize --force --copy \ + && autoheader \ + && automake --add-missing --foreign --copy \ +- && autoconf \ +- && ./configure --enable-maintainer-mode $@ ++ && autoconf +Index: claws-mail-2.9.1/src/compose.c +=================================================================== +--- claws-mail-2.9.1.orig/src/compose.c 2007-04-25 10:18:13.000000000 +0100 ++++ claws-mail-2.9.1/src/compose.c 2007-04-25 10:30:23.000000000 +0100 +@@ -6192,7 +6192,6 @@ + n_menu_entries = sizeof(compose_entries) / sizeof(compose_entries[0]); + menubar = menubar_create(window, compose_entries, + n_menu_entries, "<Compose>", compose); +- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); + + handlebox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0); diff --git a/meta/recipes-sato/claws-mail/files/streamline-ui.patch b/meta/recipes-sato/claws-mail/files/streamline-ui.patch new file mode 100644 index 0000000000..29a52ff795 --- /dev/null +++ b/meta/recipes-sato/claws-mail/files/streamline-ui.patch @@ -0,0 +1,1008 @@ +Index: claws-mail-2.9.1/src/mainwindow.c +=================================================================== +--- claws-mail-2.9.1.orig/src/mainwindow.c 2007-04-25 07:40:10.000000000 +0100 ++++ claws-mail-2.9.1/src/mainwindow.c 2007-04-25 10:26:40.000000000 +0100 +@@ -189,9 +189,6 @@ + static void toggle_statusbar_cb (MainWindow *mainwin, + guint action, + GtkWidget *widget); +-static void set_layout_cb (MainWindow *mainwin, +- guint action, +- GtkWidget *widget); + + static void addressbook_open_cb (MainWindow *mainwin, + guint action, +@@ -538,94 +535,24 @@ + {N_("/_Edit/_Search folder..."), "<shift><control>F", search_cb, 1, NULL}, + {N_("/_Edit/_Quick search"), "slash", mainwindow_quicksearch, 0, NULL}, + {N_("/_View"), NULL, NULL, 0, "<Branch>"}, +- {N_("/_View/Show or hi_de"), NULL, NULL, 0, "<Branch>"}, +- {N_("/_View/Show or hi_de/_Message view"), +- "V", toggle_message_cb, 0, "<ToggleItem>"}, +- {N_("/_View/Show or hi_de/_Toolbar"), +- NULL, NULL, 0, "<Branch>"}, +- {N_("/_View/Show or hi_de/_Toolbar/Text _below icons"), +- NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"}, +- {N_("/_View/Show or hi_de/_Toolbar/Text be_side icons"), +- NULL, toggle_toolbar_cb, TOOLBAR_BOTH_HORIZ, "/View/Show or hide/Toolbar/Text below icons"}, +- {N_("/_View/Show or hi_de/_Toolbar/_Icons only"), +- NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Text below icons"}, +- {N_("/_View/Show or hi_de/_Toolbar/_Text only"), +- NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Text below icons"}, +- {N_("/_View/Show or hi_de/_Toolbar/_Hide"), +- NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Text below icons"}, +- {N_("/_View/Show or hi_de/Status _bar"), +- NULL, toggle_statusbar_cb, 0, "<ToggleItem>"}, + {N_("/_View/Set displayed _columns"), NULL, NULL, 0, "<Branch>"}, + {N_("/_View/Set displayed _columns/in _Folder list..."), NULL, set_folder_display_item_cb, 0, NULL}, + {N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL}, + + {N_("/_View/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/La_yout"), NULL, NULL, 0, "<Branch>"}, +- {N_("/_View/Layout/_Standard"), NULL, set_layout_cb, NORMAL_LAYOUT, "<RadioItem>"}, +- {N_("/_View/Layout/_Three columns"), NULL, set_layout_cb, VERTICAL_LAYOUT, "/View/Layout/Standard"}, +- {N_("/_View/Layout/_Wide message"), NULL, set_layout_cb, WIDE_LAYOUT, "/View/Layout/Standard"}, +- {N_("/_View/Layout/W_ide message list"),NULL, set_layout_cb, WIDE_MSGLIST_LAYOUT, "/View/Layout/Standard"}, +- {N_("/_View/Layout/S_mall screen"), NULL, set_layout_cb, SMALL_LAYOUT, "/View/Layout/Standard"}, +- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"}, + {N_("/_View/_Sort"), NULL, NULL, 0, "<Branch>"}, +- {N_("/_View/_Sort/by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"}, +- {N_("/_View/_Sort/by S_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _Date"), NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _From"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _To"), NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by S_ubject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _color label"), +- NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _status"), NULL, sort_summary_cb, SORT_BY_STATUS, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by a_ttachment"), +- NULL, sort_summary_cb, SORT_BY_MIME, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by score"), NULL, sort_summary_cb, SORT_BY_SCORE, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by locked"), NULL, sort_summary_cb, SORT_BY_LOCKED, "/View/Sort/by number"}, +- {N_("/_View/_Sort/D_on't sort"), NULL, sort_summary_cb, SORT_BY_NONE, "/View/Sort/by number"}, ++ {N_("/_View/_Sort/by _Date"), NULL, sort_summary_cb, SORT_BY_DATE, "<RadioItem>"}, ++ {N_("/_View/_Sort/by _From"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by Date"}, ++ {N_("/_View/_Sort/by _To"), NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by Date"}, ++ {N_("/_View/_Sort/by S_ubject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by Date"}, + {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"}, + {N_("/_View/_Sort/Ascending"), NULL, sort_summary_type_cb, SORT_ASCENDING, "<RadioItem>"}, + {N_("/_View/_Sort/Descending"), NULL, sort_summary_type_cb, SORT_DESCENDING, "/View/Sort/Ascending"}, +- {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Sort/_Attract by subject"), +- NULL, attract_by_subject_cb, 0, NULL}, + {N_("/_View/Th_read view"), "<control>T", thread_cb, 0, "<ToggleItem>"}, + {N_("/_View/E_xpand all threads"), NULL, expand_threads_cb, 0, NULL}, + {N_("/_View/Co_llapse all threads"), NULL, collapse_threads_cb, 0, NULL}, + {N_("/_View/_Hide read messages"), NULL, hide_read_messages, 0, "<ToggleItem>"}, + +- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to"), NULL, NULL, 0, "<Branch>"}, +- {N_("/_View/_Go to/_Previous message"), "P", prev_cb, 0, NULL}, +- {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL}, +- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to/P_revious unread message"), +- "<shift>P", prev_unread_cb, 0, NULL}, +- {N_("/_View/_Go to/N_ext unread message"), +- "<shift>N", next_unread_cb, 0, NULL}, +- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to/Previous ne_w message"), NULL, prev_new_cb, 0, NULL}, +- {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_cb, 0, NULL}, +- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to/Previous _marked message"), +- NULL, prev_marked_cb, 0, NULL}, +- {N_("/_View/_Go to/Next m_arked message"), +- NULL, next_marked_cb, 0, NULL}, +- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to/Previous _labeled message"), +- NULL, prev_labeled_cb, 0, NULL}, +- {N_("/_View/_Go to/Next la_beled message"), +- NULL, next_labeled_cb, 0, NULL}, +- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to/Last read message"), +- NULL, last_read_cb, 0, NULL}, +- {N_("/_View/_Go to/Parent message"), +- "<control>Up", parent_cb, 0, NULL}, +- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to/Next unread _folder"), "<shift>G", goto_unread_folder_cb, 0, NULL}, +- {N_("/_View/_Go to/_Other folder..."), "G", goto_folder_cb, 0, NULL}, +- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"}, +- + #define ENC_SEPARATOR \ + {N_("/_View/Character _encoding/---"), NULL, NULL, 0, "<Separator>"} + #define ENC_ACTION(action) \ +@@ -742,7 +669,6 @@ + #undef DEC_ACTION + + {N_("/_View/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/Open in new _window"), "<control><alt>N", open_msg_cb, 0, NULL}, + {N_("/_View/Mess_age source"), "<control>U", view_source_cb, 0, NULL}, + {N_("/_View/All headers"), "<control>H", show_all_header_cb, 0, "<ToggleItem>"}, + {N_("/_View/Quotes"), NULL, NULL, 0, "<Branch>"}, +@@ -1137,23 +1063,14 @@ + gint i; + guint n_menu_entries; + +- static GdkGeometry geometry; +- + debug_print("Creating main window...\n"); + mainwin = g_new0(MainWindow, 1); + + /* main window */ + window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow"); +- gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION); ++ gtk_window_set_title(GTK_WINDOW(window), _("Mail")); + gtk_window_set_resizable(GTK_WINDOW(window), TRUE); + +- if (!geometry.min_height) { +- geometry.min_width = 320; +- geometry.min_height = 200; +- } +- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry, +- GDK_HINT_MIN_SIZE); +- + g_signal_connect(G_OBJECT(window), "delete_event", + G_CALLBACK(main_window_close_cb), mainwin); + MANAGE_WINDOW_SIGNALS_CONNECT(window); +@@ -1184,21 +1101,9 @@ + /* gtk_widget_show(gtk_item_factory_get_item(ifactory,"/Message/Mailing-List")); + main_create_mailing_list_menu (mainwin, NULL); */ + +- menu_set_sensitive(ifactory, "/Help/Manual", manual_available(MANUAL_MANUAL_LOCAL)); +- +- if (prefs_common.toolbar_detachable) { +- handlebox = gtk_handle_box_new(); +- gtk_widget_show(handlebox); +- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0); +- g_signal_connect(G_OBJECT(handlebox), "child_attached", +- G_CALLBACK(toolbar_child_attached), mainwin); +- g_signal_connect(G_OBJECT(handlebox), "child_detached", +- G_CALLBACK(toolbar_child_detached), mainwin); +- } else { +- handlebox = gtk_hbox_new(FALSE, 0); +- gtk_widget_show(handlebox); +- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0); +- } ++ handlebox = gtk_hbox_new(FALSE, 0); ++ gtk_widget_show(handlebox); ++ gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0); + /* link window to mainwin->window to avoid gdk warnings */ + mainwin->window = window; + +@@ -1405,36 +1310,6 @@ + (ifactory, "/View/Character encoding/Auto detect"); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE); + +- switch (prefs_common.toolbar_style) { +- case TOOLBAR_NONE: +- menuitem = gtk_item_factory_get_item +- (ifactory, "/View/Show or hide/Toolbar/Hide"); +- break; +- case TOOLBAR_ICON: +- menuitem = gtk_item_factory_get_item +- (ifactory, "/View/Show or hide/Toolbar/Icons only"); +- break; +- case TOOLBAR_TEXT: +- menuitem = gtk_item_factory_get_item +- (ifactory, "/View/Show or hide/Toolbar/Text only"); +- break; +- case TOOLBAR_BOTH: +- menuitem = gtk_item_factory_get_item +- (ifactory, "/View/Show or hide/Toolbar/Text below icons"); +- break; +- case TOOLBAR_BOTH_HORIZ: +- menuitem = gtk_item_factory_get_item +- (ifactory, +- "/View/Show or hide/Toolbar/Text beside icons"); +- } +- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE); +- +- gtk_widget_hide(mainwin->hbox_stat); +- menuitem = gtk_item_factory_get_item +- (ifactory, "/View/Show or hide/Status bar"); +- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), +- prefs_common.show_statusbar); +- + /* set account selection menu */ + ac_menu = gtk_item_factory_get_widget + (ifactory, "/Configuration/Change current account"); +@@ -2284,16 +2159,6 @@ + {"/View/Expand all threads" , M_MSG_EXIST}, + {"/View/Collapse all threads" , M_MSG_EXIST}, + {"/View/Hide read messages" , M_HIDE_READ_MSG}, +- {"/View/Go to/Previous message" , M_MSG_EXIST}, +- {"/View/Go to/Next message" , M_MSG_EXIST}, +- {"/View/Go to/Previous unread message" , M_MSG_EXIST}, +- {"/View/Go to/Previous new message" , M_MSG_EXIST}, +- {"/View/Go to/Previous marked message" , M_MSG_EXIST}, +- {"/View/Go to/Previous labeled message", M_MSG_EXIST}, +- {"/View/Go to/Next labeled message", M_MSG_EXIST}, +- {"/View/Go to/Last read message" , M_SINGLE_TARGET_EXIST}, +- {"/View/Go to/Parent message" , M_SINGLE_TARGET_EXIST}, +- {"/View/Open in new window" , M_SINGLE_TARGET_EXIST}, + {"/View/Message source" , M_SINGLE_TARGET_EXIST}, + {"/View/All headers" , M_SINGLE_TARGET_EXIST}, + {"/View/Quotes" , M_SINGLE_TARGET_EXIST}, +@@ -2379,40 +2244,20 @@ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \ + } + +- SET_CHECK_MENU_ACTIVE("/View/Show or hide/Message view", +- messageview_is_visible(mainwin->messageview)); +- + summaryview = mainwin->summaryview; +- menu_path = "/View/Sort/Don't sort"; ++ menu_path = "/View/Sort/by Date"; + + switch (summaryview->sort_key) { +- case SORT_BY_NUMBER: +- menu_path = "/View/Sort/by number"; break; +- case SORT_BY_SIZE: +- menu_path = "/View/Sort/by Size"; break; +- case SORT_BY_DATE: +- menu_path = "/View/Sort/by Date"; break; + case SORT_BY_FROM: + menu_path = "/View/Sort/by From"; break; + case SORT_BY_TO: + menu_path = "/View/Sort/by To"; break; + case SORT_BY_SUBJECT: + menu_path = "/View/Sort/by Subject"; break; +- case SORT_BY_LABEL: +- menu_path = "/View/Sort/by color label"; break; +- case SORT_BY_MARK: +- menu_path = "/View/Sort/by mark"; break; +- case SORT_BY_STATUS: +- menu_path = "/View/Sort/by status"; break; +- case SORT_BY_MIME: +- menu_path = "/View/Sort/by attachment"; break; +- case SORT_BY_SCORE: +- menu_path = "/View/Sort/by score"; break; +- case SORT_BY_LOCKED: +- menu_path = "/View/Sort/by locked"; break; + case SORT_BY_NONE: ++ case SORT_BY_DATE: + default: +- menu_path = "/View/Sort/Don't sort"; break; ++ menu_path = "/View/Sort/by Date"; break; + } + SET_CHECK_MENU_ACTIVE(menu_path, TRUE); + +@@ -2735,8 +2580,6 @@ + gtk_widget_destroy(mainwin->hpaned); + } + +- menu_set_sensitive(ifactory, "/View/Show or hide/Message view", +- (layout_mode != WIDE_MSGLIST_LAYOUT && layout_mode != SMALL_LAYOUT)); + switch (layout_mode) { + case VERTICAL_LAYOUT: + case NORMAL_LAYOUT: +@@ -2877,37 +2720,6 @@ + + prefs_common.layout_mode = layout_mode; + +- menuitem = gtk_item_factory_get_item +- (ifactory, "/View/Show or hide/Message view"); +- gtk_check_menu_item_set_active +- (GTK_CHECK_MENU_ITEM(menuitem), +- messageview_is_visible(mainwin->messageview)); +- +-#define SET_CHECK_MENU_ACTIVE(path, active) \ +-{ \ +- menuitem = gtk_item_factory_get_widget(ifactory, path); \ +- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \ +-} +- +- switch (prefs_common.layout_mode) { +- case NORMAL_LAYOUT: +- SET_CHECK_MENU_ACTIVE("/View/Layout/Standard", TRUE); +- break; +- case VERTICAL_LAYOUT: +- SET_CHECK_MENU_ACTIVE("/View/Layout/Three columns", TRUE); +- break; +- case WIDE_LAYOUT: +- SET_CHECK_MENU_ACTIVE("/View/Layout/Wide message", TRUE); +- break; +- case WIDE_MSGLIST_LAYOUT: +- SET_CHECK_MENU_ACTIVE("/View/Layout/Wide message list", TRUE); +- break; +- case SMALL_LAYOUT: +- SET_CHECK_MENU_ACTIVE("/View/Layout/Small screen", TRUE); +- break; +- } +-#undef SET_CHECK_MENU_ACTIVE +- + if (folderwin) { + g_signal_connect + (G_OBJECT(folderwin), "size_allocate", +@@ -3116,12 +2928,6 @@ + summary_toggle_view(mainwin->summaryview); + } + +-static void toggle_toolbar_cb(MainWindow *mainwin, guint action, +- GtkWidget *widget) +-{ +- toolbar_toggle(action, mainwin); +-} +- + static void main_window_reply_cb(MainWindow *mainwin, guint action, + GtkWidget *widget) + { +Index: claws-mail-2.9.1/src/prefs_common.c +=================================================================== +--- claws-mail-2.9.1.orig/src/prefs_common.c 2007-04-25 07:40:10.000000000 +0100 ++++ claws-mail-2.9.1/src/prefs_common.c 2007-04-25 07:42:17.000000000 +0100 +@@ -262,7 +262,7 @@ + {"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL, + NULL, NULL, NULL}, + +-#ifndef MAEMO ++#if 0 + {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL, + NULL, NULL, NULL}, + #else +@@ -300,7 +300,7 @@ + &prefs_common.normalfont_gtk1, P_STRING, NULL, NULL, NULL}, + + /* new fonts */ +-#ifndef MAEMO ++#if 0 + {"widget_font_gtk2", NULL, + &SPECIFIC_PREFS.widgetfont, P_STRING, NULL, NULL, NULL}, + {"message_font_gtk2", "Monospace 9", +@@ -416,7 +416,7 @@ + + {"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL, + NULL, NULL, NULL}, +-#ifndef MAEMO ++#if 0 + {"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM, + NULL, NULL, NULL}, + #else +@@ -544,7 +544,7 @@ + {"folder_col_pos_total", "3", + &prefs_common.folder_col_pos[F_COL_TOTAL], P_INT, NULL, NULL, NULL}, + +-#ifndef MAEMO ++#if 0 + {"folder_col_size_folder", "120", + &prefs_common.folder_col_size[F_COL_FOLDER], P_INT, NULL, NULL, NULL}, + {"folder_col_size_new", "32", +@@ -702,7 +702,7 @@ + &SPECIFIC_PREFS.mime_open_cmd, P_STRING, NULL, NULL, NULL}, + + /* Interface */ +-#ifndef MAEMO ++#if 0 + {"layout_mode", "0", &prefs_common.layout_mode, P_INT, + NULL, NULL, NULL}, + #else +Index: claws-mail-2.9.1/src/toolbar.c +=================================================================== +--- claws-mail-2.9.1.orig/src/toolbar.c 2007-04-25 07:40:10.000000000 +0100 ++++ claws-mail-2.9.1/src/toolbar.c 2007-04-25 07:42:17.000000000 +0100 +@@ -841,26 +841,17 @@ + gtk_widget_hide(handlebox_wid); + break; + case TOOLBAR_ICON: +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid), +- GTK_TOOLBAR_ICONS); +- break; + case TOOLBAR_TEXT: +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid), +- GTK_TOOLBAR_TEXT); +- break; + case TOOLBAR_BOTH: +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid), +- GTK_TOOLBAR_BOTH); +- break; + case TOOLBAR_BOTH_HORIZ: + gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid), +- GTK_TOOLBAR_BOTH_HORIZ); ++ GTK_TOOLBAR_ICONS); + break; + default: + return; + } + +- prefs_common.toolbar_style = (ToolbarStyle)action; ++ prefs_common.toolbar_style = (ToolbarStyle)TOOLBAR_ICON; + gtk_widget_set_size_request(handlebox_wid, 1, -1); + + if (prefs_common.toolbar_style != TOOLBAR_NONE) { +@@ -1594,7 +1585,7 @@ + gtk_container_add(GTK_CONTAINER(container), toolbar); + gtk_container_set_border_width(GTK_CONTAINER(container), 2); + gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL); +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH); ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); + + for (cur = toolbar_list; cur != NULL; cur = cur->next) { + +Index: claws-mail-2.9.1/src/gtk/prefswindow.c +=================================================================== +--- claws-mail-2.9.1.orig/src/gtk/prefswindow.c 2007-04-25 07:40:10.000000000 +0100 ++++ claws-mail-2.9.1/src/gtk/prefswindow.c 2007-04-25 10:30:15.000000000 +0100 +@@ -343,6 +343,10 @@ + gint x = gdk_screen_width(); + gint y = gdk_screen_height(); + static GdkGeometry geometry; ++ gint col_count = g_slist_length (prefs_pages); ++ ++ if (col_count > 1) ++ col_count = 2; + + prefswindow = g_new0(PrefsWindow, 1); + +@@ -360,39 +364,52 @@ + gtk_window_set_resizable (GTK_WINDOW(prefswindow->window), TRUE); + gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4); + +- prefswindow->table1 = gtk_table_new(2, 2, FALSE); ++ prefswindow->table1 = gtk_table_new(col_count, col_count, FALSE); + gtk_widget_show(prefswindow->table1); + gtk_container_add(GTK_CONTAINER(prefswindow->window), prefswindow->table1); + +- prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); +- gtk_widget_show(prefswindow->scrolledwindow1); +- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); +- gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->scrolledwindow1, 0, 1, 0, 1, GTK_FILL, GTK_FILL | GTK_EXPAND, 2, 2); +- +- prefswindow->tree_view = prefswindow_tree_view_create(prefswindow); +- gtk_widget_show(prefswindow->tree_view); +- gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1), +- prefswindow->tree_view); +- +- prefswindow->frame = gtk_frame_new(NULL); +- gtk_widget_show(prefswindow->frame); +- gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN); +- gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->frame, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2); +- +- prefswindow->table2 = gtk_table_new(1, 2, FALSE); +- gtk_widget_show(prefswindow->table2); +- gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2); +- +- prefswindow->labelframe = gtk_frame_new(NULL); +- gtk_widget_show(prefswindow->labelframe); +- gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->labelframe), GTK_SHADOW_OUT); +- gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->labelframe, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 1, 1); +- +- prefswindow->pagelabel = gtk_label_new(""); +- gtk_widget_show(prefswindow->pagelabel); +- gtk_label_set_justify(GTK_LABEL(prefswindow->pagelabel), GTK_JUSTIFY_LEFT); +- gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0); +- gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel); ++ if (col_count > 1) ++ { ++ prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); ++ gtk_widget_show(prefswindow->scrolledwindow1); ++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); ++ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->scrolledwindow1, 0, 1, 0, 1, GTK_FILL, GTK_FILL | GTK_EXPAND, 2, 2); ++ ++ prefswindow->tree_view = prefswindow_tree_view_create(prefswindow); ++ gtk_widget_show(prefswindow->tree_view); ++ gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1), ++ prefswindow->tree_view); ++ ++ prefswindow->frame = gtk_frame_new(NULL); ++ gtk_widget_show(prefswindow->frame); ++ gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN); ++ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->frame, col_count - 1, col_count, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2); ++ ++ prefswindow->table2 = gtk_table_new(1, 2, FALSE); ++ gtk_widget_show(prefswindow->table2); ++ gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2); ++ } ++ else ++ { ++ prefswindow->table2 = gtk_table_new(1, 2, FALSE); ++ gtk_widget_show(prefswindow->table2); ++ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->table2, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2); ++ } ++ ++ ++ if (col_count > 1) ++ { ++ prefswindow->labelframe = gtk_frame_new(NULL); ++ gtk_widget_show(prefswindow->labelframe); ++ gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->labelframe), GTK_SHADOW_OUT); ++ gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->labelframe, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 1, 1); ++ ++ prefswindow->pagelabel = gtk_label_new(""); ++ gtk_widget_show(prefswindow->pagelabel); ++ gtk_label_set_justify(GTK_LABEL(prefswindow->pagelabel), GTK_JUSTIFY_LEFT); ++ gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0); ++ gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel); ++ } + + prefswindow->scrolledwindow2 = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_show(prefswindow->scrolledwindow2); +@@ -411,9 +428,38 @@ + gtk_widget_show(prefswindow->empty_page); + gtk_container_add(GTK_CONTAINER(prefswindow->notebook), prefswindow->empty_page); + +- prefswindow_build_tree(prefswindow->tree_view, prefs_pages); ++ if (col_count > 1) ++ { ++ prefswindow_build_tree(prefswindow->tree_view, prefs_pages); ++ ++ gtk_widget_grab_focus(prefswindow->tree_view); ++ } ++ else ++ { ++ PrefsPage * page = prefs_pages->data; ++ gint pagenum; ++ GtkAdjustment *adj; ++ ++ if (!page->page_open) ++ { ++ page->create_widget(page, ++ GTK_WINDOW(prefswindow->window), ++ prefswindow->data); ++ gtk_container_add(GTK_CONTAINER(prefswindow->notebook), ++ page->widget); ++ page->page_open = TRUE; ++ } ++ ++ pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(prefswindow->notebook), ++ page->widget); ++ gtk_notebook_set_current_page(GTK_NOTEBOOK(prefswindow->notebook), ++ pagenum); + +- gtk_widget_grab_focus(prefswindow->tree_view); ++ adj = gtk_scrolled_window_get_vadjustment( ++ GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2)); ++ gtk_adjustment_set_value(adj, 0); ++ ++ } + + gtkut_stock_button_set_create(&prefswindow->confirm_area, + &prefswindow->apply_btn, GTK_STOCK_APPLY, +@@ -440,28 +486,6 @@ + G_CALLBACK(prefswindow_key_pressed), &(prefswindow->window)); + #endif + +- /* connect to callback only if we hhave non-NULL pointers to store size to */ +- if (prefswindow->save_width && prefswindow->save_height) { +- g_signal_connect(G_OBJECT(prefswindow->window), "size_allocate", +- G_CALLBACK(prefs_size_allocate_cb), prefswindow); +- } +- +- if (!geometry.min_height) { +- +- if (x < 800 && y < 600) { +- geometry.min_width = 600; +- geometry.min_height = 440; +- } else { +- geometry.min_width = 700; +- geometry.min_height = 550; +- } +- } +- gtk_window_set_geometry_hints(GTK_WINDOW(prefswindow->window), NULL, &geometry, +- GDK_HINT_MIN_SIZE); +- if (prefswindow->save_width && prefswindow->save_height) { +- gtk_widget_set_size_request(prefswindow->window, *(prefswindow->save_width), +- *(prefswindow->save_height)); +- } + + gtk_widget_show(prefswindow->window); + #ifdef MAEMO +Index: claws-mail-2.9.1/src/compose.c +=================================================================== +--- claws-mail-2.9.1.orig/src/compose.c 2007-04-25 07:40:10.000000000 +0100 ++++ claws-mail-2.9.1/src/compose.c 2007-04-25 10:18:13.000000000 +0100 +@@ -352,9 +352,6 @@ + + /* callback functions */ + +-static gboolean compose_edit_size_alloc (GtkEditable *widget, +- GtkAllocation *allocation, +- GtkSHRuler *shruler); + static void account_activated (GtkComboBox *optmenu, + gpointer data); + static void attach_selected (GtkTreeView *tree_view, +@@ -439,9 +436,6 @@ + guint action, + GtkWidget *widget); + +-static void compose_toggle_ruler_cb (gpointer data, +- guint action, +- GtkWidget *widget); + static void compose_toggle_sign_cb (gpointer data, + guint action, + GtkWidget *widget); +@@ -788,7 +782,6 @@ + ENC_ACTION(C_WINDOWS_874)}, + + {N_("/_Tools"), NULL, NULL, 0, "<Branch>"}, +- {N_("/_Tools/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"}, + {N_("/_Tools/_Address book"), "<shift><control>A", compose_address_cb , 0, NULL}, + {N_("/_Tools/_Template"), NULL, NULL, 0, "<Branch>"}, + {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"}, +@@ -2067,7 +2060,6 @@ + menu_set_sensitive(ifactory, "/Message/Insert signature", FALSE); + menu_set_sensitive(ifactory, "/Edit", FALSE); + menu_set_sensitive(ifactory, "/Options", FALSE); +- menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE); + menu_set_sensitive(ifactory, "/Tools/Actions", FALSE); + + if (compose->toolbar->draft_btn) +@@ -5684,7 +5676,7 @@ + g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus", + G_CALLBACK(compose_grab_focus_cb), compose); + gtk_widget_show(combo); +- gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_SHRINK, GTK_FILL, 0, 0); ++ gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_FILL, GTK_FILL, 0, 0); + if (compose->header_last) { + const gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry)); + string = headers; +@@ -5778,7 +5770,7 @@ + + static GtkWidget *compose_create_header(Compose *compose) + { +- GtkWidget *from_optmenu_hbox; ++ GtkWidget *from_optmenu; + GtkWidget *header_scrolledwin; + GtkWidget *header_table; + +@@ -5788,18 +5780,20 @@ + header_scrolledwin = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_show(header_scrolledwin); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(header_scrolledwin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); +- + header_table = gtk_table_new(2, 2, FALSE); ++ gtk_table_set_col_spacings (GTK_TABLE (header_table), BORDER_WIDTH); + gtk_widget_show(header_table); + gtk_container_set_border_width(GTK_CONTAINER(header_table), BORDER_WIDTH); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table); +- gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_ETCHED_IN); ++ gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_NONE); + count = 0; + + /* option menu for selecting accounts */ +- from_optmenu_hbox = compose_account_option_menu_create(compose); +- gtk_table_attach(GTK_TABLE(header_table), from_optmenu_hbox, +- 0, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); ++ from_optmenu = compose_account_option_menu_create(compose); ++ gtk_table_attach(GTK_TABLE(header_table), from_optmenu, ++ 0, 1, count, count + 1, GTK_FILL, GTK_FILL, 0, 0); ++ gtk_table_attach(GTK_TABLE(header_table), compose->from_name, ++ 1, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + count++; + + compose->header_table = header_table; +@@ -6140,15 +6134,12 @@ + GtkWidget *vbox2; + + GtkWidget *label; +- GtkWidget *subject_hbox; +- GtkWidget *subject_frame; ++ GtkWidget *edit_frame; + GtkWidget *subject_entry; + GtkWidget *subject; + GtkWidget *paned; + + GtkWidget *edit_vbox; +- GtkWidget *ruler_hbox; +- GtkWidget *ruler; + GtkWidget *scrolledwin; + GtkWidget *text; + GtkTextBuffer *buffer; +@@ -6169,8 +6160,6 @@ + GtkAspell * gtkaspell = NULL; + #endif + +- static GdkGeometry geometry; +- + g_return_val_if_fail(account != NULL, NULL); + + debug_print("Creating compose window...\n"); +@@ -6190,28 +6179,6 @@ + + window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "compose"); + +- gtk_window_set_resizable(GTK_WINDOW(window), TRUE); +- gtk_widget_set_size_request(window, -1, prefs_common.compose_height); +- +- if (!geometry.max_width) { +- geometry.max_width = gdk_screen_width(); +- geometry.max_height = gdk_screen_height(); +- } +- +- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, +- &geometry, GDK_HINT_MAX_SIZE); +- if (!geometry.min_width) { +- geometry.min_width = 600; +- geometry.min_height = 480; +- } +- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, +- &geometry, GDK_HINT_MIN_SIZE); +- +-#ifndef MAEMO +- if (compose_force_window_origin) +- gtk_widget_set_uposition(window, prefs_common.compose_x, +- prefs_common.compose_y); +-#endif + g_signal_connect(G_OBJECT(window), "delete_event", + G_CALLBACK(compose_delete_cb), compose); + MANAGE_WINDOW_SIGNALS_CONNECT(window); +@@ -6227,11 +6194,7 @@ + n_menu_entries, "<Compose>", compose); + gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); + +- if (prefs_common.toolbar_detachable) { +- handlebox = gtk_handle_box_new(); +- } else { +- handlebox = gtk_hbox_new(FALSE, 0); +- } ++ handlebox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0); + + gtk_widget_realize(handlebox); +@@ -6244,7 +6207,6 @@ + + /* Notebook */ + notebook = gtk_notebook_new(); +- gtk_widget_set_size_request(notebook, -1, 130); + gtk_widget_show(notebook); + + /* header labels and entries */ +@@ -6258,18 +6220,10 @@ + /* Others Tab */ + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), + compose_create_others(compose), +- gtk_label_new_with_mnemonic(_("Othe_rs"))); ++ gtk_label_new_with_mnemonic(_("Othe_r"))); + + /* Subject */ +- subject_hbox = gtk_hbox_new(FALSE, 0); +- gtk_widget_show(subject_hbox); +- +- subject_frame = gtk_frame_new(NULL); +- gtk_frame_set_shadow_type(GTK_FRAME(subject_frame), GTK_SHADOW_NONE); +- gtk_box_pack_start(GTK_BOX(subject_hbox), subject_frame, TRUE, TRUE, 0); +- gtk_widget_show(subject_frame); +- +- subject = gtk_hbox_new(FALSE, HSPACING_NARROW); ++ subject = gtk_hbox_new(FALSE, BORDER_WIDTH); + gtk_container_set_border_width(GTK_CONTAINER(subject), 0); + gtk_widget_show(subject); + +@@ -6283,20 +6237,16 @@ + G_CALLBACK(compose_grab_focus_cb), compose); + gtk_widget_show(subject_entry); + compose->subject_entry = subject_entry; +- gtk_container_add(GTK_CONTAINER(subject_frame), subject); + +- edit_vbox = gtk_vbox_new(FALSE, 0); ++ edit_vbox = gtk_vbox_new(FALSE, BORDER_WIDTH); ++ gtk_container_set_border_width(GTK_CONTAINER(edit_vbox), BORDER_WIDTH); + +- gtk_box_pack_start(GTK_BOX(edit_vbox), subject_hbox, FALSE, FALSE, 0); ++ gtk_box_pack_start(GTK_BOX(edit_vbox), subject, FALSE, FALSE, 0); + +- /* ruler */ +- ruler_hbox = gtk_hbox_new(FALSE, 0); +- gtk_box_pack_start(GTK_BOX(edit_vbox), ruler_hbox, FALSE, FALSE, 0); +- +- ruler = gtk_shruler_new(); +- gtk_ruler_set_range(GTK_RULER(ruler), 0.0, 100.0, 1.0, 100.0); +- gtk_box_pack_start(GTK_BOX(ruler_hbox), ruler, TRUE, TRUE, +- BORDER_WIDTH); ++ edit_frame = gtk_frame_new(NULL); ++ gtk_frame_set_shadow_type(GTK_FRAME(edit_frame), GTK_SHADOW_IN); ++ gtk_widget_show(edit_frame); ++ gtk_container_add(GTK_CONTAINER(edit_frame), edit_vbox); + + /* text widget */ + scrolledwin = gtk_scrolled_window_new(NULL, NULL); +@@ -6317,9 +6267,6 @@ + + gtk_container_add(GTK_CONTAINER(scrolledwin), text); + +- g_signal_connect_after(G_OBJECT(text), "size_allocate", +- G_CALLBACK(compose_edit_size_alloc), +- ruler); + g_signal_connect(G_OBJECT(buffer), "changed", + G_CALLBACK(compose_changed_cb), compose); + g_signal_connect(G_OBJECT(text), "grab_focus", +@@ -6363,7 +6310,7 @@ + gtk_widget_set_size_request(edit_vbox, -1, mode == COMPOSE_NEW ? 250 : 230); + #endif + gtk_paned_add1(GTK_PANED(paned), notebook); +- gtk_paned_add2(GTK_PANED(paned), edit_vbox); ++ gtk_paned_add2(GTK_PANED(paned), edit_frame); + gtk_widget_show_all(paned); + + +@@ -6408,8 +6355,6 @@ + + compose->notebook = notebook; + compose->edit_vbox = edit_vbox; +- compose->ruler_hbox = ruler_hbox; +- compose->ruler = ruler; + compose->scrolledwin = scrolledwin; + compose->text = text; + +@@ -6531,13 +6476,6 @@ + + compose_list = g_list_append(compose_list, compose); + +- if (!prefs_common.show_ruler) +- gtk_widget_hide(ruler_hbox); +- +- menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Show ruler"); +- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), +- prefs_common.show_ruler); +- + /* Priority */ + compose->priority = PRIORITY_NORMAL; + compose_update_priority_menu_item(compose); +@@ -6568,7 +6506,6 @@ + static GtkWidget *compose_account_option_menu_create(Compose *compose) + { + GList *accounts; +- GtkWidget *hbox; + GtkWidget *optmenu; + GtkWidget *optmenubox; + GtkListStore *menu; +@@ -6584,7 +6521,6 @@ + optmenu = gtkut_sc_combobox_create(optmenubox, FALSE); + menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu))); + +- hbox = gtk_hbox_new(FALSE, 6); + from_name = gtk_entry_new(); + + g_signal_connect_after(G_OBJECT(from_name), "grab_focus", +@@ -6623,9 +6559,6 @@ + G_CALLBACK(account_activated), + compose); + +- gtk_box_pack_start(GTK_BOX(hbox), optmenubox, FALSE, FALSE, 0); +- gtk_box_pack_start(GTK_BOX(hbox), from_name, TRUE, TRUE, 0); +- + gtk_tooltips_set_tip(compose->tooltips, optmenubox, + _("Account to use for this email"), NULL); + gtk_tooltips_set_tip(compose->tooltips, from_name, +@@ -6633,7 +6566,7 @@ + + compose->from_name = from_name; + +- return hbox; ++ return optmenubox; + } + + static void compose_set_priority_cb(gpointer data, +@@ -7851,32 +7784,6 @@ + + /* callback functions */ + +-/* compose_edit_size_alloc() - called when resized. don't know whether Gtk +- * includes "non-client" (windows-izm) in calculation, so this calculation +- * may not be accurate. +- */ +-static gboolean compose_edit_size_alloc(GtkEditable *widget, +- GtkAllocation *allocation, +- GtkSHRuler *shruler) +-{ +- if (prefs_common.show_ruler) { +- gint char_width = 0, char_height = 0; +- gint line_width_in_chars; +- +- gtkut_get_font_size(GTK_WIDGET(widget), +- &char_width, &char_height); +- line_width_in_chars = +- (allocation->width - allocation->x) / char_width; +- +- /* got the maximum */ +- gtk_ruler_set_range(GTK_RULER(shruler), +- 0.0, line_width_in_chars, 0, +- /*line_width_in_chars*/ char_width); +- } +- +- return TRUE; +-} +- + static void account_activated(GtkComboBox *optmenu, gpointer data) + { + Compose *compose = (Compose *)data; +@@ -9040,21 +8947,6 @@ + compose_update_privacy_system_menu_item(compose, warn); + } + +-static void compose_toggle_ruler_cb(gpointer data, guint action, +- GtkWidget *widget) +-{ +- Compose *compose = (Compose *)data; +- +- if (GTK_CHECK_MENU_ITEM(widget)->active) { +- gtk_widget_show(compose->ruler_hbox); +- prefs_common.show_ruler = TRUE; +- } else { +- gtk_widget_hide(compose->ruler_hbox); +- gtk_widget_queue_resize(compose->edit_vbox); +- prefs_common.show_ruler = FALSE; +- } +-} +- + static void compose_attach_drag_received_cb (GtkWidget *widget, + GdkDragContext *context, + gint x, +Index: claws-mail-2.9.1/src/folderview.c +=================================================================== +--- claws-mail-2.9.1.orig/src/folderview.c 2007-04-03 19:10:25.000000000 +0100 ++++ claws-mail-2.9.1/src/folderview.c 2007-04-25 10:28:00.000000000 +0100 +@@ -73,6 +73,11 @@ + #define COL_FOLDER_WIDTH 150 + #define COL_NUM_WIDTH 32 + ++/* added dummy column to stop the last column from ++ * resizing insanely in small screen view ++ */ ++#define _N_FOLDER_COLS (N_FOLDER_COLS + 1) ++ + static GList *folderview_list = NULL; + + static GtkStyle *normal_style; +@@ -448,7 +453,7 @@ + gint *col_pos; + FolderColumnState *col_state; + FolderColumnType type; +- gchar *titles[N_FOLDER_COLS]; ++ gchar *titles[_N_FOLDER_COLS]; + gint i; + GtkWidget *scrolledwin = folderview->scrolledwin; + +@@ -471,8 +476,9 @@ + titles[col_pos[F_COL_UNREAD]] = _("Unread"); + /* TRANSLATORS: This in Number sign in American style */ + titles[col_pos[F_COL_TOTAL]] = _("#"); ++ titles[F_COL_DUMMY] = ""; + +- ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER], ++ ctree = gtk_sctree_new_with_titles(_N_FOLDER_COLS, col_pos[F_COL_FOLDER], + titles); + + gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE); +@@ -510,6 +516,9 @@ + (GTK_CLIST(ctree), i, col_state[i].visible); + } + ++ GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button, ++ GTK_CAN_FOCUS); ++ + g_signal_connect(G_OBJECT(ctree), "key_press_event", + G_CALLBACK(folderview_key_pressed), + folderview); +@@ -605,9 +614,6 @@ + (GTK_SCROLLED_WINDOW(scrolledwin), + GTK_POLICY_AUTOMATIC, + prefs_common.folderview_vscrollbar_policy); +- gtk_widget_set_size_request(scrolledwin, +- prefs_common.folderview_width, +- prefs_common.folderview_height); + + folderview->scrolledwin = scrolledwin; + ctree = folderview_ctree_create(folderview); +@@ -2268,7 +2274,7 @@ + static void folderview_create_folder_node(FolderView *folderview, FolderItem *item) + { + GtkCTree *ctree = GTK_CTREE(folderview->ctree); +- gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"}; ++ gchar *text[_N_FOLDER_COLS] = {NULL, "0", "0", "0", ""}; + GtkCTreeNode *node, *parent_node; + gint *col_pos = folderview->col_pos; + FolderItemUpdateData hookdata; +Index: claws-mail-2.9.1/src/folderview.h +=================================================================== +--- claws-mail-2.9.1.orig/src/folderview.h 2007-03-22 17:22:52.000000000 +0000 ++++ claws-mail-2.9.1/src/folderview.h 2007-04-25 10:16:55.000000000 +0100 +@@ -37,7 +37,8 @@ + F_COL_FOLDER, + F_COL_NEW, + F_COL_UNREAD, +- F_COL_TOTAL ++ F_COL_TOTAL, ++ F_COL_DUMMY + } FolderColumnType; + + #define N_FOLDER_COLS 4 diff --git a/meta/recipes-sato/libical/libical_0.44.bb b/meta/recipes-sato/libical/libical_0.44.bb new file mode 100644 index 0000000000..0b016a0b8f --- /dev/null +++ b/meta/recipes-sato/libical/libical_0.44.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "iCal and scheduling (RFC 2445, 2446, 2447) library" +HOMEPAGE = "http://sourceforge.net/projects/freeassociation/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=16077&atid=116077" +LICENSE = "LGPLv2.1 | MPLv1.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=35da21efce2b9f0ca07524c9f844e6ed \ + file://LICENSE;md5=35da21efce2b9f0ca07524c9f844e6ed" +SECTION = "libs" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${P}.tar.gz" + +inherit autotools diff --git a/meta/recipes-sato/rxvt-unicode/files/makefile.patch b/meta/recipes-sato/rxvt-unicode/files/makefile.patch new file mode 100644 index 0000000000..86f82eeb4c --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/files/makefile.patch @@ -0,0 +1,20 @@ +--- ../rxvt-unicode-cvs-r0/rxvt-unicode/Makefile.in 2004-08-12 22:32:40 +01:00 ++++ rxvt-unicode/Makefile.in 2004-12-24 03:09:00 +00:00 +@@ -9,7 +9,7 @@ + first_rule: all + dummy: + +-subdirs = src doc src/test ++subdirs = src src/test + allsubdirs = W11 $(subdirs) + + DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog +@@ -24,7 +24,7 @@ + + #------------------------------------------------------------------------- + +-all allbin alldoc tags: ++all allbin tags: + @if test x@host_os@ = xcygwin; then (cd W11; ${MAKE} $@) || exit 1; fi + @for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done + diff --git a/meta/recipes-sato/rxvt-unicode/files/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/files/rxvt.desktop new file mode 100644 index 0000000000..a419c98a13 --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/files/rxvt.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Terminal +Comment=When all else fails. +Exec=/usr/bin/rxvt +Icon=utilities-terminal.png +Terminal=false +Type=Application +Categories=Utility +StartupNotify=false + diff --git a/meta/recipes-sato/rxvt-unicode/files/rxvt.png b/meta/recipes-sato/rxvt-unicode/files/rxvt.png Binary files differnew file mode 100644 index 0000000000..e56fa2e9cd --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/files/rxvt.png diff --git a/meta/recipes-sato/rxvt-unicode/files/signedchar.patch b/meta/recipes-sato/rxvt-unicode/files/signedchar.patch new file mode 100644 index 0000000000..6faa175143 --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/files/signedchar.patch @@ -0,0 +1,11 @@ +--- ../rxvt-unicode-cvs-r0/rxvt-unicode/src/command.C 2004-12-21 06:43:00 +00:00 ++++ rxvt-unicode/src/command.C 2004-12-24 02:31:36 +00:00 +@@ -1862,7 +1862,7 @@ + #endif /* NO_SCROLLBAR_REPORT */ + + { +- char upordown = 0; ++ signed char upordown = 0; + + if (scrollBar.style == R_SB_NEXT) + { diff --git a/meta/recipes-sato/rxvt-unicode/files/xwc.patch b/meta/recipes-sato/rxvt-unicode/files/xwc.patch new file mode 100644 index 0000000000..7cf59656ce --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/files/xwc.patch @@ -0,0 +1,28 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- rxvt-unicode-4.8/src/screen.C~xwc.c ++++ rxvt-unicode-4.8/src/screen.C +@@ -3058,7 +3058,7 @@ + else + rxvt_warn ("can't get primary selection, ignoring.\n"); + +-#if 0 ++#ifdef HAVE_XWC + XTextProperty ct; + + if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) +@@ -3632,9 +3632,11 @@ + } + else + #endif ++#ifdef HAVE_XWC + if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) + freect = 1; + else ++#endif + { + /* if we failed to convert then send it raw */ + ct.value = (unsigned char *)cl; diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch new file mode 100644 index 0000000000..eb87b84b25 --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch @@ -0,0 +1,24 @@ +diff -urNd ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C +--- ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00 ++++ rxvt-unicode-5.3/src/screen.C 2005-04-05 22:12:45 +01:00 +@@ -3064,7 +3064,7 @@ + else + rxvt_warn ("can't get primary selection, ignoring.\n"); + +-#if 0 ++#ifdef HAVE_XWC + XTextProperty ct; + + if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) +@@ -3648,9 +3648,11 @@ + } + else + #endif ++#ifdef HAVE_XWC + if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) + freect = 1; + else ++#endif + { + /* if we failed to convert then send it raw */ + ct.value = (unsigned char *)cl; diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb new file mode 100644 index 0000000000..d13089501f --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb @@ -0,0 +1,72 @@ +SECTION = "x11/utils" +DEPENDS = "virtual/libx11 libxt libxft" +DESCRIPTION = "rxvt-unicode is a clone of the well known \ +terminal emulator rxvt, modified to store text in Unicode \ +(either UCS-2 or UCS-4) and to use locale-correct input and \ +output. It also supports mixing multiple fonts at the \ +same time, including Xft fonts." +LICENSE = "GPL" +SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ + file://xwc.patch;patch=1 \ + file://signedchar.patch;patch=1 \ + file://rxvt.desktop \ + file://rxvt.png" +PR = "r5" + +inherit autotools update-alternatives + +PROVIDES = "virtual/x-terminal-emulator" +ALTERNATIVE_NAME = "x-terminal-emulator" +ALTERNATIVE_PATH = "${bindir}/rxvt" + +CFLAGS_append = " -fpermissive" + +# This is necessary so that the "tic" command executed during the install can +# link with the correct libary in staging. +export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}" + +EXTRA_OECONF = "--enable-menubar --enable-xim \ + --enable-utmp --enable-wtmp --enable-lastlog \ + --disable-strings --with-term=rxvt --enable-keepscrolling \ + --enable-xft --with-name=rxvt --enable-frills \ + --enable-swapscreen --enable-transparency \ + --with-codesets=eu \ + --enable-cursor-blink --enable-pointer-blank \ + --enable-text-blink --enable-rxvt-scroll \ + --enable-combining --enable-shared \ + --enable-xgetdefault \ + --with-x=${STAGING_DIR_HOST}${prefix}" +EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \ + 'XLIB=-L${STAGING_LIBDIR} -lX11'" + +do_configure () { + mv autoconf/configure.in . || true + rm autoconf/libtool.m4 + libtoolize --force + autotools_do_configure + echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h + echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h + echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h + echo '#define HAVE_XLOCALE 1' >> config.h +} + +do_compile () { + if test -e ${S}/${HOST_SYS}-libtool; then + LIBTOOL=${S}/${HOST_SYS}-libtool + else + LIBTOOL=${S}/libtool + fi + # docs need "yodl" and I have no idea what that is + oe_runmake -C src "LIBTOOL=$LIBTOOL" +} + +do_install_append () { + install -d ${D}/${datadir} + install -d ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps/ + + install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications +} + +FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" diff --git a/meta/recipes-sato/webkit/files/GNUmakefile.am b/meta/recipes-sato/webkit/files/GNUmakefile.am new file mode 100644 index 0000000000..39817f1dd5 --- /dev/null +++ b/meta/recipes-sato/webkit/files/GNUmakefile.am @@ -0,0 +1,856 @@ +# Top-level Makefile rule for automake +# +# Variable conventions: +# +# _h_api = API headers that will be installed and included in the distribution +# _cppflags = flags that will be passed to the C/CXX Preprocessor +# _sources = sources that will be compiled and included in the distribution +# _built_sources = files that will be autogenerated by the build system and +# will be part of the _SOURCES primary +# _built_nosources = files that are autogenerated but are not part of the +# _SOURCES primary +# _cleanfiles = files that will be removed by the clean target +# +# Sources, headers, flags, etc... should be added to the respective variables +# with the above suffix, e.g, webcore-specific sources should go to +# webcore_sources, gtk port API and WebCoreSupport parts to webkitgtk_sources, +# etc... The only exceptions are the global variables. See Global Variables +# below. +# +# Global Variables +# +# global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any +# specific port +# 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@ + +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-introspection \ + --enable-gtk-doc + +# Directory for autogenerated sources +GENSOURCES := $(top_builddir)/DerivedSources +GENSOURCESWEBKITDOM := $(top_builddir)/DerivedSources/webkit +GENPROGRAMS := $(top_builddir)/Programs + +# Script for creating hash tables +CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table + +# Script for creating regexp tables +CREATE_REGEXP_TABLES = $(srcdir)/JavaScriptCore/create_regex_tables + +# Programs to run the WebKitGtk unit tests +GTESTER = gtester +GTESTER_REPORT = gtester-report + +# Libraries and support components +bin_PROGRAMS := +noinst_PROGRAMS := +noinst_HEADERS := +noinst_LTLIBRARIES := +lib_LTLIBRARIES := +IDL_BINDINGS := +TEST_PROGS := +POFILES := +MOFILES := +javascriptcore_h_api := +javascriptcore_cppflags:= +javascriptcore_sources := +javascriptcore_built_sources := +javascriptcore_built_nosources := +javascriptcore_dist := +webcore_cppflags := +webcore_sources := +webcore_libadd := +webcore_built_sources := +webcore_built_nosources := +webcore_dist := +webcoregtk_cppflags := +webcoregtk_sources := +IDL_BINDINGS_GDOM := +GDOM_AUTO_CLASSES := +GDOM_FIXED_CLASSES := +GDOM_CLASSES := +GDOM_HEADERS_BUILT := +GDOM_HEADERS_FIXED := +libgdom_h_api := +libgdom_cleanfiles := +webkitgtk_h_api := +webkitgtk_sources := +webkitgtk_cppflags := +webkitgtk_built_sources := +webkitgtk_built_nosources := +webkitgtk_cleanfiles := +global_cppflags := +global_cflags := +global_cxxflags := +corekit_cflags := +corekit_cppflags := +JSCORE_GIRSOURCES := +WEBKIT_GIRSOURCES := +typelibsdir := +typelibs_DATA := +EXTRA_DIST := +BUILT_SOURCES := +CLEANFILES := +DISTCLEANFILES := +MAINTAINERCLEANFILES := + +webcoregtk_cppflags += \ + -I$(top_builddir)/DerivedSources/webkit \ + -I$(srcdir)/WebCore/bindings \ + -I$(srcdir)/WebCore/bindings/gobject + +# CFLAGS/CXXFLAGS used by WebCore and WebKit +# +# gtk+.pc already include glib, cairo, freetype and pango CFLAGS +# Don't include them for now to reduce the noise when compiling +# $(GLIB_CFLAGS) $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(FREETYPE_CFLAGS) +corekit_cflags += \ + -fno-strict-aliasing \ + $(COVERAGE_CFLAGS) \ + $(ENCHANT_CFLAGS) \ + $(GAIL_CFLAGS) \ + $(GEOCLUE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(GTK_CFLAGS) \ + $(HILDON_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(LIBXML_CFLAGS) \ + $(LIBXSLT_CFLAGS) \ + $(SQLITE3_CFLAGS) \ + $(UNICODE_CFLAGS) \ + $(XT_CFLAGS) + +# When building webcore/webkit, we want WebCore/config.h and NOT +# JavaScriptCore/config.h, hence, it's important that WebCore/ should come first +# before JavaScriptCore in the include path. +corekit_cppflags += \ + $(global_cppflags) \ + $(webcore_cppflags) \ + $(webcoregtk_cppflags) \ + $(javascriptcore_cppflags) + +# For the Gtk port we want to use XP_UNIX both in X11 and Mac +if !TARGET_WIN32 +corekit_cppflags += -DXP_UNIX +endif + +# 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 -Wno-parentheses \ + -fno-exceptions + +global_cxxflags += \ + $(global_cflags) \ + $(SYMBOL_VISIBILITY_INLINES) \ + -fno-rtti + +# -no-undefined required for building DLLs on Windows +# It breaks the build on other platforms, so we use it conditionally +if OS_WIN32 +no_undefined = -no-undefined +version_script = -export-symbols-regex "^(webkit_|JS).*" +endif + +if OS_GNU +version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter +endif + +# Shared libraries +lib_LTLIBRARIES += \ + libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la + +# Convenience libraries +noinst_LTLIBRARIES += \ + libJavaScriptCore.la + +# JavaScriptCore +javascriptcore_cppflags += \ + -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ + -I$(srcdir)/JavaScriptCore/parser \ + -I$(srcdir)/JavaScriptCore/wtf \ + -I$(srcdir)/JavaScriptCore/wtf/gtk \ + -I$(srcdir)/JavaScriptCore/wtf/gobject \ + -I$(top_builddir)/DerivedSources + +nodist_EXTRA_libJavaScriptCore_la_SOURCES = \ + $(javascriptcore_built_nosources) + +nodist_libJavaScriptCore_la_SOURCES = \ + $(javascriptcore_built_sources) + +libJavaScriptCore_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/JavaScriptCore +libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api) + +libJavaScriptCore_la_SOURCES = \ + $(javascriptcore_sources) + +libJavaScriptCore_la_LIBADD = \ + $(UNICODE_LIBS) \ + $(GLIB_LIBS) \ + -lpthread + +libJavaScriptCore_la_CXXFLAGS = \ + $(global_cxxflags) \ + $(libJavaScriptCore_la_CFLAGS) + +libJavaScriptCore_la_CFLAGS = \ + -fstrict-aliasing \ + -O3 \ + $(global_cflags) \ + $(GLIB_CFLAGS) \ + $(UNICODE_CFLAGS) + +libJavaScriptCore_la_CPPFLAGS = \ + $(global_cppflags) \ + $(javascriptcore_cppflags) + +# WebKit +nodist_EXTRA_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ + $(webcore_built_nosources) + +nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ + $(webcore_built_sources) \ + $(webkitgtk_built_sources) + +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \ + $(webkitgtk_h_api) \ + WebKit/gtk/webkit/webkitenumtypes.h + +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ + $(webcore_sources) \ + $(webcoregtk_sources) \ + $(webkitgtk_sources) + +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \ + $(global_cxxflags) \ + $(corekit_cflags) + +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \ + $(global_cflags) \ + $(corekit_cflags) + +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \ + $(corekit_cppflags) \ + $(webkitgtk_cppflags) \ + $(HILDON_CPPFLAGS) + +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ + -version-info @LIBWEBKITGTK_VERSION@ \ + $(version_script) \ + $(no_undefined) + +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \ + -lpthread \ + libJavaScriptCore.la \ + libWebCoreJS.la \ + libgdom.la \ + $(webcore_ldflags) \ + $(CAIRO_LIBS) \ + $(COVERAGE_LDFLAGS) \ + $(ENCHANT_LIBS) \ + $(FREETYPE_LIBS) \ + $(GAIL_LIBS) \ + $(GEOCLUE_LIBS) \ + $(GLIB_LIBS) \ + $(GSTREAMER_LIBS) \ + $(GTK_LIBS) \ + $(HILDON_LIBS) \ + $(JPEG_LIBS) \ + $(LIBSOUP_LIBS) \ + $(LIBXML_LIBS) \ + $(LIBXSLT_LIBS) \ + $(PANGO_LIBS) \ + $(PNG_LIBS) \ + $(SQLITE3_LIBS) \ + $(UNICODE_LIBS) \ + $(XT_LIBS) + +libgdom_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit +nodist_libgdom_la_HEADERS = \ + $(libgdom_h_api) + +libgdom_cleanfiles += \ + $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h \ + $(top_builddir)/libgdom.la \ + $(top_builddir)/stamp-webkitdomenumtypes.h + +# +# Extra checks and flags +global_cppflags += \ + -DBUILDING_CAIRO__=1 \ + -DBUILDING_GTK__=1 \ + -DWTF_CHANGES + +if USE_ICU_UNICODE +global_cppflags += \ + -DWTF_USE_ICU_UNICODE=1 +endif + +if USE_GLIB_UNICODE +global_cppflags += \ + -DWTF_USE_GLIB_UNICODE=1 +endif + +if !ENABLE_FAST_MALLOC +global_cppflags += \ + -DUSE_SYSTEM_MALLOC +endif + +if !ENABLE_DEBUG +global_cppflags += -DNDEBUG +global_cflags += $(SYMBOL_VISIBILITY) +else +webcoregtk_cppflags += \ + -DG_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DPANGO_DISABLE_DEPRECATED + +# Might be useful in the future +# -DGDK_MULTIHEAD_SAFE \ +# -DGTK_MULTIHEAD_SAFE +endif + +if ENABLE_COVERAGE +global_cppflags += \ + -DGCC_GENERATE_TEST_COVERAGE_FILES \ + -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS +endif + +webkitgtk_h_api += \ + $(srcdir)/WebKit/gtk/webkit/webkit.h \ + $(srcdir)/WebKit/gtk/webkit/webkitdefines.h \ + $(srcdir)/WebKit/gtk/webkit/webkitdownload.h \ + $(srcdir)/WebKit/gtk/webkit/webkiterror.h \ + $(srcdir)/WebKit/gtk/webkit/webkithittestresult.h \ + $(srcdir)/WebKit/gtk/webkit/webkitnetworkrequest.h \ + $(srcdir)/WebKit/gtk/webkit/webkitnetworkresponse.h \ + $(srcdir)/WebKit/gtk/webkit/webkitsoupauthdialog.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebbackforwardlist.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebdatasource.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebframe.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebhistoryitem.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebinspector.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \ + $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebview.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \ + $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h \ + $(top_builddir)/WebKit/gtk/webkit/webkitversion.h + +webkitgtk_built_sources += \ + DerivedSources/webkitenumtypes.cpp \ + DerivedSources/webkitdomenumtypes.cpp \ + DerivedSources/webkitmarshal.cpp \ + DerivedSources/webkitmarshal.h \ + WebKit/gtk/webkit/webkitenumtypes.h + +webkitgtk_sources += \ + WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ + WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ + WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp \ + WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h \ + WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/DragClientGtk.h \ + WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/EditorClientGtk.h \ + WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \ + WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \ + WebKit/gtk/webkit/webkitapplicationcache.cpp \ + WebKit/gtk/webkit/webkitdownload.cpp \ + WebKit/gtk/webkit/webkiterror.cpp \ + WebKit/gtk/webkit/webkithittestresult.cpp \ + WebKit/gtk/webkit/webkitnetworkrequest.cpp \ + WebKit/gtk/webkit/webkitnetworkresponse.cpp \ + WebKit/gtk/webkit/webkitprivate.cpp \ + WebKit/gtk/webkit/webkitprivate.h \ + WebKit/gtk/webkit/webkitsoupauthdialog.c \ + WebKit/gtk/webkit/webkitversion.cpp \ + WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ + WebKit/gtk/webkit/webkitwebdatasource.cpp \ + WebKit/gtk/webkit/webkitwebframe.cpp \ + WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ + WebKit/gtk/webkit/webkitwebinspector.cpp \ + WebKit/gtk/webkit/webkitwebnavigationaction.cpp \ + WebKit/gtk/webkit/webkitwebpolicydecision.cpp \ + WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \ + WebKit/gtk/webkit/webkitwebresource.cpp \ + WebKit/gtk/webkit/webkitwebdatabase.cpp \ + WebKit/gtk/webkit/webkitsecurityorigin.cpp \ + WebKit/gtk/webkit/webkitwebsettings.cpp \ + WebKit/gtk/webkit/webkitwebview.cpp \ + WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \ + WebKit/gtk/webkit/webkitworkers.cpp + +webkitgtk_cppflags += \ + -DBUILDING_WEBKIT \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + -DDATA_DIR=\"${datadir}\" \ + -I$(srcdir)/WebKit/gtk \ + -I$(srcdir)/WebKit/gtk/WebCoreSupport \ + -I$(srcdir)/WebKit/gtk/webkit \ + -I$(top_builddir)/WebKit/gtk \ + -I$(top_builddir)/WebKit/gtk/webkit \ + -I$(GENSOURCESWEBKITDOM) + +webkitgtk_cleanfiles += \ + $(top_builddir)/stamp-webkitmarshal.cpp \ + $(top_builddir)/stamp-webkitmarshal.h \ + $(top_builddir)/stamp-webkitenumtypes.cpp \ + $(top_builddir)/stamp-webkitenumtypes.h \ + $(top_builddir)/Programs/GtkLauncher \ + $(top_builddir)/WebKit/gtk/docs/version.xml \ + $(top_builddir)/WebKit/gtk/docs/GNUmakefile \ + $(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \ + $(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \ + $(top_builddir)/WebKit/gtk/webkit/webkitversion.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc + +if ENABLE_INTROSPECTION + +JSCore-@WEBKITGTK_API_VERSION@.gir: $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir + cp $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(builddir)/ + +JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir +WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir + +$(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la + $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=@WEBKITGTK_API_VERSION@ \ + --include=GObject-2.0 \ + --include=Gtk-@GTK_API_VERSION@ \ + --include=JSCore-@WEBKITGTK_API_VERSION@ \ + --include=Soup-2.4 \ + --library=webkitgtk-@WEBKITGTK_API_VERSION@ \ + --libtool="$(LIBTOOL)" \ + --pkg gobject-2.0 \ + --pkg gtk+-@GTK_API_VERSION@ \ + --pkg libsoup-2.4 \ + --output $@ \ + --add-include-path $(top_srcdir)/WebKit/gtk \ + --add-include-path $(builddir) \ + -I$(top_srcdir)/WebKit/gtk \ + -I$(top_builddir)/WebKit/gtk \ + -I$(top_builddir)/DerivedSources \ + -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \ + -I$(top_srcdir) \ + $(webkitgtk_h_api) \ + $(libgdom_h_api) + +girdir = $(datadir)/gir-1.0 +gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES) + +typelibsdir += $(libdir)/girepository-1.0 +typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib) + +%.typelib: %.gir $(G_IR_COMPILER) + $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk --includedir $(builddir) $< -o $@ + +CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA) + +endif + +EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir + +WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal +WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list + +$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp + @true + +$(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h + @true + +stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST) + $(AM_V_GEN) echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \ + $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \ + echo timestamp > $(@F) + +stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST) + $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \ + echo timestamp > $(@F) + +WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h + @true +stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile + $(AM_V_GEN)glib-mkenums \ + --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \ + --fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \ + --fhead "#include <glib-object.h>\n\n" \ + --fhead "#include <webkit/webkitdefines.h>\n\n" \ + --fhead "G_BEGIN_DECLS\n\n" \ + --ftail "G_END_DECLS\n\n" \ + --ftail "#endif\n" \ + --fprod "#include <webkit/@basename@>\n\n" \ + --eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \ + --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \ + $(webkitgtk_h_api) | \ + sed 's,web_kit,webkit,' | \ + sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \ + > xgen-gth \ + && (cmp -s xgen-gth WebKit/gtk/webkit/webkitenumtypes.h || cp xgen-gth WebKit/gtk/webkit/webkitenumtypes.h) \ + && rm -f xgen-gth \ + && echo timestamp > $(@F) + +DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile + $(AM_V_GEN)glib-mkenums \ + --fhead "#include <config.h>\n" \ + --fhead "#include <glib-object.h>\n" \ + --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h\"\n\n" \ + --fhead "extern \"C\" {\n\n" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "static const G@Type@Value _@enum_name@_values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n};\n\n" \ + --vtail "GType @enum_name@_get_type(void)\n{\n" \ + --vtail " static GType type = 0;\n\n" \ + --vtail " if (!type)\n" \ + --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \ + --vtail " return type;\n}\n\n" \ + --ftail "}\n" \ + $(webkitgtk_h_api) | \ + sed 's,web_kit,webkit,' \ + > xgen-gtc \ + && cp xgen-gtc $@ \ + && rm -f xgen-gtc + +WebKit/gtk/webkit/webkitdomenumtypes.h: stamp-webkitdomenumtypes.h + @true +stamp-webkitdomenumtypes.h: $(libgdom_h_api) GNUmakefile + $(AM_V_GEN)glib-mkenums \ + --fhead "#ifndef WEBKIT_DOM_ENUM_TYPES_H\n" \ + --fhead "#define WEBKIT_DOM_ENUM_TYPES_H\n\n" \ + --fhead "#include <glib-object.h>\n\n" \ + --fhead "G_BEGIN_DECLS\n\n" \ + --ftail "G_END_DECLS\n\n" \ + --ftail "#endif\n" \ + --fprod "#include <webkit/@basename@>\n\n" \ + --eprod "#define WEBKIT_DOM_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \ + --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);n\n" \ + $(libgdom_h_api) | \ + sed 's,web_kit,webkit_dom,' | \ + sed 's,WEBKIT_DOM_TYPE_KIT,WEBKIT_DOM_TYPE,' \ + > xgen-cgth \ + && (cmp -s xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h || cp xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h) \ + && rm -f xgen-cgth \ + && echo timestamp > $(@F) + +DerivedSources/webkitdomenumtypes.cpp: $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h $(libgdom_h_api) GNUmakefile + $(AM_V_GEN)glib-mkenums \ + --fhead "#include <config.h>\n" \ + --fhead "#include <glib-object.h>\n" \ + --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h\"\n\n" \ + --fhead "extern \"C\" {\n\n" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "static const G@Type@Value _@enum_name@_values] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n};\n\n" \ + --vtail "GType @enum_name@_get_type(void)\n{\n" \ + --vtail " static GType type = 0;\n\n" \ + --vtail " if (!type)\n" \ + --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \ + --vtail " return type;\n}\n\n" \ + --ftail "}\n" \ + $(libgdom_h_api) | \ + sed 's,web_kit,webkitdom,' \ + > xgen-cgtc \ + && cp xgen-cgtc $@ \ + && rm -f xgen-cgtc + +# Files that will be distributed +EXTRA_DIST += \ + $(srcdir)/gtk-doc.make \ + WebKit/LICENSE \ + $(javascriptcore_dist) \ + $(webcore_dist) \ + $(srcdir)/autotools/symbols.filter \ + $(srcdir)/WebKit/gtk/ChangeLog \ + $(srcdir)/WebKit/gtk/NEWS \ + $(srcdir)/WebKit/gtk/webkitmarshal.list \ + $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \ + $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \ + $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \ + $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \ + $(srcdir)/WebKit/gtk/docs/version.xml.in \ + $(srcdir)/WebKit/gtk/po/* \ + $(srcdir)/WebKit/gtk/resources/* \ + $(srcdir)/WebKit/gtk/tests/resources/* \ + $(srcdir)/WebKit/gtk/tests/test_utils.h + +# extra resource files +resourcesdir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/resources +dist_resources_DATA = \ + $(shell ls $(srcdir)/WebKit/gtk/resources/*.html) + +# END WEBKIT GTK+ + +# Include module makefiles +include JavaScriptCore/GNUmakefile.am +include WebCore/GNUmakefile.am +include WebKitTools/GNUmakefile.am +include WebKit/gtk/po/GNUmakefile.am + +# Build unit tests +noinst_PROGRAMS += $(TEST_PROGS) + +webkit_tests_cflags = \ + -fno-strict-aliasing \ + -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ + -I$(srcdir)/WebKit/gtk \ + -I$(top_builddir)/WebKit/gtk \ + -I$(top_builddir)/DerivedSources \ + -I$(top_srcdir)/WebCore/bindings \ + -I$(top_srcdir)/WebCore/bindings/gobject \ + $(global_cflags) \ + $(GLIB_CFLAGS) \ + $(GTK_CFLAGS) \ + $(LIBSOUP_CFLAGS) + +webkit_tests_ldadd = \ + libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ + $(GTK_LIBS) \ + $(GLIB_LIBS) \ + $(LIBSOUP_LIBS) + +webkit_tests_ldflags = \ + -no-install \ + -no-fast-install + +TEST_PROGS += \ + Programs/unittests/testdomdocument \ + Programs/unittests/testdomdomwindow \ + Programs/unittests/testdomnode \ + Programs/unittests/testhttpbackend \ + Programs/unittests/testloading \ + Programs/unittests/testglobals \ + Programs/unittests/testmimehandling \ + Programs/unittests/testnetworkrequest \ + Programs/unittests/testnetworkresponse \ + Programs/unittests/testwebframe \ + Programs/unittests/testwebbackforwardlist \ + Programs/unittests/testwebhistoryitem \ + Programs/unittests/testwindow \ + Programs/unittests/testdownload \ + Programs/unittests/testatk \ + Programs/unittests/testatkroles \ + Programs/unittests/testhittestresult \ + Programs/unittests/testwebsettings \ + Programs/unittests/testwebresource \ + Programs/unittests/testwebdatasource \ + Programs/unittests/testwebview \ + Programs/unittests/testkeyevents \ + Programs/unittests/testcopyandpaste + +# Add additional tests here +Programs_unittests_testdomdocument_SOURCES = WebKit/gtk/tests/testdomdocument.c +Programs_unittests_testdomdocument_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testdomdocument_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testdomdomwindow_SOURCES = WebKit/gtk/tests/testdomdomwindow.c +Programs_unittests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testdomdomwindow_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testdomnode_SOURCES = WebKit/gtk/tests/testdomnode.c +Programs_unittests_testdomnode_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testdomnode_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testdomnode_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c +Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testglobals_SOURCES = WebKit/gtk/tests/testglobals.c +Programs_unittests_testglobals_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testglobals_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testglobals_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testloading_SOURCES = WebKit/gtk/tests/testloading.c +Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c WebKit/gtk/tests/test_utils.c +Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c +Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testnetworkresponse_SOURCES = WebKit/gtk/tests/testnetworkresponse.c +Programs_unittests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testnetworkresponse_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c +Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwebframe_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testwebbackforwardlist_SOURCES = WebKit/gtk/tests/testwebbackforwardlist.c +Programs_unittests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryitem.c +Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testwindow_SOURCES = WebKit/gtk/tests/testwindow.c +Programs_unittests_testwindow_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwindow_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwindow_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c +Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testdownload_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testatk_SOURCES = WebKit/gtk/tests/testatk.c +Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testatkroles_SOURCES = WebKit/gtk/tests/testatkroles.c +Programs_unittests_testatkroles_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testatkroles_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testatkroles_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testwebsettings_SOURCES = WebKit/gtk/tests/testwebsettings.c +Programs_unittests_testwebsettings_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebsettings_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testwebresource_SOURCES = WebKit/gtk/tests/testwebresource.c +Programs_unittests_testwebresource_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebresource_LDADD = $(webkit_tests_ldadd) + +Programs_unittests_testwebdatasource_SOURCES = WebKit/gtk/tests/testwebdatasource.c +Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd) + +Programs_unittests_testwebview_SOURCES = WebKit/gtk/tests/testwebview.c WebKit/gtk/tests/test_utils.c +Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testhittestresult_SOURCES = WebKit/gtk/tests/testhittestresult.c +Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd) + +Programs_unittests_testkeyevents_SOURCES = WebKit/gtk/tests/testkeyevents.c +Programs_unittests_testkeyevents_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testcopyandpaste_SOURCES = WebKit/gtk/tests/testcopyandpaste.c +Programs_unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags) + +# Autogenerated sources +BUILT_SOURCES += \ + $(javascriptcore_built_sources) \ + $(javascriptcore_built_nosources) \ + $(webcore_built_sources) \ + $(webcore_built_nosources) \ + $(webkitgtk_built_sources) \ + $(webkitgtk_built_nosources) \ + $(gdom_built_nosources) + +# Project-wide clean rules +# Files that will be cleaned +CLEANFILES += \ + $(BUILT_SOURCES) \ + $(webkitgtk_cleanfiles) \ + $(libgdom_cleanfiles) + +DISTCLEANFILES += \ + $(CLEANFILES) + +MAINTAINERCLEANFILES += \ + $(CLEANFILES) \ + $(srcdir)/aconfig.h.in \ + $(srcdir)/autotools/config.* \ + $(srcdir)/autotools/compile \ + $(srcdir)/autotools/depcomp \ + $(srcdir)/autotools/install-sh \ + $(srcdir)/autotools/missing \ + $(srcdir)/configure \ + $(srcdir)/GNUmakefile.in \ + $(srcdir)/INSTALL \ + $(srcdir)/README \ + $(top_builddir)/config.* + +# Older automake versions (1.7) place Plo files in a different place so we need +# to create the output directory manually. +all-local: stamp-po + $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources + +# remove built sources and program directories +clean-local: + -rm -rf $(GENPROGRAMS) + +maintainer-clean-local: distclean-local + +distclean-local: + -rm -rf $(GENSOURCES) $(GENPROGRAMS) + +dist-hook: + cp $(srcdir)/WebKit/gtk/NEWS $(distdir)/ + +install-data-local: po-install-data-local + +installdirs-data-local: po-installdirs-data-local + +uninstall-local: po-uninstall-local + +# Run all tests in cwd +# FIXME: we should run this under xvfb +test: $(TEST_PROGS) + $(GTESTER) --verbose $(TEST_PROGS); + +# test-report: run tests in cwd and generate report +# full-report: run tests in cwd with -m perf and -m slow and generate report +# perf-report: run tests in cwd with -m perf and generate report +test-report full-report perf-report: $(TEST_PROGS) + @ case $@ in \ + test-report) test_options="-k";; \ + full-report) test_options="-k -m=perf";; \ + perf-report) test_options="-k -m=perf -m=slow";; \ + esac ; \ + $(GTESTER) --verbose $$test_options -o test-report.xml $(TEST_PROGS); \ + $(GTESTER_REPORT) test-report.xml > test-report.html ; + +.PHONY: test test-report perf-report full-report +check-local: test diff --git a/meta/recipes-sato/webkit/files/Makefile b/meta/recipes-sato/webkit/files/Makefile new file mode 100644 index 0000000000..1e50d1d358 --- /dev/null +++ b/meta/recipes-sato/webkit/files/Makefile @@ -0,0 +1,17 @@ +MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools + +all: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +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 + +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/meta/recipes-sato/webkit/files/Makefile.shared b/meta/recipes-sato/webkit/files/Makefile.shared new file mode 100644 index 0000000000..aa9fa728d6 --- /dev/null +++ b/meta/recipes-sato/webkit/files/Makefile.shared @@ -0,0 +1,18 @@ +SCRIPTS_PATH ?= ../WebKitTools/Scripts +XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) + +all: + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +debug d development dev develop: force + $(SCRIPTS_PATH)/set-webkit-configuration --debug + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +release r deployment dep deploy: force + $(SCRIPTS_PATH)/set-webkit-configuration --release + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +clean: + ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +force: ; diff --git a/meta/recipes-sato/webkit/files/WebKit.pri b/meta/recipes-sato/webkit/files/WebKit.pri new file mode 100644 index 0000000000..d12423beb2 --- /dev/null +++ b/meta/recipes-sato/webkit/files/WebKit.pri @@ -0,0 +1,107 @@ +# Include file to make it easy to include WebKit into Qt projects + + +isEmpty(OUTPUT_DIR) { + CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release + CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug +} + +!gtk-port:CONFIG += qt-port +qt-port:DEFINES += BUILDING_QT__=1 +qt-port:!building-libs { + QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR + LIBS += -lQtWebKit + DEPENDPATH += $$PWD/WebKit/qt/Api +} + +gtk-port:!building-libs { + QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR + LIBS += -lWebKitGtk + DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit +} + +gtk-port { + CONFIG += link_pkgconfig + + DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1 + + # We use FreeType directly with Cairo + PKGCONFIG += cairo-ft + + directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0 + else: PKGCONFIG += cairo gtk+-2.0 + + # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb) + CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG) + + # We use the curl http backend on all platforms + PKGCONFIG += libcurl + DEFINES += WTF_USE_CURL=1 + + LIBS += -lWebKitGtk -ljpeg -lpng + + QMAKE_CXXFLAGS += $$system(icu-config --cppflags) + QMAKE_LIBS += $$system(icu-config --ldflags) + + # This set of warnings is borrowed from the Mac build + QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef + + # These flags are based on optimization experience from the Mac port: + # Helps code size significantly and speed a little + QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti + + DEPENDPATH += $$PWD/JavaScriptCore/API + INCLUDEPATH += $$PWD +} + +DEFINES += USE_SYSTEM_MALLOC +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 +gtk-port:INCLUDEPATH += \ + $$BASE_DIR/WebCore/platform/gtk \ + $$BASE_DIR/WebCore/platform/network/curl \ + $$BASE_DIR/WebCore/platform/graphics/cairo \ + $$BASE_DIR/WebCore/loader/gtk \ + $$BASE_DIR/WebCore/page/gtk \ + $$BASE_DIR/WebKit/gtk \ + $$BASE_DIR/WebKit/gtk/WebCoreSupport \ + $$BASE_DIR/WebKit/gtk/webkit +INCLUDEPATH += \ + $$BASE_DIR/JavaScriptCore/ \ + $$BASE_DIR/JavaScriptCore/kjs \ + $$BASE_DIR/JavaScriptCore/bindings \ + $$BASE_DIR/JavaScriptCore/bindings/c \ + $$BASE_DIR/JavaScriptCore/wtf \ + $$BASE_DIR/JavaScriptCore/ForwardingHeaders \ + $$BASE_DIR/WebCore \ + $$BASE_DIR/WebCore/ForwardingHeaders \ + $$BASE_DIR/WebCore/platform \ + $$BASE_DIR/WebCore/platform/network \ + $$BASE_DIR/WebCore/platform/graphics \ + $$BASE_DIR/WebCore/loader \ + $$BASE_DIR/WebCore/page \ + $$BASE_DIR/WebCore/css \ + $$BASE_DIR/WebCore/dom \ + $$BASE_DIR/WebCore/bridge \ + $$BASE_DIR/WebCore/editing \ + $$BASE_DIR/WebCore/rendering \ + $$BASE_DIR/WebCore/history \ + $$BASE_DIR/WebCore/xml \ + $$BASE_DIR/WebCore/html \ + $$BASE_DIR/WebCore/plugins + + +macx { + INCLUDEPATH += /usr/include/libxml2 + LIBS += -lxml2 -lxslt +} diff --git a/meta/recipes-sato/webkit/files/WebKit.pro b/meta/recipes-sato/webkit/files/WebKit.pro new file mode 100644 index 0000000000..bc14feb5f6 --- /dev/null +++ b/meta/recipes-sato/webkit/files/WebKit.pro @@ -0,0 +1,21 @@ +TEMPLATE = subdirs +CONFIG += ordered +!gtk-port:CONFIG += qt-port +qt-port { + lessThan(QT_MINOR_VERSION, 4) { + !win32-*:SUBDIRS += WebKit/qt/Plugins + } +} +SUBDIRS += \ + WebCore \ + JavaScriptCore/kjs/testkjs.pro + +qt-port { + SUBDIRS += WebKit/qt/QtLauncher + + !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro +} + +gtk-port:SUBDIRS += \ + WebKitTools/GtkLauncher \ + WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro diff --git a/meta/recipes-sato/webkit/files/autogen.sh b/meta/recipes-sato/webkit/files/autogen.sh new file mode 100755 index 0000000000..97beb209d2 --- /dev/null +++ b/meta/recipes-sato/webkit/files/autogen.sh @@ -0,0 +1,63 @@ +#! /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 + +GTKDOCIZE_FLAGS="--copy" +LIBTOOLIZE_FLAGS="--force --automake" +ACLOCAL_FLAGS="-I autotools" +AUTOMAKE_FLAGS="--foreign --add-missing" + +DIE=0 + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" + DIE=1 +} + +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have automake installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" + DIE=1 +} + +LIBTOOLIZE=libtoolize +($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || { + LIBTOOLIZE=glibtoolize + ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have libtool installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" + DIE=1 + } +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +rm -rf $top_srcdir/autom4te.cache + +touch README INSTALL + +gtkdocize $GTKDOCIZE_FLAGS > /dev/null 2>&1 || echo "Warning: not running gtk-docize." +aclocal $ACLOCAL_FLAGS || exit $? +$LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $? +autoheader || exit $? +automake $AUTOMAKE_FLAGS || exit $? +autoconf || exit $? + +cd $ORIGDIR || exit 1 + +$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? diff --git a/meta/recipes-sato/webkit/files/configure.ac b/meta/recipes-sato/webkit/files/configure.ac new file mode 100644 index 0000000000..d4f3e749fc --- /dev/null +++ b/meta/recipes-sato/webkit/files/configure.ac @@ -0,0 +1,983 @@ +AC_PREREQ(2.59) + +m4_define([webkit_major_version], [1]) +m4_define([webkit_minor_version], [3]) +m4_define([webkit_micro_version], [2]) + +# This is the version we'll be using as part of our User-Agent string +# e.g., AppleWebKit/$(webkit_user_agent_version) ... +# +# Sourced from WebCore/Configurations/Version.xcconfig +m4_define([webkit_user_agent_major_version], [531]) +m4_define([webkit_user_agent_minor_version], [2]) + +AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) + +AC_CONFIG_MACRO_DIR([autotools]) +AC_CONFIG_AUX_DIR([autotools]) +AC_SUBST(ACLOCAL_AMFLAGS, "-I autotools") + +AC_CONFIG_HEADERS([autotoolsconfig.h]) +AC_CANONICAL_HOST + +WEBKIT_MAJOR_VERSION=webkit_major_version +WEBKIT_MINOR_VERSION=webkit_minor_version +WEBKIT_MICRO_VERSION=webkit_micro_version +WEBKIT_USER_AGENT_MAJOR_VERSION=webkit_user_agent_major_version +WEBKIT_USER_AGENT_MINOR_VERSION=webkit_user_agent_minor_version +AC_SUBST(WEBKIT_MAJOR_VERSION) +AC_SUBST(WEBKIT_MINOR_VERSION) +AC_SUBST(WEBKIT_MICRO_VERSION) +AC_SUBST(WEBKIT_USER_AGENT_MAJOR_VERSION) +AC_SUBST(WEBKIT_USER_AGENT_MINOR_VERSION) + +AC_CONFIG_SRCDIR([WebCore/config.h]) + +dnl # Libtool library version, not to confuse with API version +dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning +LIBWEBKITGTK_VERSION=0:0:0 +AC_SUBST([LIBWEBKITGTK_VERSION]) + +AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) + +# Use AM_SILENT_RULES if present +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +# host checking - inspired by the GTK+ configure.in +# TODO: move these to webkit.m4? +AC_MSG_CHECKING([for native Win32]) +case "$host" in + *-*-mingw*) + os_win32=yes + ;; + *) + os_win32=no + ;; +esac +AC_MSG_RESULT([$os_win32]) + +case "$host" in + *-*-linux*) + os_linux=yes + ;; + *-*-freebsd*) + os_freebsd=yes + ;; + *-*-darwin*) + os_darwin=yes + ;; +esac + +case "$host_os" in + gnu* | linux* | k*bsd*-gnu) + os_gnu=yes + ;; + *) + os_gnu=no + ;; +esac + +# initialize webkit options +WEBKIT_INIT +AC_DISABLE_STATIC +AC_LIBTOOL_WIN32_DLL +AC_PROG_LIBTOOL + +AC_PATH_PROG(FLEX, flex) +if test -z "$FLEX"; then + AC_MSG_ERROR([You need the 'flex' lexer generator to compile WebKit]) +else + FLEX_VERSION=`$FLEX --version | sed 's,.*\ \([0-9]*\.[0-9]*\.[0-9]*\)$,\1,'` + AX_COMPARE_VERSION([2.5.33],[gt],[$FLEX_VERSION], + AC_MSG_WARN([You need at least version 2.5.33 of the 'flex' lexer generator to compile WebKit correctly])) +fi + +AC_PATH_PROG(GPERF, gperf) +if test -z "$GPERF"; then + AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit]) +fi + +# 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 exists]), + AC_MSG_ERROR([pthread support is required to build WebKit])) +fi + +# check for libjpeg the way Gtk does it. +AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, + jpeg_ok=yes, jpeg_ok=no + AC_MSG_ERROR([JPEG library (libjpeg) not found])) +if test "$jpeg_ok" = yes; then + AC_MSG_CHECKING([for jpeglib]) + AC_TRY_CPP( +[#include <stdio.h> +#undef PACKAGE +#undef VERSION +#undef HAVE_STDLIB_H +#include <jpeglib.h>], + jpeg_ok=yes, + jpeg_ok=no) + AC_MSG_RESULT($jpeg_ok) + if test "$jpeg_ok" = yes; then + JPEG_LIBS="-ljpeg" + # should we check for progressive JPEG like GTK+ as well? + else + AC_MSG_ERROR([JPEG library (libjpeg) not found]) + fi +fi +AC_SUBST([JPEG_LIBS]) + +# Check for libpng the way Gtk+ does it +for l in libpng libpng14 libpng12; do + AC_MSG_CHECKING(for $l) + if $PKG_CONFIG --exists $l ; then + AC_MSG_RESULT(yes) + PNG_LIBS=`$PKG_CONFIG --libs $l` + png_ok=yes + break + else + AC_MSG_RESULT(no) + png_ok=no + fi +done +if test "$png_ok" != yes; then + AC_CHECK_LIB(png, png_read_info, + [AC_CHECK_HEADER(png.h, + png_ok=yes, + png_ok=no)], + AC_MSG_ERROR([PNG library (libpng) not found]), -lz -lm) + if test "$png_ok" = yes; then + AC_MSG_CHECKING([for png_structp in png.h]) + AC_TRY_COMPILE([#include <png.h>], + [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;], + png_ok=yes, + png_ok=no) + AC_MSG_RESULT($png_ok) + if test "$png_ok" = yes; then + PNG_LIBS='-lpng -lz' + else + AC_MSG_ERROR([PNG library (libpng) not found]) + fi + else + AC_MSG_ERROR([PNG library (libpng) not found]) + fi +fi +AC_SUBST([PNG_LIBS]) + +# determine the GTK+ version to use +AC_MSG_CHECKING([the GTK+ version to use]) +AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk=2.0|3.0], [the GTK+ version to use (default: 2.0)])], + [case "$with_gtk" in + 2.0|3.0) ;; + *) AC_MSG_ERROR([invalid GTK+ version specified]) ;; + esac], + [with_gtk=2.0]) +AC_MSG_RESULT([$with_gtk]) + +case "$with_gtk" in + 2.0) GTK_REQUIRED_VERSION=2.10 + GTK_API_VERSION=2.0 + WEBKITGTK_API_MAJOR_VERSION=1 + WEBKITGTK_API_MINOR_VERSION=0 + WEBKITGTK_API_VERSION=1.0 + WEBKITGTK_PC_NAME=webkit + GAIL_PC_NAME=gail + GAIL_REQUIRED_VERSION=1.8 + ;; + 3.0) GTK_REQUIRED_VERSION=2.90 + GTK_API_VERSION=3.0 + WEBKITGTK_API_MAJOR_VERSION=3 + WEBKITGTK_API_MINOR_VERSION=0 + WEBKITGTK_API_VERSION=3.0 + WEBKITGTK_PC_NAME=webkitgtk + GAIL_PC_NAME=gail-3.0 + GAIL_REQUIRED_VERSION=2.90.4 + ;; +esac + +AC_SUBST([WEBKITGTK_API_MAJOR_VERSION]) +AC_SUBST([WEBKITGTK_API_MINOR_VERSION]) +AC_SUBST([WEBKITGTK_API_VERSION]) +AC_SUBST([WEBKITGTK_PC_NAME]) +AC_SUBST([GTK_API_VERSION]) +AM_CONDITIONAL([GTK_API_VERSION_2],[test "$GTK_API_VERSION" = "2.0"]) + +# determine the GDK/GTK+ target +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_target="x11"]) + +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_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 + +# minimum base dependencies +LIBSOUP_REQUIRED_VERSION=2.28.2 +CAIRO_REQUIRED_VERSION=1.6 +FONTCONFIG_REQUIRED_VERSION=2.4 +FREETYPE2_REQUIRED_VERSION=9.0 +LIBXML_REQUIRED_VERSION=2.6 + +# minimum GTK+ base dependencies +PANGO_REQUIRED_VERSION=1.12 + +# optional modules +LIBXSLT_REQUIRED_VERSION=1.1.7 +SQLITE_REQUIRED_VERSION=3.0 +GSTREAMER_REQUIRED_VERSION=0.10 +GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.25 +ENCHANT_REQUIRED_VERSION=0.22 + +# Available modules +# +# glib - glib and includes gthread +# unicode - check and identify which unicode backend to use +# +# todo: webcore gtk +WEBKIT_CHECK_DEPENDENCIES([glib unicode]) + +GETTEXT_PACKAGE=$PACKAGE +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", + [The gettext catalog name]) + +PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION) +AC_SUBST(LIBXML_CFLAGS) +AC_SUBST(LIBXML_LIBS) + +PKG_CHECK_MODULES(PANGO, + [pango >= $PANGO_REQUIRED_VERSION + pangoft2]) +AC_SUBST(PANGO_CFLAGS) +AC_SUBST(PANGO_LIBS) + +PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION) +AC_SUBST(ENCHANT_CFLAGS) +AC_SUBST(ENCHANT_LIBS) + +PKG_CHECK_MODULES(GAIL, $GAIL_PC_NAME >= $GAIL_REQUIRED_VERSION) +AC_SUBST(GAIL_CFLAGS) +AC_SUBST(GAIL_LIBS) + +# check for target-specific dependencies +if test "$with_target" = "directfb"; then + PKG_CHECK_MODULES(CAIRO, cairo-directfb >= $CAIRO_REQUIRED_VERSION) + PKG_CHECK_MODULES(GTK, gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION) + AC_DEFINE([WTF_PLATFORM_DIRECTFB],[1],[Define if target is DirectFB]) +else + PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION) + PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION) + + if test "$with_target" = "x11" && test "$os_win32" = "no"; then + # check for XT + PKG_CHECK_MODULES([XT], + [xt], + [xt_has_pkg_config=yes], + [xt_has_pkg_config=no]) + # some old versions of Xt do not provide xt.pc, so try to link against Xt + # and if it's installed fall back to just adding -lXt + if test "$xt_has_pkg_config" = "no"; then + # using AC_CHECK_LIB instead of AC_SEARCH_LIB is fine in this case as + # we don't care about the XtOpenDisplay symbol but only about the + # existence of libXt + AC_CHECK_LIB([Xt], [XtOpenDisplay], + [XT_CFLAGS=""; XT_LIBS="-lXt"], + [AC_MSG_ERROR([X Toolkit Intrinsics library (libXt) not found])]) + fi + AC_SUBST([XT_CFLAGS]) + AC_SUBST([XT_LIBS]) + AC_DEFINE([WTF_PLATFORM_X11],[1],[Define if target is X11]) + fi +fi +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) +AC_SUBST(CAIRO_CFLAGS) +AC_SUBST(CAIRO_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="no"]) +AC_MSG_RESULT([$enable_debug]) + +# check whether to enable optimized builds +AC_MSG_CHECKING([whether to enable optimized builds]) +AC_ARG_ENABLE(optimizations, + AC_HELP_STRING([--enable-optimizations], + [turn on optimize builds (GCC only) + [default=yes]]), + [enable_optimizations=$enableval], + [if test "$enable_debug" = "yes"; then enable_optimizations="no"; else enable_optimizations="yes"; fi]) +AC_MSG_RESULT([$enable_optimizations]) + +# check whether to enable 3D transforms support +AC_MSG_CHECKING([whether to enable support for 3D Transforms]) +AC_ARG_ENABLE(3D_transforms, + AC_HELP_STRING([--enable-3D-transforms], + [enable support for 3D transforms [default=no]]), + [],[enable_3D_transforms="no"]) +AC_MSG_RESULT([$enable_3D_transforms]) + +# check whether to enable channel messaging support +AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support]) +AC_ARG_ENABLE(channel_messaging, + AC_HELP_STRING([--enable-channel-messaging], + [enable HTML5 channel messaging support [default=yes]]), + [],[enable_channel_messaging="yes"]) +AC_MSG_RESULT([$enable_channel_messaging]) + +# check whether to enable JavaScript debugger/profiler support +AC_MSG_CHECKING([whether to enable JavaScript debugger/profiler support]) +AC_ARG_ENABLE(javascript_debugger, + AC_HELP_STRING([--enable-javascript-debugger], + [enable JavaScript debugger/profiler support [default=yes]]), + [],[enable_javascript_debugger="yes"]) +AC_MSG_RESULT([$enable_javascript_debugger]) + +# check whether to enable HTML5 Offline Web Applications support +AC_MSG_CHECKING([whether to enable HTML5 offline web applications support]) +AC_ARG_ENABLE(offline_web_applications, + AC_HELP_STRING([--enable-offline-web-applications], + [enable HTML5 offline web applications support [default=yes]]), + [],[enable_offline_web_applications="yes"]) +AC_MSG_RESULT([$enable_offline_web_applications]) + +# check whether to enable HTML5 client-side session and persitent storage support +AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support]) +AC_ARG_ENABLE(dom_storage, + AC_HELP_STRING([--enable-dom-storage], + [enable HTML5 client-side session and persistent storage support [default=yes]]), + [],[enable_dom_storage="yes"]) +AC_MSG_RESULT([$enable_dom_storage]) + +# check whether to enable the indexed database API +AC_MSG_CHECKING([whether to enable the indexed database API]) +AC_ARG_ENABLE(indexed_database, + AC_HELP_STRING([--enable-indexeddb], + [enable the indexed database API [default=no]]), + [],[enable_indexed_database="no"]) +AC_MSG_RESULT([$enable_indexed_database]) + +# check whether to enable the speech input API +AC_MSG_CHECKING([whether to enable the speech input API]) +AC_ARG_ENABLE(input_speech, + AC_HELP_STRING([--enable-input-speech], + [enable the speech input API [default=no]]), + [],[enable_input_speech="no"]) +AC_MSG_RESULT([$enable_input_speech]) + +# check whether to build with database support +AC_MSG_CHECKING([whether to enable HTML5 client-side database storage support]) +AC_ARG_ENABLE(database, + AC_HELP_STRING([--enable-database], + [enable HTML5 client-side database storage support [default=yes]]), + [],[enable_database="yes"]) +AC_MSG_RESULT([$enable_database]) + +# check whether to build with server-sent events support +AC_MSG_CHECKING([whether to enable HTML5 server-sent events support]) +AC_ARG_ENABLE(eventsource, + AC_HELP_STRING([--enable-eventsource], + [enable HTML5 server-sent events support [default=yes]]), + [],[enable_eventsource="yes"]) +AC_MSG_RESULT([$enable_eventsource]) + +# check whether to build with icon database support +AC_MSG_CHECKING([whether to enable icon database support]) +AC_ARG_ENABLE(icon_database, + AC_HELP_STRING([--enable-icon-database], + [enable icon database [default=yes]]), + [],[enable_icon_database="yes"]) +AC_MSG_RESULT([$enable_icon_database]) + +# check whether to build with image resizer API support +AC_MSG_CHECKING([whether to enable image resizer API support]) +AC_ARG_ENABLE(image_resizer, + AC_HELP_STRING([--enable-image-resizer], + [enable image resizer [default=no]]), + [],[enable_image_resizer="no"]) +AC_MSG_RESULT([$enable_image_resizer]) + +# check whether to enable HTML5 datalist support +AC_MSG_CHECKING([whether to enable HTML5 datalist support]) +AC_ARG_ENABLE(datalist, + AC_HELP_STRING([--enable-datalist], + [enable HTML5 datalist support [default=yes]]), + [],[enable_datalist="yes"]) +AC_MSG_RESULT([$enable_datalist]) + +# check whether to enable HTML5 ruby support +AC_MSG_CHECKING([whether to enable HTML5 ruby support]) +AC_ARG_ENABLE(ruby, + AC_HELP_STRING([--enable-ruby], + [enable HTML5 ruby support [default=yes]]), + [],[enable_ruby="yes"]) +AC_MSG_RESULT([$enable_ruby]) + +# check whether to enable HTML5 sandbox iframe support +AC_MSG_CHECKING([whether to enable HTML5 sandboxed iframe support]) +AC_ARG_ENABLE(sandbox, + AC_HELP_STRING([--enable-sandbox], + [enable HTML5 sandboxed iframe support [default=yes]]), + [],[enable_sandbox="yes"]) +AC_MSG_RESULT([$enable_sandbox]) + +# check whether to enable HTML5 audio/video support +AC_MSG_CHECKING([whether to enable HTML5 video support]) +AC_ARG_ENABLE(video, + AC_HELP_STRING([--enable-video], + [enable HTML5 video support [default=yes]]), + [],[enable_video="yes"]) +AC_MSG_RESULT([$enable_video]) + +# check whether to enable XHTML-MP support +AC_MSG_CHECKING([whether to enable XHTML-MP support]) +AC_ARG_ENABLE(xhtmlmp, + AC_HELP_STRING([--enable-xhtmlmp], + [enable support for XHTML-MP [default=no]]), + [],[enable_xhtmlmp="no"]) +AC_MSG_RESULT([$enable_xhtmlmp]) + +# 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=yes]]), + [],[enable_xpath="yes"]) +AC_MSG_RESULT([$enable_xpath]) + +# check whether to enable XSLT support +AC_MSG_CHECKING([whether to enable XSLT support]) +AC_ARG_ENABLE(xslt, + AC_HELP_STRING([--enable-xslt], + [enable support for XSLT [default=yes]]), + [],[enable_xslt="yes"]) +AC_MSG_RESULT([$enable_xslt]) + +# check whether to enable geolocation support +AC_MSG_CHECKING([whether to enable geolocation support]) +AC_ARG_ENABLE(geolocation, + AC_HELP_STRING([--enable-geolocation], + [enable support for geolocation [default=no]]), + [],[enable_geolocation="no"]) +AC_MSG_RESULT([$enable_geolocation]) + +# check whether to enable MathML support +AC_MSG_CHECKING([whether to enable MathML support]) +AC_ARG_ENABLE(mathml, + AC_HELP_STRING([--enable-mathml], + [enable support for MathML [default=no]]), + [],[enable_mathml="no"]) +AC_MSG_RESULT([$enable_mathml]) + +# check whether to enable SVG support +AC_MSG_CHECKING([whether to enable SVG support]) +AC_ARG_ENABLE(svg, + AC_HELP_STRING([--enable-svg], + [enable support for SVG [default=yes]]), + [],[enable_svg="yes"]) +AC_MSG_RESULT([$enable_svg]) + +# check whether to enable WML support +AC_MSG_CHECKING([whether to enable WML support]) +AC_ARG_ENABLE(wml, + AC_HELP_STRING([--enable-wml], + [enable support for WML [default=no]]), + [],[enable_wml="no"]) +AC_MSG_RESULT([$enable_wml]) + +# check whether to enable SharedWorkers support +AC_MSG_CHECKING([whether to enable SharedWorkers support]) +AC_ARG_ENABLE(shared_workers, + AC_HELP_STRING([--enable-shared-workers], + [enable support for SharedWorkers [default=yes]]), + [],[enable_shared_workers="yes"]) +AC_MSG_RESULT([$enable_shared_workers]) + +# check whether to enable Web Workers support +AC_MSG_CHECKING([whether to enable Web Workers support]) +AC_ARG_ENABLE(workers, + AC_HELP_STRING([--enable-workers], + [enable support for Web Workers [default=yes]]), + [],[enable_workers="yes"]) +AC_MSG_RESULT([$enable_workers]) + +# turn off svg features if --disable-svg is requested +if test "$enable_svg" = "no"; then + enable_svg_animation=no + enable_svg_fonts=no + enable_svg_foreign_object=no + enable_svg_as_image=no + enable_svg_use=no +fi + +# check whether to enable support for SVG animation +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 (experimental) [default=yes]]), + [],[enable_svg_animation="yes"]) +AC_MSG_RESULT([$enable_svg_animation]) + +# check whether to enable support for filters +AC_MSG_CHECKING([whether to enable support for filters]) +AC_ARG_ENABLE(filters, + AC_HELP_STRING([--enable-filters], + [enable support for filters (experimental) [default=yes]]), + [],[enable_filters="yes"]) +AC_MSG_RESULT([$enable_filters]) + +# check whether to enable support for SVG fonts +AC_MSG_CHECKING([whether to enable support for SVG fonts]) +AC_ARG_ENABLE(svg_fonts, + AC_HELP_STRING([--enable-svg-fonts], + [enable support for SVG fonts (experimental) [default=yes]]), + [],[enable_svg_fonts="yes"]) +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=yes]]), + [],[enable_svg_foreign_object="yes"]) +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, + AC_HELP_STRING([--enable-svg-as-image], + [enable SVG as Image support (experimental) [default=yes]]), + [],[enable_svg_as_image="yes"]) +AC_MSG_RESULT([$enable_svg_as_image]) + +# check whether to enable SVG USE element support +AC_MSG_CHECKING([whether to enable support for SVG use element]) +AC_ARG_ENABLE(svg_use, + AC_HELP_STRING([--enable-svg-use], + [enable SVG use element support (experimental) [default=yes]]), + [],[enable_svg_use="yes"]) +AC_MSG_RESULT([$enable_svg_use]) + +# check for SVG features, enabling SVG if necessary +if test "$enable_svg_animation" = "yes" || \ + test "$enable_svg_fonts" = "yes" || \ + test "$enable_svg_foreign_object" = "yes" || \ + test "$enable_svg_as_image" = "yes" || \ + test "$enable_svg_use" = "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 + +# check whether to enable Web Socket support +AC_MSG_CHECKING([whether to enable Web Sockets support]) +AC_ARG_ENABLE(web_sockets, + AC_HELP_STRING([--enable-web-sockets], + [enable support for Web Sockets [default=no]]), + [],[enable_web_sockets="no"]) +AC_MSG_RESULT([$enable_web_sockets]) + +# check whether to enable Web Timing support +AC_MSG_CHECKING([whether to enable Web Timing support]) +AC_ARG_ENABLE(web_timing, + AC_HELP_STRING([--enable-web-timing], + [enable support for Web Timing [default=no]]), + [],[enable_web_timing="no"]) +AC_MSG_RESULT([$enable_web_timing]) + +# check whether to enable Blob.slice support +AC_MSG_CHECKING([whether to enable Blob.slice support]) +AC_ARG_ENABLE(blob_slice, + AC_HELP_STRING([--enable-blob-slice], + [enable support for Blob.slice [default=no]]), + [],[enable_blob_slice="no"]) +AC_MSG_RESULT([$enable_blob_slice]) + +# check whether to enable Fast Mobile Scrolling support +AC_MSG_CHECKING([whether to enable Fast Mobile Scrolling]) +AC_ARG_ENABLE(fast_mobile_scrolling, + AC_HELP_STRING([--enable-fast-mobile-scrolling], + [enable support for Fast Mobile Scrolling [default=no]]), + [],[enable_fast_mobile_scrolling="no"]) +AC_MSG_RESULT([$enable_fast_mobile_scrolling]) + +# check whether to enable FileReader support +AC_MSG_CHECKING([whether to enable FileReader support]) +AC_ARG_ENABLE(file_reader, + AC_HELP_STRING([--enable-file-reader], + [enable support for FileReader [default=no]]), + [],[enable_file_reader="no"]) +AC_MSG_RESULT([$enable_file_reader]) + +# check whether to enable FileWriter support +AC_MSG_CHECKING([whether to enable FileWriter support]) +AC_ARG_ENABLE(file_writer, + AC_HELP_STRING([--enable-file-writer], + [enable support for FileWriter [default=no]]), + [],[enable_file_writer="no"]) +AC_MSG_RESULT([$enable_file_writer]) + +# check whether to enable code coverage +AC_MSG_CHECKING([whether to enable code coverage support]) +AC_ARG_ENABLE(coverage, + AC_HELP_STRING([--enable-coverage], + [enable code coverage support [default=no]]), + [],[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]) + +AC_MSG_CHECKING([whether to enable JIT compilation]) +AC_ARG_ENABLE([jit], + AC_HELP_STRING([--enable-jit], + [Enable JIT compilation default=yes]), + [],[enable_jit="yes"]) +if test "$enable_jit" = "yes"; then + case "$host_cpu" in + i*86|x86_64) + AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT]) + AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR]) + AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT]) + AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls]) + AC_DEFINE([ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS], [1], [Define to enable optimized property access]) + AC_DEFINE([ENABLE_JIT_OPTIMIZE_ARITHMETIC], [1], [Define to enable optimized arithmetic]) + case "$host_cpu" in + i*86) + AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list]) + ;; + x86_64) + AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register]) + AC_DEFINE([WTF_USE_ALTERNATE_JSIMMEDIATE], [1], [Use alternate JSImmediate]) + ;; + esac + ;; + *) + enable_jit="no (CPU '$host_cpu' not supported)" + ;; + esac +fi +AC_MSG_RESULT([$enable_jit]) + +# GObject Introspection +AC_MSG_CHECKING([whether to enable GObject introspection support]) +AC_ARG_ENABLE([introspection], + [AS_HELP_STRING([--enable-introspection],[Enable GObject introspection (default: disabled)])], + [],[enable_introspection=no]) +AC_MSG_RESULT([$enable_introspection]) + +G_IR_SCANNER= +G_IR_COMPILER= +G_IR_GENERATE= +GIRDIR= +GIRTYPELIBDIR= + +if test "$enable_introspection" = "yes"; then + GOBJECT_INTROSPECTION_REQUIRED=0.6.15 + PKG_CHECK_MODULES([INTROSPECTION],[gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED]) + + G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)" + G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)" + G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)" + AC_DEFINE([ENABLE_INTROSPECTION],[1],[Define to enable GObject introspection support]) +fi + +AC_SUBST([G_IR_SCANNER]) +AC_SUBST([G_IR_COMPILER]) +AC_SUBST([G_IR_GENERATE]) + +# determine the font backend +AC_MSG_CHECKING([the font backend to use]) +AC_ARG_WITH(font_backend, + AC_HELP_STRING([--with-font-backend=@<:@freetype/pango@:>@], + [Select font backend [default=freetype]]), + [],[with_font_backend="freetype"]) + +case "$with_font_backend" in + freetype|pango) ;; + *) AC_MSG_ERROR([Invalid font backend: must be freetype or pango.]) ;; +esac +AC_MSG_RESULT([$with_font_backend]) + +# Add '-g' flag to gcc if it's debug build +if test "$enable_debug" = "yes"; then + CXXFLAGS="$CXXFLAGS -g" + CFLAGS="$CFLAGS -g" +else + AC_DEFINE([NDEBUG], [1], [Define to disable debugging features]) +fi + +# Add the appropriate 'O' level for optimized builds +if test "$enable_optimizations" = "yes"; then + CXXFLAGS="$CXXFLAGS -O2" + CFLAGS="$CFLAGS -O2" +else + CXXFLAGS="$CXXFLAGS -O0" + CFLAGS="$CFLAGS -O0" +fi + +PKG_CHECK_MODULES([LIBSOUP], + [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION]) +AC_SUBST([LIBSOUP_CFLAGS]) +AC_SUBST([LIBSOUP_LIBS]) + +# check if we can use libSoup 2.29.90 features +PKG_CHECK_MODULES([LIBSOUP_2_29_90], + [libsoup-2.4 >= 2.29.90], + [have_libsoup_2_29_90=yes], + [have_libsoup_2_29_90=no]) +if test "$have_libsoup_2_29_90" = "yes"; then + AC_DEFINE([HAVE_LIBSOUP_2_29_90], 1, [Whether libSoup 2.29.90 features are available]) +fi + +# check if FreeType/FontConfig are available +if test "$with_font_backend" = "freetype"; then + if test "$with_target" = "directfb"; then + PKG_CHECK_MODULES([FREETYPE], + [fontconfig >= $FONTCONFIG_REQUIRED_VERSION + freetype2 >= $FREETYPE2_REQUIRED_VERSION]) + else + PKG_CHECK_MODULES([FREETYPE], + [cairo-ft + fontconfig >= $FONTCONFIG_REQUIRED_VERSION + freetype2 >= $FREETYPE2_REQUIRED_VERSION]) + fi + AC_SUBST([FREETYPE_CFLAGS]) + AC_SUBST([FREETYPE_LIBS]) +fi + +# check if sqlite 3 is available +if test "$enable_icon_database" = "yes" || \ + test "$enable_database" = "yes" || \ + test "$enable_offline_web_applications" = "yes" || \ + test "$enable_dom_storage" = "yes"; then + PKG_CHECK_MODULES([SQLITE3], + [sqlite3 >= $SQLITE_REQUIRED_VERSION], + [sqlite3_has_pkg_config=yes], + [sqlite3_has_pkg_config=no]) + if test "$sqlite3_has_pkg_config" = "no"; then + AC_SEARCH_LIBS([sqlite3_open16], [sqlite3], + [SQLITE3_LIBS="$LIBS";SQLITE3_CFLAGS="-I $srcdir/WebKitLibraries/WebCoreSQLite3"], + [AC_MSG_ERROR([SQLite3 is required to enable Database support])]) + fi + 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]) + AC_SUBST([LIBXSLT_CFLAGS]) + AC_SUBST([LIBXSLT_LIBS]) +fi + +# check if geoclue is available +if test "$enable_geolocation" = "yes"; then + PKG_CHECK_MODULES([GEOCLUE], [geoclue]) + AC_SUBST([GEOCLUE_CFLAGS]) + AC_SUBST([GEOCLUE_LIBS]) +fi + +# check if gstreamer is available +if test "$enable_video" = "yes"; then + PKG_CHECK_MODULES([GSTREAMER], + [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION + gstreamer-app-0.10 + gstreamer-base-0.10 + gstreamer-pbutils-0.10 + gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION + gstreamer-video-0.10]) + AC_SUBST([GSTREAMER_CFLAGS]) + AC_SUBST([GSTREAMER_LIBS]) +fi + +# check for code coverage support +if test "$enable_coverage" = "yes"; then + COVERAGE_CFLAGS="-MD" + COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs" + AC_SUBST([COVERAGE_CFLAGS]) + AC_SUBST([COVERAGE_LDFLAGS]) +fi + +# check for HTML features +if test "$enable_video" = "yes"; then + html_flags=yes +fi + +GTK_DOC_CHECK([1.10]) + +# OS conditionals +AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"]) +AM_CONDITIONAL([OS_UNIX],[test "$os_win32" = "no"]) +AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"]) +AM_CONDITIONAL([OS_GNU],[test "$os_gnu" = "yes"]) +AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"]) + +# target conditionals +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"]) + +# Unicode backend conditionals +AM_CONDITIONAL([USE_ICU_UNICODE], [test "$with_unicode_backend" = "icu"]) +AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"]) + +# Font backend conditionals +AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"]) +AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"]) + +# WebKit feature conditionals +AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) +AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"]) +AM_CONDITIONAL([ENABLE_BLOB_SLICE],[test "$enable_blob_slice" = "yes"]) +AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"]) +AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"]) +AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"]) +AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"]) +AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"]) +AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"]) +AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"]) +AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"]) +AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) +AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"]) +AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"]) +AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"]) +AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"]) +AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) +AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"]) +AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"]) +AM_CONDITIONAL([ENABLE_FILE_READER],[test "$enable_file_reader" = "yes"]) +AM_CONDITIONAL([ENABLE_FILE_WRITER],[test "$enable_file_writer" = "yes"]) +AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"]) +AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"]) +AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"]) +AM_CONDITIONAL([ENABLE_SANDBOX],[test "$enable_sandbox" = "yes"]) +AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"]) +AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"]) +AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "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" = "yes"]) +AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"]) +AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"]) +AM_CONDITIONAL([ENABLE_WML],[test "$enable_wml" = "yes"]) +AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"]) +AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"]) +AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"]) +AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"]) +AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"]) +AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"]) + +# Gtk conditionals +AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"]) + + +AC_CONFIG_FILES([ +GNUmakefile +WebKit/gtk/webkit/webkitversion.h +WebKit/gtk/docs/GNUmakefile +WebKit/gtk/docs/version.xml +] +) + +AC_CONFIG_FILES([ +WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in +WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in] +,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] +) + +AC_OUTPUT + +echo " +WebKit was configured with the following options: + +Build configuration: + Enable debugging (slow) : $enable_debug + Enable GCC build optimization : $enable_optimizations + Code coverage support : $enable_coverage + Unicode backend : $with_unicode_backend + Font backend : $with_font_backend + Optimized memory allocator : $enable_fast_malloc +Features: + 3D Transforms : $enable_3D_transforms + Blob.slice support : $enable_blob_slice + Fast Mobile Scrolling : $enable_fast_mobile_scrolling + JIT compilation : $enable_jit + Filters support : $enable_filters + FileReader support : $enable_file_reader + FileWriter support : $enable_file_writer + Geolocation support : $enable_geolocation + JavaScript debugger/profiler support : $enable_javascript_debugger + MathML support : $enable_mathml + HTML5 offline web applications support : $enable_offline_web_applications + HTML5 channel messaging support : $enable_channel_messaging + HTML5 client-side session and persistent storage support : $enable_dom_storage + HTML5 client-side database storage support : $enable_database + HTML5 ruby support : $enable_ruby + HTML5 sandboxed iframe support : $enable_sandbox + HTML5 server-sent events support : $enable_eventsource + HTML5 video element support : $enable_video + Icon database support : $enable_icon_database + Image resizer support : $enable_image_resizer + SharedWorkers support : $enable_shared_workers + Speech input support : $enable_input_speech + SVG support : $enable_svg + SVG animation support : $enable_svg_animation + 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 + WML support : $enable_wml + Web Sockets support : $enable_web_sockets + Web Timing support : $enable_web_timing + Web Workers support : $enable_workers + XHTML-MP support : $enable_xhtmlmp + XPATH support : $enable_xpath + XSLT support : $enable_xslt +GTK+ configuration: + GTK+ version : $with_gtk + GDK target : $with_target + Hildon UI extensions : $with_hildon + Introspection support : $enable_introspection +" +if test "$with_unicode_backend" = "glib"; then + echo " >> WARNING: the glib-based unicode backend is slow and incomplete <<" + echo + echo +fi diff --git a/meta/recipes-sato/webkit/files/fix_im.patch b/meta/recipes-sato/webkit/files/fix_im.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/meta/recipes-sato/webkit/files/fix_im.patch diff --git a/meta/recipes-sato/webkit/files/gtk-doc.make b/meta/recipes-sato/webkit/files/gtk-doc.make new file mode 100644 index 0000000000..354ffb7c66 --- /dev/null +++ b/meta/recipes-sato/webkit/files/gtk-doc.make @@ -0,0 +1,173 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp +else +all-local: +endif + +docs: html-build.stamp + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +tmpl/*.sgml: + @true + + +#### xml #### + +sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp + +############## + +clean-local: + rm -f *~ *.bak + rm -rf .libs + +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + +install-data-local: + -installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb new file mode 100644 index 0000000000..fe31b9c24c --- /dev/null +++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb @@ -0,0 +1,71 @@ +DESCRIPTION = "WebKitGTK+ is the port of the portable web rendering engine WebKitK to the GTK+ platform." +HOMEPAGE = "http://www.webkitgtk.org/" +BUGTRACKER = "http://bugs.webkit.org/" + +LICENSE = "BSD & LGPLv2+" +LIC_FILES_CHKSUM = "file://WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ + file://WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ + file://JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90" + +DEPENDS = "enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3" +DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native sqlite3" + +SRCREV_FORMAT = "webcore-rwebkit" + +PV = "1.3.2+svnr${SRCREV}" +PR = "r0" + +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 \ + svn://svn.webkit.org/repository/webkit/trunk/;module=autotools;proto=http \ + file://Makefile \ + file://Makefile.shared \ + file://autogen.sh \ + file://configure.ac \ + file://GNUmakefile.am \ + file://gtk-doc.make \ + " + +S = "${WORKDIR}/" + +inherit autotools lib_package pkgconfig + +EXTRA_OECONF = "\ + --enable-debug=no \ + --enable-svg \ + --enable-icon-database=yes \ + --disable-fast-malloc \ + " + +EXTRA_AUTORECONF = " -I autotools " + +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} +} + +PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore" +FILES_${PN}launcher = "${bindir}/GtkLauncher" +FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" +FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*" +FILES_${PN}-webinspector = "${datadir}/webkit-1.0/webinspector/" +FILES_${PN} += "${datadir}/webkit-1.0/resources/error.html ${datadir}/webkit-1.0/images" + + + |
