aboutsummaryrefslogtreecommitdiffstats
path: root/graphics/kipi-plugins-kde4
diff options
context:
space:
mode:
authorrakuco <rakuco@FreeBSD.org>2016-04-15 03:06:40 +0800
committerrakuco <rakuco@FreeBSD.org>2016-04-15 03:06:40 +0800
commite9ad886e44162415aab1bbfdd1d4f1e3f99f494c (patch)
tree051583946fdc17f3a3d3ca1b88558aa6e4cf8102 /graphics/kipi-plugins-kde4
parent254c6e4f2a395f8104a193d7b45bf9bfae9dcaac (diff)
downloadfreebsd-ports-gnome-e9ad886e44162415aab1bbfdd1d4f1e3f99f494c.tar.gz
freebsd-ports-gnome-e9ad886e44162415aab1bbfdd1d4f1e3f99f494c.tar.zst
freebsd-ports-gnome-e9ad886e44162415aab1bbfdd1d4f1e3f99f494c.zip
Update DigiKam and related ports to 4.14.0.
This is a huge leap, as we are moving from 4.2.0 (released in August 2014) to 4.14.0 (released in October 2015). Version 4.14.0 is the last KDE4-based release, and 5.0.0 will be based on KDE Frameworks 5. Noteworthy port changes: - Most patches in graphics/digikam-kde4 are no longer necessary. - graphics/kipi-plugin-googledrive and graphics/kipi-plugin-picasaweb have been merged into graphics/kipi-plugin-googleservices following what upstream did to those plugins. - astro/libkgeomap and graphics/libkface are no longer included in the DigiKam tarball and are now completely independent ports whose tarballs are released as part of KDE Applications. - net/libmediawiki is neither included in the DigiKam tarball nor released as a separate tarball, so we had to resort to fetching it from an older DigiKam release which contains it. - graphics/digikam-kde4 now has a runtime dependency on x11/kde4-runtime. See bug 203222 for details. A lot of people have contributed to this update over the years in our experimental area51 repository. Tobias Berner (our usual suspect), Adriaan de Groot, makc@, alonso@ and jhale@ at the very least. PR: 203222 PR: 204623 Submitted by: Tobias Berner <tcberner@gmail.com>, Adriaan de Groot <groot@kde.org>, alonso, jhale, makc, rakuco
Diffstat (limited to 'graphics/kipi-plugins-kde4')
-rw-r--r--graphics/kipi-plugins-kde4/Makefile1
-rw-r--r--graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt28
-rw-r--r--graphics/kipi-plugins-kde4/files/extrapatch-extra_kipi_plugins_cmakelists.patch20
3 files changed, 36 insertions, 13 deletions
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index c4fc6f6ea2f6..f95ae4f68ba0 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= ${DIGIKAM_VER}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics kde
-DISTFILES= #
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 kipi graphics plugins (meta port)
diff --git a/graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt b/graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt
index bf85629066c7..552aa033329b 100644
--- a/graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt
+++ b/graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt
@@ -1,15 +1,19 @@
---- ./CMakeLists.txt.orig 2013-03-11 08:24:11.000000000 +0000
-+++ ./CMakeLists.txt 2013-04-05 19:33:30.200669787 +0000
-@@ -410,7 +410,6 @@
+--- ./CMakeLists.txt.orig 2015-02-25 22:15:14.659030000 +0100
++++ ./CMakeLists.txt 2015-02-25 22:17:07.071209000 +0100
+@@ -356,7 +356,6 @@
- # Plugins which will be always compiled
+ # Plugins which will be always compiled
-- ADD_SUBDIRECTORY(common)
- ADD_SUBDIRECTORY(timeadjust)
- ADD_SUBDIRECTORY(jpeglossless)
- ADD_SUBDIRECTORY(rawconverter)
-@@ -515,3 +514,4 @@
- ENDIF(NOT WIN32)
+- add_subdirectory(common)
+ add_subdirectory(timeadjust)
+ add_subdirectory(jpeglossless)
+ add_subdirectory(rawconverter)
+@@ -468,7 +467,7 @@
+ endif()
- ENDIF(KIPIPLUGINS_CAN_BE_COMPILED)
-+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/common/libkipiplugins/tools/kpversion.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/common/libkipiplugins/kpversion.h)
+ endif()
+-
++ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/common/libkipiplugins/tools/kpversion.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/common/libkipiplugins/kpversion.h)
+ else()
+
+ message(STATUS "")
diff --git a/graphics/kipi-plugins-kde4/files/extrapatch-extra_kipi_plugins_cmakelists.patch b/graphics/kipi-plugins-kde4/files/extrapatch-extra_kipi_plugins_cmakelists.patch
new file mode 100644
index 000000000000..f9797aae5e38
--- /dev/null
+++ b/graphics/kipi-plugins-kde4/files/extrapatch-extra_kipi_plugins_cmakelists.patch
@@ -0,0 +1,20 @@
+Do not expanding the variables in the if() clause twice, otherwise if OpenCV is
+not found we end up with an error like this:
+
+CMake Error at CMakeLists.txt:186 (if):
+ if given arguments:
+
+ "FALSE" "AND" "VERSION_GREATER" "2.4.99"
+
+ Unknown arguments specified
+--- ./CMakeLists.txt.orig 2016-03-28 21:43:04.153625000 +0000
++++ ./CMakeLists.txt 2016-03-28 21:43:15.768736000 +0000
+@@ -182,7 +182,7 @@
+ set(OPENCV_MIN_VERSION "2.4.9")
+ DETECT_OPENCV(${OPENCV_MIN_VERSION} core highgui objdetect contrib legacy imgproc)
+
+- if(${OpenCV_FOUND} AND ${OpenCV_VERSION} VERSION_GREATER 2.4.99)
++ if(OpenCV_FOUND AND OpenCV_VERSION VERSION_GREATER 2.4.99)
+ message(STATUS "ENABLE_OPENCV3 option is disabled and OpenCV >= 3.0.0 have been found. Enabled ENABLE_OPENCV3")
+ set(OpenCV_FOUND FALSE)
+ endif()