summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2013-12-12 07:14:58 +0400
committerIgor Pashev <pashev.igor@gmail.com>2013-12-12 11:52:34 +0400
commit5af8a7e4b10648c39460efc1092e1d23cba2df9a (patch)
tree1e84e8714d176c4632d2f8f9adb138a6df803e7e
parentcd16003d22e919d4db34e7c5465695d7c8ff3da1 (diff)
downloadqtwebkit-5af8a7e4b10648c39460efc1092e1d23cba2df9a.tar.gz
Added dyson-glib.patch
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/dyson-glib.patch13
-rw-r--r--debian/patches/series1
3 files changed, 15 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1d4e0c5..535d8d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtwebkit (2.2.1-7+dyson1) UNRELEASED; urgency=low
* Added dyson-yield.patch
* Added dyson-MathExtras.h.patch
* Added dyson-MachineStackMarker-stackPointer.patch
+ * Added dyson-glib.patch
-- Igor Pashev <pashev.igor@gmail.com> Tue, 03 Dec 2013 23:54:22 +0400
diff --git a/debian/patches/dyson-glib.patch b/debian/patches/dyson-glib.patch
new file mode 100644
index 0000000..0ea1f7b
--- /dev/null
+++ b/debian/patches/dyson-glib.patch
@@ -0,0 +1,13 @@
+Index: qtwebkit/Source/JavaScriptCore/wtf/wtf.pri
+===================================================================
+--- qtwebkit.orig/Source/JavaScriptCore/wtf/wtf.pri 2013-12-10 19:58:34.136805014 +0400
++++ qtwebkit/Source/JavaScriptCore/wtf/wtf.pri 2013-12-12 11:20:03.602944747 +0400
+@@ -41,7 +41,7 @@
+ wtf/unicode/icu/CollatorICU.cpp \
+ wtf/unicode/UTF8.cpp
+
+-linux-*|glibc-*|hurd-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
++linux-*|glibc-*|hurd-*|dyson-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
+ !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
+ DEFINES += ENABLE_GLIB_SUPPORT=1
+ PKGCONFIG += glib-2.0 gio-2.0
diff --git a/debian/patches/series b/debian/patches/series
index 8400380..7f87232 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ dyson-solaris-use-system-malloc.patch
dyson-yield.patch
dyson-MathExtras.h.patch
dyson-MachineStackMarker-stackPointer.patch
+dyson-glib.patch