Hello community, here is the log from the commit of package q4wine for openSUSE:Factory checked in at 2018-06-25 11:39:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/q4wine (Old) and /work/SRC/openSUSE:Factory/.q4wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "q4wine" Mon Jun 25 11:39:05 2018 rev:33 rq:618381 version:1.3.7 Changes: -------- --- /work/SRC/openSUSE:Factory/q4wine/q4wine.changes 2018-05-02 12:19:03.010805909 +0200 +++ /work/SRC/openSUSE:Factory/.q4wine.new/q4wine.changes 2018-06-25 11:39:21.940202617 +0200 @@ -1,0 +2,5 @@ +Wed Jun 20 08:11:18 UTC 2018 - [email protected] + +- Add q4wine-qt511.patch: Fix build with Qt >= 5.11. + +------------------------------------------------------------------- New: ---- q4wine-qt511.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ q4wine.spec ++++++ --- /var/tmp/diff_new_pack.YllP5f/_old 2018-06-25 11:39:23.816133371 +0200 +++ /var/tmp/diff_new_pack.YllP5f/_new 2018-06-25 11:39:23.824133076 +0200 @@ -24,6 +24,8 @@ Group: System/Emulators/PC URL: http://q4wine.brezblock.org.ua/ Source0: https://github.com/brezerk/q4wine/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM q4wine-qt511.patch -- fix build with Qt >= 5.11 (fixed in git) +Patch0: q4wine-qt511.patch BuildRequires: cmake >= 2.8.0 BuildRequires: fdupes BuildRequires: fuseiso @@ -67,11 +69,11 @@ %prep %setup -q +%patch0 -p1 %build mkdir build cd build -# FIXME: you should use %%cmake macros cmake .. \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_C_FLAGS="%{optflags}" \ ++++++ q4wine-qt511.patch ++++++ Index: q4wine-1.3.7/src/q4wine-cli/CMakeLists.txt =================================================================== --- q4wine-1.3.7.orig/src/q4wine-cli/CMakeLists.txt +++ q4wine-1.3.7/src/q4wine-cli/CMakeLists.txt @@ -34,7 +34,7 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD ENDIF(${CMAKE_SYSTEM_NAME} MATCHES FreeBSD) if(QT5 MATCHES ON) - qt5_use_modules(q4wine-cli Core DBus Network Sql Widgets Xml) + target_link_libraries(q4wine-cli Qt5::Core Qt5::DBus Qt5::Network Qt5::Sql Qt5::Widgets Qt5::Xml) target_link_libraries(q4wine-cli q4wine-core ${BSD_LIBS}) else(QT5 MATCHES ON) TARGET_LINK_LIBRARIES( q4wine-cli ${QT_LIBRARIES} q4wine-core ${BSD_LIBS}) Index: q4wine-1.3.7/src/q4wine-gui/CMakeLists.txt =================================================================== --- q4wine-1.3.7.orig/src/q4wine-gui/CMakeLists.txt +++ q4wine-1.3.7/src/q4wine-gui/CMakeLists.txt @@ -209,7 +209,7 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD ENDIF(${CMAKE_SYSTEM_NAME} MATCHES FreeBSD) if (QT5 MATCHES ON) - qt5_use_modules(q4wine Core DBus Network Sql Widgets Xml) + target_link_libraries(q4wine Qt5::Core Qt5::DBus Qt5::Network Qt5::Sql Qt5::Widgets Qt5::Xml) target_link_libraries(q4wine q4wine-core ${BSD_LIBS} ${QTSINGLEAPPLIB}) else (QT5 MATCHES ON) TARGET_LINK_LIBRARIES( q4wine ${QT_LIBRARIES} q4wine-core ${BSD_LIBS} ${QTSINGLEAPPLIB}) Index: q4wine-1.3.7/src/q4wine-helper/CMakeLists.txt =================================================================== --- q4wine-1.3.7.orig/src/q4wine-helper/CMakeLists.txt +++ q4wine-1.3.7/src/q4wine-helper/CMakeLists.txt @@ -60,7 +60,7 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD ENDIF(${CMAKE_SYSTEM_NAME} MATCHES FreeBSD) if(QT5 MATCHES ON) - qt5_use_modules(q4wine-helper Core DBus Network Sql Widgets Xml) + target_link_libraries(q4wine-helper Qt5::Core Qt5::DBus Qt5::Network Qt5::Sql Qt5::Widgets Qt5::Xml) target_link_libraries(q4wine-helper q4wine-core ${BSD_LIBS}) else(QT5 MATCHES ON) TARGET_LINK_LIBRARIES( q4wine-helper ${QT_LIBRARIES} q4wine-core ${BSD_LIBS}) Index: q4wine-1.3.7/src/q4wine-lib/CMakeLists.txt =================================================================== --- q4wine-1.3.7.orig/src/q4wine-lib/CMakeLists.txt +++ q4wine-1.3.7/src/q4wine-lib/CMakeLists.txt @@ -85,7 +85,7 @@ IF( ${CMAKE_SYSTEM_NAME} MATCHES Darwin ENDIF( ${CMAKE_SYSTEM_NAME} MATCHES Darwin ) if(QT5 MATCHES ON) - qt5_use_modules(q4wine-core Core DBus Network Sql Widgets Xml) + target_link_libraries(q4wine-core Qt5::Core Qt5::DBus Qt5::Network Qt5::Sql Qt5::Widgets Qt5::Xml) else(QT5 MATCHES ON) target_link_libraries( q4wine-core ${QT_LIBRARIES}) endif(QT5 MATCHES ON) Index: q4wine-1.3.7/src/qtsingleapplication/CMakeLists.txt =================================================================== --- q4wine-1.3.7.orig/src/qtsingleapplication/CMakeLists.txt +++ q4wine-1.3.7/src/qtsingleapplication/CMakeLists.txt @@ -23,5 +23,5 @@ ENDIF( QT5 MATCHES ON ) ADD_LIBRARY( qtsingleapp STATIC ${QSINGLEAPP_LIB_SOURCES} ${QSINGLEAPP_LIB_HEADERS} ${QTSINGLEAPPLICATION-LIB-MOC-SRCS} ) if(QT5 MATCHES ON) - qt5_use_modules(qtsingleapp Core Network Widgets) + target_link_libraries(qtsingleapp Qt5::Core Qt5::Network Qt5::Widgets) endif(QT5 MATCHES ON) \ No newline at end of file
