Hello community, here is the log from the commit of package nextcloud-client for openSUSE:Factory checked in at 2018-06-19 11:57:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nextcloud-client (Old) and /work/SRC/openSUSE:Factory/.nextcloud-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nextcloud-client" Tue Jun 19 11:57:16 2018 rev:11 rq:616366 version:2.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/nextcloud-client/nextcloud-client.changes 2018-03-02 21:10:49.722838300 +0100 +++ /work/SRC/openSUSE:Factory/.nextcloud-client.new/nextcloud-client.changes 2018-06-19 11:57:23.364009256 +0200 @@ -1,0 +2,6 @@ +Tue Jun 12 11:12:00 UTC 2018 - [email protected] + +- Add nextcloud-client-2.3.3-fix-qt-5.11.patch: Fix Qt 5.11+ + compatibility. + +------------------------------------------------------------------- New: ---- nextcloud-client-2.3.3-fix-qt-5.11.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nextcloud-client.spec ++++++ --- /var/tmp/diff_new_pack.5K6Ac5/_old 2018-06-19 11:57:24.919951482 +0200 +++ /var/tmp/diff_new_pack.5K6Ac5/_new 2018-06-19 11:57:24.923951334 +0200 @@ -1,7 +1,7 @@ # # spec file for package nextcloud-client # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,9 +22,9 @@ Version: 2.3.3 Release: 0 Summary: Nextcloud desktop synchronisation client -License: GPL-2.0+ AND LGPL-3.0+ +License: GPL-2.0-or-later AND LGPL-3.0-or-later Group: Productivity/Networking/File-Sharing -Url: https://nextcloud.com/ +URL: https://nextcloud.com/ Source: https://launchpad.net/~nextcloud-devs/+archive/ubuntu/client/+files/%{name}_%{version}.orig.tar.bz2 Source1: sysctl-sync-inotify.conf # PATCH-FIX-OPENSUSE nextcloud-client-fix-rpath.patch [email protected] -- Fix RPATH. @@ -33,6 +33,8 @@ Patch1: nextcloud-client-remove-datetime.patch # PATCH-FIX-OPENSUSE nextcloud-client-fix-caja-nemo-appnames.patch [email protected] -- Fix the Caja and Nemo extensions appname. Patch2: nextcloud-client-fix-caja-nemo-appnames.patch +# PATCH-FIX-OPENSUSE nextcloud-client-2.3.3-fix-qt-5.11.patch -- Fix Qt 5.11+ compatibility. +Patch3: nextcloud-client-2.3.3-fix-qt-5.11.patch BuildRequires: cmake >= 2.8.0 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -58,10 +60,10 @@ BuildRequires: pkgconfig(sqlite3) Requires: %{soname}%{sover} = %{version} Recommends: %{name}-lang -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) BuildRequires: kio-devel %endif -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) BuildRequires: doxygen BuildRequires: python3-Sphinx Suggests: %{name}-doc = %{version} @@ -79,7 +81,7 @@ %lang_package -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) %package doc Summary: Documentation for nextcloud-client Group: Documentation/HTML @@ -136,7 +138,7 @@ This package provides overlay icons to visualise the synchronisation state in the Nautilus file manager. -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) %package -n nemo-extension-nextcloud Summary: Nemo overlay icons Group: Productivity/File utilities @@ -167,6 +169,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 cp -f %{SOURCE1} sysctl-sync-inotify.conf # A workaround for gh#owncloud/ownbrander#322 @@ -178,7 +181,7 @@ %cmake \ -DGIT_SHA1="GITDIR-NOTFOUND" \ -DCMAKE_SKIP_RPATH=OFF \ -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) -DWITH_DOC=ON \ %endif -DOEM_THEME_DIR="$nextcloud_theme" @@ -195,7 +198,7 @@ rm -rf %{buildroot}%{_datadir}/caja-python/ %endif -%if 0%{?suse_version} <= 1320 && (0%{?sle_version} < 120200 && 0%{?is_opensuse}) +%if 0%{?suse_version} < 1500 && (0%{?sle_version} < 120200 && 0%{?is_opensuse}) # There's no Nemo in openSUSE Leap 42.1 and older. rm -rf %{buildroot}%{_datadir}/nemo-python/ %endif @@ -207,7 +210,7 @@ fi done -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) # Properly rename mans. mv -f %{buildroot}%{_mandir}/man1/{owncloud,nextcloud}.1 mv -f %{buildroot}%{_mandir}/man1/{owncloudcmd,nextcloudcmd}.1 @@ -228,7 +231,7 @@ %postun -n %{soname}%{sover} -p /sbin/ldconfig -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -239,31 +242,39 @@ %endif %files +%if 0%{?suse_version} >= 1500 +%license LICENSE +%else %doc LICENSE +%endif %config %{_sysconfdir}/Nextcloud/ %config %{_sysconfdir}/sysctl.d/100-%{name}-sync-inotify.conf %{_bindir}/nextcloud* %dir %{_datadir}/nextcloud/ %{_datadir}/applications/nextcloud.desktop -%if 0%{?suse_version} <= 1320 && 0%{?sle_version} < 120200 +%if 0%{?suse_version} < 1500 && 0%{?sle_version} < 120200 %dir %{_datadir}/icons/hicolor/512x512/ %dir %{_datadir}/icons/hicolor/512x512/apps/ %endif %{_datadir}/icons/hicolor/*/apps/Nextcloud*.* -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) %{_mandir}/man1/nextcloud*.1%{?ext_man} %endif %files lang %{_datadir}/nextcloud/i18n/ -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) %files doc %doc %{_docdir}/%{name}-doc/ %endif %files -n %{soname}%{sover} +%if 0%{?suse_version} >= 1500 +%license LICENSE +%else %doc LICENSE +%endif %{_libdir}/%{soname}.so.* %dir %{_libdir}/nextcloud/ %{_libdir}/nextcloud/libocsync.so.* @@ -285,7 +296,7 @@ %dir %{_datadir}/nautilus-python/extensions/ %{_datadir}/nautilus-python/extensions/syncstate-Nextcloud.py* -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) %files -n nemo-extension-nextcloud %dir %{_datadir}/nemo-python/ %dir %{_datadir}/nemo-python/extensions/ ++++++ nextcloud-client-2.3.3-fix-qt-5.11.patch ++++++ --- a/client/cmake/modules/QtVersionAbstraction.cmake +++ b/client/cmake/modules/QtVersionAbstraction.cmake @@ -134,9 +134,6 @@ if(NOT Qt5Core_FOUND) find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} ) macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://www.qt-project.org"; TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n qtwebkit-devel package and whatever contains QtUiTools is installed too") - macro(qt5_use_modules) - endmacro() - macro(qt_wrap_ui) qt4_wrap_ui(${ARGN}) endmacro() --- a/client/src/cmd/CMakeLists.txt +++ b/client/src/cmd/CMakeLists.txt @@ -22,7 +22,6 @@ include_directories(${CMAKE_SOURCE_DIR}/ if(NOT BUILD_LIBRARIES_ONLY) add_executable(${cmd_NAME} ${cmd_SRC}) - qt5_use_modules(${cmd_NAME} Network Sql) set_target_properties(${cmd_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) if(LIB_INSTALL_DIR MATCHES "^/") @@ -33,7 +32,7 @@ if(NOT BUILD_LIBRARIES_ONLY) INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" ) endif() - target_link_libraries(${cmd_NAME} ${synclib_NAME}) + target_link_libraries(${cmd_NAME} Qt5::Core Qt5::Network ${synclib_NAME}) endif() if(BUILD_OWNCLOUD_OSX_BUNDLE) --- a/client/src/crashreporter/CMakeLists.txt +++ b/client/src/crashreporter/CMakeLists.txt @@ -32,8 +32,6 @@ if(NOT BUILD_LIBRARIES_ONLY) ${crashreporter_RC_RCC} ) - qt5_use_modules(${CRASHREPORTER_EXECUTABLE} Widgets Network) - set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON) set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) if(LIB_INSTALL_DIR MATCHES "^/") @@ -43,7 +41,7 @@ if(NOT BUILD_LIBRARIES_ONLY) endif() target_link_libraries(${CRASHREPORTER_EXECUTABLE} crashreporter-gui - ${QT_LIBRARIES} + Qt5::Core Qt5::Widgets Qt5::Network ) if(BUILD_OWNCLOUD_OSX_BUNDLE) --- a/client/src/gui/CMakeLists.txt +++ b/client/src/gui/CMakeLists.txt @@ -237,10 +237,10 @@ list(APPEND final_src ${ownCloud}) set(ownCloud ${ownCloud_old}) if (WITH_DBUS) - set(ADDITIONAL_APP_MODULES DBus) + set(ADDITIONAL_APP_MODULES Qt5::DBus) endif(WITH_DBUS) if (NOT NO_SHIBBOLETH) - list(APPEND ADDITIONAL_APP_MODULES WebKitWidgets) + list(APPEND ADDITIONAL_APP_MODULES Qt5::WebKitWidgets) endif() if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) @@ -260,14 +260,12 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src}) add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src}) - qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml Sql ${ADDITIONAL_APP_MODULES}) else() # set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf. set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns") # we must add MACOSX_BUNDLE only if building a bundle add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src}) - qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml Sql ${ADDITIONAL_APP_MODULES}) set (QM_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/Translations) install(FILES ${client_I18N} DESTINATION ${QM_DIR}) @@ -285,8 +283,7 @@ else() endif() add_library(updater STATIC ${updater_SRCS} ${updaterMoc}) -target_link_libraries(updater ${synclib_NAME}) -qt5_use_modules(updater Widgets Network Xml) +target_link_libraries(updater Qt5::Widgets Qt5::Network Qt5::Xml ${synclib_NAME}) set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} @@ -300,7 +297,7 @@ else(LIB_INSTALL_DIR MATCHES "^/") INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" ) endif() -target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} ) +target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml ${ADDITIONAL_APP_MODULES} ) target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} ) target_link_libraries( ${APPLICATION_EXECUTABLE} updater ) target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} ) --- a/client/src/libsync/CMakeLists.txt +++ b/client/src/libsync/CMakeLists.txt @@ -137,9 +137,9 @@ GENERATE_EXPORT_HEADER( ${synclib_NAME} ) if(TOKEN_AUTH_ONLY) - qt5_use_modules(${synclib_NAME} Network Concurrent) + target_link_libraries(${synclib_NAME} Qt5::Network Qt5::Concurrent) else() - qt5_use_modules(${synclib_NAME} Widgets Network Concurrent) + target_link_libraries(${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Concurrent) endif() set_target_properties( ${synclib_NAME} PROPERTIES @@ -163,14 +163,14 @@ endif() if(BUILD_LIBRARIES_ONLY) #add_library(${synclib_NAME}_static STATIC ${libsync_SRCS} ${syncMoc}) - #qt5_use_modules(${synclib_NAME}_static Widgets Network Xml Sql) #set_target_properties( ${synclib_NAME}_static PROPERTIES # VERSION ${MIRALL_VERSION} # SOVERSION ${MIRALL_SOVERSION} #) - #target_link_libraries(${synclib_NAME}_static ${libsync_LINK_TARGETS} ) + #target_link_libraries(${synclib_NAME}_static Qt5::Widgets Qt5::Network Qt5::Xml + # ${libsync_LINK_TARGETS} ) endif() if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) --- a/client/test/owncloud_add_test.cmake +++ b/client/test/owncloud_add_test.cmake @@ -1,3 +1,5 @@ +find_package(Qt5 COMPONENTS Core Test Xml Network REQUIRED) + macro(owncloud_add_test test_class additional_cpp) include_directories(${QT_INCLUDES} "${PROJECT_SOURCE_DIR}/src/gui" @@ -11,14 +13,12 @@ macro(owncloud_add_test test_class addit string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE) add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp}) - qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml Network) set_target_properties(${OWNCLOUD_TEST_CLASS}Test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}) target_link_libraries(${OWNCLOUD_TEST_CLASS}Test updater ${APPLICATION_EXECUTABLE}sync - ${QT_QTTEST_LIBRARY} - ${QT_QTCORE_LIBRARY} + Qt5::Core Qt5::Test Qt5::Xml Qt5::Network ) add_definitions(-DOWNCLOUD_TEST) @@ -40,14 +40,12 @@ macro(owncloud_add_benchmark test_class string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE) add_executable(${OWNCLOUD_TEST_CLASS}Bench benchmarks/bench${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp}) - qt5_use_modules(${OWNCLOUD_TEST_CLASS}Bench Test Sql Xml Network) set_target_properties(${OWNCLOUD_TEST_CLASS}Bench PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}) target_link_libraries(${OWNCLOUD_TEST_CLASS}Bench updater ${APPLICATION_EXECUTABLE}sync - ${QT_QTTEST_LIBRARY} - ${QT_QTCORE_LIBRARY} + Qt5::Core Qt5::Test Qt5::Xml Qt5::Network ) add_definitions(-DOWNCLOUD_TEST)
