gtk-webcore: add gcc4 patches for jscore, nrcit, and nrcore, fixes bug #684, thanks to Eric Shattow

6 files changed, 42 insertions, 3 deletions

diff --git a/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-JavaScriptCore.patch b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-JavaScriptCore.patch
new file mode 100644
index 0000000000..d48644cf5e
--- /dev/null
+++ b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-JavaScriptCore.patch
@@ -0,0 +1,12 @@
+diff -bur JavaScriptCore~orig/configure.in JavaScriptCore/configure.in
+--- JavaScriptCore~orig/configure.in	2006-02-12 01:51:50.000000000 -0600
++++ JavaScriptCore/configure.in	2006-02-12 22:26:44.000000000 -0600
+@@ -63,7 +63,7 @@
+ fi
+ changequote([,])dnl
+ 
+-CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++"
++CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++ -fno-threadsafe-statics"
+ LDFLAGS="$LDFLAGS $PACKAGE_LIBS" #-nodefaultlibs -lgcc -lc -lm"
+ 
+ CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS -I\$(top_srcdir)/kjs -I\$(top_srcdir)/pcre -I\$(top_srcdir)/" 
diff --git a/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCit.patch b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCit.patch
new file mode 100644
index 0000000000..bee942fa9a
--- /dev/null
+++ b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCit.patch
@@ -0,0 +1,12 @@
+diff -bur NRCit~orig/configure.in NRCit/configure.in
+--- NRCit~orig/configure.in	2005-08-08 18:07:00.000000000 -0500
++++ NRCit/configure.in	2006-02-12 21:28:53.000000000 -0600
+@@ -37,7 +37,7 @@
+   esac
+   case " $CXXFLAGS " in
+   *[\ \	]-Wall[\ \	]*) ;;
+-  *) CXXFLAGS="$CXXFLAGS -Wall -Werror" ;;
++  *) CXXFLAGS="$CXXFLAGS -Wall -Werror -fno-threadsafe-statics" ;;
+   esac
+ fi
+ changequote([,])dnl
diff --git a/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCore.patch b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCore.patch
new file mode 100644
index 0000000000..d3cb8c9b47
--- /dev/null
+++ b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCore.patch
@@ -0,0 +1,12 @@
+diff -bur NRCore~orig/configure.in NRCore/configure.in
+--- NRCore~orig/configure.in	2005-02-16 03:31:43.000000000 -0600
++++ NRCore/configure.in	2006-02-12 21:03:49.000000000 -0600
+@@ -107,7 +107,7 @@
+   esac
+   case " $CXXFLAGS " in
+   *[\ \	]-Wall[\ \	]*) ;;
+-  *) CXXFLAGS="$CXXFLAGS -Wall " ;;
++  *) CXXFLAGS="$CXXFLAGS -Wall -fno-threadsafe-statics " ;;
+   esac
+ fi
+ changequote([,])dnl
diff --git a/packages/gtk-webcore/osb-jscore_20060212.bb b/packages/gtk-webcore/osb-jscore_20060212.bb
index 6a2959b993..2c96450d52 100644
--- a/packages/gtk-webcore/osb-jscore_20060212.bb
+++ b/packages/gtk-webcore/osb-jscore_20060212.bb
@@ -9,7 +9,8 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDSRCDATE}"
 PR = "r0"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDSRCDATE}"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDSRCDATE} \
+           file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1"
 S = "${WORKDIR}/JavaScriptCore"
 
 inherit autotools pkgconfig
diff --git a/packages/gtk-webcore/osb-nrcit_20060212.bb b/packages/gtk-webcore/osb-nrcit_20060212.bb
index f9633f339e..8e1259a916 100644
--- a/packages/gtk-webcore/osb-nrcit_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcit_20060212.bb
@@ -12,7 +12,8 @@ PR = "r0"
 DEPENDS = "curl librsvg osb-nrcore"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCit;date=${FIXEDSRCDATE} \
-	   file://stop-load.image-loading.patch;patch=1"
+           file://stop-load.image-loading.patch;patch=1 \
+           file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
 S = "${WORKDIR}/NRCit"
 
 inherit autotools pkgconfig
diff --git a/packages/gtk-webcore/osb-nrcore_20060212.bb b/packages/gtk-webcore/osb-nrcore_20060212.bb
index 34d93d81a9..f730b0df87 100644
--- a/packages/gtk-webcore/osb-nrcore_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcore_20060212.bb
@@ -12,7 +12,8 @@ PR = "r0"
 DEPENDS = "glib-2.0 gtk+ pango osb-jscore"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \
-	   file://KWIQ-mimetype-segfault.patch;patch=1"
+           file://KWIQ-mimetype-segfault.patch;patch=1 \
+           file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1"
 S = "${WORKDIR}/NRCore"
 
 LEAD_SONAME = "libnrcore.so"