From 17207917868476622b00656fc5f139ae126b90ff Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 25 Nov 2020 14:13:29 -0800 Subject: kirigami: maintain our patches relative to upstream Having them as commits like this should make it easier to migrate them as we update the underlying Kirigami version. Signed-off-by: Dirk Hohndel --- ...clude-the-shared-not-shared-result-in-log.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 mobile-widgets/3rdparty/0008-include-the-shared-not-shared-result-in-log.patch (limited to 'mobile-widgets/3rdparty/0008-include-the-shared-not-shared-result-in-log.patch') diff --git a/mobile-widgets/3rdparty/0008-include-the-shared-not-shared-result-in-log.patch b/mobile-widgets/3rdparty/0008-include-the-shared-not-shared-result-in-log.patch new file mode 100644 index 000000000..38bb2aa7d --- /dev/null +++ b/mobile-widgets/3rdparty/0008-include-the-shared-not-shared-result-in-log.patch @@ -0,0 +1,33 @@ +From a17a22e08e3398b243dbc369a8ff4c790c58db44 Mon Sep 17 00:00:00 2001 +From: Dirk Hohndel +Date: Thu, 3 Dec 2020 15:01:18 -0800 +Subject: [PATCH 08/11] include the shared / not shared result in log + +We shouldn't be building Kirigami as shared library, yet that's +what makes our GitHub builds fail. + +Signed-off-by: Dirk Hohndel +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9f1404ac..6e4f4bba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,9 +37,12 @@ set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.kirigami) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + + if(NOT BUILD_SHARED_LIBS) ++ message(STATUS "Static build of libkirigami") + add_definitions(-DKIRIGAMI_BUILD_TYPE_STATIC) + add_definitions(-DQT_PLUGIN) + add_definitions(-DQT_STATICPLUGIN=1) ++else() ++ message(STATUS "Shared build of libkirigami -- BUILD_SHARED_LIBS is \"${BUILD_SHARED_LIBS}\"") + endif() + + ################# set KDE specific information ################# +-- +2.25.1 + -- cgit v1.2.3-70-g09d2