From c780faafe6d55d2f846785e03a1cfd76030e42da Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 4 Jan 2015 01:44:03 +0000 Subject: [PATCH] extra-cmake-modules: Update to 1.5.0 / 5.5.0 --- mingw-w64-extra-cmake-modules/PKGBUILD | 10 ++++++---- .../set-AUTOSTATICPLUGINS.patch | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 mingw-w64-extra-cmake-modules/set-AUTOSTATICPLUGINS.patch diff --git a/mingw-w64-extra-cmake-modules/PKGBUILD b/mingw-w64-extra-cmake-modules/PKGBUILD index 9e78f06915..7d9c7b4773 100644 --- a/mingw-w64-extra-cmake-modules/PKGBUILD +++ b/mingw-w64-extra-cmake-modules/PKGBUILD @@ -4,8 +4,8 @@ _realname=extra-cmake-modules pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.3.0 -_pkgver=5.3.0 +pkgver=1.5.0 +_pkgver=5.5.0 pkgrel=1 pkgdesc='Extra CMake modules (mingw-w64)' arch=('any') @@ -13,8 +13,10 @@ url='https://projects.kde.org/projects/kdesupport/extra-cmake-modules' license=('LGPL') depends=("${MINGW_PACKAGE_PREFIX}-cmake") # makedepends=('python-sphinx') # qt5-tools for QtHelp pages -source=("http://download.kde.org/stable/frameworks/${_pkgver}/${_realname}-${pkgver}.tar.xz") -md5sums=('a0b95a4e5ffb8bde51a95584292b03ed') +source=("http://download.kde.org/stable/frameworks/${_pkgver%.*}/${_realname}-${pkgver}.tar.xz" + "set-AUTOSTATICPLUGINS.patch") +md5sums=('2967e1ac220cf9b3a52cd19ec2a608df' + '0d249754247382f3b8dda80d6833aac4') prepare() { mkdir -p build-${CARCH} diff --git a/mingw-w64-extra-cmake-modules/set-AUTOSTATICPLUGINS.patch b/mingw-w64-extra-cmake-modules/set-AUTOSTATICPLUGINS.patch new file mode 100644 index 0000000000..f0f5329b47 --- /dev/null +++ b/mingw-w64-extra-cmake-modules/set-AUTOSTATICPLUGINS.patch @@ -0,0 +1,15 @@ +diff -urN extra-cmake-modules-1.5.0.orig/kde-modules/KDECMakeSettings.cmake extra-cmake-modules-1.5.0/kde-modules/KDECMakeSettings.cmake +--- extra-cmake-modules-1.5.0.orig/kde-modules/KDECMakeSettings.cmake 2015-01-04 01:35:09.800389800 +0000 ++++ extra-cmake-modules-1.5.0/kde-modules/KDECMakeSettings.cmake 2015-01-04 01:37:00.535144400 +0000 +@@ -151,6 +151,11 @@ + # Since CMake 2.8.6 + set(CMAKE_AUTOMOC ON) + ++ # Enable autostaticplugins in MSYS2 qt5-static/cmake ++ # Since https://github.com/Alexpux/MINGW-packages/commit/e5517227778695a51bd56df07f1b05c43103ad3f ++ # and https://github.com/Alexpux/MINGW-packages/commit/aa8f86ab267446002bcbb59e1455fbdf0d9f1cde ++ set(CMAKE_AUTOSTATICPLUGINS ON) ++ + # By default, create 'GUI' executables. This can be reverted on a per-target basis + # using ECMMarkNonGuiExecutable + # Since CMake 2.8.8