Accepting request 1064533 from KDE:Frameworks5

Plasma 5.27.0, preliminary tarballs

OBS-URL: https://build.opensuse.org/request/show/1064533
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=205
This commit is contained in:
Dominique Leuenberger 2023-02-13 15:40:03 +00:00 committed by Git OBS Bridge
commit 2daa134e60
7 changed files with 86 additions and 65 deletions

View File

@ -8,25 +8,25 @@ This reverts commit 240d0d6fe1e5db88e304199339396bd48c23e130.
We want those icons in openSUSE. They've always been there and there is no We want those icons in openSUSE. They've always been there and there is no
reason not to have them. reason not to have them.
--- ---
kioslave/desktop/CMakeLists.txt | 1 + kioworkers/desktop/CMakeLists.txt | 1 +
kioslave/desktop/Home.desktop | 88 ++++++++++++++++++++++++++++++++++++++++ kioworkers/desktop/Home.desktop | 88 ++++++++++++++++++++++++++++++++++++++++
kioslave/desktop/kio_desktop.cpp | 4 ++ kioworkers/desktop/kio_desktop.cpp | 4 ++
3 files changed, 93 insertions(+) 3 files changed, 93 insertions(+)
create mode 100644 kioslave/desktop/Home.desktop create mode 100644 kioworkers/desktop/Home.desktop
Index: plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/CMakeLists.txt Index: plasma-workspace-5.17.80git.20221219T021648~0ddf86c99/kioworkers/desktop/CMakeLists.txt
=================================================================== ===================================================================
--- plasma-workspace-5.17.80git.20220531T124808~09e811ca3.orig/kioslave/desktop/CMakeLists.txt 2022-05-31 12:48:08.000000000 +0200 --- plasma-workspace-5.17.80git.20221219T021648~0ddf86c99.orig/kioworkers/desktop/CMakeLists.txt 2022-12-19 03:16:48.000000000 +0100
+++ plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/CMakeLists.txt 2022-05-31 22:01:39.580389443 +0200 +++ plasma-workspace-5.17.80git.20221219T021648~0ddf86c99/kioworkers/desktop/CMakeLists.txt 2022-12-19 11:17:42.513241900 +0100
@@ -24,3 +24,4 @@ @@ -24,3 +24,4 @@
########### install files ############### ########### install files ###############
install(FILES directory.desktop directory.trash DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop) install(FILES directory.desktop directory.trash DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop)
+install(FILES Home.desktop DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop/DesktopLinks) +install(FILES Home.desktop DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop/DesktopLinks)
Index: plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/Home.desktop Index: plasma-workspace-5.17.80git.20221219T021648~0ddf86c99/kioworkers/desktop/Home.desktop
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/Home.desktop 2022-05-31 22:01:39.580389443 +0200 +++ plasma-workspace-5.17.80git.20221219T021648~0ddf86c99/kioworkers/desktop/Home.desktop 2022-12-19 11:17:42.513241900 +0100
@@ -0,0 +1,88 @@ @@ -0,0 +1,88 @@
+[Desktop Entry] +[Desktop Entry]
+Encoding=UTF-8 +Encoding=UTF-8
@ -116,18 +116,18 @@ Index: plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/Ho
+Icon=user-home +Icon=user-home
+Type=Link +Type=Link
+ +
Index: plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/kio_desktop.cpp Index: plasma-workspace-5.17.80git.20221219T021648~0ddf86c99/kioworkers/desktop/kio_desktop.cpp
=================================================================== ===================================================================
--- plasma-workspace-5.17.80git.20220531T124808~09e811ca3.orig/kioslave/desktop/kio_desktop.cpp 2022-05-31 12:48:08.000000000 +0200 --- plasma-workspace-5.17.80git.20221219T021648~0ddf86c99.orig/kioworkers/desktop/kio_desktop.cpp 2022-12-19 03:16:48.000000000 +0100
+++ plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/kio_desktop.cpp 2022-05-31 22:01:39.580389443 +0200 +++ plasma-workspace-5.17.80git.20221219T021648~0ddf86c99/kioworkers/desktop/kio_desktop.cpp 2022-12-19 11:17:42.513241900 +0100
@@ -77,6 +77,10 @@ @@ -76,6 +76,10 @@
// Copy the .directory file // Copy the .directory file
QFile::copy(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/directory.desktop")), desktopPath + "/.directory"); QFile::copy(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/directory.desktop")), desktopPath + "/.directory");
+ // Copy the trash link + // Copy the trash link
+ QFile::copy(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/directory.trash")), + QFile::copy(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/directory.trash")),
+ desktopPath + "/trash.desktop"); + desktopPath + "/trash.desktop");
+ +
// Copy the desktop links // Copy the desktop links
QSet<QString> links; QSet<QString> links;
const auto dirs = const auto dirs =

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4cb2926fcd661ab827205b76a3f29efd820b9a787fd9707d5d88dcf530b55220
size 17470516

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmO0eJ4ACgkQ11dEg7tX
sY324RAAgmH5r52rG9t4Vcb7p92kC/kecxVKaf3s/Xxlpy9wgmHf7BJTWYMw4hJY
iIVkFhgP5TP8nCOuitTJTiwzUvGPOsL3VG9Mg/8C+V7zyuEVwEwVggU1FUQl+keF
0XruZVH3J+7/qSWtzV9pgsS2VHs36pScOkYcj4Mg9oamDBq2w+Rh3wHPhDq7kRTa
2/FgF7gPGo+VQObuHZkwpGhyfczkL8kTibbzpnVlpJCLcyEmAjsL8eHbNChjz7kE
yAnb0YhU1yQLxiQtT8NopA/f7QuMOmB5mMB6QcK3golLnX8RnTkv1c4TB+MWHkhI
eTMkTV5+Jdx1NRpFPEMhKdhwxskalKwSTzI67zRcsdKV/0bHGHwsGliSS2R239iS
rmjlpxhcg7aPeKQN9Cn2QQMgmA+RemQu9q5WRWHz4T4w7SwNith0baPlGyq61iBe
oG3RM8xAAJ47T6qmQkqE3VdmkpoAFoQdDRVMsCM15/kDfdDMzAgEy6pNV9ZQhsUr
1bZVFOgqXYGqdvPjznBfrQmmnGBs0CS3E7M8q/pxtCbjNttV27rr4luKOH7Q9qrc
iQcUwnOh9tFApDLOJQKz4h5iJZsqKqh87ZSSpG5sg/7jqgYOTwR986CvHviYLx4g
8kw4F/gOOz7I9gyk559kQD/QSpOaCgJeXh3vk6T/2+FDEBxkqnw=
=GtOR
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48f285d682cd449c6e98d997174c14760ba27984955c6f66d9004c628f7ba070
size 18615048

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmPk5RkACgkQ11dEg7tX
sY3eMQ//ci7Vwl0zBDZN5yhrbmzJqB634dUeNo1bWROHWV/hma/8qaF6DxAjBwc7
8ToAHhDgYkfT/jOzqUiWelpOKy4wiJZ0HuxNGR1E1/R6+GohjxuCAkyqKq91NeZu
GRUpurZSbslefXJqfPhLMN0hnk+gt3XqW7in7+tTH6yKdyD3/zxGo1My1UV7hvNT
uYmbnXThT0nQMdMpSB768LixPQcgKZn3EEGISgGpqVWYt/nwO8RqT+YMPziC7onZ
n/ltaI3XvjwZnDyJ7rbvwEZmqSMgjD6s9jG67KI6MpgwF6+MYdQo16qRjetBsaYo
QsPC1+SgQAX23blWB15NLgwXlPj8mGUPjrrFAcGL8Rty2szP6eIiQMhWnfvhZVXN
mXtI3y9m9sDtuKW2NW4Kn9G/IQ0BmZbGRk0dKE3/IRqouqfRhL0PkkWX5rMWUf75
g9KmjUmTFnVMj5AUjnrXMbaawL8RWnb5lgVY38seJmIMfi+xVFr9MjNbdz8Xnock
5beTAJDcss3Vcx0ELu3xNKO/eHEORvVy4Wj2foPamo40m5HEZNNYDrGtu2GoBBbs
PFPVWLqiQz68kDJ2w+X/D/hgx0VncLzKsPPeusXA1hZl5oawfkIiSSdUs5zAnQzr
W7wtyf3BOMeRZXeNJ4yy5GuXORcMHxdihcGHlG5IcP09VcIXTGU=
=xVXX
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Feb 9 14:19:50 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.27.0
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.27.0
- Too many changes to list here
-------------------------------------------------------------------
Thu Jan 19 14:43:25 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.26.90
* New feature release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.26.90
- Too many changes to list here
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 4 14:06:22 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de> Wed Jan 4 14:06:22 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -25,20 +25,19 @@
%bcond_without released %bcond_without released
Name: plasma5-workspace Name: plasma5-workspace
%global _plasma5_bugfix 5.26.4
# Full Plasma 5 version (e.g. 5.9.1) # Full Plasma 5 version (e.g. 5.9.1)
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
# Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF) # Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
Version: 5.26.5 Version: 5.27.0
Release: 0 Release: 0
Summary: The KDE Plasma Workspace Components Summary: The KDE Plasma Workspace Components
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}/plasma-workspace-%{version}.tar.xz Source: plasma-workspace-%{version}.tar.xz
%if %{with released} %if %{with released}
Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig Source1: plasma-workspace-%{version}.tar.xz.sig
Source2: plasma.keyring Source2: plasma.keyring
%endif %endif
Source3: xprop-kde-full-session.desktop Source3: xprop-kde-full-session.desktop
@ -131,6 +130,7 @@ BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(libqalculate) BuildRequires: pkgconfig(libqalculate)
BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(wayland-client) >= 1.15 BuildRequires: pkgconfig(wayland-client) >= 1.15
BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xcb-composite) BuildRequires: pkgconfig(xcb-composite)
@ -192,7 +192,6 @@ Requires: xprop
# hardcode versions of plasma-framework-components and plasma-framework-private packages, as upstream doesn't keep backwards compability there # hardcode versions of plasma-framework-components and plasma-framework-private packages, as upstream doesn't keep backwards compability there
%requires_ge plasma-framework-components %requires_ge plasma-framework-components
%requires_ge plasma-framework %requires_ge plasma-framework
Recommends: %{name}-lang
Recommends: kio-extras5 Recommends: kio-extras5
# The lockscreen has a button to open a virtual keyboard # The lockscreen has a button to open a virtual keyboard
Recommends: libqt5-qtvirtualkeyboard Recommends: libqt5-qtvirtualkeyboard
@ -213,6 +212,9 @@ Provides: qt5qmlimport(org.kde.plasma.shell.2) = 0
Provides: kde-user-manager = %{version} Provides: kde-user-manager = %{version}
Obsoletes: kde-user-manager < %{version} Obsoletes: kde-user-manager < %{version}
Obsoletes: kde-user-manager-lang < %{version} Obsoletes: kde-user-manager-lang < %{version}
# Existed in KDE:Unstable:Frameworks for a short time
Provides: %{name}-zsh-completion = %{version}
Obsoletes: %{name}-zsh-completion < %{version}
%description %description
This package contains the basic packages for a Plasma workspace. This package contains the basic packages for a Plasma workspace.
@ -328,41 +330,39 @@ Plasma 5 session with Wayland from a display manager.
%autosetup -p1 -n plasma-workspace-%{version} %autosetup -p1 -n plasma-workspace-%{version}
%build %build
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} < 1550
export CXX=g++-10 export CXX=g++-10
%endif %endif
%cmake_kf5 -d build -- -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} -DGLIBC_LOCALE_GENERATED=TRUE -DGLIBC_LOCALE_GEN=OFF %cmake_kf5 -d build -- -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} -DGLIBC_LOCALE_GENERATED=TRUE -DGLIBC_LOCALE_GEN=OFF
%cmake_build %cmake_build
%install %install
%kf5_makeinstall -C build %kf5_makeinstall -C build
%if %{with released} %{kf5_find_lang}
%{kf5_find_lang} %{kf5_find_htmldocs}
%{kf5_find_htmldocs}
%endif
%suse_update_desktop_file -r %{buildroot}%{_kf5_applicationsdir}/org.kde.klipper.desktop System TrayIcon %suse_update_desktop_file -r %{buildroot}%{_kf5_applicationsdir}/org.kde.klipper.desktop System TrayIcon
mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/ mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/
cp %{_kf5_iconsdir}/breeze/apps/48/klipper.svg %{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/ cp %{_kf5_iconsdir}/breeze/apps/48/klipper.svg %{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/
# Copy the icon for org.kde.kcolorschemeeditor.desktop # Copy the icon for org.kde.kcolorschemeeditor.desktop
mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/32x32/apps/ mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/32x32/apps/
cp %{_kf5_iconsdir}/breeze/preferences/32/preferences-desktop-color.svg %{buildroot}%{_kf5_iconsdir}/hicolor/32x32/apps/ cp %{_kf5_iconsdir}/breeze/preferences/32/preferences-desktop-color.svg %{buildroot}%{_kf5_iconsdir}/hicolor/32x32/apps/
# Rename upstream session file to oS location # Rename upstream session file to oS location
mv %{buildroot}%{_kf5_sharedir}/xsessions/{plasma,plasma5}.desktop mv %{buildroot}%{_kf5_sharedir}/xsessions/{plasma,plasma5}.desktop
# Install compatibility symlink # Install compatibility symlink
ln -s %{_kf5_sharedir}/xsessions/plasma5.desktop %{buildroot}%{_kf5_sharedir}/xsessions/kde-plasma.desktop ln -s %{_kf5_sharedir}/xsessions/plasma5.desktop %{buildroot}%{_kf5_sharedir}/xsessions/kde-plasma.desktop
mkdir -p %{buildroot}%{_sysconfdir}/alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
install -m0644 %{SOURCE3} %{buildroot}%{_kf5_configdir}/autostart/xprop-kde-full-session.desktop install -m0644 %{SOURCE3} %{buildroot}%{_kf5_configdir}/autostart/xprop-kde-full-session.desktop
%fdupes %{buildroot}/%{_prefix} %fdupes %{buildroot}/%{_prefix}
%post %post
/sbin/ldconfig /sbin/ldconfig
@ -484,6 +484,7 @@ fi
%{_libexecdir}/plasma-dbus-run-session-if-needed %{_libexecdir}/plasma-dbus-run-session-if-needed
%{_kf5_libdir}/kconf_update_bin/krunnerglobalshortcuts %{_kf5_libdir}/kconf_update_bin/krunnerglobalshortcuts
%{_kf5_libdir}/kconf_update_bin/krunnerhistory %{_kf5_libdir}/kconf_update_bin/krunnerhistory
%{_kf5_libdir}/kconf_update_bin/plasmashell-5.27-use-panel-thickness-in-default-group
%{_kf5_plugindir}/ %{_kf5_plugindir}/
%{_kf5_qmldir}/ %{_kf5_qmldir}/
%{_kf5_applicationsdir}/org.kde.klipper.desktop %{_kf5_applicationsdir}/org.kde.klipper.desktop
@ -518,6 +519,10 @@ fi
%doc %lang(en) %{_kf5_htmldir}/en/klipper/ %doc %lang(en) %{_kf5_htmldir}/en/klipper/
%doc %lang(en) %{_kf5_htmldir}/en/kcontrol/ %doc %lang(en) %{_kf5_htmldir}/en/kcontrol/
%doc %lang(en) %{_kf5_htmldir}/en/PolicyKit-kde/ %doc %lang(en) %{_kf5_htmldir}/en/PolicyKit-kde/
%dir %{_datadir}/zsh
%dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/_plasmashell
%{_kf5_notifydir}/ %{_kf5_notifydir}/
%{_kf5_servicesdir}/ %{_kf5_servicesdir}/
%{_kf5_servicetypesdir}/ %{_kf5_servicetypesdir}/
@ -613,8 +618,6 @@ fi
%dir %{_datadir}/wayland-sessions/ %dir %{_datadir}/wayland-sessions/
%{_datadir}/wayland-sessions/plasmawayland.desktop %{_datadir}/wayland-sessions/plasmawayland.desktop
%if %{with released}
%files lang -f %{name}.lang %files lang -f %{name}.lang
%endif
%changelog %changelog