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

qt5: Resync with qt5-static, KDE F5 + krita (WIP)

Browse Source
This commit is contained in:
Ray Donnelly 2015-11-12 00:16:00 +00:00
parent 63b882028b
commit eddb003aa5
37 changed files with 390 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mingw-w64-PKGBUILD-common/build-kf5-shared Normal file
View File

@ -0,0 +1,36 @@
#!/usr/bin/env bash
THISDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# Listed in tier-order
declare -a pkgs=(
#extra-cmake-modules
attica-qt5
karchive-qt5
kcodecs-qt5
kconfig-qt5
kcoreaddons-qt5
kdbusaddons-qt5
kglobalaccel-qt5
kguiaddons-qt5
ki18n-qt5
kidletime-qt5
kimageformats-qt5
kitemmodels-qt5
kitemviews-qt5
kjs-qt5
kplotting-qt5
kwidgetsaddons-qt5
kwindowsystem-qt5
qt5
qwt-qt5
solid-qt5
)
for pkg in "${pkgs[@]}"; do
pushd ${THISDIR}/../mingw-w64-${pkg}
export KF5_VARIANT=shared
rm -rf *pkg*xz src pkg
makepkg-mingw -siLf || exit 1
popd
done

4
mingw-w64-PKGBUILD-common/kde-frameworks5
View File

@ -8,8 +8,9 @@ _kde_f5_init_package() {
fi
_basename=${_PKG}
_realname=${_PKG}-qt5${_namesuff}
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
url="https://projects.kde.org/projects/frameworks/${_PKG}"
url=https://projects.kde.org/projects/frameworks/${_PKG}
}
_kde_f5_add_depends() {
@ -31,4 +32,3 @@ _kde_f5_CMAKE_BUILD_TYPE() {
echo "Release"
fi
}

10
mingw-w64-attica-qt5/PKGBUILD
View File

@ -2,8 +2,12 @@
# Maintainer (ArchLinux): Andrea Scarpino <andrea@archlinux.org>
# Maintainer (MSYS2): Ray Donnelly <mingw.android@gmail.com>
_variant=-static
#_variant=-shared
if [ -n ${KF5_VARIANT} ]; then
_variant=-${KF5_VARIANT}
else
_variant=-shared
fi
source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
_kde_f5_init_package "${_variant}" "attica"
pkgver=5.12.0
@ -43,7 +47,7 @@ build() {
-DBUILD_TESTING=OFF \
-DECM_DIR=${MINGW_PREFIX}/share/ECM \
"${extra_config[@]}" \
-G'MSYS Makefiles' --debug-output
-G'MSYS Makefiles'
make
}

2
mingw-w64-cmake/PKGBUILD
View File

@ -19,7 +19,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-libarchive"
"${MINGW_PACKAGE_PREFIX}-zlib")
optdepends=("${MINGW_PACKAGE_PREFIX}-qt5: CMake Qt GUI")
options=('staticlibs') # '!strip' 'debug'
options=('staticlibs' '!strip' 'debug')
source=("http://www.cmake.org/files/v${pkgver%.*}/${_realname}-${pkgver}.tar.gz"
"disable-response-files-for-msys.patch"
"dont-install-bundle.patch"

3
mingw-w64-karchive-qt5/PKGBUILD
View File

@ -9,7 +9,6 @@ _kde_f5_init_package "${_variant}" "karchive"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Qt 5 addon providing access to numerous types of archives (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")
@ -42,7 +41,7 @@ build() {
-DBUILD_TESTING=OFF \
-DECM_DIR=${MINGW_PREFIX}/share/ECM \
"${extra_config[@]}" \
-G'MSYS Makefiles' --debug-output --trace
-G'MSYS Makefiles'
make
}

3
mingw-w64-kcodecs-qt5/PKGBUILD
View File

@ -9,7 +9,6 @@ _kde_f5_init_package "${_variant}" "kcodecs"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Plugins allowing Qt applications to access further types of images (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")
@ -42,7 +41,7 @@ build() {
-DBUILD_TESTING=OFF \
-DECM_DIR=${MINGW_PREFIX}/share/ECM \
"${extra_config[@]}" \
-G'MSYS Makefiles' --debug-output
-G'MSYS Makefiles'
make
}

1
mingw-w64-kconfig-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "kconfig"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="KConfig provides an advanced configuration system (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")

3
mingw-w64-kcoreaddons-qt5/PKGBUILD
View File

@ -9,7 +9,6 @@ _kde_f5_init_package "${_variant}" "kcoreaddons"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Classes built on top of QtCore to perform various tasks (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")
@ -43,7 +42,7 @@ build() {
-DBUILD_TESTING=OFF \
-DECM_DIR=${MINGW_PREFIX}/share/ECM \
"${extra_config[@]}" \
-G'MSYS Makefiles' --debug-output
-G'MSYS Makefiles'
make
}

5
mingw-w64-kdbusaddons-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "kdbusaddons"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="KConfig provides an advanced configuration system (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")
@ -41,8 +40,8 @@ build() {
-DBUILD_TESTING=OFF \
-DECM_DIR=${MINGW_PREFIX}/share/ECM \
"${extra_config[@]}" \
-G'MSYS Makefiles' --debug-output
make VERBOSE=1
-G'MSYS Makefiles'
make
}
package() {

1
mingw-w64-kglobalaccel-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "kglobalaccel"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Global desktop keyboard shortcuts (mingw-w64-qt5${_namesuff})"
license=('LGPL')
depends=('qt5-base' 'shared-mime-info' 'gamin')

1
mingw-w64-kguiaddons-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "kguiaddons"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Utilities for graphical user interfaces (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")

1
mingw-w64-ki18n-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "ki18n"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="KDE Gettext-based UI text internationalization (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")

1
mingw-w64-kidletime-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "kidletime"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Reporting of idle time of user and system (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")

1
mingw-w64-kimageformats-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "kimageformats"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Plugins to allow QImage to support extra file formats (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")

1
mingw-w64-kitemmodels-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "kitemmodels"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Plugins to allow QImage to support extra file formats (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")

1
mingw-w64-kitemviews-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "kitemviews"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Plugins to allow QImage to support extra file formats (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")

1
mingw-w64-kjs-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "kjs"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Plugins to allow QImage to support extra file formats (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")

1
mingw-w64-kplotting-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "kplotting"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Plugins to allow QImage to support extra file formats (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")

85
mingw-w64-krita-git/PKGBUILD Normal file
View File

@ -0,0 +1,85 @@
# (MSYS2) Maintainer: Ray Donnelly <mingw.android@gmail.com>
# (ArchLinux) Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
# (ArchLinux) Contributor: Bruno Pagani (a.k.a. ArchangeGabriel) <bruno.n.pagani at gmail dot com>
# For now as I've not got shared KF5 ready.
_variant=-static
#_variant=-shared
_basename=krita
_realname=${_basename}-git
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.0.89.r39172.46b0002
pkgrel=1
pkgdesc="A free digital painting application. Digital Painting, Creative Freedom!. (GIT Version) (mingw-w64)"
arch=('any')
url="http://www.krita.org"
license=('GPL2')
depends=("${MINGW_PACKAGE_PREFIX}-fftw"
"${MINGW_PACKAGE_PREFIX}-gsl"
"${MINGW_PACKAGE_PREFIX}-LibRaw"
"${MINGW_PACKAGE_PREFIX}-opencolorio"
"${MINGW_PACKAGE_PREFIX}-boost"
"${MINGW_PACKAGE_PREFIX}-exiv2"
"${MINGW_PACKAGE_PREFIX}-openexr"
"${MINGW_PACKAGE_PREFIX}-poppler"
# "${MINGW_PACKAGE_PREFIX}-kio"
"${MINGW_PACKAGE_PREFIX}-hicolor-icon-theme"
)
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules"
"git"
"${MINGW_PACKAGE_PREFIX}-boost"
# "${MINGW_PACKAGE_PREFIX}-vc"
"${MINGW_PACKAGE_PREFIX}-python3"
"${MINGW_PACKAGE_PREFIX}-eigen3"
)
provides=("${MINGW_PACKAGE_PREFIX}-krita")
conflicts=("${MINGW_PACKAGE_PREFIX}-krita")
install=krita-git.install
source=('git://anongit.kde.org/krita.git')
sha1sums=('SKIP')
pkgver() {
cd "${srcdir}"/${_basename}
_ver="$(cat CMakeLists.txt | grep -m3 -e CALLIGRA_STABLE_VERSION_MAJOR -e CALLIGRA_STABLE_VERSION_MINOR -e CALLIGRA_VERSION_RELEASE | cut -d ')' -f1 | grep -o "[[:digit:]]*" | paste -sd'.')"
echo "${_ver}.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
}
prepare() {
cd "${srcdir}"/${_basename}
}
build() {
local -a extra_config
mkdir -p build-${CARCH}${_variant}
cd build-${CARCH}${_variant}
if [ "${_variant}" = "-static" ]; then
extra_config+=( -DBUILD_SHARED_LIBS=NO )
QT5_PREFIX=${MINGW_PREFIX}/qt5-static
export PATH=${QT5_PREFIX}/bin:"$PATH"
else
QT5_PREFIX=${MINGW_PREFIX}
fi
if check_option "debug" "n"; then
extra_config+=("-DCMAKE_BUILD_TYPE=Release")
else
extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
fi
cmake ../${_basename} \
-DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \
-DLIB_INSTALL_DIR=lib \
-DECM_MKSPECS_INSTALL_DIR=${QT5_PREFIX} \
-DQt5_DIR=${QT5_PREFIX}/lib/cmake/Qt5 \
-DBUILD_TESTING=OFF \
-DECM_DIR=${MINGW_PREFIX}/share/ECM \
"${extra_config[@]}" \
-G'MSYS Makefiles'
make
}
package() {
cd build-${CARCH}${_variant}
make DESTDIR="${pkgdir}" install
}

13
mingw-w64-krita-git/krita-git.install Normal file
View File

@ -0,0 +1,13 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-mime-database usr/share/mime &> /dev/null
update-desktop-database -q
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

1
mingw-w64-kwidgetsaddons-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "kwidgetsaddons"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Plugins to allow QImage to support extra file formats (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")

1
mingw-w64-kwindowsystem-qt5/PKGBUILD
View File

@ -7,7 +7,6 @@ _kde_f5_init_package "${_variant}" "kwindowsystem"
pkgver=5.12.0
pkgrel=1
arch=('any')
url=('https://projects.kde.org/projects/frameworks/${_basename}')
pkgdesc="Plugins to allow QImage to support extra file formats (mingw-w64-qt5${_namesuff})"
license=('LGPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")

6
mingw-w64-qt5-static/0042-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch
View File

@ -63,7 +63,7 @@ diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/mkspecs/features/data/c
!!ELSE
add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
!!ENDIF
@@ -276,6 +294,46 @@
@@ -276,6 +294,48 @@
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINE})
@ -93,7 +93,9 @@ diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/mkspecs/features/data/c
+ get_filename_component(_plugindir ${PLUGIN_LOCATION} PATH)
+ get_filename_component(_plugindirname ${_plugindir} NAME)
+ get_filename_component(_pluginname ${PLUGIN_LOCATION} NAME)
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+ set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY STATIC_PLUGINS ${Plugin})
+!!ENDIF
+ string(REGEX REPLACE \"^lib(.*)\\\\.a\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/share/qt5/plugins/${_plugindirname}/\\\\1.prl\" plugin_prl_file_location ${_pluginname})
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+ macro_process_plugin_prl_file(${plugin_prl_file_location} ${Configuration} \"share/qt5/plugins\" ${PLUGIN_LOCATION} )
@ -110,7 +112,7 @@ diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/mkspecs/features/data/c
!!IF !equals(TEMPLATE, aux)
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -356,37 +414,6 @@
@@ -356,37 +416,6 @@
)
!!ENDIF // TEMPLATE != aux

35
mingw-w64-qt5/0038-qt-5.5.0-cmake-Rearrange-STATIC-vs-INTERFACE-targets.patch Normal file
View File

@ -0,0 +1,35 @@
From 1f36ecb8823d607883aabfee07d9a0c03982257b Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 26 Aug 2015 12:45:43 +0100
Subject: [PATCH 38/38] cmake: Rearrange STATIC vs INTERFACE targets
Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED)
for header-only modules when building Qt5 statically.
---
mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index d2358ca..6b1dc95 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endif()
!!ENDIF
+!!IF equals(TEMPLATE, aux)
+ add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
+!!ELSE
!!IF !isEmpty(CMAKE_STATIC_TYPE)
add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
!!ELSE
-!!IF equals(TEMPLATE, aux)
- add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
-!!ELSE
add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
!!ENDIF
!!ENDIF
--
2.5.0

10
mingw-w64-qt5/0038-qt-5.4.0-Make-it-possible-to-use-static-builds-of-Qt-with-CMa.patch → mingw-w64-qt5/0039-qt-5.4.0-Make-it-possible-to-use-static-builds-of-Qt-with-CMa.patch
View File

@ -1,7 +1,7 @@
diff -urN qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qt-everywhere-opensource-src-5.4.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
--- qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2014-12-13 10:34:57.668743500 +0000
+++ qt-everywhere-opensource-src-5.4.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2014-12-13 14:40:54.557845500 +0000
@@ -57,13 +57,13 @@
diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qt-everywhere-opensource-src-5.5.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
--- qt-everywhere-opensource-src-5.5.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2015-08-26 15:00:26.576032700 +0100
+++ qt-everywhere-opensource-src-5.5.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2015-08-26 15:00:42.742765400 +0100
@@ -65,13 +65,13 @@
!!ENDIF
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
@ -17,7 +17,7 @@ diff -urN qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/c
)
!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
@@ -197,6 +197,40 @@
@@ -228,6 +228,40 @@
!!IF !isEmpty(CMAKE_STATIC_TYPE)
add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")

18
mingw-w64-qt5/0039-qt-5.4.0-Generate-separated-libraries-in-prl-files-for-CMake.patch → mingw-w64-qt5/0040-qt-5.4.0-Generate-separated-libraries-in-prl-files-for-CMake.patch
View File

@ -1,7 +1,7 @@
diff -urN qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qt-everywhere-opensource-src-5.4.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
--- qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2014-12-13 15:16:58.576095000 +0000
+++ qt-everywhere-opensource-src-5.4.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2014-12-14 10:10:27.960078400 +0000
@@ -209,9 +209,8 @@
diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qt-everywhere-opensource-src-5.5.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
--- qt-everywhere-opensource-src-5.5.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2015-08-26 15:06:08.512109600 +0100
+++ qt-everywhere-opensource-src-5.5.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2015-08-26 15:06:33.366637700 +0100
@@ -240,9 +240,8 @@
# all the right information.
macro(macro_process_prl_file prl_file_location Configuration)
if (EXISTS \"${prl_file_location}\")
@ -13,12 +13,12 @@ diff -urN qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/c
if (_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES)
set(_list_sep \";\")
endif()
diff -urN qt-everywhere-opensource-src-5.4.0.orig/qtbase/qmake/generators/makefile.cpp qt-everywhere-opensource-src-5.4.0/qtbase/qmake/generators/makefile.cpp
--- qt-everywhere-opensource-src-5.4.0.orig/qtbase/qmake/generators/makefile.cpp 2014-12-13 15:16:49.416878800 +0000
+++ qt-everywhere-opensource-src-5.4.0/qtbase/qmake/generators/makefile.cpp 2014-12-14 10:11:38.093945800 +0000
@@ -1009,6 +1009,13 @@
diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/qmake/generators/makefile.cpp qt-everywhere-opensource-src-5.5.0/qtbase/qmake/generators/makefile.cpp
--- qt-everywhere-opensource-src-5.5.0.orig/qtbase/qmake/generators/makefile.cpp 2015-08-26 14:29:10.131124600 +0100
+++ qt-everywhere-opensource-src-5.5.0/qtbase/qmake/generators/makefile.cpp 2015-08-26 15:06:33.375635900 +0100
@@ -1006,6 +1006,13 @@
for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
t << project->values((*it).toKey()).join(' ').replace('\\', "\\\\") << " ";
t << qv(project->values((*it).toKey()));
t << endl;
+ t << "QMAKE_PRL_LIBS_FOR_CMAKE = ";
+ QString sep;

2
mingw-w64-qt5/0040-qt-5.4.0-Fix-mingw-create_cmake-prl-file-has-no-lib-prefix.patch → mingw-w64-qt5/0041-qt-5.4.0-Fix-mingw-create_cmake-prl-file-has-no-lib-prefix.patch
View File

@ -1,6 +1,6 @@
--- qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/create_cmake.prf.orig 2014-12-14 20:11:38.710428500 +0000
+++ qt-everywhere-opensource-src-5.4.0/qtbase/mkspecs/features/create_cmake.prf 2014-12-14 22:16:48.451709600 +0000
@@ -214,8 +214,8 @@
@@ -233,8 +233,8 @@
CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a
CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a

26
mingw-w64-qt5/0041-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch → mingw-w64-qt5/0042-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch
View File

@ -1,7 +1,7 @@
diff -urN qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qt-everywhere-opensource-src-5.4.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
--- qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2015-01-03 22:54:41.110170600 +0000
+++ qt-everywhere-opensource-src-5.4.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2015-01-03 22:58:39.875293700 +0000
@@ -56,14 +56,17 @@
diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qt-everywhere-opensource-src-5.5.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
--- qt-everywhere-opensource-src-5.5.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2015-08-26 15:31:26.194016900 +0100
+++ qt-everywhere-opensource-src-5.5.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2015-08-26 15:21:30.905016900 +0100
@@ -64,14 +64,17 @@
set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
!!ENDIF
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
@ -21,7 +21,7 @@ diff -urN qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/c
)
!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
@@ -207,17 +210,31 @@
@@ -238,17 +241,31 @@
# Parse the prl files generated by qmake to get the link dependencies. They
# contain all the information we need, and they are the only location with
# all the right information.
@ -55,7 +55,7 @@ diff -urN qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/c
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
macro_process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG)
!!ELSE
@@ -230,6 +247,7 @@
@@ -261,6 +278,7 @@
!!ENDIF
# Excerpt from: end
@ -63,7 +63,7 @@ diff -urN qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/c
!!ELSE
add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
!!ENDIF
@@ -242,6 +260,46 @@
@@ -276,6 +294,48 @@
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINE})
@ -93,7 +93,9 @@ diff -urN qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/c
+ get_filename_component(_plugindir ${PLUGIN_LOCATION} PATH)
+ get_filename_component(_plugindirname ${_plugindir} NAME)
+ get_filename_component(_pluginname ${PLUGIN_LOCATION} NAME)
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+ set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY STATIC_PLUGINS ${Plugin})
+!!ENDIF
+ string(REGEX REPLACE \"^lib(.*)\\\\.a\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/share/qt5/plugins/${_plugindirname}/\\\\1.prl\" plugin_prl_file_location ${_pluginname})
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+ macro_process_plugin_prl_file(${plugin_prl_file_location} ${Configuration} \"share/qt5/plugins\" ${PLUGIN_LOCATION} )
@ -110,9 +112,9 @@ diff -urN qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/c
!!IF !equals(TEMPLATE, aux)
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -316,38 +363,6 @@
!!ENDIF // CMAKE_DEBUG_TYPE
@@ -356,37 +416,6 @@
)
!!ENDIF // TEMPLATE != aux
- file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
- unset(pluginTargets)
@ -145,7 +147,7 @@ diff -urN qt-everywhere-opensource-src-5.4.0.orig/qtbase/mkspecs/features/data/c
- endforeach()
- endif()
-
-
!!IF !isEmpty(CMAKE_MODULE_EXTRAS)
include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
!!ENDIF

11
mingw-w64-qt5/0042-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch
View File

@ -1,11 +0,0 @@
--- qt-everywhere-opensource-src-5.4.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf.orig 2014-12-05 16:25:19.000000000 +0000
+++ qt-everywhere-opensource-src-5.4.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf 2015-02-03 18:15:21.775257200 +0000
@@ -7,7 +7,7 @@
linux-g++*:!isGCCVersionSupported():return(false)
!isPythonVersionSupported(): return(false)
- linux-g++*|win32-msvc2013|macx-clang: return(true)
+ linux-g++*|win32-*|macx-clang: return(true)
boot2qt: return(true)
warning("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation".)

11
mingw-w64-qt5/0043-qt-5.5.0-static-cmake-regex-QT_INSTALL_LIBS-in-QMAKE_PRL_LIBS_FOR_CMAKE.patch Normal file
View File

@ -0,0 +1,11 @@
diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qt-everywhere-opensource-src-5.5.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
--- qt-everywhere-opensource-src-5.5.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2015-08-27 12:15:50.549764900 +0100
+++ qt-everywhere-opensource-src-5.5.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2015-08-27 12:32:35.136763200 +0100
@@ -249,6 +249,7 @@
if (EXISTS \"${prl_file_location}\")
file(STRINGS \"${prl_file_location}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\")
string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\\n]*)\" \"\\\\1\" static_depends ${prl_strings} )
+ string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" static_depends \"${static_depends}\")
if (_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LIB_DEPENDENCIES)
set(_list_sep \";\")
endif()

12
mingw-w64-qt5/0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch Normal file
View File

@ -0,0 +1,12 @@
diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtwebengine/tools/qmake/mkspecs/features/functions.prf qt-everywhere-opensource-src-5.5.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf
--- qt-everywhere-opensource-src-5.5.0.orig/qtwebengine/tools/qmake/mkspecs/features/functions.prf 2015-08-26 14:34:22.019269600 +0100
+++ qt-everywhere-opensource-src-5.5.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf 2015-08-26 15:34:44.547516900 +0100
@@ -14,7 +14,7 @@
linux-g++*:!isGCCVersionSupported(): return(false)
!isPythonVersionSupported(): return(false)
- linux-g++*|win32-msvc2013|macx-clang: return(true)
+ linux-g++*|win32-*|macx-clang: return(true)
boot2qt: return(true)
skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")

0
mingw-w64-qt5/0043-qt-5.4.1-static-use-qminimal-platform-plugin-for-qcollectiongenerator.patch → mingw-w64-qt5/0045-qt-5.4.1-static-use-qminimal-platform-plugin-for-qcollectiongenerator.patch
View File

0
mingw-w64-qt5/0044-qt-5.4.1-Revert-Revert-fix-NTFS-mount-points.patch → mingw-w64-qt5/0046-qt-5.4.1-Revert-Revert-fix-NTFS-mount-points.patch
View File

59
mingw-w64-qt5/0045-qt-5.4.1-Emit-QMAKE_DEFAULT_LIBDIRS-and-INCDIRS-to-qconfig-pri.patch → mingw-w64-qt5/0047-qt-5.4.1-Emit-QMAKE_DEFAULT_LIBDIRS-and-INCDIRS-to-qconfig-pri.patch
View File

@ -1,18 +1,19 @@
--- x86_64/qtbase/tools/configure/environment.h.orig 2015-02-17 04:56:37.000000000 +0000
+++ x86_64/qtbase/tools/configure/environment.h 2015-04-27 20:38:52.767995400 +0100
@@ -57,6 +57,10 @@
static QString detectQMakeSpec();
static Compiler compilerFromQMakeSpec(const QString &qmakeSpec);
+ static int compileSomething(const QString &flags, const QString &code, QString &stdOut, QString &stdErr);
+ static QString detectCompilerDefaultIncDirs();
+ static QString detectCompilerDefaultLibDirs();
+
static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv);
static QString execute(const QString &command, int *returnCode = 0);
static bool cpdir(const QString &srcDir, const QString &destDir);
--- x86_64/qtbase/tools/configure/environment.cpp.orig 2015-02-17 04:56:37.000000000 +0000
+++ x86_64/qtbase/tools/configure/environment.cpp 2015-04-28 00:16:41.914633600 +0100
diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/tools/configure/configureapp.cpp qt-everywhere-opensource-src-5.5.0/qtbase/tools/configure/configureapp.cpp
--- qt-everywhere-opensource-src-5.5.0.orig/qtbase/tools/configure/configureapp.cpp 2015-08-26 14:29:09.999124600 +0100
+++ qt-everywhere-opensource-src-5.5.0/qtbase/tools/configure/configureapp.cpp 2015-08-26 15:41:02.749516900 +0100
@@ -3448,6 +3448,9 @@
// FIXME: add detection
configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
+ } else {
+ configStream << " QMAKE_DEFAULT_LIBDIRS = " << Environment::detectCompilerDefaultLibDirs() << endl;
+ configStream << " QMAKE_DEFAULT_INCDIRS = " << Environment::detectCompilerDefaultIncDirs() << endl;
}
configStream << "}" << endl;
configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/tools/configure/environment.cpp qt-everywhere-opensource-src-5.5.0/qtbase/tools/configure/environment.cpp
--- qt-everywhere-opensource-src-5.5.0.orig/qtbase/tools/configure/environment.cpp 2015-08-26 14:29:10.004624600 +0100
+++ qt-everywhere-opensource-src-5.5.0/qtbase/tools/configure/environment.cpp 2015-08-26 15:41:02.742516900 +0100
@@ -40,6 +40,8 @@
#include <qfile.h>
#include <qfileinfo.h>
@ -22,7 +23,7 @@
#include <process.h>
#include <errno.h>
@@ -236,6 +238,112 @@
@@ -249,6 +251,112 @@
#endif
};
@ -135,15 +136,17 @@
/*!
Creates a commandling from \a program and it \a arguments,
escaping characters that needs it.
--- x86_64/qtbase/tools/configure/configureapp.cpp.orig 2015-04-27 17:41:27.741748800 +0100
+++ x86_64/qtbase/tools/configure/configureapp.cpp 2015-04-27 19:08:16.403164800 +0100
@@ -3388,6 +3388,9 @@
// FIXME: add detection
configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
+ } else {
+ configStream << " QMAKE_DEFAULT_LIBDIRS = " << Environment::detectCompilerDefaultLibDirs() << endl;
+ configStream << " QMAKE_DEFAULT_INCDIRS = " << Environment::detectCompilerDefaultIncDirs() << endl;
}
configStream << "}" << endl;
configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/tools/configure/environment.h qt-everywhere-opensource-src-5.5.0/qtbase/tools/configure/environment.h
--- qt-everywhere-opensource-src-5.5.0.orig/qtbase/tools/configure/environment.h 2015-08-26 14:29:10.018624600 +0100
+++ qt-everywhere-opensource-src-5.5.0/qtbase/tools/configure/environment.h 2015-08-26 15:41:02.735516900 +0100
@@ -58,6 +58,10 @@
static Compiler compilerFromQMakeSpec(const QString &qmakeSpec);
static QString gccVersion();
+ static int compileSomething(const QString &flags, const QString &code, QString &stdOut, QString &stdErr);
+ static QString detectCompilerDefaultIncDirs();
+ static QString detectCompilerDefaultLibDirs();
+
static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv);
static QString execute(const QString &command, int *returnCode = 0);
static bool cpdir(const QString &srcDir, const QString &destDir);

75
mingw-w64-qt5/0048-qt-5.4.2-win32-Avoid-platformNativeInterface-segfaults-with-minimal-platform.patch Normal file
View File

@ -0,0 +1,75 @@
diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/src/widgets/dialogs/qmessagebox.cpp qt-everywhere-opensource-src-5.5.0/qtbase/src/widgets/dialogs/qmessagebox.cpp
--- qt-everywhere-opensource-src-5.5.0.orig/qtbase/src/widgets/dialogs/qmessagebox.cpp 2015-08-26 14:28:59.145124600 +0100
+++ qt-everywhere-opensource-src-5.5.0/qtbase/src/widgets/dialogs/qmessagebox.cpp 2015-08-26 15:46:50.092516900 +0100
@@ -68,9 +68,11 @@
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
HMENU qt_getWindowsSystemMenu(const QWidget *w)
{
- if (QWindow *window = QApplicationPrivate::windowForWidget(w))
- if (void *handle = QGuiApplication::platformNativeInterface()->nativeResourceForWindow("handle", window))
- return GetSystemMenu(reinterpret_cast<HWND>(handle), false);
+ if (QGuiApplication::platformNativeInterface()) {
+ if (QWindow *window = QApplicationPrivate::windowForWidget(w))
+ if (void *handle = QGuiApplication::platformNativeInterface()->nativeResourceForWindow("handle", window))
+ return GetSystemMenu(reinterpret_cast<HWND>(handle), false);
+ }
return 0;
}
#endif
diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/src/widgets/dialogs/qwizard_win.cpp qt-everywhere-opensource-src-5.5.0/qtbase/src/widgets/dialogs/qwizard_win.cpp
--- qt-everywhere-opensource-src-5.5.0.orig/qtbase/src/widgets/dialogs/qwizard_win.cpp 2015-08-26 14:28:59.139624600 +0100
+++ qt-everywhere-opensource-src-5.5.0/qtbase/src/widgets/dialogs/qwizard_win.cpp 2015-08-26 15:46:50.084516900 +0100
@@ -288,10 +288,11 @@
// The dynamic property takes effect when creating the platform window.
window->setProperty("_q_windowsCustomMargins", customMarginsV);
// If a platform window exists, change via native interface.
- if (QPlatformWindow *platformWindow = window->handle()) {
- QGuiApplication::platformNativeInterface()->
- setWindowProperty(platformWindow, QStringLiteral("WindowsCustomMargins"),
- customMarginsV);
+ if (QGuiApplication::platformNativeInterface()) {
+ if (QPlatformWindow *platformWindow = window->handle())
+ QGuiApplication::platformNativeInterface()->
+ setWindowProperty(platformWindow, QStringLiteral("WindowsCustomMargins"),
+ customMarginsV);
}
}
}
@@ -685,6 +686,8 @@
// wizard is a child window.
HDC QVistaHelper::backingStoreDC(const QWidget *wizard, QPoint *offset)
{
+ if (!QGuiApplication::platformNativeInterface())
+ return static_cast<HDC>(0);
HDC hdc = static_cast<HDC>(QGuiApplication::platformNativeInterface()->nativeResourceForBackingStore(QByteArrayLiteral("getDC"), wizard->backingStore()));
*offset = QPoint(0, 0);
if (!wizard->windowHandle())
@@ -699,7 +702,7 @@
// Do not use winId() as this enforces native children of the parent
// widget when called before show() as happens when calling setWizardStyle().
if (QWindow *window = wizard->windowHandle())
- if (window->handle())
+ if (window->handle() && QGuiApplication::platformNativeInterface())
if (void *vHwnd = QGuiApplication::platformNativeInterface()->nativeResourceForWindow(QByteArrayLiteral("handle"), window))
return static_cast<HWND>(vHwnd);
qWarning().nospace() << "Failed to obtain HWND for wizard.";
diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtbase/src/widgets/kernel/qapplication_p.h qt-everywhere-opensource-src-5.5.0/qtbase/src/widgets/kernel/qapplication_p.h
--- qt-everywhere-opensource-src-5.5.0.orig/qtbase/src/widgets/kernel/qapplication_p.h 2015-08-26 14:28:59.349124600 +0100
+++ qt-everywhere-opensource-src-5.5.0/qtbase/src/widgets/kernel/qapplication_p.h 2015-08-26 15:46:50.098516900 +0100
@@ -254,10 +254,12 @@
#ifdef Q_OS_WIN
static HWND getHWNDForWidget(const QWidget *widget)
{
- if (QWindow *window = windowForWidget(widget))
- if (window->handle())
- return static_cast<HWND> (QGuiApplication::platformNativeInterface()->
- nativeResourceForWindow(QByteArrayLiteral("handle"), window));
+ if (QGuiApplication::platformNativeInterface()) {
+ if (QWindow *window = windowForWidget(widget))
+ if (window->handle())
+ return static_cast<HWND> (QGuiApplication::platformNativeInterface()->
+ nativeResourceForWindow(QByteArrayLiteral("handle"), window));
+ }
return 0;
}
#endif

11
mingw-w64-qt5/0049-qt-5.5.0-win32-g++-dont-define-QT_NO_SYSTEMSEMAPHORE-QT_NO_SHAREDMEMORY.patch Normal file
View File

@ -0,0 +1,11 @@
--- qtbase/configure.orig 2015-08-25 12:42:05.631715900 +0100
+++ qtbase/configure 2015-08-26 13:57:02.447124600 +0100
@@ -4462,7 +4462,7 @@
if compileTest unix/ipc_posix "ipc_posix" ; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
else
- if [ "$XPLATFORM_ANDROID" = "no" ] ; then
+ if [ "$XPLATFORM_ANDROID" = "no" -a "$XPLATFORM_MINGW" = "no" ] ; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY"
fi
fi

56
mingw-w64-qt5/PKGBUILD
View File

@ -80,7 +80,7 @@ else
fi
pkgver=${_ver_base//-/}
pkgrel=2
pkgrel=3
arch=('any')
pkgdesc="A cross-platform application and UI framework (mingw-w64${_namesuff})"
url='http://qt-project.org/'
@ -183,14 +183,16 @@ source=(#http://download.qt-project.org/development_releases/qt/${pkgver%.*}/${_
0035-qt-5.3.2-dont-add-resource-files-to-qmake-libs.patch
0036-qt-5.3.2-win32-qt5-static-cmake-link-ws2_32-and--static.patch
0037-qt-5.4.0-Improve-cmake-plugin-detection-as-not-all-are-suffixed-Plugin.patch
0038-qt-5.4.0-Make-it-possible-to-use-static-builds-of-Qt-with-CMa.patch
0039-qt-5.4.0-Generate-separated-libraries-in-prl-files-for-CMake.patch
0040-qt-5.4.0-Fix-mingw-create_cmake-prl-file-has-no-lib-prefix.patch
0041-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch
0042-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch
0043-qt-5.4.1-static-use-qminimal-platform-plugin-for-qcollectiongenerator.patch
0044-qt-5.4.1-Revert-Revert-fix-NTFS-mount-points.patch
0045-qt-5.4.1-Emit-QMAKE_DEFAULT_LIBDIRS-and-INCDIRS-to-qconfig-pri.patch)
0038-qt-5.5.0-cmake-Rearrange-STATIC-vs-INTERFACE-targets.patch
0039-qt-5.4.0-Make-it-possible-to-use-static-builds-of-Qt-with-CMa.patch
0040-qt-5.4.0-Generate-separated-libraries-in-prl-files-for-CMake.patch
0041-qt-5.4.0-Fix-mingw-create_cmake-prl-file-has-no-lib-prefix.patch
0042-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch
0043-qt-5.5.0-static-cmake-regex-QT_INSTALL_LIBS-in-QMAKE_PRL_LIBS_FOR_CMAKE.patch
0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch
0045-qt-5.4.1-static-use-qminimal-platform-plugin-for-qcollectiongenerator.patch
0046-qt-5.4.1-Revert-Revert-fix-NTFS-mount-points.patch
0047-qt-5.4.1-Emit-QMAKE_DEFAULT_LIBDIRS-and-INCDIRS-to-qconfig-pri.patch)
# Translates using cygpath according to the ${_make} being used
# (so either mingw32-make or MSYS2 make can be used)
@ -302,18 +304,24 @@ prepare() {
# Patches so that qt5-static can be used with cmake.
patch -p1 -i ${srcdir}/0036-qt-5.3.2-win32-qt5-static-cmake-link-ws2_32-and--static.patch
patch -p1 -i ${srcdir}/0037-qt-5.4.0-Improve-cmake-plugin-detection-as-not-all-are-suffixed-Plugin.patch
patch -p1 -i ${srcdir}/0038-qt-5.4.0-Make-it-possible-to-use-static-builds-of-Qt-with-CMa.patch
patch -p1 -i ${srcdir}/0039-qt-5.4.0-Generate-separated-libraries-in-prl-files-for-CMake.patch
patch -p1 -i ${srcdir}/0040-qt-5.4.0-Fix-mingw-create_cmake-prl-file-has-no-lib-prefix.patch
patch -p1 -i ${srcdir}/0041-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch
# patch -p1 -i ${srcdir}/0042-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch
patch -p1 -i ${srcdir}/0043-qt-5.4.1-static-use-qminimal-platform-plugin-for-qcollectiongenerator.patch
pushd qtbase > /dev/null
patch -p1 -i ${srcdir}/0044-qt-5.4.1-Revert-Revert-fix-NTFS-mount-points.patch
patch -p1 -i ${srcdir}/0038-qt-5.5.0-cmake-Rearrange-STATIC-vs-INTERFACE-targets.patch
popd
patch -p1 -i ${srcdir}/0039-qt-5.4.0-Make-it-possible-to-use-static-builds-of-Qt-with-CMa.patch
patch -p1 -i ${srcdir}/0040-qt-5.4.0-Generate-separated-libraries-in-prl-files-for-CMake.patch
patch -p1 -i ${srcdir}/0041-qt-5.4.0-Fix-mingw-create_cmake-prl-file-has-no-lib-prefix.patch
patch -p1 -i ${srcdir}/0042-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch
patch -p1 -i ${srcdir}/0043-qt-5.5.0-static-cmake-regex-QT_INSTALL_LIBS-in-QMAKE_PRL_LIBS_FOR_CMAKE.patch
# patch -p1 -i ${srcdir}/0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch
patch -p1 -i ${srcdir}/0045-qt-5.4.1-static-use-qminimal-platform-plugin-for-qcollectiongenerator.patch
pushd qtbase > /dev/null
patch -p1 -i ${srcdir}/0046-qt-5.4.1-Revert-Revert-fix-NTFS-mount-points.patch
popd > /dev/null
patch -p1 -i ${srcdir}/0045-qt-5.4.1-Emit-QMAKE_DEFAULT_LIBDIRS-and-INCDIRS-to-qconfig-pri.patch
patch -p1 -i ${srcdir}/0047-qt-5.4.1-Emit-QMAKE_DEFAULT_LIBDIRS-and-INCDIRS-to-qconfig-pri.patch
# See: https://bugreports.qt-project.org/browse/QTBUG-37902
# _ver_num=${_ver_base%%-*}
@ -627,11 +635,13 @@ md5sums=('c2a249e8795d45200d997d96860d0353'
'df6964dca18a315fab60adc0d7a7aedb'
'fbf568c6ed68ab4a372e03f9b84dafe8'
'f323f5016ab38ceb3f10673ef9ae4337'
'd66b2afce490ab8a82feae08c747e367'
'92fb1954fe3ab91d99a09c7f8a878218'
'ab2cac300aa7a908ea8840649f0b51fc'
'f1d010fc441350b8ff20213714ecae74'
'd9e0f8a09b24757c274187469c7661d4'
'3323d4694a011b1048512fa27cf9768c'
'6e4a9c4850a1505a442f78d415ffadb9'
'e49923654e2dff35e86cda6e1b566118'
'b2269fae567d93fed03fe2affeca116c'
'e1307c1fd57be3024a1e715c9061ebfb'
'f63b3d50851ede0124dedccdcd7a6aed'
'27e0f474f66f05f3911c71621b24636d'
'51016015352313cdd749ae1ff3e14614'
'9bc9c1177134d0f2fd782db3f394a318'
'35ca99ccfe9fcd2ed2d8668023d885e2')
'857309396cfdf6bfff91fe86afb947c2')