forked from pool/kinfocenter5
Plasma 5.16 Beta, 2nd try. Please publish disable K:F5 before accepting, to give openQA a chance.
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=234
This commit is contained in:
Luca Beltrame
Git OBS Bridge
parent
980fe07f05
commit
b0e3d5b18c
@ -1,29 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:0119da58b2274bab76ef27d37032b5b104bad162675bfbee631286186d2e17a8
|
|
||||||
size 1321684
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlzRVLQACgkQ7JTRj38F
|
|
||||||
mX6qngf/WxtSoZ5KtQvdBhs0r8LK382TjW4/ClrvoUrwUOm5nSDmp3JAVvRTgOYd
|
|
||||||
NMPP1uuE4dazIPzS3HY1kf5miO6Sdg+OqQt9//1f+b2YTSa9QXVtYK1/nJJFd1Xc
|
|
||||||
REmwFKSJVrR2LgDNIsVY5nE1ugmalygkN5nVQxAE36QPaf7F/vAH+3oI6VxBBEC6
|
|
||||||
o7mjFOm0xn75YHrfXV/GIzVurpij/xVgE5eRZqQbivWXjMIodk+orp2nMomXtC0U
|
|
||||||
m7OHrysmSTaYjXLLMc7WFoYiI/FW/NK6/fL2y3nnWOxCwM4DtIKcmp055cu9hNcV
|
|
||||||
aLY5O0Iml1CFCxYgwVhKqc+YBLbrfQ==
|
|
||||||
=b3t5
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
3
kinfocenter-5.15.90.tar.xz
Normal file
3
kinfocenter-5.15.90.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2b367415c218794db208c5b34aceee79c6f89a0886c0a3ef2e5a007fa4e0438d
|
||||||
|
size 1321300
|
||||||
11
kinfocenter-5.15.90.tar.xz.sig
Normal file
11
kinfocenter-5.15.90.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlzdOqQACgkQ7JTRj38F
|
||||||
|
mX4XtAgAvTt+p8aP1uJedhqZikE/M+CCE0RpcH4VE9Aq5S30tG2Qt3HM/Eq1vNj3
|
||||||
|
txkOFzIduESBdgTPIQ1v9y5o0lTwKFYc3TdBthj5NtLQDKK0QGWRr1Pvj/oHYA1+
|
||||||
|
dA3de+Ciy6Vz7zLOpLrdcDEJI5FJN7OxRPjF6mMdbx3gfyzj3ncNgtxCdiGWBFuQ
|
||||||
|
xLV9IzuYnZ8YHmJ2/t7eTCHHuH61C07pLM13Hno32yfuAJ3Ki/vWotcUy/8nUHM4
|
||||||
|
XdVQCn2xrl6e4GhU2dz7wW10bv1no3YHBnh4AGQ15sg4CMUs7D3P536sD0+WBIwq
|
||||||
|
83NLKFIdxxGbqR0IjaNOXRzDqeUvww==
|
||||||
|
=8tS+
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
@ -1,3 +1,24 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 16 16:56:37 UTC 2019 - fabian@ritter-vogt.de
|
||||||
|
|
||||||
|
- Update to 5.15.90
|
||||||
|
* New feature release
|
||||||
|
* For more details please see:
|
||||||
|
* https://www.kde.org/announcements/plasma-5.15.90.php
|
||||||
|
- Changes since 5.15.5:
|
||||||
|
* bump Qt version to 5.12 as agreed at start of cycle
|
||||||
|
* drop internal os-release class in favor of KOSRelease of kcoreaddons 5.58
|
||||||
|
* extends keywords of device info module
|
||||||
|
* Add appstream data
|
||||||
|
* Correctly show memory sizes > 4 GiB on 32 bit Linux (kde#406351)
|
||||||
|
* [about-distro] OSRelease to collect "extra" keys
|
||||||
|
* [about-distro] pimpl OSRelease privates
|
||||||
|
* Fix initial width/height in KCMs that use qml (kde#398820)
|
||||||
|
* color monochrome icons to tooltip colors
|
||||||
|
* remove deprecated methods
|
||||||
|
- Drop patches, now upstream:
|
||||||
|
* Correctly-show-mem-size-over-4GiB-on-32bit.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue May 7 11:04:56 UTC 2019 - fabian@ritter-vogt.de
|
Tue May 7 11:04:56 UTC 2019 - fabian@ritter-vogt.de
|
||||||
|
|
||||||
|
|||||||
@ -16,11 +16,11 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%global kf5_version 5.54.0
|
%global kf5_version 5.58.0
|
||||||
|
|
||||||
%bcond_without lang
|
%bcond_without lang
|
||||||
Name: kinfocenter5
|
Name: kinfocenter5
|
||||||
Version: 5.15.5
|
Version: 5.15.90
|
||||||
Release: 0
|
Release: 0
|
||||||
# Full Plasma 5 version (e.g. 5.8.95)
|
# Full Plasma 5 version (e.g. 5.8.95)
|
||||||
%{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}}
|
%{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}}
|
||||||
@ -30,15 +30,13 @@ Summary: Utility that provides information about a computer system
|
|||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: System/GUI/KDE
|
Group: System/GUI/KDE
|
||||||
Url: http://www.kde.org/
|
Url: http://www.kde.org/
|
||||||
Source: https://download.kde.org/stable/plasma/%{version}/kinfocenter-%{version}.tar.xz
|
Source: https://download.kde.org/unstable/plasma/%{version}/kinfocenter-%{version}.tar.xz
|
||||||
%if %{with lang}
|
%if %{with lang}
|
||||||
Source1: https://download.kde.org/stable/plasma/%{version}/kinfocenter-%{version}.tar.xz.sig
|
Source1: https://download.kde.org/unstable/plasma/%{version}/kinfocenter-%{version}.tar.xz.sig
|
||||||
Source2: plasma.keyring
|
Source2: plasma.keyring
|
||||||
%endif
|
%endif
|
||||||
# PATCH-FIX-OPENSUSE plasma-session-name.patch
|
# PATCH-FIX-OPENSUSE plasma-session-name.patch
|
||||||
Patch0: 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: extra-cmake-modules >= 1.2.0
|
||||||
BuildRequires: kf5-filesystem
|
BuildRequires: kf5-filesystem
|
||||||
BuildRequires: libraw1394-devel
|
BuildRequires: libraw1394-devel
|
||||||
@ -64,9 +62,9 @@ BuildRequires: cmake(KF5Solid) >= %{kf5_version}
|
|||||||
BuildRequires: cmake(KF5Wayland) >= %{_plasma5_version}
|
BuildRequires: cmake(KF5Wayland) >= %{_plasma5_version}
|
||||||
BuildRequires: cmake(KF5WidgetsAddons) >= %{kf5_version}
|
BuildRequires: cmake(KF5WidgetsAddons) >= %{kf5_version}
|
||||||
BuildRequires: cmake(KF5XmlGui) >= %{kf5_version}
|
BuildRequires: cmake(KF5XmlGui) >= %{kf5_version}
|
||||||
BuildRequires: cmake(Qt5Core) >= 5.4.0
|
BuildRequires: cmake(Qt5Core) >= 5.12.0
|
||||||
BuildRequires: cmake(Qt5Gui) >= 5.4.0
|
BuildRequires: cmake(Qt5Gui)
|
||||||
BuildRequires: cmake(Qt5Widgets) >= 5.4.0
|
BuildRequires: cmake(Qt5Widgets)
|
||||||
BuildRequires: pkgconfig(egl)
|
BuildRequires: pkgconfig(egl)
|
||||||
%ifarch %arm aarch64
|
%ifarch %arm aarch64
|
||||||
BuildRequires: pkgconfig(glesv2)
|
BuildRequires: pkgconfig(glesv2)
|
||||||
@ -76,9 +74,7 @@ BuildRequires: pkgconfig(gl)
|
|||||||
BuildRequires: pkgconfig(glu)
|
BuildRequires: pkgconfig(glu)
|
||||||
BuildRequires: pkgconfig(x11)
|
BuildRequires: pkgconfig(x11)
|
||||||
Conflicts: kdebase4-workspace < 5.3.0
|
Conflicts: kdebase4-workspace < 5.3.0
|
||||||
%if %{with lang}
|
|
||||||
Recommends: %{name}-lang
|
Recommends: %{name}-lang
|
||||||
%endif
|
|
||||||
# needed for the fileindexermonitor
|
# needed for the fileindexermonitor
|
||||||
Requires: baloo5-imports
|
Requires: baloo5-imports
|
||||||
|
|
||||||
@ -88,7 +84,7 @@ KDE Utility that provides information about a computer system.
|
|||||||
%lang_package
|
%lang_package
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n kinfocenter-%{version}
|
%setup -q -n kinfocenter-%{version}
|
||||||
%autopatch -p1
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
|
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
|
||||||
@ -117,6 +113,7 @@ KDE Utility that provides information about a computer system.
|
|||||||
%{_kf5_sharedir}/kxmlgui5/
|
%{_kf5_sharedir}/kxmlgui5/
|
||||||
%{_kf5_configdir}/menus/kinfocenter.menu
|
%{_kf5_configdir}/menus/kinfocenter.menu
|
||||||
%{_kf5_sharedir}/desktop-directories/
|
%{_kf5_sharedir}/desktop-directories/
|
||||||
|
%{_kf5_appstreamdir}/org.kde.kinfocenter.appdata.xml
|
||||||
|
|
||||||
%if %{with lang}
|
%if %{with lang}
|
||||||
%files lang -f %{name}.lang
|
%files lang -f %{name}.lang
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user