commit kdegraphics-thumbnailers for openSUSE:Factory

31 Aug 2015

Hello community,

here is the log from the commit of package kdegraphics-thumbnailers for openSUSE:Factory checked in at 2015-08-31 22:59:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdegraphics-thumbnailers (Old)
 and      /work/SRC/openSUSE:Factory/.kdegraphics-thumbnailers.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdegraphics-thumbnailers"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kdegraphics-thumbnailers/kdegraphics-thumbnailers.changes	2015-07-14 17:33:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdegraphics-thumbnailers.new/kdegraphics-thumbnailers.changes	2015-08-31 22:59:20.000000000 +0200
@@ -1,0 +2,26 @@
+Sun Aug 30 17:41:57 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Added 0001-Initial-port-to-Frameworks.patch,
+  0002-Now-it-builds-with-KF5DCraw.patch and
+  0003-Build-with-latest-changes-in-libkexiv2-repo.patch from
+  upstream frameworks branch, to make thumbnailers usable with
+  15.08 dolphin
+- Added kio-devel, extra-cmake-modules, kf5-filesystem and
+  pkgconfig(Qt5Gui) >= 5.2.0 BuildRequires, due to above patch
+
+-------------------------------------------------------------------
+Wed Aug 19 19:43:01 UTC 2015 - cgiboudeaux@gmx.com
+
+- Update to KDE Applications 15.08.0
+   * KDE Applications 15.08.0
+   * https://www.kde.org/announcements/announce-applications-15.08.0.php
+
+-------------------------------------------------------------------
+Fri Aug  7 06:52:42 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.07.90
+   * KDE Applications 15.08.0 RC1
+   * https://www.kde.org/announcements/announce-applications-15.07.90.php
+
+
+-------------------------------------------------------------------

Old:
----
  kdegraphics-thumbnailers-15.04.3.tar.xz

New:
----
  0001-Initial-port-to-Frameworks.patch
  0002-Now-it-builds-with-KF5DCraw.patch
  0003-Build-with-latest-changes-in-libkexiv2-repo.patch
  kdegraphics-thumbnailers-15.08.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdegraphics-thumbnailers.spec ++++++
--- /var/tmp/diff_new_pack.xUJVNw/_old	2015-08-31 22:59:21.000000000 +0200
+++ /var/tmp/diff_new_pack.xUJVNw/_new	2015-08-31 22:59:21.000000000 +0200
@@ -17,19 +17,25 @@
 
 
 Name:           kdegraphics-thumbnailers
-Version:        15.04.3
+Version:        15.08.0
 Release:        0
 Summary:        Graphics file thumbnail generators
 License:        LGPL-2.1+
 Group:          Productivity/Graphics/Other
 Url:            http://www.kde.org
 Source0:        %{name}-%{version}.tar.xz
-BuildRequires:  libkdcraw-devel
-BuildRequires:  libkexiv2-devel
-BuildRequires:  oxygen-icon-theme-large
+Patch0:         0001-Initial-port-to-Frameworks.patch
+Patch1:         0002-Now-it-builds-with-KF5DCraw.patch
+Patch2:         0003-Build-with-latest-changes-in-libkexiv2-repo.patch
+# FIXME once kf5-based libs are released, enable these back
+#BuildRequires:  libkdcraw-devel
+#BuildRequires:  libkexiv2-devel
+BuildRequires:  extra-cmake-modules
+BuildRequires:  kf5-filesystem
+BuildRequires:  kio-devel
 BuildRequires:  xz
+BuildRequires:  pkgconfig(Qt5Gui) >= 5.2.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%kde4_runtime_requires
 
 %description
 This package allows KDE applications to show thumbnails
@@ -37,28 +43,20 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-  %cmake_kde4 -d build
+  %cmake_kf5 -d build
   %make_jobs
 
 %install
-  cd build
-  %make_install
-  %kde_post_install
-
-%post   -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%clean
-  rm -rf %{buildroot}
+  %kf5_makeinstall -C build
 
 %files
 %defattr(-,root,root)
-%{_kde4_modulesdir}/gsthumbnail.so
-%{_kde4_modulesdir}/rawthumbnail.so
-%{_kde4_servicesdir}/gsthumbnail.desktop
-%{_kde4_servicesdir}/rawthumbnail.desktop
+%{_kf5_servicesdir}/
+%{_kf5_plugindir}/
 
 %changelog

++++++ 0001-Initial-port-to-Frameworks.patch ++++++
...
From 010ca9359c20606e98d6c507f0b135cf4fc6c88e Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Mon, 27 Oct 2014 11:45:18 +0100
Subject: [PATCH 1/3] Initial port to Frameworks
KDcraw still needs some fixing to be usable to the outside world
---
 CMakeLists.txt     | 48 ++++++++++++++++++++++++++++++++++--------------
 ps/CMakeLists.txt  |  4 ++--
 ps/gscreator.cpp   |  3 +--
 raw/CMakeLists.txt |  8 ++------
 raw/rawcreator.cpp |  6 +++---
 5 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47bd2fb0f89b10fe8a3c5d05db59e8a484001fd1..c65fb3ab0ccba89095a1c105c2f98e2993819747 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,23 +1,43 @@
 project(kdegraphics-thumbnailers)
 
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
-include(MacroLibrary)
-include(MacroOptionalAddSubdirectory)
+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+set(QT_MIN_VERSION "5.2.0")
 
-add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
-include_directories(${KDE4_INCLUDES})
+find_package(ECM 1.0.0 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
-macro_optional_find_package(Kexiv2)
-macro_optional_find_package(Kdcraw)
+include(ECMOptionalAddSubdirectory)
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
+include(FeatureSummary)
 
-macro_log_feature(KEXIV2_FOUND "libkexiv2" "A library for reading and writing image metadata" "www.kde.org" FALSE "" "Required to build the RAW thumbnailer")
-macro_log_feature(KDCRAW_FOUND "libkdcraw" "A library for accessing raw files" "www.kde.org" FALSE "" "Required to build the RAW thumbnailer")
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Gui)
+find_package(KF5 REQUIRED COMPONENTS KIO)
 
-macro_optional_add_subdirectory(ps)
+add_definitions(${QT_DEFINITIONS} -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 
-if(KEXIV2_FOUND AND KDCRAW_FOUND)
-macro_optional_add_subdirectory(raw)
+find_package(KF5KExiv2)
+set_package_properties("KF5KExiv2"    PROPERTIES
+                       DESCRIPTION "A library for reading and writing image metadata"
+                       URL         "www.kde.org"
+                       TYPE        OPTIONAL
+                       PURPOSE     "Required to build the RAW thumbnailer"
+)
+
+find_package(KF5KDcraw)
+set_package_properties("KF5KDcraw"    PROPERTIES
+                       DESCRIPTION "A library for accessing raw files"
+                       URL         "www.kde.org"
+                       TYPE        OPTIONAL
+                       PURPOSE     "Required to build the RAW thumbnailer"
+)
+
+
+ecm_optional_add_subdirectory(ps)
+
+if(KF5KExiv2_FOUND AND KF5KDcraw_FOUND)
+ecm_optional_add_subdirectory(raw)
 endif()
 
-macro_display_feature_log()
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/ps/CMakeLists.txt b/ps/CMakeLists.txt
index b6643a3a157ad6f3179d389c2a60250ec8c15576..92ea9c26fc8f21adb5dda072694c0af15d92445e 100644
--- a/ps/CMakeLists.txt
+++ b/ps/CMakeLists.txt
@@ -3,10 +3,10 @@
 set(gsthumbnail_PART_SRCS gscreator.cpp dscparse.cpp dscparse_adapter.cpp)
 
 
-kde4_add_plugin(gsthumbnail ${gsthumbnail_PART_SRCS})
+add_library(gsthumbnail MODULE ${gsthumbnail_PART_SRCS})
 
 
-target_link_libraries(gsthumbnail  ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} )
+target_link_libraries(gsthumbnail  Qt5::Gui KF5::KIOWidgets )
 
 install(TARGETS gsthumbnail  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
diff --git a/ps/gscreator.cpp b/ps/gscreator.cpp
index 2650e306f1481c4cfa676130ca7f55313fa6f0bf..df2de700d5b6f549838406e0b3c9d35396923f4e 100644
--- a/ps/gscreator.cpp
+++ b/ps/gscreator.cpp
@@ -67,7 +67,6 @@
 #include <sys/wait.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <kdemacros.h>
 
 #include <qcolor.h>
 #include <qfile.h>
@@ -82,7 +81,7 @@
 
 extern "C"
 {
-    KDE_EXPORT ThumbCreator *new_creator()
+    Q_DECL_EXPORT ThumbCreator *new_creator()
     {
         return new GSCreator;
     }
diff --git a/raw/CMakeLists.txt b/raw/CMakeLists.txt
index adce793f9545f4492721a5fbc6aabaf481fd3814..f5d18f56cc62c9fb6a6f926b1c973cc37d4203bf 100644
--- a/raw/CMakeLists.txt
+++ b/raw/CMakeLists.txt
@@ -1,16 +1,12 @@
 project(rawthumbnail)
 
-## includes and linking
-include_directories(${KEXIV2_INCLUDE_DIR} ${KDCRAW_INCLUDE_DIR})
-
-
 #sources
 set(rawthumbnail_SRCS rawcreator.cpp)
-kde4_add_plugin(rawthumbnail ${rawthumbnail_SRCS})
+add_library(rawthumbnail MODULE ${rawthumbnail_SRCS})
 
 
 ## includes and linking
-target_link_libraries(rawthumbnail ${KDE4_KIO_LIBS} ${KDCRAW_LIBRARIES} ${KEXIV2_LIBRARIES} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS})
+target_link_libraries(rawthumbnail Qt5::Gui KF5::KIOWidgets KF5::Kdcraw KF5::Kexiv2)
 
 ## install the plugin
 install(TARGETS rawthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/raw/rawcreator.cpp b/raw/rawcreator.cpp
index 48d27492691b70affa5aa70a7a08c98bf0e4d6ba..e3c9ed4279a2feda5afa1f18bf24c76c4d6c1ecc 100644
--- a/raw/rawcreator.cpp
+++ b/raw/rawcreator.cpp
@@ -21,12 +21,12 @@
 
 #include <QImage>
 
-#include <libkdcraw/kdcraw.h>
-#include <libkexiv2/kexiv2.h>
+#include <kdcraw/kdcraw.h>
+#include <kexiv2/kexiv2.h>
 
 extern "C"
 {
-    KDE_EXPORT ThumbCreator *new_creator()
+    Q_DECL_EXPORT ThumbCreator *new_creator()
     {
         return new RAWCreator;
     }
-- 
2.5.0

++++++ 0002-Now-it-builds-with-KF5DCraw.patch ++++++
...
From a7e01b190b0978599631d66f6f03ee1c6a6eb1e4 Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Mon, 27 Oct 2014 12:18:19 +0100
Subject: [PATCH 2/3] Now it builds with KF5DCraw
---
 raw/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/raw/CMakeLists.txt b/raw/CMakeLists.txt
index f5d18f56cc62c9fb6a6f926b1c973cc37d4203bf..3dbbf24dc6e8e9ec0b11e7b8a9431c7b70c495a8 100644
--- a/raw/CMakeLists.txt
+++ b/raw/CMakeLists.txt
@@ -6,7 +6,7 @@ add_library(rawthumbnail MODULE ${rawthumbnail_SRCS})
 
 
 ## includes and linking
-target_link_libraries(rawthumbnail Qt5::Gui KF5::KIOWidgets KF5::Kdcraw KF5::Kexiv2)
+target_link_libraries(rawthumbnail Qt5::Gui KF5::KIOWidgets KF5::KDcraw KF5::Kexiv2)
 
 ## install the plugin
 install(TARGETS rawthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
-- 
2.5.0

++++++ 0003-Build-with-latest-changes-in-libkexiv2-repo.patch ++++++
...
From fa9e70cd5950e36608211507f53f8bd1d12e074f Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Sun, 30 Nov 2014 19:59:20 +0100
Subject: [PATCH 3/3] Build with latest changes in libkexiv2 repo
---
 raw/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/raw/CMakeLists.txt b/raw/CMakeLists.txt
index 3dbbf24dc6e8e9ec0b11e7b8a9431c7b70c495a8..e5e305691aa50330e12f0715ceaa8fde7c507c35 100644
--- a/raw/CMakeLists.txt
+++ b/raw/CMakeLists.txt
@@ -6,7 +6,7 @@ add_library(rawthumbnail MODULE ${rawthumbnail_SRCS})
 
 
 ## includes and linking
-target_link_libraries(rawthumbnail Qt5::Gui KF5::KIOWidgets KF5::KDcraw KF5::Kexiv2)
+target_link_libraries(rawthumbnail Qt5::Gui KF5::KIOWidgets KF5::KDcraw KF5::KExiv2)
 
 ## install the plugin
 install(TARGETS rawthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
-- 
2.5.0

++++++ kdegraphics-thumbnailers-15.04.3.tar.xz -> kdegraphics-thumbnailers-15.08.0.tar.xz ++++++

    

commit kdegraphics-thumbnailers for openSUSE:Factory

root＠hilbert.suse.de