summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-09-01 19:09:11 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-01 19:09:57 +0100
commitd62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch)
treef36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/recipes-sato
parentcaab7fc509bf27706ff3248689f6afd04225cfda (diff)
downloadpoky-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/claws-mail/claws-mail.inc57
-rw-r--r--meta/recipes-sato/claws-mail/claws-mail_2.9.1.bb1
-rw-r--r--meta/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb14
-rw-r--r--meta/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb14
-rw-r--r--meta/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb14
-rw-r--r--meta/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb14
-rw-r--r--meta/recipes-sato/claws-mail/files/desktop.patch19
-rw-r--r--meta/recipes-sato/claws-mail/files/fix-build.patch24
-rw-r--r--meta/recipes-sato/claws-mail/files/owl-window-menu.patch1009
-rw-r--r--meta/recipes-sato/claws-mail/files/streamline-ui.patch1008
-rw-r--r--meta/recipes-sato/libical/libical_0.44.bb11
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/makefile.patch20
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/rxvt.desktop11
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/rxvt.pngbin0 -> 2847 bytes
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/signedchar.patch11
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/xwc.patch28
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch24
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb72
-rw-r--r--meta/recipes-sato/webkit/files/GNUmakefile.am856
-rw-r--r--meta/recipes-sato/webkit/files/Makefile17
-rw-r--r--meta/recipes-sato/webkit/files/Makefile.shared18
-rw-r--r--meta/recipes-sato/webkit/files/WebKit.pri107
-rw-r--r--meta/recipes-sato/webkit/files/WebKit.pro21
-rwxr-xr-xmeta/recipes-sato/webkit/files/autogen.sh63
-rw-r--r--meta/recipes-sato/webkit/files/configure.ac983
-rw-r--r--meta/recipes-sato/webkit/files/fix_im.patch0
-rw-r--r--meta/recipes-sato/webkit/files/gtk-doc.make173
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_svn.bb71
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 @@
1SECTION = "x11/network"
2DESCRIPTION = "Mail user agent"
3#DEPENDS = "gtk+ gpgme libetpan libgnomeprint aspell openssl"
4DEPENDS = "gtk+ libetpan openssl libowl"
5LICENSE = "GPL"
6PR = "r6"
7
8SRC_URI = "\
9 ${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2 \
10 file://desktop.patch;patch=1 \
11 file://streamline-ui.patch;patch=1 \
12 file://owl-window-menu.patch;patch=1 \
13 file://fix-build.patch;patch=1 \
14 "
15
16FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
17
18#EXTRA_OECONF = "--disable-aspell-test \
19# --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${prefix} \
20# --enable-aspell"
21
22EXTRA_OECONF = "--disable-aspell-test \
23 --disable-aspell \
24 --disable-manual \
25# --disable-openssl \
26 --disable-crash-dialog \
27 --disable-jpilot \
28 --disable-trayicon-plugin \
29 --disable-spamassassin-plugin \
30 --disable-bogofilter-plugin \
31 --disable-pgpcore-plugin \
32 --disable-pgpmime-plugin \
33 --disable-pgpinline-plugin \
34 --disable-dillo-viewer-plugin \
35 --disable-clamav-plugin \
36# --disable-libetpan \
37 --disable-gnomeprint \
38 --disable-valgrind \
39 --disable-static \
40 "
41
42CFLAGS += "-D_GNU_SOURCE"
43
44inherit autotools pkgconfig gettext
45
46do_install_append() {
47 install -d ${D}${datadir}/applications
48 install -m 0644 claws-mail.desktop ${D}${datadir}/applications/
49 install -d ${D}${datadir}/pixmaps
50 install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
51}
52
53#python populate_packages_prepend () {
54# abiword_libdir = bb.data.expand('${libdir}/claws-mail/plugins', d)
55#
56# do_split_packages(d, abiword_libdir, '^(.*)\.so$', 'claws-mail-plugin-%s', 'Claws plugin for %s', extra_depends='')
57#}
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 @@
1SECTION = "x11/network"
2DESCRIPTION = "Mail user agent plugins"
3DEPENDS = "claws-mail gtkhtml2 curl"
4LICENSE = "GPL"
5PR = "r1"
6
7SRC_URI = "http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-${PV}.tar.gz"
8
9inherit autotools pkgconfig gettext
10
11S = "${WORKDIR}/gtkhtml2_viewer-${PV}"
12
13FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
14
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 @@
1SECTION = "x11/network"
2DESCRIPTION = "Mail user agent plugins"
3DEPENDS = "claws-mail db"
4LICENSE = "GPL"
5PR = "r1"
6
7SRC_URI = "http://www.claws-mail.org/downloads/plugins/maildir-${PV}.tar.gz"
8
9inherit autotools pkgconfig
10
11S = "${WORKDIR}/maildir-${PV}"
12
13FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
14
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 @@
1SECTION = "x11/network"
2DESCRIPTION = "Mail user agent plugins"
3DEPENDS = "claws-mail"
4LICENSE = "GPL"
5PR = "r2"
6
7SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz"
8
9inherit autotools pkgconfig
10
11S = "${WORKDIR}/mailmbox-${PV}"
12
13FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
14FILES_${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 @@
1SECTION = "x11/network"
2DESCRIPTION = "Mail user agent plugins"
3DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+"
4LICENSE = "GPL"
5PR = "r1"
6
7SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz"
8
9inherit autotools pkgconfig gettext
10
11S = "${WORKDIR}/rssyl-${PV}"
12
13FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
14
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 @@
1Index: claws-mail-2.9.1/claws-mail.desktop
2===================================================================
3--- claws-mail-2.9.1.orig/claws-mail.desktop 2007-04-24 17:40:20.000000000 +0100
4+++ claws-mail-2.9.1/claws-mail.desktop 2007-04-25 07:08:36.000000000 +0100
5@@ -1,11 +1,11 @@
6 [Desktop Entry]
7 Encoding=UTF-8
8-Name=Claws Mail
9+Name=Mail
10 Exec=claws-mail
11 Icon=claws-mail
12-Info="Claws Mail"
13+Info=Email Application
14 Categories=GTK;Network;Email;
15-Comment="Gtk+ based Mail Client"
16+Comment=Email Application
17 Terminal=false
18 Type=Application
19 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 @@
1Remove duplicate file entries as this breaks install with new Automake
2
3JL 19/03/10
4
5Index: claws-mail-2.9.1/src/gtk/Makefile.am
6===================================================================
7--- claws-mail-2.9.1.orig/src/gtk/Makefile.am 2007-03-22 07:52:47.000000000 +0000
8+++ claws-mail-2.9.1/src/gtk/Makefile.am 2010-03-19 14:54:06.565828281 +0000
9@@ -44,7 +44,6 @@
10 filesel.h \
11 foldersort.h \
12 gtkaspell.h \
13- gtksctree.h \
14 gtkshruler.h \
15 gtksctree.h \
16 gtksourceprintjob.h \
17@@ -57,7 +56,6 @@
18 menu.h \
19 pluginwindow.h \
20 prefswindow.h \
21- gtkvscrollbutton.h \
22 progressdialog.h \
23 quicksearch.h \
24 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 @@
1Index: claws-mail-2.9.1/src/addressbook.c
2===================================================================
3--- claws-mail-2.9.1.orig/src/addressbook.c 2007-04-25 10:18:13.000000000 +0100
4+++ claws-mail-2.9.1/src/addressbook.c 2007-04-25 10:30:23.000000000 +0100
5@@ -941,7 +941,6 @@
6 sizeof(addressbook_entries[0]);
7 menubar = menubar_create(window, addressbook_entries, n_entries,
8 "<AddressBook>", NULL);
9- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
10 menu_factory = gtk_item_factory_from_widget(menubar);
11
12 vbox2 = gtk_vbox_new(FALSE, BORDER_WIDTH);
13Index: claws-mail-2.9.1/src/gtk/menu.c
14===================================================================
15--- claws-mail-2.9.1.orig/src/gtk/menu.c 2007-04-25 10:18:13.000000000 +0100
16+++ claws-mail-2.9.1/src/gtk/menu.c 2007-04-25 10:30:23.000000000 +0100
17@@ -35,10 +35,7 @@
18 #include "menu.h"
19 #include "utils.h"
20
21-#ifdef MAEMO
22-#include <hildon-widgets/hildon-program.h>
23-#include <gtk/gtkmain.h>
24-#endif
25+#include <libowl/owlwindowmenu.h>
26
27 static void connect_accel_change_signals(GtkWidget* widget, GtkWidget *wid2) ;
28
29@@ -49,20 +46,14 @@
30 GtkItemFactory *factory;
31 GtkWidget *menubar;
32
33-#ifdef MAEMO
34 factory = gtk_item_factory_new(GTK_TYPE_MENU, path, NULL);
35-#else
36- factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, path, NULL);
37-#endif
38 gtk_item_factory_set_translate_func(factory, menu_translate,
39 NULL, NULL);
40 gtk_item_factory_create_items(factory, n_entries, entries, data);
41 gtk_window_add_accel_group (GTK_WINDOW (window), factory->accel_group);
42
43 menubar = gtk_item_factory_get_widget(factory, path);
44-#ifdef MAEMO
45- hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar));
46-#endif
47+ owl_set_window_menu(GTK_WINDOW(window), GTK_MENU(menubar));
48 return menubar;
49 }
50
51Index: claws-mail-2.9.1/src/mainwindow.c
52===================================================================
53--- claws-mail-2.9.1.orig/src/mainwindow.c 2007-04-25 10:26:40.000000000 +0100
54+++ claws-mail-2.9.1/src/mainwindow.c 2007-04-25 10:30:23.000000000 +0100
55@@ -1094,8 +1094,6 @@
56 n_menu_entries = sizeof(mainwin_entries) / sizeof(mainwin_entries[0]);
57 menubar = menubar_create(window, mainwin_entries,
58 n_menu_entries, "<Main>", mainwin);
59- gtk_widget_show(menubar);
60- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
61 ifactory = gtk_item_factory_from_widget(menubar);
62
63 /* gtk_widget_show(gtk_item_factory_get_item(ifactory,"/Message/Mailing-List"));
64Index: claws-mail-2.9.1/src/messageview.c
65===================================================================
66--- claws-mail-2.9.1.orig/src/messageview.c 2007-04-25 10:18:13.000000000 +0100
67+++ claws-mail-2.9.1/src/messageview.c 2007-04-25 10:30:23.000000000 +0100
68@@ -414,8 +414,6 @@
69 n_menu_entries = sizeof(msgview_entries) / sizeof(msgview_entries[0]);
70 menubar = menubar_create(window, msgview_entries,
71 n_menu_entries, "<MessageView>", msgview);
72- gtk_widget_show(menubar);
73- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
74
75 if (prefs_common.toolbar_detachable) {
76 handlebox = gtk_handle_box_new();
77@@ -478,6 +476,7 @@
78 g_signal_connect(G_OBJECT(window), "key_press_event",
79 G_CALLBACK(key_pressed), msgview);
80 #endif
81+ gtk_widget_realize(window);
82 messageview_add_toolbar(msgview, window);
83
84 if (show) {
85Index: claws-mail-2.9.1/configure.ac
86===================================================================
87--- claws-mail-2.9.1.orig/configure.ac 2007-04-25 10:18:13.000000000 +0100
88+++ claws-mail-2.9.1/configure.ac 2007-04-25 10:30:23.000000000 +0100
89@@ -406,6 +406,11 @@
90 AC_SUBST(GTK_CFLAGS)
91 AC_SUBST(GTK_LIBS)
92
93+OWL_CFLAGS=""
94+OWL_LIBS="-lowl"
95+AC_SUBST(OWL_CFLAGS)
96+AC_SUBST(OWL_LIBS)
97+
98 dnl GNU/Aspell is used for spell checking
99 AC_ARG_ENABLE(aspell,
100 [ --disable-aspell Disable GNU/aspell support [default=yes]],
101Index: claws-mail-2.9.1/src/Makefile.am
102===================================================================
103--- claws-mail-2.9.1.orig/src/Makefile.am 2007-04-25 10:18:13.000000000 +0100
104+++ claws-mail-2.9.1/src/Makefile.am 2007-04-25 10:30:23.000000000 +0100
105@@ -471,7 +471,8 @@
106 $(LIBICONV) \
107 $(STARTUP_NOTIFICATION_LIBS) \
108 $(LIBETPAN_LIBS) \
109- $(MAEMO_LIBS)
110+ $(MAEMO_LIBS) \
111+ $(OWL_LIBS)
112
113 AM_CPPFLAGS = \
114 -DG_LOG_DOMAIN=\"Claws-Mail\" \
115@@ -489,6 +490,7 @@
116 $(LIBETPAN_CPPFLAGS) \
117 $(STARTUP_NOTIFICATION_CFLAGS) \
118 $(MAEMO_CFLAGS) \
119+ $(OWL_CFLAGS) \
120 -Wno-unused-function
121
122 #no-unused-function is there because of bison stuff
123Index: claws-mail-2.9.1/configure
124===================================================================
125--- claws-mail-2.9.1.orig/configure 2007-04-25 10:18:13.000000000 +0100
126+++ claws-mail-2.9.1/configure 2007-04-25 10:30:23.000000000 +0100
127@@ -769,7 +769,6 @@
128 # include <unistd.h>
129 #endif"
130
131-gt_needs=
132 ac_subst_vars='SHELL
133 PATH_SEPARATOR
134 PACKAGE_NAME
135@@ -942,6 +941,8 @@
136 PASSCRYPT_KEY
137 GTK_CFLAGS
138 GTK_LIBS
139+OWL_LIBS
140+OWL_CFLAGS
141 ASPELL
142 ASPELL_CFLAGS
143 ASPELL_LIBS
144@@ -2063,7 +2064,6 @@
145 >$cache_file
146 fi
147
148-gt_needs="$gt_needs "
149 # Check that the precious variables saved in the cache have kept the same
150 # value.
151 ac_cache_corrupted=false
152@@ -3001,9 +3001,7 @@
153 # Put the nasty error message in config.log where it belongs
154 echo "$GNOME2_PKG_ERRORS" >&5
155
156- { echo "$as_me:$LINENO: result: no" >&5
157-echo "${ECHO_T}no" >&6; }
158- ac_enable_gnome2=no
159+ ac_enable_gnome2=no
160 elif test $pkg_failed = untried; then
161 ac_enable_gnome2=no
162 else
163@@ -4147,14 +4145,12 @@
164
165
166
167-
168- { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
169-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
170-if test "${ac_cv_lib_cposix_strerror+set}" = set; then
171+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
172+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
173+if test "${ac_cv_search_strerror+set}" = set; then
174 echo $ECHO_N "(cached) $ECHO_C" >&6
175 else
176- ac_check_lib_save_LIBS=$LIBS
177-LIBS="-lcposix $LIBS"
178+ ac_func_search_save_LIBS=$LIBS
179 cat >conftest.$ac_ext <<_ACEOF
180 /* confdefs.h. */
181 _ACEOF
182@@ -4177,7 +4173,14 @@
183 return 0;
184 }
185 _ACEOF
186-rm -f conftest.$ac_objext conftest$ac_exeext
187+for ac_lib in '' cposix; do
188+ if test -z "$ac_lib"; then
189+ ac_res="none required"
190+ else
191+ ac_res=-l$ac_lib
192+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
193+ fi
194+ rm -f conftest.$ac_objext conftest$ac_exeext
195 if { (ac_try="$ac_link"
196 case "(($ac_try" in
197 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
198@@ -4195,25 +4198,35 @@
199 test ! -s conftest.err
200 } && test -s conftest$ac_exeext &&
201 $as_test_x conftest$ac_exeext; then
202- ac_cv_lib_cposix_strerror=yes
203+ ac_cv_search_strerror=$ac_res
204 else
205 echo "$as_me: failed program was:" >&5
206 sed 's/^/| /' conftest.$ac_ext >&5
207
208- ac_cv_lib_cposix_strerror=no
209+
210 fi
211
212 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
213- conftest$ac_exeext conftest.$ac_ext
214-LIBS=$ac_check_lib_save_LIBS
215+ conftest$ac_exeext
216+ if test "${ac_cv_search_strerror+set}" = set; then
217+ break
218+fi
219+done
220+if test "${ac_cv_search_strerror+set}" = set; then
221+ :
222+else
223+ ac_cv_search_strerror=no
224 fi
225-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
226-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }
227-if test $ac_cv_lib_cposix_strerror = yes; then
228- LIBS="$LIBS -lcposix"
229+rm conftest.$ac_ext
230+LIBS=$ac_func_search_save_LIBS
231 fi
232+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
233+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
234+ac_res=$ac_cv_search_strerror
235+if test "$ac_res" != no; then
236+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
237
238-
239+fi
240
241 # Find a good install program. We prefer a C program (faster),
242 # so one script is as good as another. But avoid the broken or
243@@ -5769,7 +5782,7 @@
244 ;;
245 *-*-irix6*)
246 # Find out which ABI we are using.
247- echo '#line 5772 "configure"' > conftest.$ac_ext
248+ echo '#line 5785 "configure"' > conftest.$ac_ext
249 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
250 (eval $ac_compile) 2>&5
251 ac_status=$?
252@@ -8555,11 +8568,11 @@
253 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
254 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
255 -e 's:$: $lt_compiler_flag:'`
256- (eval echo "\"\$as_me:8558: $lt_compile\"" >&5)
257+ (eval echo "\"\$as_me:8571: $lt_compile\"" >&5)
258 (eval "$lt_compile" 2>conftest.err)
259 ac_status=$?
260 cat conftest.err >&5
261- echo "$as_me:8562: \$? = $ac_status" >&5
262+ echo "$as_me:8575: \$? = $ac_status" >&5
263 if (exit $ac_status) && test -s "$ac_outfile"; then
264 # The compiler can only warn and ignore the option if not recognized
265 # So say no if there are warnings other than the usual output.
266@@ -8823,11 +8836,11 @@
267 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
268 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
269 -e 's:$: $lt_compiler_flag:'`
270- (eval echo "\"\$as_me:8826: $lt_compile\"" >&5)
271+ (eval echo "\"\$as_me:8839: $lt_compile\"" >&5)
272 (eval "$lt_compile" 2>conftest.err)
273 ac_status=$?
274 cat conftest.err >&5
275- echo "$as_me:8830: \$? = $ac_status" >&5
276+ echo "$as_me:8843: \$? = $ac_status" >&5
277 if (exit $ac_status) && test -s "$ac_outfile"; then
278 # The compiler can only warn and ignore the option if not recognized
279 # So say no if there are warnings other than the usual output.
280@@ -8927,11 +8940,11 @@
281 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
282 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
283 -e 's:$: $lt_compiler_flag:'`
284- (eval echo "\"\$as_me:8930: $lt_compile\"" >&5)
285+ (eval echo "\"\$as_me:8943: $lt_compile\"" >&5)
286 (eval "$lt_compile" 2>out/conftest.err)
287 ac_status=$?
288 cat out/conftest.err >&5
289- echo "$as_me:8934: \$? = $ac_status" >&5
290+ echo "$as_me:8947: \$? = $ac_status" >&5
291 if (exit $ac_status) && test -s out/conftest2.$ac_objext
292 then
293 # The compiler can only warn and ignore the option if not recognized
294@@ -11224,7 +11237,7 @@
295 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
296 lt_status=$lt_dlunknown
297 cat > conftest.$ac_ext <<EOF
298-#line 11227 "configure"
299+#line 11240 "configure"
300 #include "confdefs.h"
301
302 #if HAVE_DLFCN_H
303@@ -11324,7 +11337,7 @@
304 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
305 lt_status=$lt_dlunknown
306 cat > conftest.$ac_ext <<EOF
307-#line 11327 "configure"
308+#line 11340 "configure"
309 #include "confdefs.h"
310
311 #if HAVE_DLFCN_H
312@@ -13660,11 +13673,11 @@
313 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
314 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
315 -e 's:$: $lt_compiler_flag:'`
316- (eval echo "\"\$as_me:13663: $lt_compile\"" >&5)
317+ (eval echo "\"\$as_me:13676: $lt_compile\"" >&5)
318 (eval "$lt_compile" 2>conftest.err)
319 ac_status=$?
320 cat conftest.err >&5
321- echo "$as_me:13667: \$? = $ac_status" >&5
322+ echo "$as_me:13680: \$? = $ac_status" >&5
323 if (exit $ac_status) && test -s "$ac_outfile"; then
324 # The compiler can only warn and ignore the option if not recognized
325 # So say no if there are warnings other than the usual output.
326@@ -13764,11 +13777,11 @@
327 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
328 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
329 -e 's:$: $lt_compiler_flag:'`
330- (eval echo "\"\$as_me:13767: $lt_compile\"" >&5)
331+ (eval echo "\"\$as_me:13780: $lt_compile\"" >&5)
332 (eval "$lt_compile" 2>out/conftest.err)
333 ac_status=$?
334 cat out/conftest.err >&5
335- echo "$as_me:13771: \$? = $ac_status" >&5
336+ echo "$as_me:13784: \$? = $ac_status" >&5
337 if (exit $ac_status) && test -s out/conftest2.$ac_objext
338 then
339 # The compiler can only warn and ignore the option if not recognized
340@@ -15325,11 +15338,11 @@
341 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
342 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
343 -e 's:$: $lt_compiler_flag:'`
344- (eval echo "\"\$as_me:15328: $lt_compile\"" >&5)
345+ (eval echo "\"\$as_me:15341: $lt_compile\"" >&5)
346 (eval "$lt_compile" 2>conftest.err)
347 ac_status=$?
348 cat conftest.err >&5
349- echo "$as_me:15332: \$? = $ac_status" >&5
350+ echo "$as_me:15345: \$? = $ac_status" >&5
351 if (exit $ac_status) && test -s "$ac_outfile"; then
352 # The compiler can only warn and ignore the option if not recognized
353 # So say no if there are warnings other than the usual output.
354@@ -15429,11 +15442,11 @@
355 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
356 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
357 -e 's:$: $lt_compiler_flag:'`
358- (eval echo "\"\$as_me:15432: $lt_compile\"" >&5)
359+ (eval echo "\"\$as_me:15445: $lt_compile\"" >&5)
360 (eval "$lt_compile" 2>out/conftest.err)
361 ac_status=$?
362 cat out/conftest.err >&5
363- echo "$as_me:15436: \$? = $ac_status" >&5
364+ echo "$as_me:15449: \$? = $ac_status" >&5
365 if (exit $ac_status) && test -s out/conftest2.$ac_objext
366 then
367 # The compiler can only warn and ignore the option if not recognized
368@@ -17616,11 +17629,11 @@
369 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
370 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
371 -e 's:$: $lt_compiler_flag:'`
372- (eval echo "\"\$as_me:17619: $lt_compile\"" >&5)
373+ (eval echo "\"\$as_me:17632: $lt_compile\"" >&5)
374 (eval "$lt_compile" 2>conftest.err)
375 ac_status=$?
376 cat conftest.err >&5
377- echo "$as_me:17623: \$? = $ac_status" >&5
378+ echo "$as_me:17636: \$? = $ac_status" >&5
379 if (exit $ac_status) && test -s "$ac_outfile"; then
380 # The compiler can only warn and ignore the option if not recognized
381 # So say no if there are warnings other than the usual output.
382@@ -17884,11 +17897,11 @@
383 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
384 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
385 -e 's:$: $lt_compiler_flag:'`
386- (eval echo "\"\$as_me:17887: $lt_compile\"" >&5)
387+ (eval echo "\"\$as_me:17900: $lt_compile\"" >&5)
388 (eval "$lt_compile" 2>conftest.err)
389 ac_status=$?
390 cat conftest.err >&5
391- echo "$as_me:17891: \$? = $ac_status" >&5
392+ echo "$as_me:17904: \$? = $ac_status" >&5
393 if (exit $ac_status) && test -s "$ac_outfile"; then
394 # The compiler can only warn and ignore the option if not recognized
395 # So say no if there are warnings other than the usual output.
396@@ -17988,11 +18001,11 @@
397 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
398 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
399 -e 's:$: $lt_compiler_flag:'`
400- (eval echo "\"\$as_me:17991: $lt_compile\"" >&5)
401+ (eval echo "\"\$as_me:18004: $lt_compile\"" >&5)
402 (eval "$lt_compile" 2>out/conftest.err)
403 ac_status=$?
404 cat out/conftest.err >&5
405- echo "$as_me:17995: \$? = $ac_status" >&5
406+ echo "$as_me:18008: \$? = $ac_status" >&5
407 if (exit $ac_status) && test -s out/conftest2.$ac_objext
408 then
409 # The compiler can only warn and ignore the option if not recognized
410@@ -20960,16 +20973,9 @@
411 found_so=
412 found_a=
413 if test $use_additional = yes; then
414- if test -n "$shlibext" \
415- && { test -f "$additional_libdir/lib$name.$shlibext" \
416- || { test "$shlibext" = dll \
417- && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
418+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
419 found_dir="$additional_libdir"
420- if test -f "$additional_libdir/lib$name.$shlibext"; then
421- found_so="$additional_libdir/lib$name.$shlibext"
422- else
423- found_so="$additional_libdir/lib$name.dll.a"
424- fi
425+ found_so="$additional_libdir/lib$name.$shlibext"
426 if test -f "$additional_libdir/lib$name.la"; then
427 found_la="$additional_libdir/lib$name.la"
428 fi
429@@ -20997,16 +21003,9 @@
430 case "$x" in
431 -L*)
432 dir=`echo "X$x" | sed -e 's/^X-L//'`
433- if test -n "$shlibext" \
434- && { test -f "$dir/lib$name.$shlibext" \
435- || { test "$shlibext" = dll \
436- && test -f "$dir/lib$name.dll.a"; }; }; then
437+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
438 found_dir="$dir"
439- if test -f "$dir/lib$name.$shlibext"; then
440- found_so="$dir/lib$name.$shlibext"
441- else
442- found_so="$dir/lib$name.dll.a"
443- fi
444+ found_so="$dir/lib$name.$shlibext"
445 if test -f "$dir/lib$name.la"; then
446 found_la="$dir/lib$name.la"
447 fi
448@@ -21927,13 +21926,6 @@
449
450
451
452-
453-
454-
455-
456-
457-
458-
459 { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
460 echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; }
461 if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
462@@ -22070,37 +22062,17 @@
463 LTLIBINTL=
464 POSUB=
465
466- case " $gt_needs " in
467- *" need-formatstring-macros "*) gt_api_version=3 ;;
468- *" need-ngettext "*) gt_api_version=2 ;;
469- *) gt_api_version=1 ;;
470- esac
471- gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
472- gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
473-
474 if test "$USE_NLS" = "yes"; then
475 gt_use_preinstalled_gnugettext=no
476
477
478- if test $gt_api_version -ge 3; then
479- gt_revision_test_code='
480-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
481-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
482-#endif
483-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
484-'
485- else
486- gt_revision_test_code=
487- fi
488- if test $gt_api_version -ge 2; then
489- gt_expression_test_code=' + * ngettext ("", "", 0)'
490- else
491- gt_expression_test_code=
492- fi
493+
494+
495+
496
497 { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
498 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
499-if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then
500+if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
501 echo $ECHO_N "(cached) $ECHO_C" >&6
502 else
503 cat >conftest.$ac_ext <<_ACEOF
504@@ -22110,14 +22082,13 @@
505 cat >>conftest.$ac_ext <<_ACEOF
506 /* end confdefs.h. */
507 #include <libintl.h>
508-$gt_revision_test_code
509 extern int _nl_msg_cat_cntr;
510 extern int *_nl_domain_bindings;
511 int
512 main ()
513 {
514 bindtextdomain ("", "");
515-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
516+return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
517 ;
518 return 0;
519 }
520@@ -22140,22 +22111,21 @@
521 test ! -s conftest.err
522 } && test -s conftest$ac_exeext &&
523 $as_test_x conftest$ac_exeext; then
524- eval "$gt_func_gnugettext_libc=yes"
525+ gt_cv_func_gnugettext1_libc=yes
526 else
527 echo "$as_me: failed program was:" >&5
528 sed 's/^/| /' conftest.$ac_ext >&5
529
530- eval "$gt_func_gnugettext_libc=no"
531+ gt_cv_func_gnugettext1_libc=no
532 fi
533
534 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
535 conftest$ac_exeext conftest.$ac_ext
536 fi
537-ac_res=`eval echo '${'$gt_func_gnugettext_libc'}'`
538- { echo "$as_me:$LINENO: result: $ac_res" >&5
539-echo "${ECHO_T}$ac_res" >&6; }
540+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
541+echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
542
543- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
544+ if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
545
546
547
548@@ -22398,16 +22368,9 @@
549 found_so=
550 found_a=
551 if test $use_additional = yes; then
552- if test -n "$shlibext" \
553- && { test -f "$additional_libdir/lib$name.$shlibext" \
554- || { test "$shlibext" = dll \
555- && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
556+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
557 found_dir="$additional_libdir"
558- if test -f "$additional_libdir/lib$name.$shlibext"; then
559- found_so="$additional_libdir/lib$name.$shlibext"
560- else
561- found_so="$additional_libdir/lib$name.dll.a"
562- fi
563+ found_so="$additional_libdir/lib$name.$shlibext"
564 if test -f "$additional_libdir/lib$name.la"; then
565 found_la="$additional_libdir/lib$name.la"
566 fi
567@@ -22435,16 +22398,9 @@
568 case "$x" in
569 -L*)
570 dir=`echo "X$x" | sed -e 's/^X-L//'`
571- if test -n "$shlibext" \
572- && { test -f "$dir/lib$name.$shlibext" \
573- || { test "$shlibext" = dll \
574- && test -f "$dir/lib$name.dll.a"; }; }; then
575+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
576 found_dir="$dir"
577- if test -f "$dir/lib$name.$shlibext"; then
578- found_so="$dir/lib$name.$shlibext"
579- else
580- found_so="$dir/lib$name.dll.a"
581- fi
582+ found_so="$dir/lib$name.$shlibext"
583 if test -f "$dir/lib$name.la"; then
584 found_la="$dir/lib$name.la"
585 fi
586@@ -22712,7 +22668,7 @@
587
588 { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
589 echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
590-if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then
591+if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
592 echo $ECHO_N "(cached) $ECHO_C" >&6
593 else
594 gt_save_CPPFLAGS="$CPPFLAGS"
595@@ -22726,7 +22682,6 @@
596 cat >>conftest.$ac_ext <<_ACEOF
597 /* end confdefs.h. */
598 #include <libintl.h>
599-$gt_revision_test_code
600 extern int _nl_msg_cat_cntr;
601 extern
602 #ifdef __cplusplus
603@@ -22737,7 +22692,7 @@
604 main ()
605 {
606 bindtextdomain ("", "");
607-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
608+return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
609 ;
610 return 0;
611 }
612@@ -22760,17 +22715,17 @@
613 test ! -s conftest.err
614 } && test -s conftest$ac_exeext &&
615 $as_test_x conftest$ac_exeext; then
616- eval "$gt_func_gnugettext_libintl=yes"
617+ gt_cv_func_gnugettext1_libintl=yes
618 else
619 echo "$as_me: failed program was:" >&5
620 sed 's/^/| /' conftest.$ac_ext >&5
621
622- eval "$gt_func_gnugettext_libintl=no"
623+ gt_cv_func_gnugettext1_libintl=no
624 fi
625
626 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
627 conftest$ac_exeext conftest.$ac_ext
628- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
629+ if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
630 LIBS="$LIBS $LIBICONV"
631 cat >conftest.$ac_ext <<_ACEOF
632 /* confdefs.h. */
633@@ -22779,7 +22734,6 @@
634 cat >>conftest.$ac_ext <<_ACEOF
635 /* end confdefs.h. */
636 #include <libintl.h>
637-$gt_revision_test_code
638 extern int _nl_msg_cat_cntr;
639 extern
640 #ifdef __cplusplus
641@@ -22790,7 +22744,7 @@
642 main ()
643 {
644 bindtextdomain ("", "");
645-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
646+return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
647 ;
648 return 0;
649 }
650@@ -22815,7 +22769,7 @@
651 $as_test_x conftest$ac_exeext; then
652 LIBINTL="$LIBINTL $LIBICONV"
653 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
654- eval "$gt_func_gnugettext_libintl=yes"
655+ gt_cv_func_gnugettext1_libintl=yes
656
657 else
658 echo "$as_me: failed program was:" >&5
659@@ -22830,13 +22784,12 @@
660 CPPFLAGS="$gt_save_CPPFLAGS"
661 LIBS="$gt_save_LIBS"
662 fi
663-ac_res=`eval echo '${'$gt_func_gnugettext_libintl'}'`
664- { echo "$as_me:$LINENO: result: $ac_res" >&5
665-echo "${ECHO_T}$ac_res" >&6; }
666+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
667+echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
668 fi
669
670- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
671- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
672+ if test "$gt_cv_func_gnugettext1_libc" = "yes" \
673+ || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
674 && test "$PACKAGE" != gettext-runtime \
675 && test "$PACKAGE" != gettext-tools; }; then
676 gt_use_preinstalled_gnugettext=yes
677@@ -22876,7 +22829,7 @@
678 { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
679 echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
680 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
681- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
682+ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
683 gt_source="external libintl"
684 else
685 gt_source="libc"
686@@ -22891,7 +22844,7 @@
687 if test "$USE_NLS" = "yes"; then
688
689 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
690- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
691+ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
692 { echo "$as_me:$LINENO: checking how to link with libintl" >&5
693 echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
694 { echo "$as_me:$LINENO: result: $LIBINTL" >&5
695@@ -26592,12 +26545,8 @@
696 esac
697 done
698
699-
700-
701-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
702- if test -n "$ac_tool_prefix"; then
703- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
704-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
705+ # Extract the first word of "pkg-config", so it can be a program name with args.
706+set dummy pkg-config; ac_word=$2
707 { echo "$as_me:$LINENO: checking for $ac_word" >&5
708 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
709 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
710@@ -26623,6 +26572,7 @@
711 done
712 IFS=$as_save_IFS
713
714+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
715 ;;
716 esac
717 fi
718@@ -26636,88 +26586,19 @@
719 fi
720
721
722-fi
723-if test -z "$ac_cv_path_PKG_CONFIG"; then
724- ac_pt_PKG_CONFIG=$PKG_CONFIG
725- # Extract the first word of "pkg-config", so it can be a program name with args.
726-set dummy pkg-config; ac_word=$2
727-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
728-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
729-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
730- echo $ECHO_N "(cached) $ECHO_C" >&6
731-else
732- case $ac_pt_PKG_CONFIG in
733- [\\/]* | ?:[\\/]*)
734- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
735- ;;
736- *)
737- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
738-for as_dir in $PATH
739-do
740- IFS=$as_save_IFS
741- test -z "$as_dir" && as_dir=.
742- for ac_exec_ext in '' $ac_executable_extensions; do
743- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
744- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
745- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
746- break 2
747- fi
748-done
749-done
750-IFS=$as_save_IFS
751-
752- ;;
753-esac
754-fi
755-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
756-if test -n "$ac_pt_PKG_CONFIG"; then
757- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
758-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
759-else
760- { echo "$as_me:$LINENO: result: no" >&5
761-echo "${ECHO_T}no" >&6; }
762-fi
763-
764- if test "x$ac_pt_PKG_CONFIG" = x; then
765- PKG_CONFIG=""
766- else
767- case $cross_compiling:$ac_tool_warned in
768-yes:)
769-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
770-whose name does not start with the host triplet. If you think this
771-configuration is useful to you, please write to autoconf@gnu.org." >&5
772-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
773-whose name does not start with the host triplet. If you think this
774-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
775-ac_tool_warned=yes ;;
776-esac
777- PKG_CONFIG=$ac_pt_PKG_CONFIG
778- fi
779-else
780- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
781-fi
782-
783-fi
784-if test -n "$PKG_CONFIG"; then
785- _pkg_min_version=0.7
786- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
787-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
788- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
789- { echo "$as_me:$LINENO: result: yes" >&5
790-echo "${ECHO_T}yes" >&6; }
791- else
792- { echo "$as_me:$LINENO: result: no" >&5
793-echo "${ECHO_T}no" >&6; }
794- PKG_CONFIG=""
795- fi
796-
797-fi
798
799 no_glib=""
800
801- if test "x$PKG_CONFIG" = x ; then
802+ if test x$PKG_CONFIG != xno ; then
803+ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
804+ :
805+ else
806+ echo *** pkg-config too old; version 0.7 or better required.
807+ no_glib=yes
808+ PKG_CONFIG=no
809+ fi
810+ else
811 no_glib=yes
812- PKG_CONFIG=no
813 fi
814
815 min_glib_version=2.6.0
816@@ -27223,9 +27104,7 @@
817 # Put the nasty error message in config.log where it belongs
818 echo "$OPENSSL_PKG_ERRORS" >&5
819
820- { echo "$as_me:$LINENO: result: no" >&5
821-echo "${ECHO_T}no" >&6; }
822- ac_cv_enable_openssl=no
823+ ac_cv_enable_openssl=no
824 elif test $pkg_failed = untried; then
825 ac_cv_enable_openssl=no
826 else
827@@ -27793,6 +27672,11 @@
828
829
830
831+OWL_LIBS="-lowl"
832+OLS_CFLAGS=""
833+
834+
835+
836 # Check whether --enable-aspell was given.
837 if test "${enable_aspell+set}" = set; then
838 enableval=$enable_aspell; ac_cv_enable_aspell=$enableval
839@@ -28242,9 +28126,7 @@
840 # Put the nasty error message in config.log where it belongs
841 echo "$MAEMO_PKG_ERRORS" >&5
842
843- { echo "$as_me:$LINENO: result: no" >&5
844-echo "${ECHO_T}no" >&6; }
845- ac_cv_enable_maemo=no
846+ ac_cv_enable_maemo=no
847 elif test $pkg_failed = untried; then
848 ac_cv_enable_maemo=no
849 else
850@@ -29796,8 +29678,6 @@
851 # Put the nasty error message in config.log where it belongs
852 echo "$STARTUP_NOTIFICATION_PKG_ERRORS" >&5
853
854- { echo "$as_me:$LINENO: result: no" >&5
855-echo "${ECHO_T}no" >&6; }
856
857 echo "Building without libstartup-notification"
858 enable_startup_notification=no
859@@ -31300,9 +31180,7 @@
860 # Put the nasty error message in config.log where it belongs
861 echo "$CLAMAV_PKG_ERRORS" >&5
862
863- { echo "$as_me:$LINENO: result: no" >&5
864-echo "${ECHO_T}no" >&6; }
865- ac_cv_enable_clamav_plugin=no
866+ ac_cv_enable_clamav_plugin=no
867 elif test $pkg_failed = untried; then
868 ac_cv_enable_clamav_plugin=no
869 else
870@@ -31684,9 +31562,7 @@
871 # Put the nasty error message in config.log where it belongs
872 echo "$GNOMEPRINT_PKG_ERRORS" >&5
873
874- { echo "$as_me:$LINENO: result: no" >&5
875-echo "${ECHO_T}no" >&6; }
876- ac_cv_enable_gnomeprint=no
877+ ac_cv_enable_gnomeprint=no
878 elif test $pkg_failed = untried; then
879 ac_cv_enable_gnomeprint=no
880 else
881@@ -31794,9 +31670,7 @@
882 # Put the nasty error message in config.log where it belongs
883 echo "$VALGRIND_PKG_ERRORS" >&5
884
885- { echo "$as_me:$LINENO: result: no" >&5
886-echo "${ECHO_T}no" >&6; }
887- ac_cv_enable_valgrind=no
888+ ac_cv_enable_valgrind=no
889 elif test $pkg_failed = untried; then
890 ac_cv_enable_valgrind=no
891 else
892@@ -32884,6 +32758,8 @@
893 PASSCRYPT_KEY!$PASSCRYPT_KEY$ac_delim
894 GTK_CFLAGS!$GTK_CFLAGS$ac_delim
895 GTK_LIBS!$GTK_LIBS$ac_delim
896+OWL_LIBS!$OWL_LIBS$ac_delim
897+OWL_CFLAGS!$OWL_CFLAGS$ac_delim
898 ASPELL!$ASPELL$ac_delim
899 ASPELL_CFLAGS!$ASPELL_CFLAGS$ac_delim
900 ASPELL_LIBS!$ASPELL_LIBS$ac_delim
901@@ -32904,8 +32780,6 @@
902 BUILD_SPAMASSASSIN_PLUGIN_FALSE!$BUILD_SPAMASSASSIN_PLUGIN_FALSE$ac_delim
903 BUILD_BOGOFILTER_PLUGIN_TRUE!$BUILD_BOGOFILTER_PLUGIN_TRUE$ac_delim
904 BUILD_BOGOFILTER_PLUGIN_FALSE!$BUILD_BOGOFILTER_PLUGIN_FALSE$ac_delim
905-GPGME_CONFIG!$GPGME_CONFIG$ac_delim
906-GPGME_CFLAGS!$GPGME_CFLAGS$ac_delim
907 _ACEOF
908
909 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
910@@ -32947,6 +32821,8 @@
911 ac_delim='%!_!# '
912 for ac_last_try in false false false false false :; do
913 cat >conf$$subs.sed <<_ACEOF
914+GPGME_CONFIG!$GPGME_CONFIG$ac_delim
915+GPGME_CFLAGS!$GPGME_CFLAGS$ac_delim
916 GPGME_LIBS!$GPGME_LIBS$ac_delim
917 BUILD_PGPCORE_PLUGIN_TRUE!$BUILD_PGPCORE_PLUGIN_TRUE$ac_delim
918 BUILD_PGPCORE_PLUGIN_FALSE!$BUILD_PGPCORE_PLUGIN_FALSE$ac_delim
919@@ -32979,7 +32855,7 @@
920 LTLIBOBJS!$LTLIBOBJS$ac_delim
921 _ACEOF
922
923- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
924+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
925 break
926 elif $ac_last_try; then
927 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
928Index: claws-mail-2.9.1/src/Makefile.in
929===================================================================
930--- claws-mail-2.9.1.orig/src/Makefile.in 2007-04-25 10:18:13.000000000 +0100
931+++ claws-mail-2.9.1/src/Makefile.in 2007-04-25 10:30:23.000000000 +0100
932@@ -45,8 +45,7 @@
933 $(top_srcdir)/m4/aspell.m4 $(top_srcdir)/m4/check-type.m4 \
934 $(top_srcdir)/m4/gnupg-check-typedef.m4 \
935 $(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
936- $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
937- $(top_srcdir)/configure.ac
938+ $(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
939 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
940 $(ACLOCAL_M4)
941 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
942@@ -122,7 +121,7 @@
943 $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
944 $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
945 $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
946- $(am__DEPENDENCIES_2)
947+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
948 claws_mail_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
949 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
950 $(claws_mail_LDFLAGS) $(LDFLAGS) -o $@
951@@ -272,6 +271,8 @@
952 OBJEXT = @OBJEXT@
953 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
954 OPENSSL_LIBS = @OPENSSL_LIBS@
955+OWL_CFLAGS = @OWL_CFLAGS@
956+OWL_LIBS = @OWL_LIBS@
957 PACKAGE = @PACKAGE@
958 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
959 PACKAGE_NAME = @PACKAGE_NAME@
960@@ -815,7 +816,8 @@
961 $(LIBICONV) \
962 $(STARTUP_NOTIFICATION_LIBS) \
963 $(LIBETPAN_LIBS) \
964- $(MAEMO_LIBS)
965+ $(MAEMO_LIBS) \
966+ $(OWL_LIBS)
967
968 AM_CPPFLAGS = \
969 -DG_LOG_DOMAIN=\"Claws-Mail\" \
970@@ -833,7 +835,7 @@
971 $(LIBETPAN_CPPFLAGS) \
972 $(STARTUP_NOTIFICATION_CFLAGS) \
973 $(MAEMO_CFLAGS) \
974- -Wno-unused-function
975+ $(OWL_CFLAGS)
976
977
978 #no-unused-function is there because of bison stuff
979@@ -1406,6 +1408,7 @@
980 install-exec-hook:
981 @rm -f $(DESTDIR)$(bindir)/sylpheed-claws
982 @ln -s claws-mail $(DESTDIR)$(bindir)/sylpheed-claws
983+ -Wno-unused-function
984
985 @CYGWIN_TRUE@claws-mail$(EXEEXT): $(claws_mail_OBJECTS) $(claws_mail_DEPENDENCIES)
986 @CYGWIN_TRUE@ @rm -f claws-mail$(EXEEXT)
987Index: claws-mail-2.9.1/autogen.sh
988===================================================================
989--- claws-mail-2.9.1.orig/autogen.sh 2007-04-25 10:18:13.000000000 +0100
990+++ claws-mail-2.9.1/autogen.sh 2007-04-25 10:30:23.000000000 +0100
991@@ -74,5 +74,4 @@
992 && libtoolize --force --copy \
993 && autoheader \
994 && automake --add-missing --foreign --copy \
995- && autoconf \
996- && ./configure --enable-maintainer-mode $@
997+ && autoconf
998Index: claws-mail-2.9.1/src/compose.c
999===================================================================
1000--- claws-mail-2.9.1.orig/src/compose.c 2007-04-25 10:18:13.000000000 +0100
1001+++ claws-mail-2.9.1/src/compose.c 2007-04-25 10:30:23.000000000 +0100
1002@@ -6192,7 +6192,6 @@
1003 n_menu_entries = sizeof(compose_entries) / sizeof(compose_entries[0]);
1004 menubar = menubar_create(window, compose_entries,
1005 n_menu_entries, "<Compose>", compose);
1006- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
1007
1008 handlebox = gtk_hbox_new(FALSE, 0);
1009 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 @@
1Index: claws-mail-2.9.1/src/mainwindow.c
2===================================================================
3--- claws-mail-2.9.1.orig/src/mainwindow.c 2007-04-25 07:40:10.000000000 +0100
4+++ claws-mail-2.9.1/src/mainwindow.c 2007-04-25 10:26:40.000000000 +0100
5@@ -189,9 +189,6 @@
6 static void toggle_statusbar_cb (MainWindow *mainwin,
7 guint action,
8 GtkWidget *widget);
9-static void set_layout_cb (MainWindow *mainwin,
10- guint action,
11- GtkWidget *widget);
12
13 static void addressbook_open_cb (MainWindow *mainwin,
14 guint action,
15@@ -538,94 +535,24 @@
16 {N_("/_Edit/_Search folder..."), "<shift><control>F", search_cb, 1, NULL},
17 {N_("/_Edit/_Quick search"), "slash", mainwindow_quicksearch, 0, NULL},
18 {N_("/_View"), NULL, NULL, 0, "<Branch>"},
19- {N_("/_View/Show or hi_de"), NULL, NULL, 0, "<Branch>"},
20- {N_("/_View/Show or hi_de/_Message view"),
21- "V", toggle_message_cb, 0, "<ToggleItem>"},
22- {N_("/_View/Show or hi_de/_Toolbar"),
23- NULL, NULL, 0, "<Branch>"},
24- {N_("/_View/Show or hi_de/_Toolbar/Text _below icons"),
25- NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
26- {N_("/_View/Show or hi_de/_Toolbar/Text be_side icons"),
27- NULL, toggle_toolbar_cb, TOOLBAR_BOTH_HORIZ, "/View/Show or hide/Toolbar/Text below icons"},
28- {N_("/_View/Show or hi_de/_Toolbar/_Icons only"),
29- NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Text below icons"},
30- {N_("/_View/Show or hi_de/_Toolbar/_Text only"),
31- NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Text below icons"},
32- {N_("/_View/Show or hi_de/_Toolbar/_Hide"),
33- NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Text below icons"},
34- {N_("/_View/Show or hi_de/Status _bar"),
35- NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
36 {N_("/_View/Set displayed _columns"), NULL, NULL, 0, "<Branch>"},
37 {N_("/_View/Set displayed _columns/in _Folder list..."), NULL, set_folder_display_item_cb, 0, NULL},
38 {N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL},
39
40 {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
41- {N_("/_View/La_yout"), NULL, NULL, 0, "<Branch>"},
42- {N_("/_View/Layout/_Standard"), NULL, set_layout_cb, NORMAL_LAYOUT, "<RadioItem>"},
43- {N_("/_View/Layout/_Three columns"), NULL, set_layout_cb, VERTICAL_LAYOUT, "/View/Layout/Standard"},
44- {N_("/_View/Layout/_Wide message"), NULL, set_layout_cb, WIDE_LAYOUT, "/View/Layout/Standard"},
45- {N_("/_View/Layout/W_ide message list"),NULL, set_layout_cb, WIDE_MSGLIST_LAYOUT, "/View/Layout/Standard"},
46- {N_("/_View/Layout/S_mall screen"), NULL, set_layout_cb, SMALL_LAYOUT, "/View/Layout/Standard"},
47- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
48 {N_("/_View/_Sort"), NULL, NULL, 0, "<Branch>"},
49- {N_("/_View/_Sort/by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
50- {N_("/_View/_Sort/by S_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"},
51- {N_("/_View/_Sort/by _Date"), NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"},
52- {N_("/_View/_Sort/by _From"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"},
53- {N_("/_View/_Sort/by _To"), NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by number"},
54- {N_("/_View/_Sort/by S_ubject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"},
55- {N_("/_View/_Sort/by _color label"),
56- NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"},
57- {N_("/_View/_Sort/by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"},
58- {N_("/_View/_Sort/by _status"), NULL, sort_summary_cb, SORT_BY_STATUS, "/View/Sort/by number"},
59- {N_("/_View/_Sort/by a_ttachment"),
60- NULL, sort_summary_cb, SORT_BY_MIME, "/View/Sort/by number"},
61- {N_("/_View/_Sort/by score"), NULL, sort_summary_cb, SORT_BY_SCORE, "/View/Sort/by number"},
62- {N_("/_View/_Sort/by locked"), NULL, sort_summary_cb, SORT_BY_LOCKED, "/View/Sort/by number"},
63- {N_("/_View/_Sort/D_on't sort"), NULL, sort_summary_cb, SORT_BY_NONE, "/View/Sort/by number"},
64+ {N_("/_View/_Sort/by _Date"), NULL, sort_summary_cb, SORT_BY_DATE, "<RadioItem>"},
65+ {N_("/_View/_Sort/by _From"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by Date"},
66+ {N_("/_View/_Sort/by _To"), NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by Date"},
67+ {N_("/_View/_Sort/by S_ubject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by Date"},
68 {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"},
69 {N_("/_View/_Sort/Ascending"), NULL, sort_summary_type_cb, SORT_ASCENDING, "<RadioItem>"},
70 {N_("/_View/_Sort/Descending"), NULL, sort_summary_type_cb, SORT_DESCENDING, "/View/Sort/Ascending"},
71- {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"},
72- {N_("/_View/_Sort/_Attract by subject"),
73- NULL, attract_by_subject_cb, 0, NULL},
74 {N_("/_View/Th_read view"), "<control>T", thread_cb, 0, "<ToggleItem>"},
75 {N_("/_View/E_xpand all threads"), NULL, expand_threads_cb, 0, NULL},
76 {N_("/_View/Co_llapse all threads"), NULL, collapse_threads_cb, 0, NULL},
77 {N_("/_View/_Hide read messages"), NULL, hide_read_messages, 0, "<ToggleItem>"},
78
79- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
80- {N_("/_View/_Go to"), NULL, NULL, 0, "<Branch>"},
81- {N_("/_View/_Go to/_Previous message"), "P", prev_cb, 0, NULL},
82- {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL},
83- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
84- {N_("/_View/_Go to/P_revious unread message"),
85- "<shift>P", prev_unread_cb, 0, NULL},
86- {N_("/_View/_Go to/N_ext unread message"),
87- "<shift>N", next_unread_cb, 0, NULL},
88- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
89- {N_("/_View/_Go to/Previous ne_w message"), NULL, prev_new_cb, 0, NULL},
90- {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_cb, 0, NULL},
91- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
92- {N_("/_View/_Go to/Previous _marked message"),
93- NULL, prev_marked_cb, 0, NULL},
94- {N_("/_View/_Go to/Next m_arked message"),
95- NULL, next_marked_cb, 0, NULL},
96- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
97- {N_("/_View/_Go to/Previous _labeled message"),
98- NULL, prev_labeled_cb, 0, NULL},
99- {N_("/_View/_Go to/Next la_beled message"),
100- NULL, next_labeled_cb, 0, NULL},
101- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
102- {N_("/_View/_Go to/Last read message"),
103- NULL, last_read_cb, 0, NULL},
104- {N_("/_View/_Go to/Parent message"),
105- "<control>Up", parent_cb, 0, NULL},
106- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
107- {N_("/_View/_Go to/Next unread _folder"), "<shift>G", goto_unread_folder_cb, 0, NULL},
108- {N_("/_View/_Go to/_Other folder..."), "G", goto_folder_cb, 0, NULL},
109- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
110-
111 #define ENC_SEPARATOR \
112 {N_("/_View/Character _encoding/---"), NULL, NULL, 0, "<Separator>"}
113 #define ENC_ACTION(action) \
114@@ -742,7 +669,6 @@
115 #undef DEC_ACTION
116
117 {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
118- {N_("/_View/Open in new _window"), "<control><alt>N", open_msg_cb, 0, NULL},
119 {N_("/_View/Mess_age source"), "<control>U", view_source_cb, 0, NULL},
120 {N_("/_View/All headers"), "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
121 {N_("/_View/Quotes"), NULL, NULL, 0, "<Branch>"},
122@@ -1137,23 +1063,14 @@
123 gint i;
124 guint n_menu_entries;
125
126- static GdkGeometry geometry;
127-
128 debug_print("Creating main window...\n");
129 mainwin = g_new0(MainWindow, 1);
130
131 /* main window */
132 window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow");
133- gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
134+ gtk_window_set_title(GTK_WINDOW(window), _("Mail"));
135 gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
136
137- if (!geometry.min_height) {
138- geometry.min_width = 320;
139- geometry.min_height = 200;
140- }
141- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
142- GDK_HINT_MIN_SIZE);
143-
144 g_signal_connect(G_OBJECT(window), "delete_event",
145 G_CALLBACK(main_window_close_cb), mainwin);
146 MANAGE_WINDOW_SIGNALS_CONNECT(window);
147@@ -1184,21 +1101,9 @@
148 /* gtk_widget_show(gtk_item_factory_get_item(ifactory,"/Message/Mailing-List"));
149 main_create_mailing_list_menu (mainwin, NULL); */
150
151- menu_set_sensitive(ifactory, "/Help/Manual", manual_available(MANUAL_MANUAL_LOCAL));
152-
153- if (prefs_common.toolbar_detachable) {
154- handlebox = gtk_handle_box_new();
155- gtk_widget_show(handlebox);
156- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
157- g_signal_connect(G_OBJECT(handlebox), "child_attached",
158- G_CALLBACK(toolbar_child_attached), mainwin);
159- g_signal_connect(G_OBJECT(handlebox), "child_detached",
160- G_CALLBACK(toolbar_child_detached), mainwin);
161- } else {
162- handlebox = gtk_hbox_new(FALSE, 0);
163- gtk_widget_show(handlebox);
164- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
165- }
166+ handlebox = gtk_hbox_new(FALSE, 0);
167+ gtk_widget_show(handlebox);
168+ gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
169 /* link window to mainwin->window to avoid gdk warnings */
170 mainwin->window = window;
171
172@@ -1405,36 +1310,6 @@
173 (ifactory, "/View/Character encoding/Auto detect");
174 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
175
176- switch (prefs_common.toolbar_style) {
177- case TOOLBAR_NONE:
178- menuitem = gtk_item_factory_get_item
179- (ifactory, "/View/Show or hide/Toolbar/Hide");
180- break;
181- case TOOLBAR_ICON:
182- menuitem = gtk_item_factory_get_item
183- (ifactory, "/View/Show or hide/Toolbar/Icons only");
184- break;
185- case TOOLBAR_TEXT:
186- menuitem = gtk_item_factory_get_item
187- (ifactory, "/View/Show or hide/Toolbar/Text only");
188- break;
189- case TOOLBAR_BOTH:
190- menuitem = gtk_item_factory_get_item
191- (ifactory, "/View/Show or hide/Toolbar/Text below icons");
192- break;
193- case TOOLBAR_BOTH_HORIZ:
194- menuitem = gtk_item_factory_get_item
195- (ifactory,
196- "/View/Show or hide/Toolbar/Text beside icons");
197- }
198- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
199-
200- gtk_widget_hide(mainwin->hbox_stat);
201- menuitem = gtk_item_factory_get_item
202- (ifactory, "/View/Show or hide/Status bar");
203- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
204- prefs_common.show_statusbar);
205-
206 /* set account selection menu */
207 ac_menu = gtk_item_factory_get_widget
208 (ifactory, "/Configuration/Change current account");
209@@ -2284,16 +2159,6 @@
210 {"/View/Expand all threads" , M_MSG_EXIST},
211 {"/View/Collapse all threads" , M_MSG_EXIST},
212 {"/View/Hide read messages" , M_HIDE_READ_MSG},
213- {"/View/Go to/Previous message" , M_MSG_EXIST},
214- {"/View/Go to/Next message" , M_MSG_EXIST},
215- {"/View/Go to/Previous unread message" , M_MSG_EXIST},
216- {"/View/Go to/Previous new message" , M_MSG_EXIST},
217- {"/View/Go to/Previous marked message" , M_MSG_EXIST},
218- {"/View/Go to/Previous labeled message", M_MSG_EXIST},
219- {"/View/Go to/Next labeled message", M_MSG_EXIST},
220- {"/View/Go to/Last read message" , M_SINGLE_TARGET_EXIST},
221- {"/View/Go to/Parent message" , M_SINGLE_TARGET_EXIST},
222- {"/View/Open in new window" , M_SINGLE_TARGET_EXIST},
223 {"/View/Message source" , M_SINGLE_TARGET_EXIST},
224 {"/View/All headers" , M_SINGLE_TARGET_EXIST},
225 {"/View/Quotes" , M_SINGLE_TARGET_EXIST},
226@@ -2379,40 +2244,20 @@
227 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
228 }
229
230- SET_CHECK_MENU_ACTIVE("/View/Show or hide/Message view",
231- messageview_is_visible(mainwin->messageview));
232-
233 summaryview = mainwin->summaryview;
234- menu_path = "/View/Sort/Don't sort";
235+ menu_path = "/View/Sort/by Date";
236
237 switch (summaryview->sort_key) {
238- case SORT_BY_NUMBER:
239- menu_path = "/View/Sort/by number"; break;
240- case SORT_BY_SIZE:
241- menu_path = "/View/Sort/by Size"; break;
242- case SORT_BY_DATE:
243- menu_path = "/View/Sort/by Date"; break;
244 case SORT_BY_FROM:
245 menu_path = "/View/Sort/by From"; break;
246 case SORT_BY_TO:
247 menu_path = "/View/Sort/by To"; break;
248 case SORT_BY_SUBJECT:
249 menu_path = "/View/Sort/by Subject"; break;
250- case SORT_BY_LABEL:
251- menu_path = "/View/Sort/by color label"; break;
252- case SORT_BY_MARK:
253- menu_path = "/View/Sort/by mark"; break;
254- case SORT_BY_STATUS:
255- menu_path = "/View/Sort/by status"; break;
256- case SORT_BY_MIME:
257- menu_path = "/View/Sort/by attachment"; break;
258- case SORT_BY_SCORE:
259- menu_path = "/View/Sort/by score"; break;
260- case SORT_BY_LOCKED:
261- menu_path = "/View/Sort/by locked"; break;
262 case SORT_BY_NONE:
263+ case SORT_BY_DATE:
264 default:
265- menu_path = "/View/Sort/Don't sort"; break;
266+ menu_path = "/View/Sort/by Date"; break;
267 }
268 SET_CHECK_MENU_ACTIVE(menu_path, TRUE);
269
270@@ -2735,8 +2580,6 @@
271 gtk_widget_destroy(mainwin->hpaned);
272 }
273
274- menu_set_sensitive(ifactory, "/View/Show or hide/Message view",
275- (layout_mode != WIDE_MSGLIST_LAYOUT && layout_mode != SMALL_LAYOUT));
276 switch (layout_mode) {
277 case VERTICAL_LAYOUT:
278 case NORMAL_LAYOUT:
279@@ -2877,37 +2720,6 @@
280
281 prefs_common.layout_mode = layout_mode;
282
283- menuitem = gtk_item_factory_get_item
284- (ifactory, "/View/Show or hide/Message view");
285- gtk_check_menu_item_set_active
286- (GTK_CHECK_MENU_ITEM(menuitem),
287- messageview_is_visible(mainwin->messageview));
288-
289-#define SET_CHECK_MENU_ACTIVE(path, active) \
290-{ \
291- menuitem = gtk_item_factory_get_widget(ifactory, path); \
292- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
293-}
294-
295- switch (prefs_common.layout_mode) {
296- case NORMAL_LAYOUT:
297- SET_CHECK_MENU_ACTIVE("/View/Layout/Standard", TRUE);
298- break;
299- case VERTICAL_LAYOUT:
300- SET_CHECK_MENU_ACTIVE("/View/Layout/Three columns", TRUE);
301- break;
302- case WIDE_LAYOUT:
303- SET_CHECK_MENU_ACTIVE("/View/Layout/Wide message", TRUE);
304- break;
305- case WIDE_MSGLIST_LAYOUT:
306- SET_CHECK_MENU_ACTIVE("/View/Layout/Wide message list", TRUE);
307- break;
308- case SMALL_LAYOUT:
309- SET_CHECK_MENU_ACTIVE("/View/Layout/Small screen", TRUE);
310- break;
311- }
312-#undef SET_CHECK_MENU_ACTIVE
313-
314 if (folderwin) {
315 g_signal_connect
316 (G_OBJECT(folderwin), "size_allocate",
317@@ -3116,12 +2928,6 @@
318 summary_toggle_view(mainwin->summaryview);
319 }
320
321-static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
322- GtkWidget *widget)
323-{
324- toolbar_toggle(action, mainwin);
325-}
326-
327 static void main_window_reply_cb(MainWindow *mainwin, guint action,
328 GtkWidget *widget)
329 {
330Index: claws-mail-2.9.1/src/prefs_common.c
331===================================================================
332--- claws-mail-2.9.1.orig/src/prefs_common.c 2007-04-25 07:40:10.000000000 +0100
333+++ claws-mail-2.9.1/src/prefs_common.c 2007-04-25 07:42:17.000000000 +0100
334@@ -262,7 +262,7 @@
335 {"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL,
336 NULL, NULL, NULL},
337
338-#ifndef MAEMO
339+#if 0
340 {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
341 NULL, NULL, NULL},
342 #else
343@@ -300,7 +300,7 @@
344 &prefs_common.normalfont_gtk1, P_STRING, NULL, NULL, NULL},
345
346 /* new fonts */
347-#ifndef MAEMO
348+#if 0
349 {"widget_font_gtk2", NULL,
350 &SPECIFIC_PREFS.widgetfont, P_STRING, NULL, NULL, NULL},
351 {"message_font_gtk2", "Monospace 9",
352@@ -416,7 +416,7 @@
353
354 {"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL,
355 NULL, NULL, NULL},
356-#ifndef MAEMO
357+#if 0
358 {"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM,
359 NULL, NULL, NULL},
360 #else
361@@ -544,7 +544,7 @@
362 {"folder_col_pos_total", "3",
363 &prefs_common.folder_col_pos[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
364
365-#ifndef MAEMO
366+#if 0
367 {"folder_col_size_folder", "120",
368 &prefs_common.folder_col_size[F_COL_FOLDER], P_INT, NULL, NULL, NULL},
369 {"folder_col_size_new", "32",
370@@ -702,7 +702,7 @@
371 &SPECIFIC_PREFS.mime_open_cmd, P_STRING, NULL, NULL, NULL},
372
373 /* Interface */
374-#ifndef MAEMO
375+#if 0
376 {"layout_mode", "0", &prefs_common.layout_mode, P_INT,
377 NULL, NULL, NULL},
378 #else
379Index: claws-mail-2.9.1/src/toolbar.c
380===================================================================
381--- claws-mail-2.9.1.orig/src/toolbar.c 2007-04-25 07:40:10.000000000 +0100
382+++ claws-mail-2.9.1/src/toolbar.c 2007-04-25 07:42:17.000000000 +0100
383@@ -841,26 +841,17 @@
384 gtk_widget_hide(handlebox_wid);
385 break;
386 case TOOLBAR_ICON:
387- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
388- GTK_TOOLBAR_ICONS);
389- break;
390 case TOOLBAR_TEXT:
391- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
392- GTK_TOOLBAR_TEXT);
393- break;
394 case TOOLBAR_BOTH:
395- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
396- GTK_TOOLBAR_BOTH);
397- break;
398 case TOOLBAR_BOTH_HORIZ:
399 gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
400- GTK_TOOLBAR_BOTH_HORIZ);
401+ GTK_TOOLBAR_ICONS);
402 break;
403 default:
404 return;
405 }
406
407- prefs_common.toolbar_style = (ToolbarStyle)action;
408+ prefs_common.toolbar_style = (ToolbarStyle)TOOLBAR_ICON;
409 gtk_widget_set_size_request(handlebox_wid, 1, -1);
410
411 if (prefs_common.toolbar_style != TOOLBAR_NONE) {
412@@ -1594,7 +1585,7 @@
413 gtk_container_add(GTK_CONTAINER(container), toolbar);
414 gtk_container_set_border_width(GTK_CONTAINER(container), 2);
415 gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
416- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
417+ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
418
419 for (cur = toolbar_list; cur != NULL; cur = cur->next) {
420
421Index: claws-mail-2.9.1/src/gtk/prefswindow.c
422===================================================================
423--- claws-mail-2.9.1.orig/src/gtk/prefswindow.c 2007-04-25 07:40:10.000000000 +0100
424+++ claws-mail-2.9.1/src/gtk/prefswindow.c 2007-04-25 10:30:15.000000000 +0100
425@@ -343,6 +343,10 @@
426 gint x = gdk_screen_width();
427 gint y = gdk_screen_height();
428 static GdkGeometry geometry;
429+ gint col_count = g_slist_length (prefs_pages);
430+
431+ if (col_count > 1)
432+ col_count = 2;
433
434 prefswindow = g_new0(PrefsWindow, 1);
435
436@@ -360,39 +364,52 @@
437 gtk_window_set_resizable (GTK_WINDOW(prefswindow->window), TRUE);
438 gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4);
439
440- prefswindow->table1 = gtk_table_new(2, 2, FALSE);
441+ prefswindow->table1 = gtk_table_new(col_count, col_count, FALSE);
442 gtk_widget_show(prefswindow->table1);
443 gtk_container_add(GTK_CONTAINER(prefswindow->window), prefswindow->table1);
444
445- prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
446- gtk_widget_show(prefswindow->scrolledwindow1);
447- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
448- gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->scrolledwindow1, 0, 1, 0, 1, GTK_FILL, GTK_FILL | GTK_EXPAND, 2, 2);
449-
450- prefswindow->tree_view = prefswindow_tree_view_create(prefswindow);
451- gtk_widget_show(prefswindow->tree_view);
452- gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1),
453- prefswindow->tree_view);
454-
455- prefswindow->frame = gtk_frame_new(NULL);
456- gtk_widget_show(prefswindow->frame);
457- gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN);
458- gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->frame, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2);
459-
460- prefswindow->table2 = gtk_table_new(1, 2, FALSE);
461- gtk_widget_show(prefswindow->table2);
462- gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2);
463-
464- prefswindow->labelframe = gtk_frame_new(NULL);
465- gtk_widget_show(prefswindow->labelframe);
466- gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->labelframe), GTK_SHADOW_OUT);
467- gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->labelframe, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 1, 1);
468-
469- prefswindow->pagelabel = gtk_label_new("");
470- gtk_widget_show(prefswindow->pagelabel);
471- gtk_label_set_justify(GTK_LABEL(prefswindow->pagelabel), GTK_JUSTIFY_LEFT);
472- gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0);
473- gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel);
474+ if (col_count > 1)
475+ {
476+ prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
477+ gtk_widget_show(prefswindow->scrolledwindow1);
478+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
479+ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->scrolledwindow1, 0, 1, 0, 1, GTK_FILL, GTK_FILL | GTK_EXPAND, 2, 2);
480+
481+ prefswindow->tree_view = prefswindow_tree_view_create(prefswindow);
482+ gtk_widget_show(prefswindow->tree_view);
483+ gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1),
484+ prefswindow->tree_view);
485+
486+ prefswindow->frame = gtk_frame_new(NULL);
487+ gtk_widget_show(prefswindow->frame);
488+ gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN);
489+ 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);
490+
491+ prefswindow->table2 = gtk_table_new(1, 2, FALSE);
492+ gtk_widget_show(prefswindow->table2);
493+ gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2);
494+ }
495+ else
496+ {
497+ prefswindow->table2 = gtk_table_new(1, 2, FALSE);
498+ gtk_widget_show(prefswindow->table2);
499+ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->table2, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2);
500+ }
501+
502+
503+ if (col_count > 1)
504+ {
505+ prefswindow->labelframe = gtk_frame_new(NULL);
506+ gtk_widget_show(prefswindow->labelframe);
507+ gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->labelframe), GTK_SHADOW_OUT);
508+ gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->labelframe, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 1, 1);
509+
510+ prefswindow->pagelabel = gtk_label_new("");
511+ gtk_widget_show(prefswindow->pagelabel);
512+ gtk_label_set_justify(GTK_LABEL(prefswindow->pagelabel), GTK_JUSTIFY_LEFT);
513+ gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0);
514+ gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel);
515+ }
516
517 prefswindow->scrolledwindow2 = gtk_scrolled_window_new(NULL, NULL);
518 gtk_widget_show(prefswindow->scrolledwindow2);
519@@ -411,9 +428,38 @@
520 gtk_widget_show(prefswindow->empty_page);
521 gtk_container_add(GTK_CONTAINER(prefswindow->notebook), prefswindow->empty_page);
522
523- prefswindow_build_tree(prefswindow->tree_view, prefs_pages);
524+ if (col_count > 1)
525+ {
526+ prefswindow_build_tree(prefswindow->tree_view, prefs_pages);
527+
528+ gtk_widget_grab_focus(prefswindow->tree_view);
529+ }
530+ else
531+ {
532+ PrefsPage * page = prefs_pages->data;
533+ gint pagenum;
534+ GtkAdjustment *adj;
535+
536+ if (!page->page_open)
537+ {
538+ page->create_widget(page,
539+ GTK_WINDOW(prefswindow->window),
540+ prefswindow->data);
541+ gtk_container_add(GTK_CONTAINER(prefswindow->notebook),
542+ page->widget);
543+ page->page_open = TRUE;
544+ }
545+
546+ pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(prefswindow->notebook),
547+ page->widget);
548+ gtk_notebook_set_current_page(GTK_NOTEBOOK(prefswindow->notebook),
549+ pagenum);
550
551- gtk_widget_grab_focus(prefswindow->tree_view);
552+ adj = gtk_scrolled_window_get_vadjustment(
553+ GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
554+ gtk_adjustment_set_value(adj, 0);
555+
556+ }
557
558 gtkut_stock_button_set_create(&prefswindow->confirm_area,
559 &prefswindow->apply_btn, GTK_STOCK_APPLY,
560@@ -440,28 +486,6 @@
561 G_CALLBACK(prefswindow_key_pressed), &(prefswindow->window));
562 #endif
563
564- /* connect to callback only if we hhave non-NULL pointers to store size to */
565- if (prefswindow->save_width && prefswindow->save_height) {
566- g_signal_connect(G_OBJECT(prefswindow->window), "size_allocate",
567- G_CALLBACK(prefs_size_allocate_cb), prefswindow);
568- }
569-
570- if (!geometry.min_height) {
571-
572- if (x < 800 && y < 600) {
573- geometry.min_width = 600;
574- geometry.min_height = 440;
575- } else {
576- geometry.min_width = 700;
577- geometry.min_height = 550;
578- }
579- }
580- gtk_window_set_geometry_hints(GTK_WINDOW(prefswindow->window), NULL, &geometry,
581- GDK_HINT_MIN_SIZE);
582- if (prefswindow->save_width && prefswindow->save_height) {
583- gtk_widget_set_size_request(prefswindow->window, *(prefswindow->save_width),
584- *(prefswindow->save_height));
585- }
586
587 gtk_widget_show(prefswindow->window);
588 #ifdef MAEMO
589Index: claws-mail-2.9.1/src/compose.c
590===================================================================
591--- claws-mail-2.9.1.orig/src/compose.c 2007-04-25 07:40:10.000000000 +0100
592+++ claws-mail-2.9.1/src/compose.c 2007-04-25 10:18:13.000000000 +0100
593@@ -352,9 +352,6 @@
594
595 /* callback functions */
596
597-static gboolean compose_edit_size_alloc (GtkEditable *widget,
598- GtkAllocation *allocation,
599- GtkSHRuler *shruler);
600 static void account_activated (GtkComboBox *optmenu,
601 gpointer data);
602 static void attach_selected (GtkTreeView *tree_view,
603@@ -439,9 +436,6 @@
604 guint action,
605 GtkWidget *widget);
606
607-static void compose_toggle_ruler_cb (gpointer data,
608- guint action,
609- GtkWidget *widget);
610 static void compose_toggle_sign_cb (gpointer data,
611 guint action,
612 GtkWidget *widget);
613@@ -788,7 +782,6 @@
614 ENC_ACTION(C_WINDOWS_874)},
615
616 {N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
617- {N_("/_Tools/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
618 {N_("/_Tools/_Address book"), "<shift><control>A", compose_address_cb , 0, NULL},
619 {N_("/_Tools/_Template"), NULL, NULL, 0, "<Branch>"},
620 {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"},
621@@ -2067,7 +2060,6 @@
622 menu_set_sensitive(ifactory, "/Message/Insert signature", FALSE);
623 menu_set_sensitive(ifactory, "/Edit", FALSE);
624 menu_set_sensitive(ifactory, "/Options", FALSE);
625- menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE);
626 menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
627
628 if (compose->toolbar->draft_btn)
629@@ -5684,7 +5676,7 @@
630 g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
631 G_CALLBACK(compose_grab_focus_cb), compose);
632 gtk_widget_show(combo);
633- gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_SHRINK, GTK_FILL, 0, 0);
634+ gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_FILL, GTK_FILL, 0, 0);
635 if (compose->header_last) {
636 const gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
637 string = headers;
638@@ -5778,7 +5770,7 @@
639
640 static GtkWidget *compose_create_header(Compose *compose)
641 {
642- GtkWidget *from_optmenu_hbox;
643+ GtkWidget *from_optmenu;
644 GtkWidget *header_scrolledwin;
645 GtkWidget *header_table;
646
647@@ -5788,18 +5780,20 @@
648 header_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
649 gtk_widget_show(header_scrolledwin);
650 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(header_scrolledwin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
651-
652 header_table = gtk_table_new(2, 2, FALSE);
653+ gtk_table_set_col_spacings (GTK_TABLE (header_table), BORDER_WIDTH);
654 gtk_widget_show(header_table);
655 gtk_container_set_border_width(GTK_CONTAINER(header_table), BORDER_WIDTH);
656 gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table);
657- gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_ETCHED_IN);
658+ gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_NONE);
659 count = 0;
660
661 /* option menu for selecting accounts */
662- from_optmenu_hbox = compose_account_option_menu_create(compose);
663- gtk_table_attach(GTK_TABLE(header_table), from_optmenu_hbox,
664- 0, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
665+ from_optmenu = compose_account_option_menu_create(compose);
666+ gtk_table_attach(GTK_TABLE(header_table), from_optmenu,
667+ 0, 1, count, count + 1, GTK_FILL, GTK_FILL, 0, 0);
668+ gtk_table_attach(GTK_TABLE(header_table), compose->from_name,
669+ 1, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
670 count++;
671
672 compose->header_table = header_table;
673@@ -6140,15 +6134,12 @@
674 GtkWidget *vbox2;
675
676 GtkWidget *label;
677- GtkWidget *subject_hbox;
678- GtkWidget *subject_frame;
679+ GtkWidget *edit_frame;
680 GtkWidget *subject_entry;
681 GtkWidget *subject;
682 GtkWidget *paned;
683
684 GtkWidget *edit_vbox;
685- GtkWidget *ruler_hbox;
686- GtkWidget *ruler;
687 GtkWidget *scrolledwin;
688 GtkWidget *text;
689 GtkTextBuffer *buffer;
690@@ -6169,8 +6160,6 @@
691 GtkAspell * gtkaspell = NULL;
692 #endif
693
694- static GdkGeometry geometry;
695-
696 g_return_val_if_fail(account != NULL, NULL);
697
698 debug_print("Creating compose window...\n");
699@@ -6190,28 +6179,6 @@
700
701 window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "compose");
702
703- gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
704- gtk_widget_set_size_request(window, -1, prefs_common.compose_height);
705-
706- if (!geometry.max_width) {
707- geometry.max_width = gdk_screen_width();
708- geometry.max_height = gdk_screen_height();
709- }
710-
711- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
712- &geometry, GDK_HINT_MAX_SIZE);
713- if (!geometry.min_width) {
714- geometry.min_width = 600;
715- geometry.min_height = 480;
716- }
717- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
718- &geometry, GDK_HINT_MIN_SIZE);
719-
720-#ifndef MAEMO
721- if (compose_force_window_origin)
722- gtk_widget_set_uposition(window, prefs_common.compose_x,
723- prefs_common.compose_y);
724-#endif
725 g_signal_connect(G_OBJECT(window), "delete_event",
726 G_CALLBACK(compose_delete_cb), compose);
727 MANAGE_WINDOW_SIGNALS_CONNECT(window);
728@@ -6227,11 +6194,7 @@
729 n_menu_entries, "<Compose>", compose);
730 gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
731
732- if (prefs_common.toolbar_detachable) {
733- handlebox = gtk_handle_box_new();
734- } else {
735- handlebox = gtk_hbox_new(FALSE, 0);
736- }
737+ handlebox = gtk_hbox_new(FALSE, 0);
738 gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
739
740 gtk_widget_realize(handlebox);
741@@ -6244,7 +6207,6 @@
742
743 /* Notebook */
744 notebook = gtk_notebook_new();
745- gtk_widget_set_size_request(notebook, -1, 130);
746 gtk_widget_show(notebook);
747
748 /* header labels and entries */
749@@ -6258,18 +6220,10 @@
750 /* Others Tab */
751 gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
752 compose_create_others(compose),
753- gtk_label_new_with_mnemonic(_("Othe_rs")));
754+ gtk_label_new_with_mnemonic(_("Othe_r")));
755
756 /* Subject */
757- subject_hbox = gtk_hbox_new(FALSE, 0);
758- gtk_widget_show(subject_hbox);
759-
760- subject_frame = gtk_frame_new(NULL);
761- gtk_frame_set_shadow_type(GTK_FRAME(subject_frame), GTK_SHADOW_NONE);
762- gtk_box_pack_start(GTK_BOX(subject_hbox), subject_frame, TRUE, TRUE, 0);
763- gtk_widget_show(subject_frame);
764-
765- subject = gtk_hbox_new(FALSE, HSPACING_NARROW);
766+ subject = gtk_hbox_new(FALSE, BORDER_WIDTH);
767 gtk_container_set_border_width(GTK_CONTAINER(subject), 0);
768 gtk_widget_show(subject);
769
770@@ -6283,20 +6237,16 @@
771 G_CALLBACK(compose_grab_focus_cb), compose);
772 gtk_widget_show(subject_entry);
773 compose->subject_entry = subject_entry;
774- gtk_container_add(GTK_CONTAINER(subject_frame), subject);
775
776- edit_vbox = gtk_vbox_new(FALSE, 0);
777+ edit_vbox = gtk_vbox_new(FALSE, BORDER_WIDTH);
778+ gtk_container_set_border_width(GTK_CONTAINER(edit_vbox), BORDER_WIDTH);
779
780- gtk_box_pack_start(GTK_BOX(edit_vbox), subject_hbox, FALSE, FALSE, 0);
781+ gtk_box_pack_start(GTK_BOX(edit_vbox), subject, FALSE, FALSE, 0);
782
783- /* ruler */
784- ruler_hbox = gtk_hbox_new(FALSE, 0);
785- gtk_box_pack_start(GTK_BOX(edit_vbox), ruler_hbox, FALSE, FALSE, 0);
786-
787- ruler = gtk_shruler_new();
788- gtk_ruler_set_range(GTK_RULER(ruler), 0.0, 100.0, 1.0, 100.0);
789- gtk_box_pack_start(GTK_BOX(ruler_hbox), ruler, TRUE, TRUE,
790- BORDER_WIDTH);
791+ edit_frame = gtk_frame_new(NULL);
792+ gtk_frame_set_shadow_type(GTK_FRAME(edit_frame), GTK_SHADOW_IN);
793+ gtk_widget_show(edit_frame);
794+ gtk_container_add(GTK_CONTAINER(edit_frame), edit_vbox);
795
796 /* text widget */
797 scrolledwin = gtk_scrolled_window_new(NULL, NULL);
798@@ -6317,9 +6267,6 @@
799
800 gtk_container_add(GTK_CONTAINER(scrolledwin), text);
801
802- g_signal_connect_after(G_OBJECT(text), "size_allocate",
803- G_CALLBACK(compose_edit_size_alloc),
804- ruler);
805 g_signal_connect(G_OBJECT(buffer), "changed",
806 G_CALLBACK(compose_changed_cb), compose);
807 g_signal_connect(G_OBJECT(text), "grab_focus",
808@@ -6363,7 +6310,7 @@
809 gtk_widget_set_size_request(edit_vbox, -1, mode == COMPOSE_NEW ? 250 : 230);
810 #endif
811 gtk_paned_add1(GTK_PANED(paned), notebook);
812- gtk_paned_add2(GTK_PANED(paned), edit_vbox);
813+ gtk_paned_add2(GTK_PANED(paned), edit_frame);
814 gtk_widget_show_all(paned);
815
816
817@@ -6408,8 +6355,6 @@
818
819 compose->notebook = notebook;
820 compose->edit_vbox = edit_vbox;
821- compose->ruler_hbox = ruler_hbox;
822- compose->ruler = ruler;
823 compose->scrolledwin = scrolledwin;
824 compose->text = text;
825
826@@ -6531,13 +6476,6 @@
827
828 compose_list = g_list_append(compose_list, compose);
829
830- if (!prefs_common.show_ruler)
831- gtk_widget_hide(ruler_hbox);
832-
833- menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Show ruler");
834- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
835- prefs_common.show_ruler);
836-
837 /* Priority */
838 compose->priority = PRIORITY_NORMAL;
839 compose_update_priority_menu_item(compose);
840@@ -6568,7 +6506,6 @@
841 static GtkWidget *compose_account_option_menu_create(Compose *compose)
842 {
843 GList *accounts;
844- GtkWidget *hbox;
845 GtkWidget *optmenu;
846 GtkWidget *optmenubox;
847 GtkListStore *menu;
848@@ -6584,7 +6521,6 @@
849 optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
850 menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
851
852- hbox = gtk_hbox_new(FALSE, 6);
853 from_name = gtk_entry_new();
854
855 g_signal_connect_after(G_OBJECT(from_name), "grab_focus",
856@@ -6623,9 +6559,6 @@
857 G_CALLBACK(account_activated),
858 compose);
859
860- gtk_box_pack_start(GTK_BOX(hbox), optmenubox, FALSE, FALSE, 0);
861- gtk_box_pack_start(GTK_BOX(hbox), from_name, TRUE, TRUE, 0);
862-
863 gtk_tooltips_set_tip(compose->tooltips, optmenubox,
864 _("Account to use for this email"), NULL);
865 gtk_tooltips_set_tip(compose->tooltips, from_name,
866@@ -6633,7 +6566,7 @@
867
868 compose->from_name = from_name;
869
870- return hbox;
871+ return optmenubox;
872 }
873
874 static void compose_set_priority_cb(gpointer data,
875@@ -7851,32 +7784,6 @@
876
877 /* callback functions */
878
879-/* compose_edit_size_alloc() - called when resized. don't know whether Gtk
880- * includes "non-client" (windows-izm) in calculation, so this calculation
881- * may not be accurate.
882- */
883-static gboolean compose_edit_size_alloc(GtkEditable *widget,
884- GtkAllocation *allocation,
885- GtkSHRuler *shruler)
886-{
887- if (prefs_common.show_ruler) {
888- gint char_width = 0, char_height = 0;
889- gint line_width_in_chars;
890-
891- gtkut_get_font_size(GTK_WIDGET(widget),
892- &char_width, &char_height);
893- line_width_in_chars =
894- (allocation->width - allocation->x) / char_width;
895-
896- /* got the maximum */
897- gtk_ruler_set_range(GTK_RULER(shruler),
898- 0.0, line_width_in_chars, 0,
899- /*line_width_in_chars*/ char_width);
900- }
901-
902- return TRUE;
903-}
904-
905 static void account_activated(GtkComboBox *optmenu, gpointer data)
906 {
907 Compose *compose = (Compose *)data;
908@@ -9040,21 +8947,6 @@
909 compose_update_privacy_system_menu_item(compose, warn);
910 }
911
912-static void compose_toggle_ruler_cb(gpointer data, guint action,
913- GtkWidget *widget)
914-{
915- Compose *compose = (Compose *)data;
916-
917- if (GTK_CHECK_MENU_ITEM(widget)->active) {
918- gtk_widget_show(compose->ruler_hbox);
919- prefs_common.show_ruler = TRUE;
920- } else {
921- gtk_widget_hide(compose->ruler_hbox);
922- gtk_widget_queue_resize(compose->edit_vbox);
923- prefs_common.show_ruler = FALSE;
924- }
925-}
926-
927 static void compose_attach_drag_received_cb (GtkWidget *widget,
928 GdkDragContext *context,
929 gint x,
930Index: claws-mail-2.9.1/src/folderview.c
931===================================================================
932--- claws-mail-2.9.1.orig/src/folderview.c 2007-04-03 19:10:25.000000000 +0100
933+++ claws-mail-2.9.1/src/folderview.c 2007-04-25 10:28:00.000000000 +0100
934@@ -73,6 +73,11 @@
935 #define COL_FOLDER_WIDTH 150
936 #define COL_NUM_WIDTH 32
937
938+/* added dummy column to stop the last column from
939+ * resizing insanely in small screen view
940+ */
941+#define _N_FOLDER_COLS (N_FOLDER_COLS + 1)
942+
943 static GList *folderview_list = NULL;
944
945 static GtkStyle *normal_style;
946@@ -448,7 +453,7 @@
947 gint *col_pos;
948 FolderColumnState *col_state;
949 FolderColumnType type;
950- gchar *titles[N_FOLDER_COLS];
951+ gchar *titles[_N_FOLDER_COLS];
952 gint i;
953 GtkWidget *scrolledwin = folderview->scrolledwin;
954
955@@ -471,8 +476,9 @@
956 titles[col_pos[F_COL_UNREAD]] = _("Unread");
957 /* TRANSLATORS: This in Number sign in American style */
958 titles[col_pos[F_COL_TOTAL]] = _("#");
959+ titles[F_COL_DUMMY] = "";
960
961- ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
962+ ctree = gtk_sctree_new_with_titles(_N_FOLDER_COLS, col_pos[F_COL_FOLDER],
963 titles);
964
965 gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
966@@ -510,6 +516,9 @@
967 (GTK_CLIST(ctree), i, col_state[i].visible);
968 }
969
970+ GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
971+ GTK_CAN_FOCUS);
972+
973 g_signal_connect(G_OBJECT(ctree), "key_press_event",
974 G_CALLBACK(folderview_key_pressed),
975 folderview);
976@@ -605,9 +614,6 @@
977 (GTK_SCROLLED_WINDOW(scrolledwin),
978 GTK_POLICY_AUTOMATIC,
979 prefs_common.folderview_vscrollbar_policy);
980- gtk_widget_set_size_request(scrolledwin,
981- prefs_common.folderview_width,
982- prefs_common.folderview_height);
983
984 folderview->scrolledwin = scrolledwin;
985 ctree = folderview_ctree_create(folderview);
986@@ -2268,7 +2274,7 @@
987 static void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
988 {
989 GtkCTree *ctree = GTK_CTREE(folderview->ctree);
990- gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
991+ gchar *text[_N_FOLDER_COLS] = {NULL, "0", "0", "0", ""};
992 GtkCTreeNode *node, *parent_node;
993 gint *col_pos = folderview->col_pos;
994 FolderItemUpdateData hookdata;
995Index: claws-mail-2.9.1/src/folderview.h
996===================================================================
997--- claws-mail-2.9.1.orig/src/folderview.h 2007-03-22 17:22:52.000000000 +0000
998+++ claws-mail-2.9.1/src/folderview.h 2007-04-25 10:16:55.000000000 +0100
999@@ -37,7 +37,8 @@
1000 F_COL_FOLDER,
1001 F_COL_NEW,
1002 F_COL_UNREAD,
1003- F_COL_TOTAL
1004+ F_COL_TOTAL,
1005+ F_COL_DUMMY
1006 } FolderColumnType;
1007
1008 #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 @@
1DESCRIPTION = "iCal and scheduling (RFC 2445, 2446, 2447) library"
2HOMEPAGE = "http://sourceforge.net/projects/freeassociation/"
3BUGTRACKER = "http://sourceforge.net/tracker/?group_id=16077&atid=116077"
4LICENSE = "LGPLv2.1 | MPLv1.1"
5LIC_FILES_CHKSUM = "file://COPYING;md5=35da21efce2b9f0ca07524c9f844e6ed \
6 file://LICENSE;md5=35da21efce2b9f0ca07524c9f844e6ed"
7SECTION = "libs"
8
9SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${P}.tar.gz"
10
11inherit 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 @@
1--- ../rxvt-unicode-cvs-r0/rxvt-unicode/Makefile.in 2004-08-12 22:32:40 +01:00
2+++ rxvt-unicode/Makefile.in 2004-12-24 03:09:00 +00:00
3@@ -9,7 +9,7 @@
4 first_rule: all
5 dummy:
6
7-subdirs = src doc src/test
8+subdirs = src src/test
9 allsubdirs = W11 $(subdirs)
10
11 DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
12@@ -24,7 +24,7 @@
13
14 #-------------------------------------------------------------------------
15
16-all allbin alldoc tags:
17+all allbin tags:
18 @if test x@host_os@ = xcygwin; then (cd W11; ${MAKE} $@) || exit 1; fi
19 @for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
20
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 @@
1[Desktop Entry]
2Encoding=UTF-8
3Name=Terminal
4Comment=When all else fails.
5Exec=/usr/bin/rxvt
6Icon=utilities-terminal.png
7Terminal=false
8Type=Application
9Categories=Utility
10StartupNotify=false
11
diff --git a/meta/recipes-sato/rxvt-unicode/files/rxvt.png b/meta/recipes-sato/rxvt-unicode/files/rxvt.png
new file mode 100644
index 0000000000..e56fa2e9cd
--- /dev/null
+++ b/meta/recipes-sato/rxvt-unicode/files/rxvt.png
Binary files differ
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 @@
1--- ../rxvt-unicode-cvs-r0/rxvt-unicode/src/command.C 2004-12-21 06:43:00 +00:00
2+++ rxvt-unicode/src/command.C 2004-12-24 02:31:36 +00:00
3@@ -1862,7 +1862,7 @@
4 #endif /* NO_SCROLLBAR_REPORT */
5
6 {
7- char upordown = 0;
8+ signed char upordown = 0;
9
10 if (scrollBar.style == R_SB_NEXT)
11 {
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 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- rxvt-unicode-4.8/src/screen.C~xwc.c
7+++ rxvt-unicode-4.8/src/screen.C
8@@ -3058,7 +3058,7 @@
9 else
10 rxvt_warn ("can't get primary selection, ignoring.\n");
11
12-#if 0
13+#ifdef HAVE_XWC
14 XTextProperty ct;
15
16 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
17@@ -3632,9 +3632,11 @@
18 }
19 else
20 #endif
21+#ifdef HAVE_XWC
22 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
23 freect = 1;
24 else
25+#endif
26 {
27 /* if we failed to convert then send it raw */
28 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 @@
1diff -urNd ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C
2--- ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00
3+++ rxvt-unicode-5.3/src/screen.C 2005-04-05 22:12:45 +01:00
4@@ -3064,7 +3064,7 @@
5 else
6 rxvt_warn ("can't get primary selection, ignoring.\n");
7
8-#if 0
9+#ifdef HAVE_XWC
10 XTextProperty ct;
11
12 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
13@@ -3648,9 +3648,11 @@
14 }
15 else
16 #endif
17+#ifdef HAVE_XWC
18 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
19 freect = 1;
20 else
21+#endif
22 {
23 /* if we failed to convert then send it raw */
24 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 @@
1SECTION = "x11/utils"
2DEPENDS = "virtual/libx11 libxt libxft"
3DESCRIPTION = "rxvt-unicode is a clone of the well known \
4terminal emulator rxvt, modified to store text in Unicode \
5(either UCS-2 or UCS-4) and to use locale-correct input and \
6output. It also supports mixing multiple fonts at the \
7same time, including Xft fonts."
8LICENSE = "GPL"
9SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
10 file://xwc.patch;patch=1 \
11 file://signedchar.patch;patch=1 \
12 file://rxvt.desktop \
13 file://rxvt.png"
14PR = "r5"
15
16inherit autotools update-alternatives
17
18PROVIDES = "virtual/x-terminal-emulator"
19ALTERNATIVE_NAME = "x-terminal-emulator"
20ALTERNATIVE_PATH = "${bindir}/rxvt"
21
22CFLAGS_append = " -fpermissive"
23
24# This is necessary so that the "tic" command executed during the install can
25# link with the correct libary in staging.
26export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
27
28EXTRA_OECONF = "--enable-menubar --enable-xim \
29 --enable-utmp --enable-wtmp --enable-lastlog \
30 --disable-strings --with-term=rxvt --enable-keepscrolling \
31 --enable-xft --with-name=rxvt --enable-frills \
32 --enable-swapscreen --enable-transparency \
33 --with-codesets=eu \
34 --enable-cursor-blink --enable-pointer-blank \
35 --enable-text-blink --enable-rxvt-scroll \
36 --enable-combining --enable-shared \
37 --enable-xgetdefault \
38 --with-x=${STAGING_DIR_HOST}${prefix}"
39EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
40 'XLIB=-L${STAGING_LIBDIR} -lX11'"
41
42do_configure () {
43 mv autoconf/configure.in . || true
44 rm autoconf/libtool.m4
45 libtoolize --force
46 autotools_do_configure
47 echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
48 echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
49 echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
50 echo '#define HAVE_XLOCALE 1' >> config.h
51}
52
53do_compile () {
54 if test -e ${S}/${HOST_SYS}-libtool; then
55 LIBTOOL=${S}/${HOST_SYS}-libtool
56 else
57 LIBTOOL=${S}/libtool
58 fi
59 # docs need "yodl" and I have no idea what that is
60 oe_runmake -C src "LIBTOOL=$LIBTOOL"
61}
62
63do_install_append () {
64 install -d ${D}/${datadir}
65 install -d ${D}/${datadir}/applications
66 install -d ${D}/${datadir}/pixmaps/
67
68 install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps
69 install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications
70}
71
72FILES_${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 @@
1# Top-level Makefile rule for automake
2#
3# Variable conventions:
4#
5# _h_api = API headers that will be installed and included in the distribution
6# _cppflags = flags that will be passed to the C/CXX Preprocessor
7# _sources = sources that will be compiled and included in the distribution
8# _built_sources = files that will be autogenerated by the build system and
9# will be part of the _SOURCES primary
10# _built_nosources = files that are autogenerated but are not part of the
11# _SOURCES primary
12# _cleanfiles = files that will be removed by the clean target
13#
14# Sources, headers, flags, etc... should be added to the respective variables
15# with the above suffix, e.g, webcore-specific sources should go to
16# webcore_sources, gtk port API and WebCoreSupport parts to webkitgtk_sources,
17# etc... The only exceptions are the global variables. See Global Variables
18# below.
19#
20# Global Variables
21#
22# global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any
23# specific port
24# global_cflags = CFLAGS that apply to JSC, WebCore, and to
25# any specific port
26# global_cxxflags = CXXFLAGS that apply to JSC, WebCore, and to any
27# specific port
28
29srcdir = @srcdir@
30VPATH = @srcdir@
31
32DISTCHECK_CONFIGURE_FLAGS = \
33 --enable-introspection \
34 --enable-gtk-doc
35
36# Directory for autogenerated sources
37GENSOURCES := $(top_builddir)/DerivedSources
38GENSOURCESWEBKITDOM := $(top_builddir)/DerivedSources/webkit
39GENPROGRAMS := $(top_builddir)/Programs
40
41# Script for creating hash tables
42CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table
43
44# Script for creating regexp tables
45CREATE_REGEXP_TABLES = $(srcdir)/JavaScriptCore/create_regex_tables
46
47# Programs to run the WebKitGtk unit tests
48GTESTER = gtester
49GTESTER_REPORT = gtester-report
50
51# Libraries and support components
52bin_PROGRAMS :=
53noinst_PROGRAMS :=
54noinst_HEADERS :=
55noinst_LTLIBRARIES :=
56lib_LTLIBRARIES :=
57IDL_BINDINGS :=
58TEST_PROGS :=
59POFILES :=
60MOFILES :=
61javascriptcore_h_api :=
62javascriptcore_cppflags:=
63javascriptcore_sources :=
64javascriptcore_built_sources :=
65javascriptcore_built_nosources :=
66javascriptcore_dist :=
67webcore_cppflags :=
68webcore_sources :=
69webcore_libadd :=
70webcore_built_sources :=
71webcore_built_nosources :=
72webcore_dist :=
73webcoregtk_cppflags :=
74webcoregtk_sources :=
75IDL_BINDINGS_GDOM :=
76GDOM_AUTO_CLASSES :=
77GDOM_FIXED_CLASSES :=
78GDOM_CLASSES :=
79GDOM_HEADERS_BUILT :=
80GDOM_HEADERS_FIXED :=
81libgdom_h_api :=
82libgdom_cleanfiles :=
83webkitgtk_h_api :=
84webkitgtk_sources :=
85webkitgtk_cppflags :=
86webkitgtk_built_sources :=
87webkitgtk_built_nosources :=
88webkitgtk_cleanfiles :=
89global_cppflags :=
90global_cflags :=
91global_cxxflags :=
92corekit_cflags :=
93corekit_cppflags :=
94JSCORE_GIRSOURCES :=
95WEBKIT_GIRSOURCES :=
96typelibsdir :=
97typelibs_DATA :=
98EXTRA_DIST :=
99BUILT_SOURCES :=
100CLEANFILES :=
101DISTCLEANFILES :=
102MAINTAINERCLEANFILES :=
103
104webcoregtk_cppflags += \
105 -I$(top_builddir)/DerivedSources/webkit \
106 -I$(srcdir)/WebCore/bindings \
107 -I$(srcdir)/WebCore/bindings/gobject
108
109# CFLAGS/CXXFLAGS used by WebCore and WebKit
110#
111# gtk+.pc already include glib, cairo, freetype and pango CFLAGS
112# Don't include them for now to reduce the noise when compiling
113# $(GLIB_CFLAGS) $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(FREETYPE_CFLAGS)
114corekit_cflags += \
115 -fno-strict-aliasing \
116 $(COVERAGE_CFLAGS) \
117 $(ENCHANT_CFLAGS) \
118 $(GAIL_CFLAGS) \
119 $(GEOCLUE_CFLAGS) \
120 $(GLIB_CFLAGS) \
121 $(GSTREAMER_CFLAGS) \
122 $(GTK_CFLAGS) \
123 $(HILDON_CFLAGS) \
124 $(LIBSOUP_CFLAGS) \
125 $(LIBXML_CFLAGS) \
126 $(LIBXSLT_CFLAGS) \
127 $(SQLITE3_CFLAGS) \
128 $(UNICODE_CFLAGS) \
129 $(XT_CFLAGS)
130
131# When building webcore/webkit, we want WebCore/config.h and NOT
132# JavaScriptCore/config.h, hence, it's important that WebCore/ should come first
133# before JavaScriptCore in the include path.
134corekit_cppflags += \
135 $(global_cppflags) \
136 $(webcore_cppflags) \
137 $(webcoregtk_cppflags) \
138 $(javascriptcore_cppflags)
139
140# For the Gtk port we want to use XP_UNIX both in X11 and Mac
141if !TARGET_WIN32
142corekit_cppflags += -DXP_UNIX
143endif
144
145# Default compiler flags
146global_cflags += \
147 -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
148 -Wformat -Wformat-security -Wno-format-y2k -Wundef \
149 -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
150 -Wno-unused-parameter -Wno-parentheses \
151 -fno-exceptions
152
153global_cxxflags += \
154 $(global_cflags) \
155 $(SYMBOL_VISIBILITY_INLINES) \
156 -fno-rtti
157
158# -no-undefined required for building DLLs on Windows
159# It breaks the build on other platforms, so we use it conditionally
160if OS_WIN32
161no_undefined = -no-undefined
162version_script = -export-symbols-regex "^(webkit_|JS).*"
163endif
164
165if OS_GNU
166version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
167endif
168
169# Shared libraries
170lib_LTLIBRARIES += \
171 libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
172
173# Convenience libraries
174noinst_LTLIBRARIES += \
175 libJavaScriptCore.la
176
177# JavaScriptCore
178javascriptcore_cppflags += \
179 -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
180 -I$(srcdir)/JavaScriptCore/parser \
181 -I$(srcdir)/JavaScriptCore/wtf \
182 -I$(srcdir)/JavaScriptCore/wtf/gtk \
183 -I$(srcdir)/JavaScriptCore/wtf/gobject \
184 -I$(top_builddir)/DerivedSources
185
186nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
187 $(javascriptcore_built_nosources)
188
189nodist_libJavaScriptCore_la_SOURCES = \
190 $(javascriptcore_built_sources)
191
192libJavaScriptCore_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/JavaScriptCore
193libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
194
195libJavaScriptCore_la_SOURCES = \
196 $(javascriptcore_sources)
197
198libJavaScriptCore_la_LIBADD = \
199 $(UNICODE_LIBS) \
200 $(GLIB_LIBS) \
201 -lpthread
202
203libJavaScriptCore_la_CXXFLAGS = \
204 $(global_cxxflags) \
205 $(libJavaScriptCore_la_CFLAGS)
206
207libJavaScriptCore_la_CFLAGS = \
208 -fstrict-aliasing \
209 -O3 \
210 $(global_cflags) \
211 $(GLIB_CFLAGS) \
212 $(UNICODE_CFLAGS)
213
214libJavaScriptCore_la_CPPFLAGS = \
215 $(global_cppflags) \
216 $(javascriptcore_cppflags)
217
218# WebKit
219nodist_EXTRA_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
220 $(webcore_built_nosources)
221
222nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
223 $(webcore_built_sources) \
224 $(webkitgtk_built_sources)
225
226libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
227libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
228 $(webkitgtk_h_api) \
229 WebKit/gtk/webkit/webkitenumtypes.h
230
231libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
232 $(webcore_sources) \
233 $(webcoregtk_sources) \
234 $(webkitgtk_sources)
235
236libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \
237 $(global_cxxflags) \
238 $(corekit_cflags)
239
240libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
241 $(global_cflags) \
242 $(corekit_cflags)
243
244libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
245 $(corekit_cppflags) \
246 $(webkitgtk_cppflags) \
247 $(HILDON_CPPFLAGS)
248
249libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
250 -version-info @LIBWEBKITGTK_VERSION@ \
251 $(version_script) \
252 $(no_undefined)
253
254libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
255 -lpthread \
256 libJavaScriptCore.la \
257 libWebCoreJS.la \
258 libgdom.la \
259 $(webcore_ldflags) \
260 $(CAIRO_LIBS) \
261 $(COVERAGE_LDFLAGS) \
262 $(ENCHANT_LIBS) \
263 $(FREETYPE_LIBS) \
264 $(GAIL_LIBS) \
265 $(GEOCLUE_LIBS) \
266 $(GLIB_LIBS) \
267 $(GSTREAMER_LIBS) \
268 $(GTK_LIBS) \
269 $(HILDON_LIBS) \
270 $(JPEG_LIBS) \
271 $(LIBSOUP_LIBS) \
272 $(LIBXML_LIBS) \
273 $(LIBXSLT_LIBS) \
274 $(PANGO_LIBS) \
275 $(PNG_LIBS) \
276 $(SQLITE3_LIBS) \
277 $(UNICODE_LIBS) \
278 $(XT_LIBS)
279
280libgdom_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
281nodist_libgdom_la_HEADERS = \
282 $(libgdom_h_api)
283
284libgdom_cleanfiles += \
285 $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h \
286 $(top_builddir)/libgdom.la \
287 $(top_builddir)/stamp-webkitdomenumtypes.h
288
289#
290# Extra checks and flags
291global_cppflags += \
292 -DBUILDING_CAIRO__=1 \
293 -DBUILDING_GTK__=1 \
294 -DWTF_CHANGES
295
296if USE_ICU_UNICODE
297global_cppflags += \
298 -DWTF_USE_ICU_UNICODE=1
299endif
300
301if USE_GLIB_UNICODE
302global_cppflags += \
303 -DWTF_USE_GLIB_UNICODE=1
304endif
305
306if !ENABLE_FAST_MALLOC
307global_cppflags += \
308 -DUSE_SYSTEM_MALLOC
309endif
310
311if !ENABLE_DEBUG
312global_cppflags += -DNDEBUG
313global_cflags += $(SYMBOL_VISIBILITY)
314else
315webcoregtk_cppflags += \
316 -DG_DISABLE_DEPRECATED \
317 -DGDK_PIXBUF_DISABLE_DEPRECATED \
318 -DGDK_DISABLE_DEPRECATED \
319 -DGTK_DISABLE_DEPRECATED \
320 -DPANGO_DISABLE_DEPRECATED
321
322# Might be useful in the future
323# -DGDK_MULTIHEAD_SAFE \
324# -DGTK_MULTIHEAD_SAFE
325endif
326
327if ENABLE_COVERAGE
328global_cppflags += \
329 -DGCC_GENERATE_TEST_COVERAGE_FILES \
330 -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS
331endif
332
333webkitgtk_h_api += \
334 $(srcdir)/WebKit/gtk/webkit/webkit.h \
335 $(srcdir)/WebKit/gtk/webkit/webkitdefines.h \
336 $(srcdir)/WebKit/gtk/webkit/webkitdownload.h \
337 $(srcdir)/WebKit/gtk/webkit/webkiterror.h \
338 $(srcdir)/WebKit/gtk/webkit/webkithittestresult.h \
339 $(srcdir)/WebKit/gtk/webkit/webkitnetworkrequest.h \
340 $(srcdir)/WebKit/gtk/webkit/webkitnetworkresponse.h \
341 $(srcdir)/WebKit/gtk/webkit/webkitsoupauthdialog.h \
342 $(srcdir)/WebKit/gtk/webkit/webkitwebbackforwardlist.h \
343 $(srcdir)/WebKit/gtk/webkit/webkitwebdatasource.h \
344 $(srcdir)/WebKit/gtk/webkit/webkitwebframe.h \
345 $(srcdir)/WebKit/gtk/webkit/webkitwebhistoryitem.h \
346 $(srcdir)/WebKit/gtk/webkit/webkitwebinspector.h \
347 $(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \
348 $(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \
349 $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \
350 $(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \
351 $(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \
352 $(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
353 $(srcdir)/WebKit/gtk/webkit/webkitwebview.h \
354 $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \
355 $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h \
356 $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
357
358webkitgtk_built_sources += \
359 DerivedSources/webkitenumtypes.cpp \
360 DerivedSources/webkitdomenumtypes.cpp \
361 DerivedSources/webkitmarshal.cpp \
362 DerivedSources/webkitmarshal.h \
363 WebKit/gtk/webkit/webkitenumtypes.h
364
365webkitgtk_sources += \
366 WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
367 WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
368 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
369 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
370 WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp \
371 WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h \
372 WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
373 WebKit/gtk/WebCoreSupport/DragClientGtk.h \
374 WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
375 WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
376 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
377 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
378 WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
379 WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
380 WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \
381 WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \
382 WebKit/gtk/webkit/webkitapplicationcache.cpp \
383 WebKit/gtk/webkit/webkitdownload.cpp \
384 WebKit/gtk/webkit/webkiterror.cpp \
385 WebKit/gtk/webkit/webkithittestresult.cpp \
386 WebKit/gtk/webkit/webkitnetworkrequest.cpp \
387 WebKit/gtk/webkit/webkitnetworkresponse.cpp \
388 WebKit/gtk/webkit/webkitprivate.cpp \
389 WebKit/gtk/webkit/webkitprivate.h \
390 WebKit/gtk/webkit/webkitsoupauthdialog.c \
391 WebKit/gtk/webkit/webkitversion.cpp \
392 WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
393 WebKit/gtk/webkit/webkitwebdatasource.cpp \
394 WebKit/gtk/webkit/webkitwebframe.cpp \
395 WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
396 WebKit/gtk/webkit/webkitwebinspector.cpp \
397 WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
398 WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
399 WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \
400 WebKit/gtk/webkit/webkitwebresource.cpp \
401 WebKit/gtk/webkit/webkitwebdatabase.cpp \
402 WebKit/gtk/webkit/webkitsecurityorigin.cpp \
403 WebKit/gtk/webkit/webkitwebsettings.cpp \
404 WebKit/gtk/webkit/webkitwebview.cpp \
405 WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \
406 WebKit/gtk/webkit/webkitworkers.cpp
407
408webkitgtk_cppflags += \
409 -DBUILDING_WEBKIT \
410 -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
411 -DDATA_DIR=\"${datadir}\" \
412 -I$(srcdir)/WebKit/gtk \
413 -I$(srcdir)/WebKit/gtk/WebCoreSupport \
414 -I$(srcdir)/WebKit/gtk/webkit \
415 -I$(top_builddir)/WebKit/gtk \
416 -I$(top_builddir)/WebKit/gtk/webkit \
417 -I$(GENSOURCESWEBKITDOM)
418
419webkitgtk_cleanfiles += \
420 $(top_builddir)/stamp-webkitmarshal.cpp \
421 $(top_builddir)/stamp-webkitmarshal.h \
422 $(top_builddir)/stamp-webkitenumtypes.cpp \
423 $(top_builddir)/stamp-webkitenumtypes.h \
424 $(top_builddir)/Programs/GtkLauncher \
425 $(top_builddir)/WebKit/gtk/docs/version.xml \
426 $(top_builddir)/WebKit/gtk/docs/GNUmakefile \
427 $(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \
428 $(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \
429 $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
430
431pkgconfigdir = $(libdir)/pkgconfig
432pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
433
434if ENABLE_INTROSPECTION
435
436JSCore-@WEBKITGTK_API_VERSION@.gir: $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
437 cp $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(builddir)/
438
439JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir
440WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
441
442$(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
443 $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=@WEBKITGTK_API_VERSION@ \
444 --include=GObject-2.0 \
445 --include=Gtk-@GTK_API_VERSION@ \
446 --include=JSCore-@WEBKITGTK_API_VERSION@ \
447 --include=Soup-2.4 \
448 --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
449 --libtool="$(LIBTOOL)" \
450 --pkg gobject-2.0 \
451 --pkg gtk+-@GTK_API_VERSION@ \
452 --pkg libsoup-2.4 \
453 --output $@ \
454 --add-include-path $(top_srcdir)/WebKit/gtk \
455 --add-include-path $(builddir) \
456 -I$(top_srcdir)/WebKit/gtk \
457 -I$(top_builddir)/WebKit/gtk \
458 -I$(top_builddir)/DerivedSources \
459 -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
460 -I$(top_srcdir) \
461 $(webkitgtk_h_api) \
462 $(libgdom_h_api)
463
464girdir = $(datadir)/gir-1.0
465gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
466
467typelibsdir += $(libdir)/girepository-1.0
468typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
469
470%.typelib: %.gir $(G_IR_COMPILER)
471 $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk --includedir $(builddir) $< -o $@
472
473CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
474
475endif
476
477EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
478
479WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
480WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
481
482$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp
483 @true
484
485$(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h
486 @true
487
488stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
489 $(AM_V_GEN) echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
490 $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
491 echo timestamp > $(@F)
492
493stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
494 $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
495 echo timestamp > $(@F)
496
497WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h
498 @true
499stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile
500 $(AM_V_GEN)glib-mkenums \
501 --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \
502 --fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \
503 --fhead "#include <glib-object.h>\n\n" \
504 --fhead "#include <webkit/webkitdefines.h>\n\n" \
505 --fhead "G_BEGIN_DECLS\n\n" \
506 --ftail "G_END_DECLS\n\n" \
507 --ftail "#endif\n" \
508 --fprod "#include <webkit/@basename@>\n\n" \
509 --eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
510 --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \
511 $(webkitgtk_h_api) | \
512 sed 's,web_kit,webkit,' | \
513 sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
514 > xgen-gth \
515 && (cmp -s xgen-gth WebKit/gtk/webkit/webkitenumtypes.h || cp xgen-gth WebKit/gtk/webkit/webkitenumtypes.h) \
516 && rm -f xgen-gth \
517 && echo timestamp > $(@F)
518
519DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
520 $(AM_V_GEN)glib-mkenums \
521 --fhead "#include <config.h>\n" \
522 --fhead "#include <glib-object.h>\n" \
523 --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h\"\n\n" \
524 --fhead "extern \"C\" {\n\n" \
525 --fprod "\n/* enumerations from \"@filename@\" */" \
526 --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
527 --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
528 --vtail " { 0, NULL, NULL }\n};\n\n" \
529 --vtail "GType @enum_name@_get_type(void)\n{\n" \
530 --vtail " static GType type = 0;\n\n" \
531 --vtail " if (!type)\n" \
532 --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
533 --vtail " return type;\n}\n\n" \
534 --ftail "}\n" \
535 $(webkitgtk_h_api) | \
536 sed 's,web_kit,webkit,' \
537 > xgen-gtc \
538 && cp xgen-gtc $@ \
539 && rm -f xgen-gtc
540
541WebKit/gtk/webkit/webkitdomenumtypes.h: stamp-webkitdomenumtypes.h
542 @true
543stamp-webkitdomenumtypes.h: $(libgdom_h_api) GNUmakefile
544 $(AM_V_GEN)glib-mkenums \
545 --fhead "#ifndef WEBKIT_DOM_ENUM_TYPES_H\n" \
546 --fhead "#define WEBKIT_DOM_ENUM_TYPES_H\n\n" \
547 --fhead "#include <glib-object.h>\n\n" \
548 --fhead "G_BEGIN_DECLS\n\n" \
549 --ftail "G_END_DECLS\n\n" \
550 --ftail "#endif\n" \
551 --fprod "#include <webkit/@basename@>\n\n" \
552 --eprod "#define WEBKIT_DOM_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
553 --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);n\n" \
554 $(libgdom_h_api) | \
555 sed 's,web_kit,webkit_dom,' | \
556 sed 's,WEBKIT_DOM_TYPE_KIT,WEBKIT_DOM_TYPE,' \
557 > xgen-cgth \
558 && (cmp -s xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h || cp xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h) \
559 && rm -f xgen-cgth \
560 && echo timestamp > $(@F)
561
562DerivedSources/webkitdomenumtypes.cpp: $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h $(libgdom_h_api) GNUmakefile
563 $(AM_V_GEN)glib-mkenums \
564 --fhead "#include <config.h>\n" \
565 --fhead "#include <glib-object.h>\n" \
566 --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h\"\n\n" \
567 --fhead "extern \"C\" {\n\n" \
568 --fprod "\n/* enumerations from \"@filename@\" */" \
569 --vhead "static const G@Type@Value _@enum_name@_values] = {" \
570 --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
571 --vtail " { 0, NULL, NULL }\n};\n\n" \
572 --vtail "GType @enum_name@_get_type(void)\n{\n" \
573 --vtail " static GType type = 0;\n\n" \
574 --vtail " if (!type)\n" \
575 --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
576 --vtail " return type;\n}\n\n" \
577 --ftail "}\n" \
578 $(libgdom_h_api) | \
579 sed 's,web_kit,webkitdom,' \
580 > xgen-cgtc \
581 && cp xgen-cgtc $@ \
582 && rm -f xgen-cgtc
583
584# Files that will be distributed
585EXTRA_DIST += \
586 $(srcdir)/gtk-doc.make \
587 WebKit/LICENSE \
588 $(javascriptcore_dist) \
589 $(webcore_dist) \
590 $(srcdir)/autotools/symbols.filter \
591 $(srcdir)/WebKit/gtk/ChangeLog \
592 $(srcdir)/WebKit/gtk/NEWS \
593 $(srcdir)/WebKit/gtk/webkitmarshal.list \
594 $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
595 $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
596 $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
597 $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
598 $(srcdir)/WebKit/gtk/docs/version.xml.in \
599 $(srcdir)/WebKit/gtk/po/* \
600 $(srcdir)/WebKit/gtk/resources/* \
601 $(srcdir)/WebKit/gtk/tests/resources/* \
602 $(srcdir)/WebKit/gtk/tests/test_utils.h
603
604# extra resource files
605resourcesdir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/resources
606dist_resources_DATA = \
607 $(shell ls $(srcdir)/WebKit/gtk/resources/*.html)
608
609# END WEBKIT GTK+
610
611# Include module makefiles
612include JavaScriptCore/GNUmakefile.am
613include WebCore/GNUmakefile.am
614include WebKitTools/GNUmakefile.am
615include WebKit/gtk/po/GNUmakefile.am
616
617# Build unit tests
618noinst_PROGRAMS += $(TEST_PROGS)
619
620webkit_tests_cflags = \
621 -fno-strict-aliasing \
622 -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
623 -I$(srcdir)/WebKit/gtk \
624 -I$(top_builddir)/WebKit/gtk \
625 -I$(top_builddir)/DerivedSources \
626 -I$(top_srcdir)/WebCore/bindings \
627 -I$(top_srcdir)/WebCore/bindings/gobject \
628 $(global_cflags) \
629 $(GLIB_CFLAGS) \
630 $(GTK_CFLAGS) \
631 $(LIBSOUP_CFLAGS)
632
633webkit_tests_ldadd = \
634 libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
635 $(GTK_LIBS) \
636 $(GLIB_LIBS) \
637 $(LIBSOUP_LIBS)
638
639webkit_tests_ldflags = \
640 -no-install \
641 -no-fast-install
642
643TEST_PROGS += \
644 Programs/unittests/testdomdocument \
645 Programs/unittests/testdomdomwindow \
646 Programs/unittests/testdomnode \
647 Programs/unittests/testhttpbackend \
648 Programs/unittests/testloading \
649 Programs/unittests/testglobals \
650 Programs/unittests/testmimehandling \
651 Programs/unittests/testnetworkrequest \
652 Programs/unittests/testnetworkresponse \
653 Programs/unittests/testwebframe \
654 Programs/unittests/testwebbackforwardlist \
655 Programs/unittests/testwebhistoryitem \
656 Programs/unittests/testwindow \
657 Programs/unittests/testdownload \
658 Programs/unittests/testatk \
659 Programs/unittests/testatkroles \
660 Programs/unittests/testhittestresult \
661 Programs/unittests/testwebsettings \
662 Programs/unittests/testwebresource \
663 Programs/unittests/testwebdatasource \
664 Programs/unittests/testwebview \
665 Programs/unittests/testkeyevents \
666 Programs/unittests/testcopyandpaste
667
668# Add additional tests here
669Programs_unittests_testdomdocument_SOURCES = WebKit/gtk/tests/testdomdocument.c
670Programs_unittests_testdomdocument_CFLAGS = $(webkit_tests_cflags)
671Programs_unittests_testdomdocument_LDADD = $(webkit_tests_ldadd)
672Programs_unittests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags)
673
674Programs_unittests_testdomdomwindow_SOURCES = WebKit/gtk/tests/testdomdomwindow.c
675Programs_unittests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags)
676Programs_unittests_testdomdomwindow_LDADD = $(webkit_tests_ldadd)
677Programs_unittests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags)
678
679Programs_unittests_testdomnode_SOURCES = WebKit/gtk/tests/testdomnode.c
680Programs_unittests_testdomnode_CFLAGS = $(webkit_tests_cflags)
681Programs_unittests_testdomnode_LDADD = $(webkit_tests_ldadd)
682Programs_unittests_testdomnode_LDFLAGS = $(webkit_tests_ldflags)
683
684Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c
685Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags)
686Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd)
687Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags)
688
689Programs_unittests_testglobals_SOURCES = WebKit/gtk/tests/testglobals.c
690Programs_unittests_testglobals_CFLAGS = $(webkit_tests_cflags)
691Programs_unittests_testglobals_LDADD = $(webkit_tests_ldadd)
692Programs_unittests_testglobals_LDFLAGS = $(webkit_tests_ldflags)
693
694Programs_unittests_testloading_SOURCES = WebKit/gtk/tests/testloading.c
695Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags)
696Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd)
697Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags)
698
699Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c WebKit/gtk/tests/test_utils.c
700Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags)
701Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd)
702Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags)
703
704Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c
705Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
706Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
707Programs_unittests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags)
708
709Programs_unittests_testnetworkresponse_SOURCES = WebKit/gtk/tests/testnetworkresponse.c
710Programs_unittests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags)
711Programs_unittests_testnetworkresponse_LDADD = $(webkit_tests_ldadd)
712Programs_unittests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags)
713
714Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c
715Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags)
716Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd)
717Programs_unittests_testwebframe_LDFLAGS = $(webkit_tests_ldflags)
718
719Programs_unittests_testwebbackforwardlist_SOURCES = WebKit/gtk/tests/testwebbackforwardlist.c
720Programs_unittests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags)
721Programs_unittests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd)
722Programs_unittests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags)
723
724Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryitem.c
725Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
726Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
727Programs_unittests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags)
728
729Programs_unittests_testwindow_SOURCES = WebKit/gtk/tests/testwindow.c
730Programs_unittests_testwindow_CFLAGS = $(webkit_tests_cflags)
731Programs_unittests_testwindow_LDADD = $(webkit_tests_ldadd)
732Programs_unittests_testwindow_LDFLAGS = $(webkit_tests_ldflags)
733
734Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c
735Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags)
736Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd)
737Programs_unittests_testdownload_LDFLAGS = $(webkit_tests_ldflags)
738
739Programs_unittests_testatk_SOURCES = WebKit/gtk/tests/testatk.c
740Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags)
741Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd)
742Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags)
743
744Programs_unittests_testatkroles_SOURCES = WebKit/gtk/tests/testatkroles.c
745Programs_unittests_testatkroles_CFLAGS = $(webkit_tests_cflags)
746Programs_unittests_testatkroles_LDADD = $(webkit_tests_ldadd)
747Programs_unittests_testatkroles_LDFLAGS = $(webkit_tests_ldflags)
748
749Programs_unittests_testwebsettings_SOURCES = WebKit/gtk/tests/testwebsettings.c
750Programs_unittests_testwebsettings_CFLAGS = $(webkit_tests_cflags)
751Programs_unittests_testwebsettings_LDADD = $(webkit_tests_ldadd)
752Programs_unittests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags)
753
754Programs_unittests_testwebresource_SOURCES = WebKit/gtk/tests/testwebresource.c
755Programs_unittests_testwebresource_CFLAGS = $(webkit_tests_cflags)
756Programs_unittests_testwebresource_LDADD = $(webkit_tests_ldadd)
757
758Programs_unittests_testwebdatasource_SOURCES = WebKit/gtk/tests/testwebdatasource.c
759Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags)
760Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd)
761
762Programs_unittests_testwebview_SOURCES = WebKit/gtk/tests/testwebview.c WebKit/gtk/tests/test_utils.c
763Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags)
764Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd)
765Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags)
766
767Programs_unittests_testhittestresult_SOURCES = WebKit/gtk/tests/testhittestresult.c
768Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags)
769Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd)
770
771Programs_unittests_testkeyevents_SOURCES = WebKit/gtk/tests/testkeyevents.c
772Programs_unittests_testkeyevents_CFLAGS = $(webkit_tests_cflags)
773Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd)
774Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
775
776Programs_unittests_testcopyandpaste_SOURCES = WebKit/gtk/tests/testcopyandpaste.c
777Programs_unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags)
778Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd)
779Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)
780
781# Autogenerated sources
782BUILT_SOURCES += \
783 $(javascriptcore_built_sources) \
784 $(javascriptcore_built_nosources) \
785 $(webcore_built_sources) \
786 $(webcore_built_nosources) \
787 $(webkitgtk_built_sources) \
788 $(webkitgtk_built_nosources) \
789 $(gdom_built_nosources)
790
791# Project-wide clean rules
792# Files that will be cleaned
793CLEANFILES += \
794 $(BUILT_SOURCES) \
795 $(webkitgtk_cleanfiles) \
796 $(libgdom_cleanfiles)
797
798DISTCLEANFILES += \
799 $(CLEANFILES)
800
801MAINTAINERCLEANFILES += \
802 $(CLEANFILES) \
803 $(srcdir)/aconfig.h.in \
804 $(srcdir)/autotools/config.* \
805 $(srcdir)/autotools/compile \
806 $(srcdir)/autotools/depcomp \
807 $(srcdir)/autotools/install-sh \
808 $(srcdir)/autotools/missing \
809 $(srcdir)/configure \
810 $(srcdir)/GNUmakefile.in \
811 $(srcdir)/INSTALL \
812 $(srcdir)/README \
813 $(top_builddir)/config.*
814
815# Older automake versions (1.7) place Plo files in a different place so we need
816# to create the output directory manually.
817all-local: stamp-po
818 $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
819
820# remove built sources and program directories
821clean-local:
822 -rm -rf $(GENPROGRAMS)
823
824maintainer-clean-local: distclean-local
825
826distclean-local:
827 -rm -rf $(GENSOURCES) $(GENPROGRAMS)
828
829dist-hook:
830 cp $(srcdir)/WebKit/gtk/NEWS $(distdir)/
831
832install-data-local: po-install-data-local
833
834installdirs-data-local: po-installdirs-data-local
835
836uninstall-local: po-uninstall-local
837
838# Run all tests in cwd
839# FIXME: we should run this under xvfb
840test: $(TEST_PROGS)
841 $(GTESTER) --verbose $(TEST_PROGS);
842
843# test-report: run tests in cwd and generate report
844# full-report: run tests in cwd with -m perf and -m slow and generate report
845# perf-report: run tests in cwd with -m perf and generate report
846test-report full-report perf-report: $(TEST_PROGS)
847 @ case $@ in \
848 test-report) test_options="-k";; \
849 full-report) test_options="-k -m=perf";; \
850 perf-report) test_options="-k -m=perf -m=slow";; \
851 esac ; \
852 $(GTESTER) --verbose $$test_options -o test-report.xml $(TEST_PROGS); \
853 $(GTESTER_REPORT) test-report.xml > test-report.html ;
854
855.PHONY: test test-report perf-report full-report
856check-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 @@
1MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
2
3all:
4 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
5 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
6
7debug d development dev develop:
8 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
9 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
10
11release r deployment dep deploy:
12 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
13 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
14
15clean:
16 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
17 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 @@
1SCRIPTS_PATH ?= ../WebKitTools/Scripts
2XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
3
4all:
5 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
6
7debug d development dev develop: force
8 $(SCRIPTS_PATH)/set-webkit-configuration --debug
9 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
10
11release r deployment dep deploy: force
12 $(SCRIPTS_PATH)/set-webkit-configuration --release
13 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
14
15clean:
16 ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
17
18force: ;
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 @@
1# Include file to make it easy to include WebKit into Qt projects
2
3
4isEmpty(OUTPUT_DIR) {
5 CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
6 CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
7}
8
9!gtk-port:CONFIG += qt-port
10qt-port:DEFINES += BUILDING_QT__=1
11qt-port:!building-libs {
12 QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
13 LIBS += -lQtWebKit
14 DEPENDPATH += $$PWD/WebKit/qt/Api
15}
16
17gtk-port:!building-libs {
18 QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
19 LIBS += -lWebKitGtk
20 DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit
21}
22
23gtk-port {
24 CONFIG += link_pkgconfig
25
26 DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1
27
28 # We use FreeType directly with Cairo
29 PKGCONFIG += cairo-ft
30
31 directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0
32 else: PKGCONFIG += cairo gtk+-2.0
33
34 # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb)
35 CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG)
36
37 # We use the curl http backend on all platforms
38 PKGCONFIG += libcurl
39 DEFINES += WTF_USE_CURL=1
40
41 LIBS += -lWebKitGtk -ljpeg -lpng
42
43 QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
44 QMAKE_LIBS += $$system(icu-config --ldflags)
45
46 # This set of warnings is borrowed from the Mac build
47 QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef
48
49 # These flags are based on optimization experience from the Mac port:
50 # Helps code size significantly and speed a little
51 QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
52
53 DEPENDPATH += $$PWD/JavaScriptCore/API
54 INCLUDEPATH += $$PWD
55}
56
57DEFINES += USE_SYSTEM_MALLOC
58CONFIG(release) {
59 DEFINES += NDEBUG
60}
61
62gtk-port:CONFIG(debug) {
63 DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED
64# maybe useful for debugging DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE
65}
66
67BASE_DIR = $$PWD
68qt-port:INCLUDEPATH += \
69 $$PWD/WebKit/qt/Api
70gtk-port:INCLUDEPATH += \
71 $$BASE_DIR/WebCore/platform/gtk \
72 $$BASE_DIR/WebCore/platform/network/curl \
73 $$BASE_DIR/WebCore/platform/graphics/cairo \
74 $$BASE_DIR/WebCore/loader/gtk \
75 $$BASE_DIR/WebCore/page/gtk \
76 $$BASE_DIR/WebKit/gtk \
77 $$BASE_DIR/WebKit/gtk/WebCoreSupport \
78 $$BASE_DIR/WebKit/gtk/webkit
79INCLUDEPATH += \
80 $$BASE_DIR/JavaScriptCore/ \
81 $$BASE_DIR/JavaScriptCore/kjs \
82 $$BASE_DIR/JavaScriptCore/bindings \
83 $$BASE_DIR/JavaScriptCore/bindings/c \
84 $$BASE_DIR/JavaScriptCore/wtf \
85 $$BASE_DIR/JavaScriptCore/ForwardingHeaders \
86 $$BASE_DIR/WebCore \
87 $$BASE_DIR/WebCore/ForwardingHeaders \
88 $$BASE_DIR/WebCore/platform \
89 $$BASE_DIR/WebCore/platform/network \
90 $$BASE_DIR/WebCore/platform/graphics \
91 $$BASE_DIR/WebCore/loader \
92 $$BASE_DIR/WebCore/page \
93 $$BASE_DIR/WebCore/css \
94 $$BASE_DIR/WebCore/dom \
95 $$BASE_DIR/WebCore/bridge \
96 $$BASE_DIR/WebCore/editing \
97 $$BASE_DIR/WebCore/rendering \
98 $$BASE_DIR/WebCore/history \
99 $$BASE_DIR/WebCore/xml \
100 $$BASE_DIR/WebCore/html \
101 $$BASE_DIR/WebCore/plugins
102
103
104macx {
105 INCLUDEPATH += /usr/include/libxml2
106 LIBS += -lxml2 -lxslt
107}
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 @@
1TEMPLATE = subdirs
2CONFIG += ordered
3!gtk-port:CONFIG += qt-port
4qt-port {
5 lessThan(QT_MINOR_VERSION, 4) {
6 !win32-*:SUBDIRS += WebKit/qt/Plugins
7 }
8}
9SUBDIRS += \
10 WebCore \
11 JavaScriptCore/kjs/testkjs.pro
12
13qt-port {
14 SUBDIRS += WebKit/qt/QtLauncher
15
16 !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
17}
18
19gtk-port:SUBDIRS += \
20 WebKitTools/GtkLauncher \
21 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 @@
1#! /bin/sh
2
3# Allow invocation from a separate build directory; in that case, we change
4# to the source directory to run the auto*, then change back before running configure
5srcdir=`dirname $0`
6test -z "$srcdir" && srcdir=.
7
8ORIGDIR=`pwd`
9cd $srcdir
10
11GTKDOCIZE_FLAGS="--copy"
12LIBTOOLIZE_FLAGS="--force --automake"
13ACLOCAL_FLAGS="-I autotools"
14AUTOMAKE_FLAGS="--foreign --add-missing"
15
16DIE=0
17
18(autoconf --version) < /dev/null > /dev/null 2>&1 || {
19 echo
20 echo "You must have autoconf installed to compile $PROJECT."
21 echo "Install the appropriate package for your distribution,"
22 echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
23 DIE=1
24}
25
26(automake --version) < /dev/null > /dev/null 2>&1 || {
27 echo
28 echo "You must have automake installed to compile $PROJECT."
29 echo "Install the appropriate package for your distribution,"
30 echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
31 DIE=1
32}
33
34LIBTOOLIZE=libtoolize
35($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
36 LIBTOOLIZE=glibtoolize
37 ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
38 echo
39 echo "You must have libtool installed to compile $PROJECT."
40 echo "Install the appropriate package for your distribution,"
41 echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
42 DIE=1
43 }
44}
45
46if test "$DIE" -eq 1; then
47 exit 1
48fi
49
50rm -rf $top_srcdir/autom4te.cache
51
52touch README INSTALL
53
54gtkdocize $GTKDOCIZE_FLAGS > /dev/null 2>&1 || echo "Warning: not running gtk-docize."
55aclocal $ACLOCAL_FLAGS || exit $?
56$LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $?
57autoheader || exit $?
58automake $AUTOMAKE_FLAGS || exit $?
59autoconf || exit $?
60
61cd $ORIGDIR || exit 1
62
63$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 @@
1AC_PREREQ(2.59)
2
3m4_define([webkit_major_version], [1])
4m4_define([webkit_minor_version], [3])
5m4_define([webkit_micro_version], [2])
6
7# This is the version we'll be using as part of our User-Agent string
8# e.g., AppleWebKit/$(webkit_user_agent_version) ...
9#
10# Sourced from WebCore/Configurations/Version.xcconfig
11m4_define([webkit_user_agent_major_version], [531])
12m4_define([webkit_user_agent_minor_version], [2])
13
14AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
15
16AC_CONFIG_MACRO_DIR([autotools])
17AC_CONFIG_AUX_DIR([autotools])
18AC_SUBST(ACLOCAL_AMFLAGS, "-I autotools")
19
20AC_CONFIG_HEADERS([autotoolsconfig.h])
21AC_CANONICAL_HOST
22
23WEBKIT_MAJOR_VERSION=webkit_major_version
24WEBKIT_MINOR_VERSION=webkit_minor_version
25WEBKIT_MICRO_VERSION=webkit_micro_version
26WEBKIT_USER_AGENT_MAJOR_VERSION=webkit_user_agent_major_version
27WEBKIT_USER_AGENT_MINOR_VERSION=webkit_user_agent_minor_version
28AC_SUBST(WEBKIT_MAJOR_VERSION)
29AC_SUBST(WEBKIT_MINOR_VERSION)
30AC_SUBST(WEBKIT_MICRO_VERSION)
31AC_SUBST(WEBKIT_USER_AGENT_MAJOR_VERSION)
32AC_SUBST(WEBKIT_USER_AGENT_MINOR_VERSION)
33
34AC_CONFIG_SRCDIR([WebCore/config.h])
35
36dnl # Libtool library version, not to confuse with API version
37dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
38LIBWEBKITGTK_VERSION=0:0:0
39AC_SUBST([LIBWEBKITGTK_VERSION])
40
41AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
42
43# Use AM_SILENT_RULES if present
44m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
45
46# host checking - inspired by the GTK+ configure.in
47# TODO: move these to webkit.m4?
48AC_MSG_CHECKING([for native Win32])
49case "$host" in
50 *-*-mingw*)
51 os_win32=yes
52 ;;
53 *)
54 os_win32=no
55 ;;
56esac
57AC_MSG_RESULT([$os_win32])
58
59case "$host" in
60 *-*-linux*)
61 os_linux=yes
62 ;;
63 *-*-freebsd*)
64 os_freebsd=yes
65 ;;
66 *-*-darwin*)
67 os_darwin=yes
68 ;;
69esac
70
71case "$host_os" in
72 gnu* | linux* | k*bsd*-gnu)
73 os_gnu=yes
74 ;;
75 *)
76 os_gnu=no
77 ;;
78esac
79
80# initialize webkit options
81WEBKIT_INIT
82AC_DISABLE_STATIC
83AC_LIBTOOL_WIN32_DLL
84AC_PROG_LIBTOOL
85
86AC_PATH_PROG(FLEX, flex)
87if test -z "$FLEX"; then
88 AC_MSG_ERROR([You need the 'flex' lexer generator to compile WebKit])
89else
90 FLEX_VERSION=`$FLEX --version | sed 's,.*\ \([0-9]*\.[0-9]*\.[0-9]*\)$,\1,'`
91 AX_COMPARE_VERSION([2.5.33],[gt],[$FLEX_VERSION],
92 AC_MSG_WARN([You need at least version 2.5.33 of the 'flex' lexer generator to compile WebKit correctly]))
93fi
94
95AC_PATH_PROG(GPERF, gperf)
96if test -z "$GPERF"; then
97 AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit])
98fi
99
100# pthread (not needed on Windows)
101if test "$os_win32" = "no"; then
102AC_CHECK_HEADERS([pthread.h],
103 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]),
104 AC_MSG_ERROR([pthread support is required to build WebKit]))
105fi
106
107# check for libjpeg the way Gtk does it.
108AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
109 jpeg_ok=yes, jpeg_ok=no
110 AC_MSG_ERROR([JPEG library (libjpeg) not found]))
111if test "$jpeg_ok" = yes; then
112 AC_MSG_CHECKING([for jpeglib])
113 AC_TRY_CPP(
114[#include <stdio.h>
115#undef PACKAGE
116#undef VERSION
117#undef HAVE_STDLIB_H
118#include <jpeglib.h>],
119 jpeg_ok=yes,
120 jpeg_ok=no)
121 AC_MSG_RESULT($jpeg_ok)
122 if test "$jpeg_ok" = yes; then
123 JPEG_LIBS="-ljpeg"
124 # should we check for progressive JPEG like GTK+ as well?
125 else
126 AC_MSG_ERROR([JPEG library (libjpeg) not found])
127 fi
128fi
129AC_SUBST([JPEG_LIBS])
130
131# Check for libpng the way Gtk+ does it
132for l in libpng libpng14 libpng12; do
133 AC_MSG_CHECKING(for $l)
134 if $PKG_CONFIG --exists $l ; then
135 AC_MSG_RESULT(yes)
136 PNG_LIBS=`$PKG_CONFIG --libs $l`
137 png_ok=yes
138 break
139 else
140 AC_MSG_RESULT(no)
141 png_ok=no
142 fi
143done
144if test "$png_ok" != yes; then
145 AC_CHECK_LIB(png, png_read_info,
146 [AC_CHECK_HEADER(png.h,
147 png_ok=yes,
148 png_ok=no)],
149 AC_MSG_ERROR([PNG library (libpng) not found]), -lz -lm)
150 if test "$png_ok" = yes; then
151 AC_MSG_CHECKING([for png_structp in png.h])
152 AC_TRY_COMPILE([#include <png.h>],
153 [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
154 png_ok=yes,
155 png_ok=no)
156 AC_MSG_RESULT($png_ok)
157 if test "$png_ok" = yes; then
158 PNG_LIBS='-lpng -lz'
159 else
160 AC_MSG_ERROR([PNG library (libpng) not found])
161 fi
162 else
163 AC_MSG_ERROR([PNG library (libpng) not found])
164 fi
165fi
166AC_SUBST([PNG_LIBS])
167
168# determine the GTK+ version to use
169AC_MSG_CHECKING([the GTK+ version to use])
170AC_ARG_WITH([gtk],
171 [AS_HELP_STRING([--with-gtk=2.0|3.0], [the GTK+ version to use (default: 2.0)])],
172 [case "$with_gtk" in
173 2.0|3.0) ;;
174 *) AC_MSG_ERROR([invalid GTK+ version specified]) ;;
175 esac],
176 [with_gtk=2.0])
177AC_MSG_RESULT([$with_gtk])
178
179case "$with_gtk" in
180 2.0) GTK_REQUIRED_VERSION=2.10
181 GTK_API_VERSION=2.0
182 WEBKITGTK_API_MAJOR_VERSION=1
183 WEBKITGTK_API_MINOR_VERSION=0
184 WEBKITGTK_API_VERSION=1.0
185 WEBKITGTK_PC_NAME=webkit
186 GAIL_PC_NAME=gail
187 GAIL_REQUIRED_VERSION=1.8
188 ;;
189 3.0) GTK_REQUIRED_VERSION=2.90
190 GTK_API_VERSION=3.0
191 WEBKITGTK_API_MAJOR_VERSION=3
192 WEBKITGTK_API_MINOR_VERSION=0
193 WEBKITGTK_API_VERSION=3.0
194 WEBKITGTK_PC_NAME=webkitgtk
195 GAIL_PC_NAME=gail-3.0
196 GAIL_REQUIRED_VERSION=2.90.4
197 ;;
198esac
199
200AC_SUBST([WEBKITGTK_API_MAJOR_VERSION])
201AC_SUBST([WEBKITGTK_API_MINOR_VERSION])
202AC_SUBST([WEBKITGTK_API_VERSION])
203AC_SUBST([WEBKITGTK_PC_NAME])
204AC_SUBST([GTK_API_VERSION])
205AM_CONDITIONAL([GTK_API_VERSION_2],[test "$GTK_API_VERSION" = "2.0"])
206
207# determine the GDK/GTK+ target
208AC_MSG_CHECKING([the target windowing system])
209AC_ARG_WITH(target,
210 AC_HELP_STRING([--with-target=@<:@x11/win32/quartz/directfb@:>@],
211 [Select webkit target [default=x11]]),
212 [],[with_target="x11"])
213
214case "$with_target" in
215 x11|win32|quartz|directfb) ;;
216 *) AC_MSG_ERROR([Invalid target: must be x11, quartz, win32, or directfb.]) ;;
217esac
218
219AC_MSG_RESULT([$with_target])
220
221AC_MSG_CHECKING([for Hildon UI extensions])
222AC_ARG_WITH(hildon,
223 AC_HELP_STRING([--with-hildon],
224 [Use Hildon UI extensions [default=no]]),
225 [],[with_hildon="no"])
226AC_MSG_RESULT([$with_hildon])
227
228if test "$with_hildon" = "yes"; then
229 HILDON_CPPFLAGS="-DMAEMO_CHANGES"
230 PKG_CHECK_MODULES([HILDON], [hildon-1])
231 AC_SUBST([HILDON_CPPFLAGS])
232 AC_SUBST([HILDON_CFLAGS])
233 AC_SUBST([HILDON_LIBS])
234fi
235
236# minimum base dependencies
237LIBSOUP_REQUIRED_VERSION=2.28.2
238CAIRO_REQUIRED_VERSION=1.6
239FONTCONFIG_REQUIRED_VERSION=2.4
240FREETYPE2_REQUIRED_VERSION=9.0
241LIBXML_REQUIRED_VERSION=2.6
242
243# minimum GTK+ base dependencies
244PANGO_REQUIRED_VERSION=1.12
245
246# optional modules
247LIBXSLT_REQUIRED_VERSION=1.1.7
248SQLITE_REQUIRED_VERSION=3.0
249GSTREAMER_REQUIRED_VERSION=0.10
250GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.25
251ENCHANT_REQUIRED_VERSION=0.22
252
253# Available modules
254#
255# glib - glib and includes gthread
256# unicode - check and identify which unicode backend to use
257#
258# todo: webcore gtk
259WEBKIT_CHECK_DEPENDENCIES([glib unicode])
260
261GETTEXT_PACKAGE=$PACKAGE
262AC_SUBST(GETTEXT_PACKAGE)
263AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
264 [The gettext catalog name])
265
266PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION)
267AC_SUBST(LIBXML_CFLAGS)
268AC_SUBST(LIBXML_LIBS)
269
270PKG_CHECK_MODULES(PANGO,
271 [pango >= $PANGO_REQUIRED_VERSION
272 pangoft2])
273AC_SUBST(PANGO_CFLAGS)
274AC_SUBST(PANGO_LIBS)
275
276PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION)
277AC_SUBST(ENCHANT_CFLAGS)
278AC_SUBST(ENCHANT_LIBS)
279
280PKG_CHECK_MODULES(GAIL, $GAIL_PC_NAME >= $GAIL_REQUIRED_VERSION)
281AC_SUBST(GAIL_CFLAGS)
282AC_SUBST(GAIL_LIBS)
283
284# check for target-specific dependencies
285if test "$with_target" = "directfb"; then
286 PKG_CHECK_MODULES(CAIRO, cairo-directfb >= $CAIRO_REQUIRED_VERSION)
287 PKG_CHECK_MODULES(GTK, gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION)
288 AC_DEFINE([WTF_PLATFORM_DIRECTFB],[1],[Define if target is DirectFB])
289else
290 PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION)
291 PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION)
292
293 if test "$with_target" = "x11" && test "$os_win32" = "no"; then
294 # check for XT
295 PKG_CHECK_MODULES([XT],
296 [xt],
297 [xt_has_pkg_config=yes],
298 [xt_has_pkg_config=no])
299 # some old versions of Xt do not provide xt.pc, so try to link against Xt
300 # and if it's installed fall back to just adding -lXt
301 if test "$xt_has_pkg_config" = "no"; then
302 # using AC_CHECK_LIB instead of AC_SEARCH_LIB is fine in this case as
303 # we don't care about the XtOpenDisplay symbol but only about the
304 # existence of libXt
305 AC_CHECK_LIB([Xt], [XtOpenDisplay],
306 [XT_CFLAGS=""; XT_LIBS="-lXt"],
307 [AC_MSG_ERROR([X Toolkit Intrinsics library (libXt) not found])])
308 fi
309 AC_SUBST([XT_CFLAGS])
310 AC_SUBST([XT_LIBS])
311 AC_DEFINE([WTF_PLATFORM_X11],[1],[Define if target is X11])
312 fi
313fi
314AC_SUBST(GTK_CFLAGS)
315AC_SUBST(GTK_LIBS)
316AC_SUBST(CAIRO_CFLAGS)
317AC_SUBST(CAIRO_LIBS)
318
319# check whether to build with debugging enabled
320AC_MSG_CHECKING([whether to do a debug build])
321AC_ARG_ENABLE(debug,
322 AC_HELP_STRING([--enable-debug],
323 [turn on debugging [default=no]]),
324 [],[enable_debug="no"])
325AC_MSG_RESULT([$enable_debug])
326
327# check whether to enable optimized builds
328AC_MSG_CHECKING([whether to enable optimized builds])
329AC_ARG_ENABLE(optimizations,
330 AC_HELP_STRING([--enable-optimizations],
331 [turn on optimize builds (GCC only)
332 [default=yes]]),
333 [enable_optimizations=$enableval],
334 [if test "$enable_debug" = "yes"; then enable_optimizations="no"; else enable_optimizations="yes"; fi])
335AC_MSG_RESULT([$enable_optimizations])
336
337# check whether to enable 3D transforms support
338AC_MSG_CHECKING([whether to enable support for 3D Transforms])
339AC_ARG_ENABLE(3D_transforms,
340 AC_HELP_STRING([--enable-3D-transforms],
341 [enable support for 3D transforms [default=no]]),
342 [],[enable_3D_transforms="no"])
343AC_MSG_RESULT([$enable_3D_transforms])
344
345# check whether to enable channel messaging support
346AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
347AC_ARG_ENABLE(channel_messaging,
348 AC_HELP_STRING([--enable-channel-messaging],
349 [enable HTML5 channel messaging support [default=yes]]),
350 [],[enable_channel_messaging="yes"])
351AC_MSG_RESULT([$enable_channel_messaging])
352
353# check whether to enable JavaScript debugger/profiler support
354AC_MSG_CHECKING([whether to enable JavaScript debugger/profiler support])
355AC_ARG_ENABLE(javascript_debugger,
356 AC_HELP_STRING([--enable-javascript-debugger],
357 [enable JavaScript debugger/profiler support [default=yes]]),
358 [],[enable_javascript_debugger="yes"])
359AC_MSG_RESULT([$enable_javascript_debugger])
360
361# check whether to enable HTML5 Offline Web Applications support
362AC_MSG_CHECKING([whether to enable HTML5 offline web applications support])
363AC_ARG_ENABLE(offline_web_applications,
364 AC_HELP_STRING([--enable-offline-web-applications],
365 [enable HTML5 offline web applications support [default=yes]]),
366 [],[enable_offline_web_applications="yes"])
367AC_MSG_RESULT([$enable_offline_web_applications])
368
369# check whether to enable HTML5 client-side session and persitent storage support
370AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support])
371AC_ARG_ENABLE(dom_storage,
372 AC_HELP_STRING([--enable-dom-storage],
373 [enable HTML5 client-side session and persistent storage support [default=yes]]),
374 [],[enable_dom_storage="yes"])
375AC_MSG_RESULT([$enable_dom_storage])
376
377# check whether to enable the indexed database API
378AC_MSG_CHECKING([whether to enable the indexed database API])
379AC_ARG_ENABLE(indexed_database,
380 AC_HELP_STRING([--enable-indexeddb],
381 [enable the indexed database API [default=no]]),
382 [],[enable_indexed_database="no"])
383AC_MSG_RESULT([$enable_indexed_database])
384
385# check whether to enable the speech input API
386AC_MSG_CHECKING([whether to enable the speech input API])
387AC_ARG_ENABLE(input_speech,
388 AC_HELP_STRING([--enable-input-speech],
389 [enable the speech input API [default=no]]),
390 [],[enable_input_speech="no"])
391AC_MSG_RESULT([$enable_input_speech])
392
393# check whether to build with database support
394AC_MSG_CHECKING([whether to enable HTML5 client-side database storage support])
395AC_ARG_ENABLE(database,
396 AC_HELP_STRING([--enable-database],
397 [enable HTML5 client-side database storage support [default=yes]]),
398 [],[enable_database="yes"])
399AC_MSG_RESULT([$enable_database])
400
401# check whether to build with server-sent events support
402AC_MSG_CHECKING([whether to enable HTML5 server-sent events support])
403AC_ARG_ENABLE(eventsource,
404 AC_HELP_STRING([--enable-eventsource],
405 [enable HTML5 server-sent events support [default=yes]]),
406 [],[enable_eventsource="yes"])
407AC_MSG_RESULT([$enable_eventsource])
408
409# check whether to build with icon database support
410AC_MSG_CHECKING([whether to enable icon database support])
411AC_ARG_ENABLE(icon_database,
412 AC_HELP_STRING([--enable-icon-database],
413 [enable icon database [default=yes]]),
414 [],[enable_icon_database="yes"])
415AC_MSG_RESULT([$enable_icon_database])
416
417# check whether to build with image resizer API support
418AC_MSG_CHECKING([whether to enable image resizer API support])
419AC_ARG_ENABLE(image_resizer,
420 AC_HELP_STRING([--enable-image-resizer],
421 [enable image resizer [default=no]]),
422 [],[enable_image_resizer="no"])
423AC_MSG_RESULT([$enable_image_resizer])
424
425# check whether to enable HTML5 datalist support
426AC_MSG_CHECKING([whether to enable HTML5 datalist support])
427AC_ARG_ENABLE(datalist,
428 AC_HELP_STRING([--enable-datalist],
429 [enable HTML5 datalist support [default=yes]]),
430 [],[enable_datalist="yes"])
431AC_MSG_RESULT([$enable_datalist])
432
433# check whether to enable HTML5 ruby support
434AC_MSG_CHECKING([whether to enable HTML5 ruby support])
435AC_ARG_ENABLE(ruby,
436 AC_HELP_STRING([--enable-ruby],
437 [enable HTML5 ruby support [default=yes]]),
438 [],[enable_ruby="yes"])
439AC_MSG_RESULT([$enable_ruby])
440
441# check whether to enable HTML5 sandbox iframe support
442AC_MSG_CHECKING([whether to enable HTML5 sandboxed iframe support])
443AC_ARG_ENABLE(sandbox,
444 AC_HELP_STRING([--enable-sandbox],
445 [enable HTML5 sandboxed iframe support [default=yes]]),
446 [],[enable_sandbox="yes"])
447AC_MSG_RESULT([$enable_sandbox])
448
449# check whether to enable HTML5 audio/video support
450AC_MSG_CHECKING([whether to enable HTML5 video support])
451AC_ARG_ENABLE(video,
452 AC_HELP_STRING([--enable-video],
453 [enable HTML5 video support [default=yes]]),
454 [],[enable_video="yes"])
455AC_MSG_RESULT([$enable_video])
456
457# check whether to enable XHTML-MP support
458AC_MSG_CHECKING([whether to enable XHTML-MP support])
459AC_ARG_ENABLE(xhtmlmp,
460 AC_HELP_STRING([--enable-xhtmlmp],
461 [enable support for XHTML-MP [default=no]]),
462 [],[enable_xhtmlmp="no"])
463AC_MSG_RESULT([$enable_xhtmlmp])
464
465# check whether to enable XPath support
466AC_MSG_CHECKING([whether to enable XPath support])
467AC_ARG_ENABLE(xpath,
468 AC_HELP_STRING([--enable-xpath],
469 [enable support for XPath [default=yes]]),
470 [],[enable_xpath="yes"])
471AC_MSG_RESULT([$enable_xpath])
472
473# check whether to enable XSLT support
474AC_MSG_CHECKING([whether to enable XSLT support])
475AC_ARG_ENABLE(xslt,
476 AC_HELP_STRING([--enable-xslt],
477 [enable support for XSLT [default=yes]]),
478 [],[enable_xslt="yes"])
479AC_MSG_RESULT([$enable_xslt])
480
481# check whether to enable geolocation support
482AC_MSG_CHECKING([whether to enable geolocation support])
483AC_ARG_ENABLE(geolocation,
484 AC_HELP_STRING([--enable-geolocation],
485 [enable support for geolocation [default=no]]),
486 [],[enable_geolocation="no"])
487AC_MSG_RESULT([$enable_geolocation])
488
489# check whether to enable MathML support
490AC_MSG_CHECKING([whether to enable MathML support])
491AC_ARG_ENABLE(mathml,
492 AC_HELP_STRING([--enable-mathml],
493 [enable support for MathML [default=no]]),
494 [],[enable_mathml="no"])
495AC_MSG_RESULT([$enable_mathml])
496
497# check whether to enable SVG support
498AC_MSG_CHECKING([whether to enable SVG support])
499AC_ARG_ENABLE(svg,
500 AC_HELP_STRING([--enable-svg],
501 [enable support for SVG [default=yes]]),
502 [],[enable_svg="yes"])
503AC_MSG_RESULT([$enable_svg])
504
505# check whether to enable WML support
506AC_MSG_CHECKING([whether to enable WML support])
507AC_ARG_ENABLE(wml,
508 AC_HELP_STRING([--enable-wml],
509 [enable support for WML [default=no]]),
510 [],[enable_wml="no"])
511AC_MSG_RESULT([$enable_wml])
512
513# check whether to enable SharedWorkers support
514AC_MSG_CHECKING([whether to enable SharedWorkers support])
515AC_ARG_ENABLE(shared_workers,
516 AC_HELP_STRING([--enable-shared-workers],
517 [enable support for SharedWorkers [default=yes]]),
518 [],[enable_shared_workers="yes"])
519AC_MSG_RESULT([$enable_shared_workers])
520
521# check whether to enable Web Workers support
522AC_MSG_CHECKING([whether to enable Web Workers support])
523AC_ARG_ENABLE(workers,
524 AC_HELP_STRING([--enable-workers],
525 [enable support for Web Workers [default=yes]]),
526 [],[enable_workers="yes"])
527AC_MSG_RESULT([$enable_workers])
528
529# turn off svg features if --disable-svg is requested
530if test "$enable_svg" = "no"; then
531 enable_svg_animation=no
532 enable_svg_fonts=no
533 enable_svg_foreign_object=no
534 enable_svg_as_image=no
535 enable_svg_use=no
536fi
537
538# check whether to enable support for SVG animation
539AC_MSG_CHECKING([whether to enable support for SVG animation])
540AC_ARG_ENABLE(svg_animation,
541 AC_HELP_STRING([--enable-svg-animation],
542 [enable support for SVG animation (experimental) [default=yes]]),
543 [],[enable_svg_animation="yes"])
544AC_MSG_RESULT([$enable_svg_animation])
545
546# check whether to enable support for filters
547AC_MSG_CHECKING([whether to enable support for filters])
548AC_ARG_ENABLE(filters,
549 AC_HELP_STRING([--enable-filters],
550 [enable support for filters (experimental) [default=yes]]),
551 [],[enable_filters="yes"])
552AC_MSG_RESULT([$enable_filters])
553
554# check whether to enable support for SVG fonts
555AC_MSG_CHECKING([whether to enable support for SVG fonts])
556AC_ARG_ENABLE(svg_fonts,
557 AC_HELP_STRING([--enable-svg-fonts],
558 [enable support for SVG fonts (experimental) [default=yes]]),
559 [],[enable_svg_fonts="yes"])
560AC_MSG_RESULT([$enable_svg_fonts])
561
562# check whether to enable foreign objects support for SVG
563AC_MSG_CHECKING([whether to enable support for SVG foreign objects])
564AC_ARG_ENABLE(svg_foreign_object,
565 AC_HELP_STRING([--enable-svg-foreign-object],
566 [enable support for SVG foreign objects (experimental) [default=yes]]),
567 [],[enable_svg_foreign_object="yes"])
568AC_MSG_RESULT([$enable_svg_foreign_object])
569
570# check whether to enable SVG As Image support
571AC_MSG_CHECKING([whether to enable SVG as Image support])
572AC_ARG_ENABLE(svg_as_image,
573 AC_HELP_STRING([--enable-svg-as-image],
574 [enable SVG as Image support (experimental) [default=yes]]),
575 [],[enable_svg_as_image="yes"])
576AC_MSG_RESULT([$enable_svg_as_image])
577
578# check whether to enable SVG USE element support
579AC_MSG_CHECKING([whether to enable support for SVG use element])
580AC_ARG_ENABLE(svg_use,
581 AC_HELP_STRING([--enable-svg-use],
582 [enable SVG use element support (experimental) [default=yes]]),
583 [],[enable_svg_use="yes"])
584AC_MSG_RESULT([$enable_svg_use])
585
586# check for SVG features, enabling SVG if necessary
587if test "$enable_svg_animation" = "yes" || \
588 test "$enable_svg_fonts" = "yes" || \
589 test "$enable_svg_foreign_object" = "yes" || \
590 test "$enable_svg_as_image" = "yes" || \
591 test "$enable_svg_use" = "yes"; then
592 svg_flags=yes
593 if test "$enable_svg" = "no"; then
594 AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
595 enable_svg=yes
596 fi
597fi
598
599# check whether to enable Web Socket support
600AC_MSG_CHECKING([whether to enable Web Sockets support])
601AC_ARG_ENABLE(web_sockets,
602 AC_HELP_STRING([--enable-web-sockets],
603 [enable support for Web Sockets [default=no]]),
604 [],[enable_web_sockets="no"])
605AC_MSG_RESULT([$enable_web_sockets])
606
607# check whether to enable Web Timing support
608AC_MSG_CHECKING([whether to enable Web Timing support])
609AC_ARG_ENABLE(web_timing,
610 AC_HELP_STRING([--enable-web-timing],
611 [enable support for Web Timing [default=no]]),
612 [],[enable_web_timing="no"])
613AC_MSG_RESULT([$enable_web_timing])
614
615# check whether to enable Blob.slice support
616AC_MSG_CHECKING([whether to enable Blob.slice support])
617AC_ARG_ENABLE(blob_slice,
618 AC_HELP_STRING([--enable-blob-slice],
619 [enable support for Blob.slice [default=no]]),
620 [],[enable_blob_slice="no"])
621AC_MSG_RESULT([$enable_blob_slice])
622
623# check whether to enable Fast Mobile Scrolling support
624AC_MSG_CHECKING([whether to enable Fast Mobile Scrolling])
625AC_ARG_ENABLE(fast_mobile_scrolling,
626 AC_HELP_STRING([--enable-fast-mobile-scrolling],
627 [enable support for Fast Mobile Scrolling [default=no]]),
628 [],[enable_fast_mobile_scrolling="no"])
629AC_MSG_RESULT([$enable_fast_mobile_scrolling])
630
631# check whether to enable FileReader support
632AC_MSG_CHECKING([whether to enable FileReader support])
633AC_ARG_ENABLE(file_reader,
634 AC_HELP_STRING([--enable-file-reader],
635 [enable support for FileReader [default=no]]),
636 [],[enable_file_reader="no"])
637AC_MSG_RESULT([$enable_file_reader])
638
639# check whether to enable FileWriter support
640AC_MSG_CHECKING([whether to enable FileWriter support])
641AC_ARG_ENABLE(file_writer,
642 AC_HELP_STRING([--enable-file-writer],
643 [enable support for FileWriter [default=no]]),
644 [],[enable_file_writer="no"])
645AC_MSG_RESULT([$enable_file_writer])
646
647# check whether to enable code coverage
648AC_MSG_CHECKING([whether to enable code coverage support])
649AC_ARG_ENABLE(coverage,
650 AC_HELP_STRING([--enable-coverage],
651 [enable code coverage support [default=no]]),
652 [],[enable_coverage="no"])
653AC_MSG_RESULT([$enable_coverage])
654
655# check whether to enable FastMalloc
656AC_MSG_CHECKING([whether to enable optimized memory allocator])
657AC_ARG_ENABLE(fast_malloc,
658 AC_HELP_STRING([--enable-fast-malloc],
659 [enable optimized memory allocator default=yes, default=no for debug builds]),
660 [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi])
661AC_MSG_RESULT([$enable_fast_malloc])
662
663AC_MSG_CHECKING([whether to enable JIT compilation])
664AC_ARG_ENABLE([jit],
665 AC_HELP_STRING([--enable-jit],
666 [Enable JIT compilation default=yes]),
667 [],[enable_jit="yes"])
668if test "$enable_jit" = "yes"; then
669 case "$host_cpu" in
670 i*86|x86_64)
671 AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
672 AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
673 AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT])
674 AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls])
675 AC_DEFINE([ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS], [1], [Define to enable optimized property access])
676 AC_DEFINE([ENABLE_JIT_OPTIMIZE_ARITHMETIC], [1], [Define to enable optimized arithmetic])
677 case "$host_cpu" in
678 i*86)
679 AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list])
680 ;;
681 x86_64)
682 AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register])
683 AC_DEFINE([WTF_USE_ALTERNATE_JSIMMEDIATE], [1], [Use alternate JSImmediate])
684 ;;
685 esac
686 ;;
687 *)
688 enable_jit="no (CPU '$host_cpu' not supported)"
689 ;;
690 esac
691fi
692AC_MSG_RESULT([$enable_jit])
693
694# GObject Introspection
695AC_MSG_CHECKING([whether to enable GObject introspection support])
696AC_ARG_ENABLE([introspection],
697 [AS_HELP_STRING([--enable-introspection],[Enable GObject introspection (default: disabled)])],
698 [],[enable_introspection=no])
699AC_MSG_RESULT([$enable_introspection])
700
701G_IR_SCANNER=
702G_IR_COMPILER=
703G_IR_GENERATE=
704GIRDIR=
705GIRTYPELIBDIR=
706
707if test "$enable_introspection" = "yes"; then
708 GOBJECT_INTROSPECTION_REQUIRED=0.6.15
709 PKG_CHECK_MODULES([INTROSPECTION],[gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED])
710
711 G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)"
712 G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)"
713 G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)"
714 AC_DEFINE([ENABLE_INTROSPECTION],[1],[Define to enable GObject introspection support])
715fi
716
717AC_SUBST([G_IR_SCANNER])
718AC_SUBST([G_IR_COMPILER])
719AC_SUBST([G_IR_GENERATE])
720
721# determine the font backend
722AC_MSG_CHECKING([the font backend to use])
723AC_ARG_WITH(font_backend,
724 AC_HELP_STRING([--with-font-backend=@<:@freetype/pango@:>@],
725 [Select font backend [default=freetype]]),
726 [],[with_font_backend="freetype"])
727
728case "$with_font_backend" in
729 freetype|pango) ;;
730 *) AC_MSG_ERROR([Invalid font backend: must be freetype or pango.]) ;;
731esac
732AC_MSG_RESULT([$with_font_backend])
733
734# Add '-g' flag to gcc if it's debug build
735if test "$enable_debug" = "yes"; then
736 CXXFLAGS="$CXXFLAGS -g"
737 CFLAGS="$CFLAGS -g"
738else
739 AC_DEFINE([NDEBUG], [1], [Define to disable debugging features])
740fi
741
742# Add the appropriate 'O' level for optimized builds
743if test "$enable_optimizations" = "yes"; then
744 CXXFLAGS="$CXXFLAGS -O2"
745 CFLAGS="$CFLAGS -O2"
746else
747 CXXFLAGS="$CXXFLAGS -O0"
748 CFLAGS="$CFLAGS -O0"
749fi
750
751PKG_CHECK_MODULES([LIBSOUP],
752 [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
753AC_SUBST([LIBSOUP_CFLAGS])
754AC_SUBST([LIBSOUP_LIBS])
755
756# check if we can use libSoup 2.29.90 features
757PKG_CHECK_MODULES([LIBSOUP_2_29_90],
758 [libsoup-2.4 >= 2.29.90],
759 [have_libsoup_2_29_90=yes],
760 [have_libsoup_2_29_90=no])
761if test "$have_libsoup_2_29_90" = "yes"; then
762 AC_DEFINE([HAVE_LIBSOUP_2_29_90], 1, [Whether libSoup 2.29.90 features are available])
763fi
764
765# check if FreeType/FontConfig are available
766if test "$with_font_backend" = "freetype"; then
767 if test "$with_target" = "directfb"; then
768 PKG_CHECK_MODULES([FREETYPE],
769 [fontconfig >= $FONTCONFIG_REQUIRED_VERSION
770 freetype2 >= $FREETYPE2_REQUIRED_VERSION])
771 else
772 PKG_CHECK_MODULES([FREETYPE],
773 [cairo-ft
774 fontconfig >= $FONTCONFIG_REQUIRED_VERSION
775 freetype2 >= $FREETYPE2_REQUIRED_VERSION])
776 fi
777 AC_SUBST([FREETYPE_CFLAGS])
778 AC_SUBST([FREETYPE_LIBS])
779fi
780
781# check if sqlite 3 is available
782if test "$enable_icon_database" = "yes" || \
783 test "$enable_database" = "yes" || \
784 test "$enable_offline_web_applications" = "yes" || \
785 test "$enable_dom_storage" = "yes"; then
786 PKG_CHECK_MODULES([SQLITE3],
787 [sqlite3 >= $SQLITE_REQUIRED_VERSION],
788 [sqlite3_has_pkg_config=yes],
789 [sqlite3_has_pkg_config=no])
790 if test "$sqlite3_has_pkg_config" = "no"; then
791 AC_SEARCH_LIBS([sqlite3_open16], [sqlite3],
792 [SQLITE3_LIBS="$LIBS";SQLITE3_CFLAGS="-I $srcdir/WebKitLibraries/WebCoreSQLite3"],
793 [AC_MSG_ERROR([SQLite3 is required to enable Database support])])
794 fi
795 AC_SUBST([SQLITE3_CFLAGS])
796 AC_SUBST([SQLITE3_LIBS])
797fi
798
799# check if libxslt is available
800if test "$enable_xslt" = "yes"; then
801 PKG_CHECK_MODULES([LIBXSLT],[libxslt >= $LIBXSLT_REQUIRED_VERSION])
802 AC_SUBST([LIBXSLT_CFLAGS])
803 AC_SUBST([LIBXSLT_LIBS])
804fi
805
806# check if geoclue is available
807if test "$enable_geolocation" = "yes"; then
808 PKG_CHECK_MODULES([GEOCLUE], [geoclue])
809 AC_SUBST([GEOCLUE_CFLAGS])
810 AC_SUBST([GEOCLUE_LIBS])
811fi
812
813# check if gstreamer is available
814if test "$enable_video" = "yes"; then
815 PKG_CHECK_MODULES([GSTREAMER],
816 [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
817 gstreamer-app-0.10
818 gstreamer-base-0.10
819 gstreamer-pbutils-0.10
820 gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
821 gstreamer-video-0.10])
822 AC_SUBST([GSTREAMER_CFLAGS])
823 AC_SUBST([GSTREAMER_LIBS])
824fi
825
826# check for code coverage support
827if test "$enable_coverage" = "yes"; then
828 COVERAGE_CFLAGS="-MD"
829 COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs"
830 AC_SUBST([COVERAGE_CFLAGS])
831 AC_SUBST([COVERAGE_LDFLAGS])
832fi
833
834# check for HTML features
835if test "$enable_video" = "yes"; then
836 html_flags=yes
837fi
838
839GTK_DOC_CHECK([1.10])
840
841# OS conditionals
842AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
843AM_CONDITIONAL([OS_UNIX],[test "$os_win32" = "no"])
844AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"])
845AM_CONDITIONAL([OS_GNU],[test "$os_gnu" = "yes"])
846AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"])
847
848# target conditionals
849AM_CONDITIONAL([TARGET_X11], [test "$with_target" = "x11"])
850AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"])
851AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"])
852AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"])
853
854# Unicode backend conditionals
855AM_CONDITIONAL([USE_ICU_UNICODE], [test "$with_unicode_backend" = "icu"])
856AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"])
857
858# Font backend conditionals
859AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"])
860AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
861
862# WebKit feature conditionals
863AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
864AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"])
865AM_CONDITIONAL([ENABLE_BLOB_SLICE],[test "$enable_blob_slice" = "yes"])
866AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
867AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
868AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"])
869AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
870AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
871AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"])
872AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"])
873AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"])
874AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
875AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"])
876AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
877AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"])
878AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"])
879AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
880AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
881AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
882AM_CONDITIONAL([ENABLE_FILE_READER],[test "$enable_file_reader" = "yes"])
883AM_CONDITIONAL([ENABLE_FILE_WRITER],[test "$enable_file_writer" = "yes"])
884AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
885AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
886AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"])
887AM_CONDITIONAL([ENABLE_SANDBOX],[test "$enable_sandbox" = "yes"])
888AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
889AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
890AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"])
891AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
892AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"])
893AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
894AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"])
895AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"])
896AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use" = "yes"])
897AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
898AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
899AM_CONDITIONAL([ENABLE_WML],[test "$enable_wml" = "yes"])
900AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"])
901AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"])
902AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
903AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"])
904AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"])
905AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])
906
907# Gtk conditionals
908AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
909
910
911AC_CONFIG_FILES([
912GNUmakefile
913WebKit/gtk/webkit/webkitversion.h
914WebKit/gtk/docs/GNUmakefile
915WebKit/gtk/docs/version.xml
916]
917)
918
919AC_CONFIG_FILES([
920WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in
921WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in]
922,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
923)
924
925AC_OUTPUT
926
927echo "
928WebKit was configured with the following options:
929
930Build configuration:
931 Enable debugging (slow) : $enable_debug
932 Enable GCC build optimization : $enable_optimizations
933 Code coverage support : $enable_coverage
934 Unicode backend : $with_unicode_backend
935 Font backend : $with_font_backend
936 Optimized memory allocator : $enable_fast_malloc
937Features:
938 3D Transforms : $enable_3D_transforms
939 Blob.slice support : $enable_blob_slice
940 Fast Mobile Scrolling : $enable_fast_mobile_scrolling
941 JIT compilation : $enable_jit
942 Filters support : $enable_filters
943 FileReader support : $enable_file_reader
944 FileWriter support : $enable_file_writer
945 Geolocation support : $enable_geolocation
946 JavaScript debugger/profiler support : $enable_javascript_debugger
947 MathML support : $enable_mathml
948 HTML5 offline web applications support : $enable_offline_web_applications
949 HTML5 channel messaging support : $enable_channel_messaging
950 HTML5 client-side session and persistent storage support : $enable_dom_storage
951 HTML5 client-side database storage support : $enable_database
952 HTML5 ruby support : $enable_ruby
953 HTML5 sandboxed iframe support : $enable_sandbox
954 HTML5 server-sent events support : $enable_eventsource
955 HTML5 video element support : $enable_video
956 Icon database support : $enable_icon_database
957 Image resizer support : $enable_image_resizer
958 SharedWorkers support : $enable_shared_workers
959 Speech input support : $enable_input_speech
960 SVG support : $enable_svg
961 SVG animation support : $enable_svg_animation
962 SVG fonts support : $enable_svg_fonts
963 SVG foreign object support : $enable_svg_foreign_object
964 SVG as image support : $enable_svg_as_image
965 SVG use element support : $enable_svg_use
966 WML support : $enable_wml
967 Web Sockets support : $enable_web_sockets
968 Web Timing support : $enable_web_timing
969 Web Workers support : $enable_workers
970 XHTML-MP support : $enable_xhtmlmp
971 XPATH support : $enable_xpath
972 XSLT support : $enable_xslt
973GTK+ configuration:
974 GTK+ version : $with_gtk
975 GDK target : $with_target
976 Hildon UI extensions : $with_hildon
977 Introspection support : $enable_introspection
978"
979if test "$with_unicode_backend" = "glib"; then
980 echo " >> WARNING: the glib-based unicode backend is slow and incomplete <<"
981 echo
982 echo
983fi
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 @@
1# -*- mode: makefile -*-
2
3####################################
4# Everything below here is generic #
5####################################
6
7if GTK_DOC_USE_LIBTOOL
8GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
9GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
10else
11GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
12GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
13endif
14
15# We set GPATH here; this gives us semantics for GNU make
16# which are more like other make's VPATH, when it comes to
17# whether a source that is a target of one rule is then
18# searched for in VPATH/GPATH.
19#
20GPATH = $(srcdir)
21
22TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
23
24EXTRA_DIST = \
25 $(content_files) \
26 $(HTML_IMAGES) \
27 $(DOC_MAIN_SGML_FILE) \
28 $(DOC_MODULE)-sections.txt \
29 $(DOC_MODULE)-overrides.txt
30
31DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
32 $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
33
34SCANOBJ_FILES = \
35 $(DOC_MODULE).args \
36 $(DOC_MODULE).hierarchy \
37 $(DOC_MODULE).interfaces \
38 $(DOC_MODULE).prerequisites \
39 $(DOC_MODULE).signals
40
41REPORT_FILES = \
42 $(DOC_MODULE)-undocumented.txt \
43 $(DOC_MODULE)-undeclared.txt \
44 $(DOC_MODULE)-unused.txt
45
46CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
47
48if ENABLE_GTK_DOC
49all-local: html-build.stamp
50else
51all-local:
52endif
53
54docs: html-build.stamp
55
56#### scan ####
57
58scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
59 @echo 'gtk-doc: Scanning header files'
60 @-chmod -R u+w $(srcdir)
61 cd $(srcdir) && \
62 gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
63 if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
64 CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
65 else \
66 cd $(srcdir) ; \
67 for i in $(SCANOBJ_FILES) ; do \
68 test -f $$i || touch $$i ; \
69 done \
70 fi
71 touch scan-build.stamp
72
73$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
74 @true
75
76#### templates ####
77
78tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
79 @echo 'gtk-doc: Rebuilding template files'
80 @-chmod -R u+w $(srcdir)
81 cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
82 touch tmpl-build.stamp
83
84tmpl.stamp: tmpl-build.stamp
85 @true
86
87tmpl/*.sgml:
88 @true
89
90
91#### xml ####
92
93sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
94 @echo 'gtk-doc: Building XML'
95 @-chmod -R u+w $(srcdir)
96 cd $(srcdir) && \
97 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)
98 touch sgml-build.stamp
99
100sgml.stamp: sgml-build.stamp
101 @true
102
103#### html ####
104
105html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
106 @echo 'gtk-doc: Building HTML'
107 @-chmod -R u+w $(srcdir)
108 rm -rf $(srcdir)/html
109 mkdir $(srcdir)/html
110 cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
111 test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
112 @echo 'gtk-doc: Fixing cross-references'
113 cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
114 touch html-build.stamp
115
116##############
117
118clean-local:
119 rm -f *~ *.bak
120 rm -rf .libs
121
122distclean-local:
123 cd $(srcdir) && \
124 rm -rf xml $(REPORT_FILES) \
125 $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
126
127maintainer-clean-local: clean
128 cd $(srcdir) && rm -rf xml html
129
130install-data-local:
131 -installfiles=`echo $(srcdir)/html/*`; \
132 if test "$$installfiles" = '$(srcdir)/html/*'; \
133 then echo '-- Nothing to install' ; \
134 else \
135 $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
136 for i in $$installfiles; do \
137 echo '-- Installing '$$i ; \
138 $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
139 done; \
140 echo '-- Installing $(srcdir)/html/index.sgml' ; \
141 $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
142 which gtkdoc-rebase >/dev/null && \
143 gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
144 fi
145
146
147uninstall-local:
148 rm -f $(DESTDIR)$(TARGET_DIR)/*
149
150#
151# Require gtk-doc when making dist
152#
153if ENABLE_GTK_DOC
154dist-check-gtkdoc:
155else
156dist-check-gtkdoc:
157 @echo "*** gtk-doc must be installed and enabled in order to make dist"
158 @false
159endif
160
161dist-hook: dist-check-gtkdoc dist-hook-local
162 mkdir $(distdir)/tmpl
163 mkdir $(distdir)/xml
164 mkdir $(distdir)/html
165 -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
166 -cp $(srcdir)/xml/*.xml $(distdir)/xml
167 cp $(srcdir)/html/* $(distdir)/html
168 -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
169 -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
170 cd $(distdir) && rm -f $(DISTCLEANFILES)
171 -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
172
173.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 @@
1DESCRIPTION = "WebKitGTK+ is the port of the portable web rendering engine WebKitK to the GTK+ platform."
2HOMEPAGE = "http://www.webkitgtk.org/"
3BUGTRACKER = "http://bugs.webkit.org/"
4
5LICENSE = "BSD & LGPLv2+"
6LIC_FILES_CHKSUM = "file://WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \
7 file://WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
8 file://JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90"
9
10DEPENDS = "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"
11DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native sqlite3"
12
13SRCREV_FORMAT = "webcore-rwebkit"
14
15PV = "1.3.2+svnr${SRCREV}"
16PR = "r0"
17
18SRC_URI = "\
19 svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
20 svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
21 svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http;name=webcore \
22 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \
23 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
24 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
25 svn://svn.webkit.org/repository/webkit/trunk/;module=autotools;proto=http \
26 file://Makefile \
27 file://Makefile.shared \
28 file://autogen.sh \
29 file://configure.ac \
30 file://GNUmakefile.am \
31 file://gtk-doc.make \
32 "
33
34S = "${WORKDIR}/"
35
36inherit autotools lib_package pkgconfig
37
38EXTRA_OECONF = "\
39 --enable-debug=no \
40 --enable-svg \
41 --enable-icon-database=yes \
42 --disable-fast-malloc \
43 "
44
45EXTRA_AUTORECONF = " -I autotools "
46
47do_compile_prepend() {
48 mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
49 mkdir -p ${S}/Programs/
50 cd ${S}/JavaScriptCore/pcre
51 if test -e dftables.c
52 then
53 ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
54 elif test -e dftables.cpp
55 then
56 ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf
57 fi
58 cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
59 cp dftables ${S}/Programs/
60 cd ${S}
61}
62
63PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore"
64FILES_${PN}launcher = "${bindir}/GtkLauncher"
65FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
66FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*"
67FILES_${PN}-webinspector = "${datadir}/webkit-1.0/webinspector/"
68FILES_${PN} += "${datadir}/webkit-1.0/resources/error.html ${datadir}/webkit-1.0/images"
69
70
71
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 02:31:24 +0000