summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/gtk-webcore/files/build_silence.patch32
-rw-r--r--packages/gtk-webcore/osb-nrcore_svn.bb3
2 files changed, 34 insertions, 1 deletions
diff --git a/packages/gtk-webcore/files/build_silence.patch b/packages/gtk-webcore/files/build_silence.patch
new file mode 100644
index 0000000000..bcef3954ee
--- /dev/null
+++ b/packages/gtk-webcore/files/build_silence.patch
@@ -0,0 +1,32 @@
+Index: configure.in
+===================================================================
+--- configure.in (revision 46)
++++ configure.in (working copy)
+@@ -134,9 +134,9 @@
+ AC_SUBST(LIBCURL_LIBS) #needed by the osb-nrcore.pc.in
+
+
+-CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++"
++CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++ -DLOG_DISABLED"
+
+-CPPFLAGS="$CPPFLAGS -include \"\$(top_srcdir)/WebCorePrefix.h\" $PACKAGE_CFLAGS $X_CFLAGS $JSCORE_CFLAGS $DEFINES"
++CPPFLAGS="$CPPFLAGS -include \"\$(top_srcdir)/WebCorePrefix.h\" $PACKAGE_CFLAGS $X_CFLAGS $JSCORE_CFLAGS $DEFINES -DLOG_DISABLED"
+ LDFLAGS="$LDFLAGS $PACKAGE_LIBS $X_LIBS $JSCORE_LIBS \
+ -nodefaultlibs -lgcc -lc"
+
+Index: kwiq/KWQEvent.cpp
+===================================================================
+--- kwiq/KWQEvent.cpp (revision 46)
++++ kwiq/KWQEvent.cpp (working copy)
+@@ -759,10 +759,10 @@
+ #if 0
+ if (state & GDK_MOD1_MASK)
+ qstate |= Qt::AltButton;
+-#endif
+
+ if (state & GDK_META_MASK)
+ qstate |= Qt::MetaButton;
++#endif
+
+ if (isKeypadEvent(event))
+ qstate |= Qt::Keypad;
diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb
index fefb4e8283..b7f9d069f1 100644
--- a/packages/gtk-webcore/osb-nrcore_svn.bb
+++ b/packages/gtk-webcore/osb-nrcore_svn.bb
@@ -6,7 +6,8 @@ PV = "0.5.0+svn${SRCDATE}"
PR = "r0"
SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \
- file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1"
+ file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \
+ file://build_silence.patch;patch=0"
S = "${WORKDIR}/NRCore"