[kde-freebsd] update of digikam and friends to 4.8.0
Hi
attached is a diff to bring digikam from 4.2.0 to 4.8.0.
I dropped quite a few patches of graphics/digikam-kde4, as they seem to have
made their way upstream.
I added the patch from the open pr 178063 [1] (I was not able to edit a file
without it).
I also added explicit _ON and _OFF to options that were not there, and threw
baloo at the pimlibs dependency.
Please let me know, if there is something to improve.
mfg Tobias
[1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=178063
Index: PORTS/astro/libkgeomap/Makefile
===
--- PORTS/astro/libkgeomap/Makefile (Revision 10610)
+++ PORTS/astro/libkgeomap/Makefile (Arbeitskopie)
@@ -17,6 +17,6 @@
post-patch:
${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
- ${WRKSRC}/CMakeLists.txt
+ ${WRKSRC}/${PORTNAME}/CMakeLists.txt
.include bsd.port.mk
Index: PORTS/astro/libkgeomap/pkg-plist
===
--- PORTS/astro/libkgeomap/pkg-plist (Revision 10610)
+++ PORTS/astro/libkgeomap/pkg-plist (Arbeitskopie)
@@ -13,8 +13,8 @@
include/libkgeomap/tracks.h
include/libkgeomap/version.h
lib/libkgeomap.so
-lib/libkgeomap.so.1
-lib/libkgeomap.so.1.0.0
+lib/libkgeomap.so.2
+lib/libkgeomap.so.2.1.0
libdata/pkgconfig/libkgeomap.pc
share/apps/cmake/modules/FindKGeoMap.cmake
share/apps/libkgeomap/backend-googlemaps-js.js
Index: PORTS/graphics/digikam-kde4/Makefile
===
--- PORTS/graphics/digikam-kde4/Makefile (Revision 10610)
+++ PORTS/graphics/digikam-kde4/Makefile (Arbeitskopie)
@@ -30,7 +30,7 @@
CMAKE_ARGS+= -DWITH_Sqlite2:BOOL=OFF
WRKSRC= ${WRKDIR}/${DISTNAME}/core
-SHEBANG_FILES= utilities/scripts/digitaglinktree/digitaglinktree
+SHEBANG_FILES= data/scripts/digitaglinktree/digitaglinktree
OPTIONS_DEFINE= DOCS NLS GPHOTO2 PIMLIBS MYSQL
OPTIONS_DEFAULT= GPHOTO2 PIMLIBS
@@ -43,10 +43,11 @@
GPHOTO2_DESC= Gphoto2 camera support
GPHOTO2_LIB_DEPENDS= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+GPHOTO2_CMAKE_ON= -DWITH_Gphoto2:BOOL=ON
GPHOTO2_CMAKE_OFF= -DWITH_Gphoto2:BOOL=OFF
PIMLIBS_DESC= Address book support
-PIMLIBS_USE= KDE4=pimlibs
+PIMLIBS_USE= KDE4=pimlibs baloo
PIMLIBS_CMAKE_ON= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON
PIMLIBS_CMAKE_OFF= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=OFF
@@ -53,7 +54,10 @@
MYSQL_USE= MYSQL=server QT4=sql-mysql_run
MYSQL_BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/${_MYSQL_SERVER}
MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \
- -DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin
-MYSQL_CMAKE_OFF= -DENABLE_INTERNALMYSQL:BOOL=OFF
+ -DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin \
+ -DENABLE_INTERNALMYSQL:BOOL=ON \
+ -DENABLE_MYSQLSUPPORT:BOOL=ON
+MYSQL_CMAKE_OFF= -DENABLE_INTERNALMYSQL:BOOL=OFF \
+ -DENABLE_MYSQLSUPPORT:BOOL=OFF
.include bsd.port.mk
Index: PORTS/graphics/digikam-kde4/Makefile.common
===
--- PORTS/graphics/digikam-kde4/Makefile.common (Revision 10610)
+++ PORTS/graphics/digikam-kde4/Makefile.common (Arbeitskopie)
@@ -12,7 +12,7 @@
# net/libkvkontakte
# net/libmediawiki
-DIGIKAM_VER= 4.2.0
+DIGIKAM_VER= 4.8.0
MASTER_SITES= KDE/stable/digikam
KIPI_PLUGINS_ALL= acquireimages \
Index: PORTS/graphics/digikam-kde4/distinfo
===
--- PORTS/graphics/digikam-kde4/distinfo (Revision 10610)
+++ PORTS/graphics/digikam-kde4/distinfo (Arbeitskopie)
@@ -1,2 +1,2 @@
-SHA256 (digikam-4.2.0.tar.bz2) = e86575b76672dfd0a7ed5f1d7b8b74425171804d7f16b0d743a5d2375c1c1b08
-SIZE (digikam-4.2.0.tar.bz2) = 68849613
+SHA256 (digikam-4.8.0.tar.bz2) = e20f84508f35fddcaec3b931efbc604a95050ec08c6796b6bc60a61cd58fa390
+SIZE (digikam-4.8.0.tar.bz2) = 70258947
Index: PORTS/graphics/digikam-kde4/files/patch-CMakeLists.txt
===
--- PORTS/graphics/digikam-kde4/files/patch-CMakeLists.txt (Revision 10610)
+++ PORTS/graphics/digikam-kde4/files/patch-CMakeLists.txt (Arbeitskopie)
@@ -1,27 +0,0 @@
./CMakeLists.txt.orig 2012-06-04 16:38:57.0 -0400
-+++ ./CMakeLists.txt 2012-06-24 12:52:32.0 -0400
-@@ -203,9 +203,10 @@
- FIND_LIBRARY(MATH_LIBRARY m)
- ENDIF(NOT WIN32)
-
--IF(Boost_FOUND)
--INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
--ENDIF(Boost_FOUND)
-+STRING(TOLOWER ${CMAKE_SYSTEM_NAME} node_platform)
-+IF(${node_platform} MATCHES freebsd)
-+FIND_LIBRARY(KVM_LIBRARY NAMES kvm)
-+ENDIF(${node_platform} MATCHES freebsd)
-
- #-
-
-@@ -595,6 +596,10 @@
- ${CMAKE_CURRENT_BINARY_DIR}/digikam
- )
-
-+IF(Boost_FOUND)
-+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-+ENDIF(Boost_FOUND)
-+
- IF(USE_SCRIPT_IFACE)
-
[kde-freebsd] [SVN Commit] area51/PORTS
SVN commit 10611 by aschai: Update digikam and friends to 4.8.0 This patch was sent in by T.C. Berner via mailing list earlier. M +1 -1 astro/libkgeomap/Makefile M +2 -2 astro/libkgeomap/pkg-plist M +1 -5 graphics/digikam-kde4-l10n/pkg-plist M +8 -4 graphics/digikam-kde4/Makefile M +1 -1 graphics/digikam-kde4/Makefile.common M +2 -2 graphics/digikam-kde4/distinfo D graphics/digikam-kde4/files/patch-CMakeLists.txt A graphics/digikam-kde4/files/patch-app_album_albumwatch.cpp D graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake D graphics/digikam-kde4/files/patch-cmake__modules__MacroUtils.cmake D graphics/digikam-kde4/files/patch-digikam__CMakeLists.txt D graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp M +3 -3 graphics/digikam-kde4/files/patch-libs_3rdparty_cimg_CImg.h A graphics/digikam-kde4/files/patch-libs_3rdparty_kmemoryinfo_kmemoryinfo__backend.cpp D graphics/digikam-kde4/files/patch-libs__3rdparty__kmemoryinfo__kmemoryinfo_backend.cpp D graphics/digikam-kde4/files/patch-utilities_fuzzysearchview_fuzzysearchview.cpp M +7 -0 graphics/digikam-kde4/pkg-plist M +16 -12graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt M +2 -2 graphics/libkface/Makefile M +6 -3 graphics/libkface/pkg-plist M +2 -2 net/libmediawiki/Makefile ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
[kde-freebsd] [SVN Commit] area51/PORTS/graphics/digikam-kde4
SVN commit 10613 by aschai: Facilate the mysql depencency line No suffix means both build and run time dependencies. M +1 -1 Makefile ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
[kde-freebsd] [Bug 190929] split lrelease/lupdate out of devel/qt4-linguist
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=190929 --- Comment #6 from Dmitry Marakasov amd...@freebsd.org --- Thank you! -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] 4.14.3?
On Thu, 26 Feb 2015 17:25:07 -0500 ajtiM lum...@gmail.com wrote: Hi! Just a curiosity... I use KDE 4.14.3 from early December from area51 and it works very good (for me better than previous version) but it is not in the ports still (outside is 4.14.5). Is it something wrong, please? Thank you. -- ajtiM Hi, It got delayed considerably because I generated an defunct patchset around christmas and was rather busy IRL in January. area51's KDE 4.14.3 (or rather, last week's version of it) passed an exp-run last week and is currently under review for PORTS merging at https://reviews.freebsd.org/D1950 . Alonso pgpctvAbBGoXe.pgp Description: PGP signature ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
[kde-freebsd] [SVN Commit] area51/KDE/misc
SVN commit 10614 by aschai: Fix DEPRECATED lines DEPRECATED lines should not be ended with a period (.) character. Noticed by rakuco in https://reviews.freebsd.org/D1950 M +1 -1 kde4-l10n-si/Makefile M +1 -1 kde4-l10n-tg/Makefile M +1 -1 kde4-l10n-th/Makefile ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
[kde-freebsd] 4.14.3?
Hi! Just a curiosity... I use KDE 4.14.3 from early December from area51 and it works very good (for me better than previous version) but it is not in the ports still (outside is 4.14.5). Is it something wrong, please? Thank you. -- ajtiM http://www.redbubble.com/people/lumiwa https://www.facebook.com/pages/Lumiwa-FARM/775292915882930 ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] 4.14.3?
On Thursday, February 26, 2015 11:38:01 PM Schaich Alonso wrote: On Thu, 26 Feb 2015 17:25:07 -0500 ajtiM lum...@gmail.com wrote: Hi! Just a curiosity... I use KDE 4.14.3 from early December from area51 and it works very good (for me better than previous version) but it is not in the ports still (outside is 4.14.5). Is it something wrong, please? Thank you. Hi, It got delayed considerably because I generated an defunct patchset around christmas and was rather busy IRL in January. area51's KDE 4.14.3 (or rather, last week's version of it) passed an exp-run last week and is currently under review for PORTS merging at https://reviews.freebsd.org/D1950 . Alonso Thank you very much. I didn't know and it works for me very good. Thanks to ALL for the hard and good work. -- ajtiM http://www.redbubble.com/people/lumiwa https://www.facebook.com/pages/Lumiwa-FARM/775292915882930 ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
