kcwsh: Static build fixes

This commit is contained in:
Ray Donnelly
2015-01-06 23:42:31 +00:00
parent f07f8126e2
commit 29a2bd39f7
3 changed files with 80 additions and 4 deletions

View File

@@ -0,0 +1,31 @@
From 9056181cf8bfbcc580be3857f4291e040379f7ce Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 6 Jan 2015 11:46:51 +0000
Subject: [PATCH 1/2] Add -std=c++11 globally
As suggested by Kevin Funk in:
http://mail.kde.org/pipermail/kde-windows/2014-November/009044.html
---
CMakeLists.txt | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3df427..dc0ba42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,11 @@ if(MSVC)
add_definitions(/Zc:wchar_t-)
endif()
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
+CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+endif()
+
set(KCWSH_VERSION "${KCWSH_MAJOR_VERSION}.${KCWSH_MINOR_VERSION}.${KCWSH_PATCH_VERSION}")
configure_file(cmake/KcwSHConfigVersion.cmake.in
--
2.2.1

View File

@@ -0,0 +1,34 @@
From 561bffe213fd217b48e27423eec340ef7b77c534 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 6 Jan 2015 12:20:01 +0000
Subject: [PATCH 2/2] qt-frontend: Set AUTOSTATICPLUGINS, don't force lib
kcwshqt to be SHARED
---
frontends/qt/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/frontends/qt/CMakeLists.txt b/frontends/qt/CMakeLists.txt
index d5eb4ba..51a059d 100644
--- a/frontends/qt/CMakeLists.txt
+++ b/frontends/qt/CMakeLists.txt
@@ -1,5 +1,7 @@
# place for a qt based frontend
+set(CMAKE_AUTOSTATICPLUGINS ON)
+
if(QT4_FOUND)
include_directories(${QT_INCLUDES})
@@ -16,7 +18,7 @@ set(kcwshqt_SRCS
qterminalwidget.cpp
)
-add_library(kcwshqt SHARED ${kcwshqt_SRCS} ${kcwshqt_MOCS})
+add_library(kcwshqt ${kcwshqt_SRCS} ${kcwshqt_MOCS})
if(Qt5_FOUND)
target_link_libraries(kcwshqt kcwsh Qt5::Widgets Qt5::Core)
else()
--
2.2.1

View File

@@ -15,14 +15,24 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-extra-cmake-modules")
depends=()
_kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-qt5${_namesuff}" "${MINGW_PACKAGE_PREFIX}-bzip2"
groups=('kf5')
source=("${_realname}"::"git://anongit.kde.org/${_basename}.git")
md5sums=('SKIP')
source=("${_realname}"::"git://anongit.kde.org/${_basename}.git"
"0001-Add-std-c-11-globally.patch"
"0002-qt-frontend-Set-AUTOSTATICPLUGINS-don-t-force-lib-kc.patch")
md5sums=('SKIP'
'9a28e07b8f840054141a52c4f1bad6e3'
'9e266e7e507f23b33c15d07813c7d402')
pkgver() {
cd "${srcdir}/${_realname}"
cd "${srcdir}"/${_realname}
printf "%s.%s.%s" "$_ver_base" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
prepare() {
cd "${srcdir}"/${_realname}
git am "${srcdir}"/0001-Add-std-c-11-globally.patch
git am "${srcdir}"/0002-qt-frontend-Set-AUTOSTATICPLUGINS-don-t-force-lib-kc.patch
}
build() {
local -a extra_config
mkdir -p build-${CARCH}${_variant}
@@ -35,6 +45,7 @@ build() {
QT5_PREFIX=${MINGW_PREFIX}
fi
MSYS2_ARG_CONV_EXCL=-DCMAKE_INSTALL_PREFIX \
cmake ../${_realname} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${QT5_PREFIX} \
@@ -45,7 +56,7 @@ build() {
-DECM_DIR=${MINGW_PREFIX}/share/ECM \
"${extra_config[@]}" \
-G'MSYS Makefiles'
make
make VERBOSE=1
}
package() {