gtk+: Add Upstream-Status ed: Add Upstream-Status gnome-common: Add Upstream-Status libmatchbox: Add Upstream-Status matchbox-wm: Add Upstream-Status x11vnc: Add Upstream-Status xtscal: Add Upstream-Status eds-dbus: Add Upstream-Status matchbox-desktop: Add Upstream-Status matchbox-keyboard: Add Upstream-Status matchbox-stroke: Add Upstream-Status matchbox-theme-sato: Add Upstream-Status owl-video-widget: Add Upstream-Status beecrypt: Add Upstream-Status gnome-icon-theme: Add Upstream-Status tslib: Add Upstream-Status libowl-av: Add Upstream-Status sato-icon-theme: Add Upstream-Status web-webkit: Add Upstream-Status metacity: Add Upstream-Status apr: Add Upstream-Status gdk-pixbuf: Add Upstream-Status pcmanfm: Add Upstream-Status gpgme: Add Upstream-Status eee-acpi-scripts: Add Upstream-Status libgalago: Add Upstream-Status python-pygtk: Add Upstream-Status gnome-mime-data: Add Upstream-Status clutter: Add Upstream-Status clutter-gtk: Add Upstream-Status tidy: Add Upstream-Status mutter: Add Upstream-Status xcursor-transparent-theme: Add Upstream-Status leafpad: Add Upstream-Status matchbox-config-gtk: Add Upstream-Status contacts: Add Upstream-Status dates: Add Upstream-Status web: Add Upstream-Status webkit: Add Upstream-Status - Also removed empty fix_im.patch apr-util: Add Upstream-Status libcroco: Add Upstream-Status liboil: Add Upstream-Status libxslt: Add Upstream-Status libglade: Add Upstream-Status gnome-terminal: Add Upstream-Status xev: Add Upstream-Status claws-mail: Add Upstream-Status clipboard-manager: Add Upstream-Status epdfview: Add Upstream-Status kf: Add Upstream-Status qemu: Add Upstream-Status clutter-gst: Add Upstream-Status table: Add Upstream-Status matchbox-panel-2: Add Upstream-Status (From OE-Core rev: 10bdb737c2c4c6996fd035849109a1e07580a6b9) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
36 lines
1,022 B
Diff
36 lines
1,022 B
Diff
The main webkit library links against stdc++ so we need to use g++ for
|
|
linking. The easiest way to achieve this is to add a dummy cpp file.
|
|
This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset.
|
|
|
|
RP - 14/4/08
|
|
|
|
Upstream-Status: Inappropriate [configuration]
|
|
|
|
--- webkit.orig/src/Makefile.am
|
|
+++ webkit/src/Makefile.am
|
|
@@ -1,11 +1,11 @@
|
|
AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\"
|
|
AM_CFLAGS = -Wall -export-dynamic $(WEB_CFLAGS)
|
|
|
|
bin_PROGRAMS = web2
|
|
|
|
-web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h
|
|
+web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h dummy.cpp
|
|
web2_LDADD = $(WEB_LIBS)
|
|
|
|
MAINTAINERCLEANFILES = config.h.in Makefile.in
|
|
|
|
uidir = $(pkgdatadir)
|
|
Index: webkit/configure.ac
|
|
===================================================================
|
|
--- webkit.orig/configure.ac 2008-04-14 22:15:25.000000000 +0100
|
|
+++ webkit/configure.ac 2008-04-14 22:16:31.000000000 +0100
|
|
@@ -7,6 +7,7 @@
|
|
|
|
AC_ISC_POSIX
|
|
AC_PROG_CC
|
|
+AC_PROG_CXX
|
|
AC_STDC_HEADERS
|
|
AC_PROG_LIBTOOL
|
|
|