Hello community, here is the log from the commit of package kde-odf-thumbnail for openSUSE:Factory checked in at 2016-03-09 15:17:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde-odf-thumbnail (Old) and /work/SRC/openSUSE:Factory/.kde-odf-thumbnail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde-odf-thumbnail" Changes: -------- --- /work/SRC/openSUSE:Factory/kde-odf-thumbnail/kde-odf-thumbnail.changes 2014-05-05 21:09:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kde-odf-thumbnail.new/kde-odf-thumbnail.changes 2016-03-09 16:49:01.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 7 10:40:09 UTC 2016 - wba...@tmo.at + +- Added port-to-kf5.patch: build against KF5 on Leap and Tumbleweed + so that it can be used with the KF5 based dolphin (boo#958290) +- Adjusted package description, koffice2 doesn't exist any more + +------------------------------------------------------------------- @@ -6,0 +14 @@ +------------------------------------------------------------------- New: ---- port-to-kf5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde-odf-thumbnail.spec ++++++ --- /var/tmp/diff_new_pack.DA0iFu/_old 2016-03-09 16:49:02.000000000 +0100 +++ /var/tmp/diff_new_pack.DA0iFu/_new 2016-03-09 16:49:02.000000000 +0100 @@ -24,22 +24,38 @@ Group: System/GUI/KDE Url: http://kde-apps.org/content/show.php?content=110864 Source: %{name}-%{version}.tar.gz +# PATCH-FIX-OPENSUSE port-to-kf5.patch boo#958290 wba...@tmo.at -- port it to KDE Frameworks5 +Patch: port-to-kf5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{suse_version} <= 1320 && !0%{?is_opensuse} %kde4_runtime_requires BuildRequires: libkde4-devel BuildRequires: libkdecore4-devel +%else +BuildRequires: extra-cmake-modules +BuildRequires: karchive-devel +BuildRequires: kio-devel +BuildRequires: pkgconfig(Qt5Gui) +%endif %description Plugin for KDE file managers (Dolphin and Konqueror) to preview ODF (OpenDocument Format) files as Thumbnails. -If you have koffice2 installed you won't need this package. koffice2 provides it's own ODF thumbnailer +If you have calligra-extras-dolphin installed you won't need this package. calligra provides it's own ODF thumbnailer %prep %setup -q +%if %{suse_version} > 1320 || 0%{?is_opensuse} +%patch -p1 +%endif %build +%if %{suse_version} <= 1320 && !0%{?is_opensuse} %cmake_kde4 -d build +%else +%cmake_kf5 -d build +%endif %make_jobs %install @@ -47,7 +63,9 @@ %makeinstall cd .. +%if %{suse_version} <= 1320 && !0%{?is_opensuse} %kde_post_install +%endif %clean rm -rf %{buildroot} @@ -55,7 +73,12 @@ %files %defattr(-,root,root,-) %doc README LICENSE LICENSE.html +%if %{suse_version} <= 1320 && !0%{?is_opensuse} %{_kde4_modulesdir}/opendocumentthumbnail.so %{_kde4_servicesdir}/opendocumentthumbnail.desktop +%else +%{_kf5_plugindir}/opendocumentthumbnail.so +%{_kf5_servicesdir}/opendocumentthumbnail.desktop +%endif %changelog ++++++ port-to-kf5.patch ++++++ diff -ur kde-odf-thumbnail-1.0.0.old/CMakeLists.txt kde-odf-thumbnail-1.0.0/CMakeLists.txt --- kde-odf-thumbnail-1.0.0.old/CMakeLists.txt 2010-01-20 15:41:31.000000000 +0100 +++ kde-odf-thumbnail-1.0.0/CMakeLists.txt 2016-03-05 23:49:12.947874730 +0100 @@ -1,8 +1,18 @@ project(OpenDocumentThumbnail) -find_package(KDE4 REQUIRED) -include (KDE4Defaults) +cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) +set(QT_MIN_VERSION "5.2.0") -include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} ) +find_package(ECM 1.0.0 REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDECompilerSettings) + +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Gui) +find_package(KF5 REQUIRED COMPONENTS KIO Archive) + +add_definitions(${QT_DEFINITIONS} -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) add_subdirectory( src ) diff -ur kde-odf-thumbnail-1.0.0.old/src/CMakeLists.txt kde-odf-thumbnail-1.0.0/src/CMakeLists.txt --- kde-odf-thumbnail-1.0.0.old/src/CMakeLists.txt 2010-01-20 15:44:25.000000000 +0100 +++ kde-odf-thumbnail-1.0.0/src/CMakeLists.txt 2016-03-05 23:48:14.807877671 +0100 @@ -1,11 +1,11 @@ set(OpenDocumentThumbnail_SRCS opendocumentcreator.cpp) -qt4_add_resources(OpenDocumentThumbnail_SRCS opendocumentthumbnail.qrc) +qt5_add_resources(OpenDocumentThumbnail_SRCS opendocumentthumbnail.qrc) -kde4_add_plugin(opendocumentthumbnail ${OpenDocumentThumbnail_SRCS}) +add_library(opendocumentthumbnail MODULE ${OpenDocumentThumbnail_SRCS}) -target_link_libraries(opendocumentthumbnail ${KDE4_KIO_LIBS} ) +target_link_libraries(opendocumentthumbnail Qt5::Gui KF5::KIOWidgets KF5::Archive) install(TARGETS opendocumentthumbnail DESTINATION ${PLUGIN_INSTALL_DIR} ) diff -ur kde-odf-thumbnail-1.0.0.old/src/opendocumentcreator.cpp kde-odf-thumbnail-1.0.0/src/opendocumentcreator.cpp --- kde-odf-thumbnail-1.0.0.old/src/opendocumentcreator.cpp 2010-01-22 21:39:46.000000000 +0100 +++ kde-odf-thumbnail-1.0.0/src/opendocumentcreator.cpp 2016-03-05 23:42:31.955638510 +0100 @@ -28,7 +29,7 @@ extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + Q_DECL_EXPORT ThumbCreator *new_creator() { return new ODFCreator; }
