Hello community,
here is the log from the commit of package libqjack for openSUSE:Factory
checked in at 2018-06-29 22:25:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqjack (Old)
and /work/SRC/openSUSE:Factory/.libqjack.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqjack"
Fri Jun 29 22:25:11 2018 rev:5 rq:616118 version:0.0+20170112
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqjack/libqjack.changes 2018-02-25
11:47:05.868310246 +0100
+++ /work/SRC/openSUSE:Factory/.libqjack.new/libqjack.changes 2018-06-29
22:25:12.982537164 +0200
@@ -1,0 +2,5 @@
+Mon Jun 11 18:13:47 UTC 2018 - aloi...@gmx.com
+
+- Added qjack-Qt511.patch to fix build with Qt 5.11
+
+-------------------------------------------------------------------
New:
----
qjack-Qt511.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqjack.spec ++++++
--- /var/tmp/diff_new_pack.4eKIOx/_old 2018-06-29 22:25:13.714536614 +0200
+++ /var/tmp/diff_new_pack.4eKIOx/_new 2018-06-29 22:25:13.718536610 +0200
@@ -23,12 +23,14 @@
Version: 0.0+%{_reldate}
Release: 0
Summary: Connect to the Jack Sound Server with Qt
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Development/Libraries/C and C++
Url: https://bitbucket.org/asiniscalchi/qjack
## https://bitbucket.org/asiniscalchi/qjack.git
Source: qjack-%{_reldate}.tar.bz2
Patch1: qjack-soname-lib.patch
+# PATCH-FIX-UPSTREAM qjack-Qt511.patch
+Patch2: qjack-Qt511.patch
BuildRequires: cmake
BuildRequires: gcc-c++ >= 4.5
BuildRequires: glibc-devel
@@ -61,6 +63,7 @@
%prep
%setup -q -n qjack-%{_reldate}
%patch1 -p1
+%patch2 -p1
%build
install -d build
++++++ qjack-Qt511.patch ++++++
From: Luigi Baldoni <aloi...@gmx.com>
Date: 2018-06-11 20:12:55 +0200
Subject: Fix for Qt 5.11
Upstream: submitted
The qt5_use_modules macro has been deprecated in Qt 5.11
---
Index: qjack-20170112/qjack/CMakeLists.txt
===================================================================
--- qjack-20170112.orig/qjack/CMakeLists.txt
+++ qjack-20170112/qjack/CMakeLists.txt
@@ -45,8 +45,8 @@ add_library(qjack_static STATIC ${qjack_
target_link_libraries(qjack_static ${LIBJACK_LIBRARIES})
if(Qt5Core_FOUND)
- qt5_use_modules(qjack Core)
- qt5_use_modules(qjack_static Core)
+ target_link_libraries(qjack Qt5::Core)
+ target_link_libraries(qjack_static Qt5::Core)
endif()
#install
Index: qjack-20170112/examples/CMakeLists.txt
===================================================================
--- qjack-20170112.orig/examples/CMakeLists.txt
+++ qjack-20170112/examples/CMakeLists.txt
@@ -16,21 +16,21 @@ find_package(Jack REQUIRED)
add_executable(example example.cpp)
target_link_libraries(example ${QT_LIBRARIES} qjack)
if(Qt5Core_FOUND)
- qt5_use_modules(example Core)
+ target_link_libraries(example Qt5::Core)
endif()
# Executable "qoutportexample"
add_executable(qoutportexample qoutportexample.cpp noiseqoutport.cpp
complexoscillator.cpp toneqoutport.cpp)
target_link_libraries(qoutportexample ${QT_LIBRARIES} qjack)
if(Qt5Core_FOUND)
- qt5_use_modules(qoutportexample Core)
+ target_link_libraries(qoutportexample Qt5::Core)
endif()
# Executable "qinportexample"
add_executable(qinportexample qinportexample.cpp rmsqinport.cpp
exponentialfilter.cpp )
target_link_libraries(qinportexample ${QT_LIBRARIES} qjack)
if(Qt5Core_FOUND)
- qt5_use_modules(qinportexample Core)
+ target_link_libraries(qinportexample Qt5::Core)
endif()
# Executable "qfillbufferexample" - peakaveragemeter is a QObject so generate
MOC
@@ -54,6 +54,6 @@ add_executable(qfillbufferexample qfillb
target_link_libraries(qfillbufferexample ${QT_LIBRARIES} qjack)
if(Qt5Core_FOUND)
- qt5_use_modules(qfillbufferexample Core)
+ target_link_libraries(qfillbufferexample Qt5::Core)
endif()
