From 1090ac4c8cde23415f9d1eee362e1d0b8073aad9 Mon Sep 17 00:00:00 2001
From: dou33 <johnwo3396@hotmail.com>
Date: Tue, 26 Oct 2021 18:00:09 +0800
Subject: [PATCH] fix vnc display issue

---
 0001-fix-vnc-show-issue.patch | 26 ++++++++++++++++++++++++++
 indicator-china-weather.spec  |  8 +++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 0001-fix-vnc-show-issue.patch

diff --git a/0001-fix-vnc-show-issue.patch b/0001-fix-vnc-show-issue.patch
new file mode 100644
index 0000000..c462ce0
--- /dev/null
+++ b/0001-fix-vnc-show-issue.patch
@@ -0,0 +1,26 @@
+From 90a2ef1e2e7593bd192c6ddf51e16a8914e8517b Mon Sep 17 00:00:00 2001
+From: dou33 <johnwo3396@hotmail.com>
+Date: Tue, 26 Oct 2021 17:32:01 +0800
+Subject: [PATCH] fix vnc show issue
+
+---
+ src/qtsingleapplication/qtsingleapplication.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/qtsingleapplication/qtsingleapplication.cpp b/src/qtsingleapplication/qtsingleapplication.cpp
+index d0fb15d..dc27559 100755
+--- a/src/qtsingleapplication/qtsingleapplication.cpp
++++ b/src/qtsingleapplication/qtsingleapplication.cpp
+@@ -324,7 +324,8 @@ void QtSingleApplication::activateWindow()
+ {
+     if (actWin) {
+         actWin->setWindowState(actWin->windowState() & ~Qt::WindowMinimized);
+-        actWin->raise();
++        actWin->show();//fix vnc display issue
++	actWin->raise();
+         actWin->activateWindow();
+     }
+ }
+-- 
+2.24.3 (Apple Git-128)
+
diff --git a/indicator-china-weather.spec b/indicator-china-weather.spec
index 029b4d8..156f7fb 100644
--- a/indicator-china-weather.spec
+++ b/indicator-china-weather.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Name:           indicator-china-weather
 Version:        3.1.0
-Release:        2
+Release:        3
 Summary:        The weather data are from the heweather API s6 version.
 License:        GPL-3.0+
 URL:            https://github.com/UbuntuKylin/indicator-china-weather
@@ -22,6 +22,8 @@ BuildRequires:  GeoIP-devel
 # Requires: NetworkManager
 
 patch0:  0001-remove-about.patch
+patch1:  0001-fix-vnc-show-issue.patch
+
 
 %description
  Indicator that displays China weather information
@@ -32,6 +34,7 @@ patch0:  0001-remove-about.patch
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default  indicator-china-weather.pro
@@ -63,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man1/indicator-china-weather.1.gz
 
 %changelog
+* Tue Oct 26 2021 douyan <douyan@kylinos.cn> - 3.1.0-3
+- fix vnc show issue
+
 * Tue Jan 19 2021 lvhan <lvhan@kylinos.cn> - 3.1.0-2
 - remove about