CVS commit: pkgsrc/graphics/libkipi

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Nov 17 02:45:30 UTC 2019

Modified Files:
        pkgsrc/graphics/libkipi: Makefile PLIST buildlink3.mk distinfo

Log Message:
libkipi: update to 19.08.3   qt5/kf5 version


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/graphics/libkipi/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/libkipi/PLIST
cvs rdiff -u -r1.60 -r1.61 pkgsrc/graphics/libkipi/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/libkipi/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/libkipi/Makefile
diff -u pkgsrc/graphics/libkipi/Makefile:1.80 pkgsrc/graphics/libkipi/Makefile:1.81
--- pkgsrc/graphics/libkipi/Makefile:1.80       Sat Nov  2 22:37:59 2019
+++ pkgsrc/graphics/libkipi/Makefile    Sun Nov 17 02:45:29 2019
@@ -1,17 +1,27 @@
-# $NetBSD: Makefile,v 1.80 2019/11/02 22:37:59 rillig Exp $
+# $NetBSD: Makefile,v 1.81 2019/11/17 02:45:29 markd Exp $
 
-DISTNAME=      libkipi-15.08.3
-PKGREVISION=   9
+DISTNAME=      libkipi-${KAPPSVER}
 CATEGORIES=    graphics
-COMMENT=       KDE image plugin interface
-MASTER_SITES=  ${MASTER_SITE_KDE:=applications/15.08.3/src/}
-
-.include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKGCONFIG_OVERRIDE+=   libkipi.pc.cmake
+HOMEPAGE=      https://kde.org/applications/graphics/
+COMMENT=       KDE image plugin interface
+LICENSE=       gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2
 
-.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../meta-pkgs/kde/applications.mk"
 
-.include "../../x11/kdelibs4/buildlink3.mk"
+USE_TOOLS+=    pkg-config
 
+# generation of kded.moc fails when ${PREFIX}/include in the moc include path
+SUBST_CLASSES+=                fix-moc
+SUBST_STAGE.fix-moc=   post-configure
+SUBST_MESSAGE.fix-moc= Cleaning up MOC includes
+SUBST_FILES.fix-moc=   _KDE_build/tests/plugins/CMakeFiles/kipiplugin_kxmlhelloworld_autogen.dir/AutogenInfo.cmake
+SUBST_SED.fix-moc=     -e 's,;${PREFIX}/include;,;,g'
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/libkexiv2/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/kxmlgui/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/libkipi/PLIST
diff -u pkgsrc/graphics/libkipi/PLIST:1.16 pkgsrc/graphics/libkipi/PLIST:1.17
--- pkgsrc/graphics/libkipi/PLIST:1.16  Thu Jan 19 09:05:06 2017
+++ pkgsrc/graphics/libkipi/PLIST       Sun Nov 17 02:45:29 2019
@@ -1,32 +1,40 @@
-@comment $NetBSD: PLIST,v 1.16 2017/01/19 09:05:06 markd Exp $
-bin/kxmlkipicmd
-include/libkipi/configwidget.h
-include/libkipi/imagecollection.h
-include/libkipi/imagecollectionselector.h
-include/libkipi/imagecollectionshared.h
-include/libkipi/imageinfo.h
-include/libkipi/imageinfoshared.h
-include/libkipi/interface.h
-include/libkipi/libkipi_export.h
-include/libkipi/plugin.h
-include/libkipi/pluginloader.h
-include/libkipi/uploadwidget.h
-include/libkipi/version.h
-lib/kde4/kipiplugin_kxmlhelloworld.so
-lib/libkipi.so
-lib/libkipi.so.11
-lib/libkipi.so.11.1.0
-lib/pkgconfig/libkipi.pc
+@comment $NetBSD: PLIST,v 1.17 2019/11/17 02:45:29 markd Exp $
+include/KF5/KIPI/KIPI/ConfigWidget
+include/KF5/KIPI/KIPI/ImageCollection
+include/KF5/KIPI/KIPI/ImageCollectionSelector
+include/KF5/KIPI/KIPI/ImageCollectionShared
+include/KF5/KIPI/KIPI/ImageInfo
+include/KF5/KIPI/KIPI/ImageInfoShared
+include/KF5/KIPI/KIPI/Interface
+include/KF5/KIPI/KIPI/Plugin
+include/KF5/KIPI/KIPI/PluginLoader
+include/KF5/KIPI/KIPI/UploadWidget
+include/KF5/KIPI/kipi/configwidget.h
+include/KF5/KIPI/kipi/imagecollection.h
+include/KF5/KIPI/kipi/imagecollectionselector.h
+include/KF5/KIPI/kipi/imagecollectionshared.h
+include/KF5/KIPI/kipi/imageinfo.h
+include/KF5/KIPI/kipi/imageinfoshared.h
+include/KF5/KIPI/kipi/interface.h
+include/KF5/KIPI/kipi/libkipi_config.h
+include/KF5/KIPI/kipi/libkipi_export.h
+include/KF5/KIPI/kipi/plugin.h
+include/KF5/KIPI/kipi/pluginloader.h
+include/KF5/KIPI/kipi/uploadwidget.h
+include/KF5/libkipi_version.h
+lib/cmake/KF5Kipi/KF5KipiConfig.cmake
+lib/cmake/KF5Kipi/KF5KipiConfigVersion.cmake
+lib/cmake/KF5Kipi/KF5KipiTargets-noconfig.cmake
+lib/cmake/KF5Kipi/KF5KipiTargets.cmake
+lib/libKF5Kipi.so
+lib/libKF5Kipi.so.32.0.0
+lib/libKF5Kipi.so.5.2.0
+qt5/plugins/kipiplugin_kxmlhelloworld.so
 share/icons/hicolor/128x128/apps/kipi.png
 share/icons/hicolor/16x16/apps/kipi.png
 share/icons/hicolor/22x22/apps/kipi.png
 share/icons/hicolor/32x32/apps/kipi.png
 share/icons/hicolor/48x48/apps/kipi.png
-share/kde/apps/kipi/data/kipi-icon.svg
-share/kde/apps/kipi/data/kipi-logo.svg
-share/kde/apps/kipi/data/kipi-plugins_logo.png
-share/kde/apps/kipi/kipiplugin_kxmlhelloworldui.rc
-share/kde/apps/kxmlkipicmd/kxmlkipicmd_defaultui.rc
-share/kde/apps/kxmlkipicmd/kxmlkipicmd_gwenviewui.rc
-share/kde4/services/kipiplugin_kxmlhelloworld.desktop
-share/kde4/servicetypes/kipiplugin.desktop
+share/kservices5/kipiplugin_kxmlhelloworld.desktop
+share/kservicetypes5/kipiplugin.desktop
+share/kxmlgui5/kipi/kipiplugin_kxmlhelloworldui.rc

Index: pkgsrc/graphics/libkipi/buildlink3.mk
diff -u pkgsrc/graphics/libkipi/buildlink3.mk:1.60 pkgsrc/graphics/libkipi/buildlink3.mk:1.61
--- pkgsrc/graphics/libkipi/buildlink3.mk:1.60  Thu Aug 22 12:23:20 2019
+++ pkgsrc/graphics/libkipi/buildlink3.mk       Sun Nov 17 02:45:29 2019
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.60 2019/08/22 12:23:20 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.61 2019/11/17 02:45:29 markd Exp $
 
 BUILDLINK_TREE+=       libkipi
 
 .if !defined(LIBKIPI_BUILDLINK3_MK)
 LIBKIPI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libkipi+=        libkipi>=4.8.0
-BUILDLINK_ABI_DEPENDS.libkipi?=        libkipi>=15.08.3nb9
+BUILDLINK_API_DEPENDS.libkipi+=        libkipi>=17.12.1
 BUILDLINK_PKGSRCDIR.libkipi?=  ../../graphics/libkipi
 
-.include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../x11/kxmlgui/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif # LIBKIPI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libkipi

Index: pkgsrc/graphics/libkipi/distinfo
diff -u pkgsrc/graphics/libkipi/distinfo:1.18 pkgsrc/graphics/libkipi/distinfo:1.19
--- pkgsrc/graphics/libkipi/distinfo:1.18       Thu Jan 19 09:05:06 2017
+++ pkgsrc/graphics/libkipi/distinfo    Sun Nov 17 02:45:29 2019
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2017/01/19 09:05:06 markd Exp $
+$NetBSD: distinfo,v 1.19 2019/11/17 02:45:29 markd Exp $
 
-SHA1 (libkipi-15.08.3.tar.xz) = e8d260f58d3287eec629fc8237f411831190f475
-RMD160 (libkipi-15.08.3.tar.xz) = 08c9232cd24b47bcea1c6395d8f4871e7fe1458a
-SHA512 (libkipi-15.08.3.tar.xz) = e1dfeef8d71e5e22a361d4adc1e9dd1f4d613ac195cf93ad1851740012199b67cc17afea276a22a7c20c9b599c5ee6eb804c3104606dbeead73e0adc07a42eac
-Size (libkipi-15.08.3.tar.xz) = 95080 bytes
+SHA1 (libkipi-19.08.3.tar.xz) = 49921fc73c220de000b0b06882ee8e032fc75645
+RMD160 (libkipi-19.08.3.tar.xz) = 4437e09c36b95fde8b64cc65f482a941729ba617
+SHA512 (libkipi-19.08.3.tar.xz) = 6fe9b5e96768c644fc1fc395b0787bf99504fdaed319261f04a0a88be50df5624a5cc3738e609d29da4da50b1db720098986b2da215035752b6c5d0e6b175aa4
+Size (libkipi-19.08.3.tar.xz) = 103468 bytes