diff --git a/0001-Set-SOVERSION-to-6.patch b/0001-Set-SOVERSION-to-6.patch deleted file mode 100644 index 71299c2..0000000 --- a/0001-Set-SOVERSION-to-6.patch +++ /dev/null @@ -1,54 +0,0 @@ -From de903d21a8e8cf269de7e0d37ff319943757962d Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Tue, 6 Feb 2024 21:09:39 +0100 -Subject: [PATCH] Set SOVERSION to 6 - -The SOVERSION has nothing to do with the major version, it needs to be 6 -also for 5.92.x and might even become 7+ for 6.1. ---- - src/CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b72dcb5..15d29ed 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -70,7 +70,7 @@ target_include_directories(KPipeWire PRIVATE ${CMAKE_CURRENT_BINARY_DIR} - INTERFACE "$") - set_target_properties(KPipeWire PROPERTIES - VERSION ${PROJECT_VERSION} -- SOVERSION ${PROJECT_VERSION_MAJOR} -+ SOVERSION 6 - ) - - ecm_generate_export_header(KPipeWire -@@ -99,7 +99,7 @@ target_link_libraries(KPipeWireDmaBuf PUBLIC KPipeWire - - set_target_properties(KPipeWireDmaBuf PROPERTIES - VERSION ${PROJECT_VERSION} -- SOVERSION ${PROJECT_VERSION_MAJOR} -+ SOVERSION 6 - ) - - ecm_generate_export_header(KPipeWireDmaBuf -@@ -146,7 +146,7 @@ ecm_generate_headers(KPipeWireRecord_HEADERS - ) - set_target_properties(KPipeWireRecord PROPERTIES - VERSION ${PROJECT_VERSION} -- SOVERSION ${PROJECT_VERSION_MAJOR} -+ SOVERSION 6 - ) - - install(FILES -@@ -161,7 +161,7 @@ install(TARGETS KPipeWire KPipeWireRecord KPipeWireDmaBuf EXPORT KPipeWireTarget - ecm_setup_version(PROJECT VARIABLE_PREFIX KPIPEWIRE - VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kpipewire_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPipeWireConfigVersion.cmake" -- SOVERSION ${PROJECT_VERSION_MAJOR}) -+ SOVERSION 6) - - set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPipeWire") - install(EXPORT KPipeWireTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPipeWireTargets.cmake NAMESPACE K::) --- -2.43.0 - diff --git a/0001-cmake-Add-missing-to-unbreak-the-build.patch b/0001-cmake-Add-missing-to-unbreak-the-build.patch new file mode 100644 index 0000000..060e293 --- /dev/null +++ b/0001-cmake-Add-missing-to-unbreak-the-build.patch @@ -0,0 +1,23 @@ +From df052bfa3c66d24109f40f18266ee057d1838b9b Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Wed, 6 Mar 2024 01:17:51 +0100 +Subject: [PATCH] cmake: Add missing " to unbreak the build + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 236abcd..e76484c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.16) +-project(KPipewire VERSION "6.0.1) ++project(KPipewire VERSION "6.0.1") + + set(KF6_MIN_VERSION "6.0.0") + find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE) +-- +2.43.2 + diff --git a/kpipewire-6.0.0.tar.xz b/kpipewire-6.0.0.tar.xz deleted file mode 100644 index 53219be..0000000 --- a/kpipewire-6.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd585ee4de3b5bcdc10f36fe5df91966447ca716570d6b4ea15160db1f1d73bc -size 144816 diff --git a/kpipewire-6.0.0.tar.xz.sig b/kpipewire-6.0.0.tar.xz.sig deleted file mode 100644 index 5c1d8a4..0000000 --- a/kpipewire-6.0.0.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIyBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmXWGV8ACgkQ11dEg7tX -sY2CGw/4/uc0tGl7decqrbXKRuF6o4TITbN01WipVrAPMEZUStZDTOPY41NMwdnU -u+i6XoHHlH3LEvNKgchOXCmIAuep9dcbXQPpn8LKtursH0XlhOOVeaSJA3gkQL7N -K3GxN+0QG88Pe23JadPpRImZbVNJ4NCL69S02BOnSoysGroZqvk3ab9xZyq4h7ak -33nTeVLwiH59sn3QjwVnkut/q6zZfEqAJuV8oGynEkdUCvGZDaVb4d7axpeBgQd+ -Rr+wj8um/JGXNmehGWDz475QPVJIzb/pFV8MH6r4+k1r8Lz2VK6QRqfOz7etOFpo -iR+1usU2RmTBSUqwgTI2ajAkQC1tPCfgjxwJ5Juou8jdvW4Nc0wYSeqc7J+8Swg1 -GOOqMtT+gKlgcVPT/+31JFLw2gtGcgXUbM0dudJuNrRMhIVF641zrbuxRZp69jOK -pzxOFgQcRmY4Hg6To2M2XsoMl3kLKv+U7XE4kU7AZ1lUTgfZ9eij3WrKkXPuFsW+ -WqAFitDLuFCXDwOEV2oAUvlRb233Ny3HuS3BdC459EFyvDFiiYwYgIEoOfxgfkDf -HMtXPAnIfoC3Pe/v7emX4f91beF1V8sssZC9U5gEa871LGjWVt6QRVIZN56fel5o -D01+9MH5L+JCWeo6dsnnF7eBy39o8wpw0wg222+uyViB65+i7A== -=KaUK ------END PGP SIGNATURE----- diff --git a/kpipewire-6.0.1.tar.xz b/kpipewire-6.0.1.tar.xz new file mode 100644 index 0000000..9b8554d --- /dev/null +++ b/kpipewire-6.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09f6a17d295d9474f479c56bcd8b8be690a5d5108701d0dc20227ef3851dbe39 +size 144736 diff --git a/kpipewire-6.0.1.tar.xz.sig b/kpipewire-6.0.1.tar.xz.sig new file mode 100644 index 0000000..b30a315 --- /dev/null +++ b/kpipewire-6.0.1.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmXnnjsACgkQ11dEg7tX +sY1O2BAAlKUHY3d9jeKDEZjXR8sJnuK7j/6IZqNDnkvchPPWJUNjzuSNPjPWBu5Q +0SXGa8bcVcm1IC914w/tcb5cdWXGoEaN2R5LsmgYmjbEY1LelXxqIAEHdEDLIT/O +nmRfK64d9hwFuRyDUV58KeJGkEcaKvAaHZ3Comfntp5A1S/TXYojeG2HMiHJ18Py +FgQw9rhsJmP+5ecRt6BxMDlct7WzL3qs45OsHjykOpuDo4hDq80LGgJB4IRS84TM +mhxwjFeMzIvowUN4J5JwlFPQYdl1W47Z0WuSFPHx+OqbGrwH4g0z6ZfVP1DShk71 +cVP++diI2sq1Uop4g2EhmRU9g54oogn3qwOEAZkztlMxzHFsuseeOXJE+OdnbHAW +mkvgHVbKHSvZL6lz0XeodEOR8WpxUuQuxXcdA7ZLNdyrlz7njokRUcu9the7iTEb +MATbzeJ/k3AwYN2OqIYSMD2PCya5MzOuVRMGjBKbLkx0YE3rZdLLGUH8bbDz53th +XYq1Azqr3q3smxmQhGNRjn/I++CefVSVNAM3AzjC/KacuAhjbqjS77wVBOMs+stj +GWrpRxsu6o5mR5G2b31Mxysj3UiSgbiMtUfZLgk7qvKU45Vn1cWcj9CbQ7aZi2Xh +4/4KI0brSSt7dCOm1RIZGlqQg8UAZKWwW7ZQnAn9yfgixvXNHpw= +=CL2m +-----END PGP SIGNATURE----- diff --git a/kpipewire6.changes b/kpipewire6.changes index cb28d75..7c3847d 100644 --- a/kpipewire6.changes +++ b/kpipewire6.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Mar 6 08:40:27 UTC 2024 - Fabian Vogt + +- Update to 6.0.1: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.1 +- Changes since 6.0.0: + * update version for new release +- Add patch to fix build (wtf): + * 0001-cmake-Add-missing-to-unbreak-the-build.patch +- Drop patch, no longer necessary: + * 0001-Set-SOVERSION-to-6.patch + ------------------------------------------------------------------- Wed Feb 21 18:36:12 UTC 2024 - Fabian Vogt @@ -12,7 +25,7 @@ Wed Feb 21 18:36:12 UTC 2024 - Fabian Vogt * revert to version 6.0.0 * set major version for soname * revert version number for bugfix release - * cherry-pick 530cbc35edcaab0e0ca01b2dabc0adb881d7eda0 Set the framework version in the project() call, Otherwise ecm_setup_version doesnt parse it properly + * Set the framework version in the project() call * bugfix release * Install kpipewire_version.h diff --git a/kpipewire6.spec b/kpipewire6.spec index 1eb8ce7..0f165c9 100644 --- a/kpipewire6.spec +++ b/kpipewire6.spec @@ -27,18 +27,18 @@ %{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kpipewire6 -Version: 6.0.0 +Version: 6.0.1 Release: 0 Summary: PipeWire integration for KDE Plasma License: LGPL-2.0-only AND LGPL-3.0-only URL: https://www.kde.org -Source: %{rname}-%{version}.tar.xz +Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz %if %{with released} -Source1: %{rname}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig Source2: plasma.keyring %endif # PATCH-FIX-UPSTREAM -Patch1: 0001-Set-SOVERSION-to-6.patch +Patch1: 0001-cmake-Add-missing-to-unbreak-the-build.patch BuildRequires: kf6-extra-cmake-modules BuildRequires: pkgconfig BuildRequires: qt6-gui-private-devel >= %{qt6_version}