Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

webkitgtk3: More fixes.

Browse Source
This commit is contained in:
Alexpux
2014-03-28 14:33:05 +04:00
parent dfb2c7a5a4
commit fffcc5c8c9
3 changed files with 83 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mingw-w64-webkitgtk3/0008-webkit-fix-angle-windows-compilation.mingw.patch
View File

@@ -61,16 +61,16 @@
+
--- webkitgtk-2.2.3/Source/ThirdParty/ANGLE/GNUmakefile.am.orig 2013-12-04 23:12:01.034574086 +0100
+++ webkitgtk-2.2.3/Source/ThirdParty/ANGLE/GNUmakefile.am 2013-12-04 23:19:09.719774371 +0100
@@ -75,7 +75,6 @@
Source/ThirdParty/ANGLE/src/compiler/MapLongVariableNames.h \
@@ -80,7 +80,6 @@
Source/ThirdParty/ANGLE/src/compiler/MMap.h \
Source/ThirdParty/ANGLE/src/compiler/NodeSearch.h \
Source/ThirdParty/ANGLE/src/compiler/osinclude.h \
- Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp \
Source/ThirdParty/ANGLE/src/compiler/OutputESSL.cpp \
Source/ThirdParty/ANGLE/src/compiler/OutputESSL.h \
Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.cpp \
@@ -154,3 +153,10 @@
Source/ThirdParty/ANGLE/src/compiler/VariableInfo.h \
Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.cpp \
@@ -161,3 +160,10 @@
Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.h \
Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp \
Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h
+

63
mingw-w64-webkitgtk3/0029-pass-python-and-cflags-to-girscanner.patch Normal file
View File

@@ -0,0 +1,63 @@
--- webkitgtk-2.2.5/GNUmakefile.in.orig 2014-03-28 14:01:52.271600000 +0400
+++ webkitgtk-2.2.5/GNUmakefile.in 2014-03-28 14:06:34.709600000 +0400
@@ -78633,7 +78633,9 @@
@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@WebKit2-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ $(AM_V_GEN) \
+@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ CC=$(CC) \
@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ CFLAGS="$(CFLAGS) -Wno-deprecated-declarations" \
+@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ $(PYTHON) \
@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ $(G_IR_SCANNER) \
@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ --quiet \
@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ --warn-all \
@@ -78656,6 +78658,8 @@
@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ --add-include-path=$(WebKit2) \
@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ --add-include-path=$(top_builddir) \
@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ --c-include="webkit2/webkit2.h" \
+@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ $(GTK_CFLAGS) \
+@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ $(LIBSOUP_CFLAGS) \
@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ -I$(srcdir)/Source \
@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ -I$(WebKit2) \
@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@ -I$(GENSOURCES) \
--- webkitgtk-2.2.5/Source/WebKit/gtk/GNUmakefile.am.orig 2014-03-28 14:02:42.675200000 +0400
+++ webkitgtk-2.2.5/Source/WebKit/gtk/GNUmakefile.am 2014-03-28 14:05:16.538000000 +0400
@@ -289,7 +289,9 @@
if ENABLE_INTROSPECTION
WebKit-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) JavaScriptCore-@WEBKITGTK_API_VERSION@.gir libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
$(AM_V_GEN) \
+ CC=$(CC) \
CFLAGS="$(CFLAGS) -Wno-deprecated-declarations" \
+ $(PYTHON) \
$(G_IR_SCANNER) \
--quiet \
--warn-all \
@@ -313,6 +315,8 @@
--add-include-path=$(top_builddir) \
--c-include="webkit/webkit.h" \
-DBUILDING_WEBKIT \
+ $(GTK_CFLAGS) \
+ $(LIBSOUP_CFLAGS) \
-I$(srcdir)/Source \
-I$(WebKit) \
-I$(GENSOURCES) \
--- webkitgtk-2.2.5/Source/WebKit2/GNUmakefile.am.orig 2014-03-28 14:03:01.629200000 +0400
+++ webkitgtk-2.2.5/Source/WebKit2/GNUmakefile.am 2014-03-28 14:05:00.111200000 +0400
@@ -281,7 +281,9 @@
WebKit2-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
$(AM_V_GEN) \
+ CC=$(CC) \
CFLAGS="$(CFLAGS) -Wno-deprecated-declarations" \
+ $(PYTHON) \
$(G_IR_SCANNER) \
--quiet \
--warn-all \
@@ -304,6 +306,8 @@
--add-include-path=$(WebKit2) \
--add-include-path=$(top_builddir) \
--c-include="webkit2/webkit2.h" \
+ $(GTK_CFLAGS) \
+ $(LIBSOUP_CFLAGS) \
-I$(srcdir)/Source \
-I$(WebKit2) \
-I$(GENSOURCES) \

25
mingw-w64-webkitgtk3/PKGBUILD
View File

@@ -3,7 +3,7 @@
_realname=webkitgtk
_mingw_suff=mingw-w64-${CARCH}
pkgname=("${_mingw_suff}-${_realname}2" "${_mingw_suff}-${_realname}3")
pkgver=2.2.5
pkgver=2.2.6
pkgrel=1
pkgdesc="GTK+ Web content engine library (mingw-w64)"
arch=('any')
@@ -72,7 +72,8 @@ source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz
0025-webkitgtk-2.2.5-icu-libraries.patch
0026-webkitgtk-mingw-gnu-print.patch
0027-webkitgtk-windows-fix-egl.patch
0028-Use-after-free-in-WTF-threading-code.patch)
0028-Use-after-free-in-WTF-threading-code.patch
0029-pass-python-and-cflags-to-girscanner.patch)
prepare() {
cd ${srcdir}/${_realname}-${pkgver}
@@ -101,15 +102,17 @@ prepare() {
patch -p1 -i ${srcdir}/0026-webkitgtk-mingw-gnu-print.patch
patch -p1 -i ${srcdir}/0027-webkitgtk-windows-fix-egl.patch
patch -p1 -i ${srcdir}/0028-Use-after-free-in-WTF-threading-code.patch
patch -p1 -i ${srcdir}/0029-pass-python-and-cflags-to-girscanner.patch
autoreconf --verbose --install -I Source/autotools
mkdir ${srcdir}/build-gtk{2,3}
rm -rf ${srcdir}/build-gtk{2,3}
mkdir -p ${srcdir}/build-gtk{2,3}
}
_build() {
_ver="$1"; shift
cd build-${_ver}
cd ${srcdir}/build-${_ver}
export PYTHON=${MINGW_PREFIX}/bin/python2
export RUBY=${MINGW_PREFIX}/bin/ruby
@@ -137,12 +140,13 @@ _build() {
--enable-egl=no \
"$@"
make V=1 all stamp-po
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${srcdir}/build-${_ver}/SourceJavaScriptCore \
make V=1 all stamp-po
}
build() {
_build gtk3 --enable-gtk-doc --disable-webkit2 --with-gtk=3.0
_build gtk2 --disable-webkit2 --with-gtk=2.0
_build gtk3 --disable-gtk-doc --disable-webkit2 --with-gtk=3.0
_build gtk2 --disable-gtk-doc --disable-webkit2 --with-gtk=2.0
}
package_webkitgtk2() {
@@ -179,7 +183,7 @@ package_mingw-w64-x86_64-webkitgtk3() {
package_webkitgtk3
}
md5sums=('6083e027308cf6731c6ce394bf059fa8'
md5sums=('245a9f8cac251662b7abf19903332038'
'7408cd3f6624076ffb41c7b4364faee5'
'b353ef80d7cab43524aaf5bf510d1778'
'15587d5007fabb1700e2ed4a04085c30'
@@ -187,7 +191,7 @@ md5sums=('6083e027308cf6731c6ce394bf059fa8'
'd09eb8edbf720c331d01a58f65eaa0a6'
'288b3d33b3a9826fa5dc3ce748ef1b11'
'29ab03a44da205dcd38156d63dfee22b'
'60f28fd809bb3aa0c8c791325bb29d3d'
'8f9b6a0ef1da6a8b26d7e23c2ca03e31'
'05fe8cc73be6493d8e2269b900d03cfb'
'49505091057a55fb26cc0a837f472c4a'
'be25ec74f31e48e9b177e551290ded7f'
@@ -204,4 +208,5 @@ md5sums=('6083e027308cf6731c6ce394bf059fa8'
'78e8c4c15f52ebf42f0aa66fe28acc22'
'615feb1233082dadc2f63faa01ce778f'
'292b9380c711202a166c05d84af61fa7'
'290c2221a0caebe24650f09e08a9f4dd')
'290c2221a0caebe24650f09e08a9f4dd'
'9dfc2658031dbc73606495450690e08d')