rpm/kinfocenter5
SHA256
1
0
Fork 0
forked from pool/kinfocenter5
Code Pull Requests Activity

Accepting request 349210 from KDE:Frameworks5

Browse Source 
Update to 5.5.1

OBS-URL: https://build.opensuse.org/request/show/349210
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kinfocenter5?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2015-12-29 11:56:20 +00:00 committed by Git OBS Bridge
commit 38061254c2
6 changed files with 47 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kinfocenter-5.4.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:475bf963a3b0bc5c6c267889ad96f2bf8666f051e3dbeb47b21e3ab4630bdeec
size 1131908

3
kinfocenter-5.5.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80b86a8316c24b3e725935bc6c53c884f81c1729013d35024ff4e2a034463f2c
size 1143244

58
kinfocenter-fix-cmdline-parsing.patch
View File

@ -1,58 +0,0 @@
From: Antonio Larrosa <larrosa@kde.org>
Date: Fri, 23 Oct 2015 12:57:44 +0000
Subject: Fix kinfocenter crash when run with --version
X-Git-Url: http://quickgit.kde.org/?p=kinfocenter.git&a=commitdiff&h=fe16e35904587266f37114ac682916e449677054
---
Fix kinfocenter crash when run with --version
Fix the order in which kinfocenter is initialized to first do all
commandline parsing and only then create windows. In other case
running "kinfocenter --version" crashes when unloading dynamic libraries
that shouldn't have been loaded at all.
---
--- a/main.cpp
+++ b/main.cpp
@@ -37,14 +37,7 @@
{
QApplication::setApplicationDisplayName(i18n("KDE Info Center"));
QApplication::setOrganizationDomain("kde.org");
- display = new KInfoCenter();
- display->show();
- KDBusService* service = new KDBusService(KDBusService::Unique, this);
-}
-
-int main(int argc, char *argv[])
-{
KLocalizedString::setApplicationDomain("kinfocenter");
KAboutData aboutData( QStringLiteral("kinfocenter"), i18n("KDE Info Center"),
@@ -60,14 +53,23 @@
aboutData.addAuthor(i18n("Waldo Bastian"), QString(), QStringLiteral("bastian@kde.org"));
aboutData.addAuthor(i18n("Nicolas Ternisien"), QString(), QStringLiteral("nicolas.ternisien@gmail.com"));
KAboutData::setApplicationData(aboutData);
- KicApp Kic(argc, argv);
QCommandLineParser parser;
parser.addHelpOption();
parser.addVersionOption();
aboutData.setupCommandLine(&parser);
- parser.process(Kic);
+ parser.process(*this);
aboutData.processCommandLine(&parser);
+
+ display = new KInfoCenter();
+ display->show();
+
+ KDBusService* service = new KDBusService(KDBusService::Unique, this);
+}
+
+int main(int argc, char *argv[])
+{
+ KicApp Kic(argc, argv);
return Kic.exec();
}

17
kinfocenter5.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Dec 15 17:49:51 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.5.1:
* Bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.5.1.php
-------------------------------------------------------------------
Sat Dec 12 17:31:32 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.5.0:
* For more details please see:
https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork
- Move to cmake(...) BuildRequires where possible
- Drop upstreamed kinfocenter-fix-cmdline-parsing.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Nov 8 18:35:52 UTC 2015 - hrvoje.senjan@gmail.com Sun Nov 8 18:35:52 UTC 2015 - hrvoje.senjan@gmail.com

51
kinfocenter5.spec
View File

@ -18,7 +18,7 @@
%bcond_without lang %bcond_without lang
Name: kinfocenter5 Name: kinfocenter5
Version: 5.4.3 Version: 5.5.1
Release: 0 Release: 0
Summary: Utility that provides information about a computer system Summary: Utility that provides information about a computer system
License: GPL-2.0+ License: GPL-2.0+
@ -28,28 +28,34 @@ Source: kinfocenter-%{version}.tar.xz
Source99: %{name}-rpmlintrc Source99: %{name}-rpmlintrc
# 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 kinfocenter-fix-cmdline-parsing.patch -- Fixes crash when run with --version BuildRequires: extra-cmake-modules >= 1.2.0
Patch1: kinfocenter-fix-cmdline-parsing.patch
BuildRequires: extra-cmake-modules
BuildRequires: kcmutils-devel
BuildRequires: kcompletion-devel
BuildRequires: kconfig-devel
BuildRequires: kdeclarative-devel
BuildRequires: kdelibs4support-devel
BuildRequires: kdoctools-devel
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
BuildRequires: ki18n-devel
BuildRequires: kio-devel
BuildRequires: kpackage-devel
BuildRequires: kxmlgui-devel
BuildRequires: libraw1394-devel BuildRequires: libraw1394-devel
BuildRequires: pciutils-devel BuildRequires: pciutils-devel
BuildRequires: plasma-framework-devel
BuildRequires: solid-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 BuildRequires: cmake(KF5Completion) >= 5.9.0
BuildRequires: pkgconfig(Qt5Gui) >= 5.4.0 BuildRequires: cmake(KF5Config) >= 5.9.0
BuildRequires: cmake(KF5ConfigWidgets) >= 5.9.0
BuildRequires: cmake(KF5CoreAddons) >= 5.9.0
BuildRequires: cmake(KF5DBusAddons) >= 5.9.0
BuildRequires: cmake(KF5Declarative) >= 5.9.0
BuildRequires: cmake(KF5DocTools) >= 5.9.0
BuildRequires: cmake(KF5I18n) >= 5.9.0
BuildRequires: cmake(KF5IconThemes) >= 5.9.0
BuildRequires: cmake(KF5KCMUtils) >= 5.9.0
BuildRequires: cmake(KF5KDELibs4Support) >= 5.9.0
BuildRequires: cmake(KF5KIO) >= 5.9.0
BuildRequires: cmake(KF5Package) >= 5.9.0
BuildRequires: cmake(KF5Service) >= 5.9.0
BuildRequires: cmake(KF5Solid) >= 5.9.0
BuildRequires: cmake(KF5Solid) >= 5.9.0
BuildRequires: cmake(KF5Wayland) >= %{version}
BuildRequires: cmake(KF5WidgetsAddons) >= 5.9.0
BuildRequires: cmake(KF5XmlGui) >= 5.9.0
BuildRequires: cmake(Qt5Core) >= 5.4.0
BuildRequires: cmake(Qt5Gui) >= 5.4.0
BuildRequires: cmake(Qt5Widgets) >= 5.4.0
BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(egl)
%ifarch %arm aarch64 %ifarch %arm aarch64
BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glesv2)
@ -57,9 +63,7 @@ BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gl)
%endif %endif
BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(glu)
%if 0%{?suse_version} > 1310 BuildRequires: pkgconfig(x11)
BuildRequires: kwayland-devel >= 5.0.95
%endif
Conflicts: kdebase4-workspace < 5.3.0 Conflicts: kdebase4-workspace < 5.3.0
%if %{with lang} %if %{with lang}
Recommends: %{name}-lang Recommends: %{name}-lang
@ -73,7 +77,6 @@ KDE Utility that provides information about a computer system.
%prep %prep
%setup -q -n kinfocenter-%{version} %setup -q -n kinfocenter-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
@ -82,10 +85,6 @@ KDE Utility that provides information about a computer system.
%install %install
%kf5_makeinstall -C build %kf5_makeinstall -C build
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING* %doc COPYING*

4
plasma-session-name.patch
View File

@ -6,8 +6,8 @@ index 9e9dc9c..7a34520 100644
QString Module::plasmaVersion() const QString Module::plasmaVersion() const
{ {
const QStringList &filePaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, const QStringList &filePaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
- "xsessions/plasma.desktop"); - QStringLiteral("xsessions/plasma.desktop"));
+ "xsessions/plasma5.desktop"); + QStringLiteral("xsessions/plasma5.desktop"));
if (filePaths.length() < 1) { if (filePaths.length() < 1) {
return QString(); return QString();