Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2019-09-23 12:00:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phonon4qt5" Mon Sep 23 12:00:16 2019 rev:22 rq:730299 version:4.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes 2019-09-07 11:31:39.638447488 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new.7948/phonon4qt5.changes 2019-09-23 12:00:17.465975900 +0200 @@ -1,0 +2,5 @@ +Wed Sep 11 11:34:40 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Add 0001-Remove-phonon-from-the-include-directory.patch + +------------------------------------------------------------------- New: ---- 0001-Remove-phonon-from-the-include-directory.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon4qt5.spec ++++++ --- /var/tmp/diff_new_pack.lPTkRZ/_old 2019-09-23 12:00:18.221975775 +0200 +++ /var/tmp/diff_new_pack.lPTkRZ/_new 2019-09-23 12:00:18.225975775 +0200 @@ -27,6 +27,8 @@ URL: https://phonon.kde.org/ Source: https://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch0: 0001-Remove-phonon-from-the-include-directory.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= 5.60.0 BuildRequires: fdupes @@ -97,6 +99,7 @@ %prep %setup -q -n %{rname}-%{version} +%patch0 -p1 %build %cmake_kf5 -d build ++++++ 0001-Remove-phonon-from-the-include-directory.patch ++++++ >From 8f08d48405c689cea5d91fe9e9d77b09c7b0c378 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Wed, 11 Sep 2019 11:51:47 +0200 Subject: [PATCH] Remove 'phonon' from the include directory Summary: Both the CMake and pkgconfig files say the include directory is `<prefix>/include/phonon4qt5`. Only the .pri file points to a different location. This fixes the nulloy build with recent phonon versions. Reviewers: sitter, O4 phonon Differential Revision: https://phabricator.kde.org/D23873 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85290887..ccf65c68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,7 +170,7 @@ ecm_generate_pri_file( LIB_NAME ${PHONON_LIB_SONAME} DEPS "core widgets" FILENAME_VAR pri_filename - INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/phonon + INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR} ) install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) -- 2.23.0
