diff --git a/qt5-webkit/mingw-w64/PKGBUILD b/qt5-webkit/mingw-w64/PKGBUILD index 31c94fe4..acd7b989 100644 --- a/qt5-webkit/mingw-w64/PKGBUILD +++ b/qt5-webkit/mingw-w64/PKGBUILD @@ -59,7 +59,7 @@ prepare() { # note: all patches are from http://pkgs.fedoraproject.org/git/rpms/mingw-qt5-qtwebkit.git # The ICU libraries used for cross-compilation are named exactly the same as their native Linux counterpart - patch -p0 -b -i ../qt5-qtwebkit-use-correct-icu-libs.patch + patch -p1 -b -i ../qt5-qtwebkit-use-correct-icu-libs.patch # By default the build system assumes that pkg-config isn't used for the win32 target # However, we're using it in the Fedora MinGW toolchain so make sure it is used automatically @@ -110,15 +110,17 @@ build() { cd "${srcdir}/${_pkgfqn}" for _arch in ${_architectures}; do # Generate headers - ${_arch}-syncqt.pl-qt5 -version 5.6.0 Source/sync.profile + ${_arch}-syncqt.pl-qt5 ./Source -version ${pkgver} + + mkdir -p build-${_arch} && pushd build-${_arch} # Since Source/ThirdParty/ANGLE has been removed ensure files - # from system ANGLE can be included + # from system ANGLE can be included (patches from Fedora don't help + # here because Fedora uses other paths) export CPATH="$CPATH:/usr/$_arch/include:/usr/$_arch/include/GLSLANG" # SH_GLSL_OUTPUT has been renamed to SH_GLSL_COMPATIBILITY_OUTPUT # in the latest ANGLE version so I just add a definition for backward compatibility - mkdir -p build-${_arch} && pushd build-${_arch} ${_arch}-qmake-qt5 \ QMAKE_CXXFLAGS+=-Wno-c++0x-compat \ DEFINES+=SH_GLSL_OUTPUT=SH_GLSL_COMPATIBILITY_OUTPUT \ diff --git a/qt5-webkit/mingw-w64/qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch b/qt5-webkit/mingw-w64/qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch new file mode 100644 index 00000000..d40c5457 --- /dev/null +++ b/qt5-webkit/mingw-w64/qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch @@ -0,0 +1,21 @@ +--- Source/WebKit/qt/Api/qwebkitglobal.h.orig 2013-01-06 19:14:49.225087412 +0100 ++++ Source/WebKit/qt/Api/qwebkitglobal.h 2013-01-06 19:15:02.498182976 +0100 +@@ -24,7 +24,6 @@ + #include + #include + +-#ifndef QT_STATIC + # if !defined(QT_BUILD_WEBKITWIDGETS_LIB) && defined(BUILDING_WEBKIT) + # define QWEBKIT_EXPORT Q_DECL_EXPORT + # else +@@ -37,10 +36,6 @@ + # else + # define QWEBKITWIDGETS_EXPORT Q_DECL_IMPORT + # endif +-#else +-# define QWEBKITWIDGETS_EXPORT +-# define QWEBKIT_EXPORT +-#endif + + QWEBKIT_EXPORT QString qWebKitVersion(); + QWEBKIT_EXPORT int qWebKitMajorVersion();