forked from pool/kdelibs4support
Accepting request 968156 from KDE:Frameworks5
KDE Frameworks 5.93.0 OBS-URL: https://build.opensuse.org/request/show/968156 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdelibs4support?expand=0&rev=103
This commit is contained in:
commit
d425967a58
@ -1,28 +0,0 @@
|
|||||||
From efd387e0f0816d0f1fd156f8ba75f4b56dcf5034 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
|
||||||
Date: Mon, 7 Mar 2022 14:34:11 +0100
|
|
||||||
Subject: [PATCH] Don't assume libexec is a LIB_INSTALL_DIR subfolder
|
|
||||||
|
|
||||||
FHS 3.0 states that executables not intended to be executed by users shall be under /usr/libexec [1]
|
|
||||||
|
|
||||||
[1] https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html
|
|
||||||
---
|
|
||||||
src/kdecore/kstandarddirs.cpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/kdecore/kstandarddirs.cpp b/src/kdecore/kstandarddirs.cpp
|
|
||||||
index 23064a9a..a61f5ae9 100644
|
|
||||||
--- a/src/kdecore/kstandarddirs.cpp
|
|
||||||
+++ b/src/kdecore/kstandarddirs.cpp
|
|
||||||
@@ -304,7 +304,7 @@ static QString relativeInstallPath(const char *type)
|
|
||||||
return QFile::decodeName(LIB_INSTALL_DIR "/");
|
|
||||||
}
|
|
||||||
if (strcmp("libexec", type) == 0) {
|
|
||||||
- return QFile::decodeName(LIB_INSTALL_DIR "/libexec/");
|
|
||||||
+ return QFile::decodeName(LIBEXEC_INSTALL_DIR "/");
|
|
||||||
}
|
|
||||||
if (strcmp("locale", type) == 0) {
|
|
||||||
return QFile::decodeName(LOCALE_INSTALL_DIR "/");
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
|||||||
From 5924302486a72041519f05aa3bccc3a0e7d7ca3e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
|
||||||
Date: Mon, 7 Mar 2022 12:57:35 +0100
|
|
||||||
Subject: [PATCH] Use KDE_INSTALL_FULL_* variables where needed
|
|
||||||
|
|
||||||
There's no guarantee KDE_INSTALL_* variables are relative. This can cause errors when creating symlinks after installation.
|
|
||||||
---
|
|
||||||
src/CMakeLists.txt | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
||||||
index c5abb2a6..2096b355 100644
|
|
||||||
--- a/src/CMakeLists.txt
|
|
||||||
+++ b/src/CMakeLists.txt
|
|
||||||
@@ -595,12 +595,12 @@ if (UNIX)
|
|
||||||
install(PROGRAMS kio/fileshareset DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5} )
|
|
||||||
|
|
||||||
install(CODE "
|
|
||||||
- set(FILESHARESET_PATH \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBEXECDIR_KF5}/fileshareset\")
|
|
||||||
+ set(FILESHARESET_PATH \"\$ENV{DESTDIR}/${KDE_INSTALL_FULL_LIBEXECDIR_KF5}/fileshareset\")
|
|
||||||
EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${FILESHARESET_PATH}' && chmod u+s '\${FILESHARESET_PATH}'\")
|
|
||||||
")
|
|
||||||
|
|
||||||
# write a cmake script file which creates the symlink
|
|
||||||
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake "exec_program(${CMAKE_COMMAND} ARGS -E create_symlink fileshareset \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBEXECDIR_KF5}/filesharelist\")\n")
|
|
||||||
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake "exec_program(${CMAKE_COMMAND} ARGS -E create_symlink fileshareset \"\$ENV{DESTDIR}/${KDE_INSTALL_FULL_LIBEXECDIR_KF5}/filesharelist\")\n")
|
|
||||||
# and add it as post-install script to any of the installed targets, so it will be executed during "make install"
|
|
||||||
set_target_properties(KF5KDELibs4Support PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake)
|
|
||||||
endif ()
|
|
||||||
@@ -645,7 +645,7 @@ if(NOT WIN32)
|
|
||||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex}
|
|
||||||
DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kdoctools/customization/dtd )
|
|
||||||
else()
|
|
||||||
- get_filename_component(NORMALIZED_DTD_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF5}/kdoctools/customization/dtd" ABSOLUTE)
|
|
||||||
+ set(NORMALIZED_DTD_INSTALL_PATH "${KDE_INSTALL_FULL_DATADIR_KF5}/kdoctools/customization/dtd")
|
|
||||||
# file(RELATIVE_PATH ...) returns wrong values for paths containing /../ (it doesn't normalize the path)
|
|
||||||
# To work around this we make sure the variable passed has all /../ elements
|
|
||||||
# removed using get_filename_component(... ABSOLUTE)
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:292e5e84ad8d7de90f0666b51f085a25b7a9faf521c58379d470d2994004ede0
|
|
||||||
size 3649060
|
|
@ -1,11 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmIjwmYACgkQWNDuZIpI
|
|
||||||
s7vmgQgAnRMAeWnJAFZywU/h2MQi/pOKgkOkzNkn/CkRnjjOixHuePrwElKrTxMf
|
|
||||||
3HKrdvlljhQPzvTEP6hDUT88vlB5N8+sfPljMvXjcD3gmgV3WSM2/RUYfY3AZlQi
|
|
||||||
u7XrGHYXSn06arSurxgT80pNnPnYkRY4WnQy2rvIhNfo189mSe3WiBlsfKlqacoi
|
|
||||||
zMjbShIRel3pHAV19n4JG0U8KKGrXLChiM4oiv6Ve+3cjWxj9HwLcOkEO6g+SejG
|
|
||||||
5V8NlLbuejIdZLAm8hzSZxUVMfZMhfzbH/KkRzBuHhLspTxk0tg0upcln9gdyug0
|
|
||||||
dT7rPoKYZszWTEq2SiVKykLnOfdl/g==
|
|
||||||
=YkeZ
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
kdelibs4support-5.93.0.tar.xz
Normal file
3
kdelibs4support-5.93.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:6a3e1d80cc6babc12930f24f9afd1ed10b46ae58ea71d44a466178212b07377c
|
||||||
|
size 3651032
|
11
kdelibs4support-5.93.0.tar.xz.sig
Normal file
11
kdelibs4support-5.93.0.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmJIS9wACgkQWNDuZIpI
|
||||||
|
s7vVXQf+Ni04YrbkvJfCFdECjtl2uTBcaHyQDbvXxqMUOAh+N6/Sif9JYVDX7pWU
|
||||||
|
E755j9KaF23rmQx1ay8MXmRAnkt45zX4nXH/MDPNr2V/bYQICVrF7VjUvPJALNax
|
||||||
|
S0mU1aP0wmp1XV2ojVS5J+LXGPM4BO4NBSczlBczIXhpHhcpfE7pOD8S8S+Qpc63
|
||||||
|
yVb0WR5o7WLQYRysxWVVaCe4RiWASTzaJq1pU5hGk4RJVOOBeBzv/XPYKKlXgCXD
|
||||||
|
Mudz+jVOGZESNemA9FRXyllBdHmxf2BHhKML//AiYCV7ryvDmCJJtHKvrubzl6Sl
|
||||||
|
YxXG4OhKHVEMxtnLnh64/qo31UnpnQ==
|
||||||
|
=6vyP
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +1,18 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Apr 3 10:47:08 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Update to 5.93.0
|
||||||
|
* New feature release
|
||||||
|
* For more details please see:
|
||||||
|
* https://kde.org/announcements/frameworks/5/5.93.0
|
||||||
|
- Changes since 5.92.0:
|
||||||
|
* autotests: adapt kmimetypetest after *.doc removal from kcoreaddons
|
||||||
|
* Use KDE_INSTALL_FULL_* variables where needed
|
||||||
|
* Don't assume libexec is a LIB_INSTALL_DIR subfolder
|
||||||
|
- Drop patches, now upstream:
|
||||||
|
* 0001-Don-t-assume-libexec-is-a-LIB_INSTALL_DIR-subfolder.patch
|
||||||
|
* 0001-Use-KDE_INSTALL_FULL_-variables-where-needed.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 7 22:59:09 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
Mon Mar 7 22:59:09 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
@ -17,14 +17,14 @@
|
|||||||
|
|
||||||
|
|
||||||
%define lname libKF5KDELibs4Support5
|
%define lname libKF5KDELibs4Support5
|
||||||
%define _tar_path 5.92
|
%define _tar_path 5.93
|
||||||
# Full KF5 version (e.g. 5.33.0)
|
# Full KF5 version (e.g. 5.33.0)
|
||||||
%{!?_kf5_version: %global _kf5_version %{version}}
|
%{!?_kf5_version: %global _kf5_version %{version}}
|
||||||
# Last major and minor KF5 version (e.g. 5.33)
|
# Last major and minor KF5 version (e.g. 5.33)
|
||||||
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
||||||
%bcond_without released
|
%bcond_without released
|
||||||
Name: kdelibs4support
|
Name: kdelibs4support
|
||||||
Version: 5.92.0
|
Version: 5.93.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Code and utilities to ease the transition to KDE Frameworks 5
|
Summary: Code and utilities to ease the transition to KDE Frameworks 5
|
||||||
License: LGPL-2.1-or-later
|
License: LGPL-2.1-or-later
|
||||||
@ -35,10 +35,6 @@ Source: %{name}-%{version}.tar.xz
|
|||||||
Source1: %{name}-%{version}.tar.xz.sig
|
Source1: %{name}-%{version}.tar.xz.sig
|
||||||
Source2: frameworks.keyring
|
Source2: frameworks.keyring
|
||||||
%endif
|
%endif
|
||||||
# PATCH-FIX-UPSTREAM
|
|
||||||
Patch0: 0001-Use-KDE_INSTALL_FULL_-variables-where-needed.patch
|
|
||||||
# PATCH-FIX-UPSTREAM
|
|
||||||
Patch1: 0001-Don-t-assume-libexec-is-a-LIB_INSTALL_DIR-subfolder.patch
|
|
||||||
BuildRequires: NetworkManager-devel
|
BuildRequires: NetworkManager-devel
|
||||||
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
|
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
Loading…
Reference in New Issue
Block a user