From d5bea872270d2123f74b8c84710f7565cfd6a325 Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Aug 06 2020 14:23:09 +0000
Subject: BR: qt5-qtbase-private-devel

Applied an upstream patch to fix build with Qt 5.14
Improve compatibility with new CMake macro

---

diff --git a/0001-build-fix-cc1plus-xxx.cpp-is-not-a-directory-warning.patch b/0001-build-fix-cc1plus-xxx.cpp-is-not-a-directory-warning.patch
new file mode 100644
index 0000000..93ef02a
--- /dev/null
+++ b/0001-build-fix-cc1plus-xxx.cpp-is-not-a-directory-warning.patch
@@ -0,0 +1,45 @@
+From 791fbcc9d24532df04b81bd9dabb99fb8aff79ab Mon Sep 17 00:00:00 2001
+From: Hualet Wang <mr.asianwang@gmail.com>
+Date: Tue, 6 Aug 2019 16:46:26 +0800
+Subject: [PATCH] build: fix "cc1plus xxx.cpp is not a directory" warnings
+
+---
+ src/frame/CMakeLists.txt | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/src/frame/CMakeLists.txt b/src/frame/CMakeLists.txt
+index acb137cd7..cf28dacf2 100644
+--- a/src/frame/CMakeLists.txt
++++ b/src/frame/CMakeLists.txt
+@@ -1149,13 +1149,6 @@ set(TEST_SRCS
+     ${DISPLAY_FILES}
+     ${WIDGETS_FILES}
+     ${MODULE_FILES}
+-    ${DtkWidget_INCLUDE_DIRS}
+-    ${DFrameworkDBus_INCLUDE_DIRS}
+-    ${QGSettings_INCLUDE_DIRS}
+-    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+-    ${Qt5X11Extras_INCLUDE_DIRS}
+-    ${QGSettings_INCLUDE_DIRS}
+-    ${XCB_EWMH_INCLUDE_DIRS}
+ )
+ 
+ add_executable(display-unit-test
+@@ -1163,7 +1156,13 @@ add_executable(display-unit-test
+ )
+ 
+ target_include_directories(display-unit-test PUBLIC
+-    ${TEST_SRCS}
++    ${DtkWidget_INCLUDE_DIRS}
++    ${DFrameworkDBus_INCLUDE_DIRS}
++    ${QGSettings_INCLUDE_DIRS}
++    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
++    ${Qt5X11Extras_INCLUDE_DIRS}
++    ${QGSettings_INCLUDE_DIRS}
++    ${XCB_EWMH_INCLUDE_DIRS}
+     ${PROJECT_BINARY_DIR}
+ )
+ 
+-- 
+2.26.2
+
diff --git a/deepin-control-center.spec b/deepin-control-center.spec
index bc2a77f..5230c88 100644
--- a/deepin-control-center.spec
+++ b/deepin-control-center.spec
@@ -7,6 +7,8 @@ Summary:        New control center for Linux Deepin
 License:        GPLv3
 URL:            https://github.com/linuxdeepin/dde-control-center
 Source0:        %{url}/archive/%{version}/%{repo}-%{version}.tar.gz
+# applied in upstream 791fbcc9d24532df04b81bd9dabb99fb8aff79ab
+Patch0:         0001-build-fix-cc1plus-xxx.cpp-is-not-a-directory-warning.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  desktop-file-utils
@@ -29,6 +31,7 @@ BuildRequires:  pkgconfig(xcb-ewmh)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  cmake(KF5NetworkManagerQt)
 BuildRequires:  qt5-linguist
+BuildRequires:  qt5-qtbase-private-devel
 Requires:       deepin-account-faces
 Requires:       deepin-api
 Requires:       deepin-daemon
@@ -46,16 +49,17 @@ New control center for Linux Deepin.
 
 %prep
 %setup -q -n %{repo}-%{version}
-sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
+%patch0 -p1
 sed -i '/%{repo}/s|\.\./lib|%{_libdir}|' src/frame/pluginscontroller.cpp
 
 %build
+export PATH=%{_qt5_bindir}:$PATH
 %cmake . -DDCC_DISABLE_GRUB=YES \
          -DDISABLE_SYS_UPDATE=YES
-%make_build
+%cmake_build
 
 %install
-%make_install INSTALL_ROOT=%{buildroot}
+%cmake_install
 # place holder plugins dir
 mkdir -p %{buildroot}%{_libdir}/%{repo}/plugins
 
@@ -74,6 +78,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.desktop ||:
 %{_libdir}/%{repo}/
 
 %changelog
+* Thu Aug  6 2020 Robin Lee <cheeselee@fedoraproject.org> - 5.0.0-5
+- BR: qt5-qtbase-private-devel
+- Applied an upstream patch to fix build with Qt 5.14
+- Improve compatibility with new CMake macro
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-5
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild