!13 modify version-info error

From: @pei-jiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2022-03-14 03:08:59 +00:00 committed by Gitee
commit 87f57f7206
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 51 additions and 1 deletions

View File

@ -0,0 +1,45 @@
From e6034240c90de760062bce5eddd1500748ca1542 Mon Sep 17 00:00:00 2001
From: pei-jiankang <peijiankang@kylinos.cn>
Date: Mon, 14 Mar 2022 10:46:34 +0800
Subject: [PATCH] modify version-info error
---
src/menumodule.cpp | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/menumodule.cpp b/src/menumodule.cpp
index 040a8e5..6cd0b48 100644
--- a/src/menumodule.cpp
+++ b/src/menumodule.cpp
@@ -247,7 +247,27 @@ QHBoxLayout* menuModule::initTitleBar(){
QVBoxLayout* menuModule::initBody(){
appVersion = "3.1.1";
-
+ FILE *pp = NULL;
+ char *line = NULL;
+ char *q = NULL;
+ size_t len = 0;
+ ssize_t read;
+
+ pp = popen("rpm -qa indicator-china-weather", "r");
+ if(pp) { while((read = getline(&line, &len, pp)) != -1){
+ q = strrchr(line, '\n');
+ *q = '\0';
+ QString content = line;
+ QStringList list = content.split("-");
+ if (list.size() >= 3)
+ appVersion = list.at(3);
+ }
+ }
+ if(line){
+ free(line);
+ line = NULL;
+ }
+ pclose(pp);
QPushButton *bodyIcon = new QPushButton();
bodyIcon->setFixedSize(96,96);
--
2.33.0

View File

@ -1,11 +1,12 @@
%define debug_package %{nil}
Name: indicator-china-weather
Version: 3.1.3
Release: 1
Release: 2
Summary: The weather data are from the heweather API s6 version.
License: GPL-3.0+
URL: https://github.com/UbuntuKylin/indicator-china-weather
Source0: %{name}-%{version}.tar.gz
Patch01: 0001-modify-version-info-error.patch
BuildRequires: qtchooser
BuildRequires: qt5-qtx11extras-devel
@ -30,6 +31,7 @@ BuildRequires: GeoIP-devel
%prep
%setup -q
%patch1 -p1
%build
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default indicator-china-weather.pro
@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/man/man1/indicator-china-weather.1.gz
%changelog
* Mon Mar 14 2022 pei-jiankang <peijianakng@kylinos.cn> - 3.1.3-2
- modify version-info error
* Thu Mar 03 2022 tanyulong <tanyulong@kylinos.cn> - 3.1.3-1
- update to uptream version 3.1.3