From 75249d1504bd0f9a81a4eb425f66fe45f1e8addd Mon Sep 17 00:00:00 2001 From: tanyulong2021 Date: Thu, 29 Jul 2021 17:22:17 +0800 Subject: [PATCH] fix template with C linkage error --- 0001-fix-template-with-C-linkage-error.patch | 124 +++++++++++++++++++ ukui-window-switch.spec | 7 +- 2 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 0001-fix-template-with-C-linkage-error.patch diff --git a/0001-fix-template-with-C-linkage-error.patch b/0001-fix-template-with-C-linkage-error.patch new file mode 100644 index 0000000..db0b090 --- /dev/null +++ b/0001-fix-template-with-C-linkage-error.patch @@ -0,0 +1,124 @@ +From 11d4ec4827447c058ab3a00f4d37864ed95e1e44 Mon Sep 17 00:00:00 2001 +From: tanyulong +Date: Thu, 29 Jul 2021 15:37:53 +0800 +Subject: [PATCH] fix template with C linkage error + +--- + src/ukws_helper.h | 2 -- + src/ukws_indicator.cpp | 2 -- + src/ukws_manager.cpp | 2 -- + src/ukws_window_box.h | 2 -- + src/ukws_window_info.h | 2 -- + src/ukws_wnck_operator.h | 2 -- + src/ukws_workspace_box.h | 2 -- + 7 files changed, 14 deletions(-) + +diff --git a/src/ukws_helper.h b/src/ukws_helper.h +index 610e91c..59806de 100755 +--- a/src/ukws_helper.h ++++ b/src/ukws_helper.h +@@ -20,10 +20,8 @@ + #ifndef UKWS_HELPER_H + #define UKWS_HELPER_H + +-extern "C" { + #include + #include +-} + + #include + #include +diff --git a/src/ukws_indicator.cpp b/src/ukws_indicator.cpp +index 65805df..f10f857 100755 +--- a/src/ukws_indicator.cpp ++++ b/src/ukws_indicator.cpp +@@ -34,11 +34,9 @@ + #include + #include + +-extern "C" { + #include + #include + #include +-} + + UkwsIndicator::UkwsIndicator(QWidget *parent) : QWidget(parent) + { +diff --git a/src/ukws_manager.cpp b/src/ukws_manager.cpp +index d367af0..e9cffe3 100755 +--- a/src/ukws_manager.cpp ++++ b/src/ukws_manager.cpp +@@ -26,9 +26,7 @@ + #include + #include + +-extern "C" { + #include +-} + + //#define NOT_REG_WINDOW_SWITCH_HOTKEY + //#define NOT_REG_WORKSPACE_VIEW_HOTKEY +diff --git a/src/ukws_window_box.h b/src/ukws_window_box.h +index feb6a4b..d16da93 100755 +--- a/src/ukws_window_box.h ++++ b/src/ukws_window_box.h +@@ -20,10 +20,8 @@ + #ifndef UKWS_WINDOWBOX_H + #define UKWS_WINDOWBOX_H + +-extern "C" { + #define WNCK_I_KNOW_THIS_IS_UNSTABLE + #include +-} + + #include "ukws_window_extra_label.h" + +diff --git a/src/ukws_window_info.h b/src/ukws_window_info.h +index 2c6d4e6..ef590e8 100755 +--- a/src/ukws_window_info.h ++++ b/src/ukws_window_info.h +@@ -20,10 +20,8 @@ + #ifndef UKWS_WINDOW_INFO_H + #define UKWS_WINDOW_INFO_H + +-extern "C" { + #define WNCK_I_KNOW_THIS_IS_UNSTABLE + #include +-} + + #include + #include +diff --git a/src/ukws_wnck_operator.h b/src/ukws_wnck_operator.h +index 6391ad1..d75409e 100755 +--- a/src/ukws_wnck_operator.h ++++ b/src/ukws_wnck_operator.h +@@ -20,10 +20,8 @@ + #ifndef UKWS_WNCK_OPERATOR_H + #define UKWS_WNCK_OPERATOR_H + +-extern "C" { + #define WNCK_I_KNOW_THIS_IS_UNSTABLE + #include +-} + + #include + +diff --git a/src/ukws_workspace_box.h b/src/ukws_workspace_box.h +index 1023ca7..a039e06 100755 +--- a/src/ukws_workspace_box.h ++++ b/src/ukws_workspace_box.h +@@ -20,11 +20,9 @@ + #ifndef UKWSWORKSPACEBOX_H + #define UKWSWORKSPACEBOX_H + +-extern "C" { + #define WNCK_I_KNOW_THIS_IS_UNSTABLE + #include + #include +-} + + #include "ukws_window_extra_label.h" + #include "ukws_wnck_operator.h" +-- +2.27.0 + diff --git a/ukui-window-switch.spec b/ukui-window-switch.spec index 881621c..2d15192 100644 --- a/ukui-window-switch.spec +++ b/ukui-window-switch.spec @@ -1,11 +1,12 @@ %define debug_package %{nil} Name: ukui-window-switch Version: 3.0.1 -Release: 1 +Release: 2 Summary: Front of the window switch License: GPL-2+ BSD-2-clause BSD-3-clause and GPL-2+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz +patch0: 0001-fix-template-with-C-linkage-error.patch BuildRequires: qt5-qtbase-devel BuildRequires: libblkid-devel @@ -25,6 +26,7 @@ Requires: ukwm >= 1.1.0 %prep %setup -q +%patch0 -p1 %build qmake-qt5 @@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ukui-window-switch/ %changelog +* Tue Jul 29 2021 tanyulong - 3.0.1-2 +- fix template with C linkage error + * Mon Oct 26 2020 douyan - 3.0.1-1 - update to upstream version 3.0.0-1+1103