Accepting request 699563 from home:wolfi323:test

- Add Correctly-show-mem-size-over-4GiB-on-32bit.patch to fix wrong
  display of RAM size on a 32bit system if there is more than 4 GiB
  (boo#1131826, kde#406351)

OBS-URL: https://build.opensuse.org/request/show/699563
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=230
This commit is contained in:
Fabian Vogt 2019-04-30 08:57:19 +00:00 committed by Git OBS Bridge
parent b559f78839
commit a956c5d5bd
3 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From 10d60170eaa46c3e4233c4eef966418d0065754d Mon Sep 17 00:00:00 2001
From: Christoph Feck <cfeck@kde.org>
Date: Tue, 30 Apr 2019 00:55:12 +0200
Subject: Correctly show memory sizes > 4 GiB on 32 bit Linux
BUG: 406351
FIXED-IN: 5.16.0
Differential Revision: https://phabricator.kde.org/D20828
---
Modules/about-distro/src/Module.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/about-distro/src/Module.cpp b/Modules/about-distro/src/Module.cpp
index 56358cd..b4bc67e 100644
--- a/Modules/about-distro/src/Module.cpp
+++ b/Modules/about-distro/src/Module.cpp
@@ -56,7 +56,7 @@ static qlonglong calculateTotalRam()
struct sysinfo info;
if (sysinfo(&info) == 0)
// manpage "sizes are given as multiples of mem_unit bytes"
- ret = info.totalram * info.mem_unit;
+ ret = qlonglong(info.totalram) * info.mem_unit;
#elif defined(Q_OS_FREEBSD)
/* Stuff for sysctl */
size_t len;
--
cgit v1.1

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Apr 30 05:15:51 UTC 2019 - wbauer@tmo.at
- Add Correctly-show-mem-size-over-4GiB-on-32bit.patch to fix wrong
display of RAM size on a 32bit system if there is more than 4 GiB
(boo#1131826, kde#406351)
-------------------------------------------------------------------
Tue Apr 2 12:40:57 UTC 2019 - fabian@ritter-vogt.de

View File

@ -37,6 +37,8 @@ Source2: plasma.keyring
%endif
# PATCH-FIX-OPENSUSE plasma-session-name.patch
Patch0: plasma-session-name.patch
# PATCH-FIX-UPSTREAM
Patch1: Correctly-show-mem-size-over-4GiB-on-32bit.patch
BuildRequires: extra-cmake-modules >= 1.2.0
BuildRequires: kf5-filesystem
BuildRequires: libraw1394-devel
@ -86,7 +88,7 @@ KDE Utility that provides information about a computer system.
%lang_package
%prep
%setup -q -n kinfocenter-%{version}
%patch0 -p1
%autopatch -p1
%build
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}