Thu Feb 8 13:49:04 2018 UTC ()
kwallet: Fix build, handle categories file correctly.


(jperkin)
diff -r1.36 -r1.37 pkgsrc/security/kwallet/Makefile
diff -r1.6 -r1.7 pkgsrc/security/kwallet/PLIST
diff -r1.12 -r1.13 pkgsrc/security/kwallet/distinfo
diff -r0 -r1.1 pkgsrc/security/kwallet/patches/patch-src_runtime_kwalletd_backend_blowfish.h
cvs diff -r1.36 -r1.37 pkgsrc/security/kwallet/Makefile (expand / switch to unified diff)

--- pkgsrc/security/kwallet/Makefile 2018/01/24 19:06:09 1.36
+++ pkgsrc/security/kwallet/Makefile 2018/02/08 13:49:03 1.37
@@ -1,24 +1,34 @@ @@ -1,24 +1,34 @@
1# $NetBSD: Makefile,v 1.36 2018/01/24 19:06:09 markd Exp $ 1# $NetBSD: Makefile,v 1.37 2018/02/08 13:49:03 jperkin Exp $
2 2
3DISTNAME= kwallet-${KF5VER} 3DISTNAME= kwallet-${KF5VER}
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= security 5CATEGORIES= security
6 6
7HOMEPAGE= https://community.kde.org/Frameworks 7HOMEPAGE= https://community.kde.org/Frameworks
8COMMENT= Secure and unified container for user passwords 8COMMENT= Secure and unified container for user passwords
9LICENSE= gnu-lgpl-v2.1 9LICENSE= gnu-lgpl-v2.1
10 10
11.include "../../meta-pkgs/kf5/Makefile.common" 11.include "../../meta-pkgs/kf5/Makefile.common"
12 12
13BUILD_DEPENDS+= kdoctools>=${KF5VER}:../../devel/kdoctools 13BUILD_DEPENDS+= kdoctools>=${KF5VER}:../../devel/kdoctools
14 14
15USE_TOOLS+= msgmerge 15USE_TOOLS+= msgmerge
16 16
 17SUBST_CLASSES+= xdg
 18SUBST_STAGE.xdg= pre-configure
 19SUBST_MESSAGE.xdg= Install via examples dir.
 20SUBST_FILES.xdg= CMakeLists.txt
 21SUBST_SED.xdg= -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
 22
 23MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg
 24CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/kwallet.categories \
 25 ${PKG_SYSCONFDIR}/xdg/kwallet.categories
 26
17.include "../../lang/python/tool.mk" 27.include "../../lang/python/tool.mk"
18.include "../../devel/knotifications/buildlink3.mk" 28.include "../../devel/knotifications/buildlink3.mk"
19.include "../../devel/kservice/buildlink3.mk" 29.include "../../devel/kservice/buildlink3.mk"
20.include "../../graphics/kiconthemes/buildlink3.mk" 30.include "../../graphics/kiconthemes/buildlink3.mk"
21.include "../../security/gpgme/buildlink3.mk" 31.include "../../security/gpgme/buildlink3.mk"
22.include "../../security/libgcrypt/buildlink3.mk" 32.include "../../security/libgcrypt/buildlink3.mk"
23.include "../../x11/qt5-qtbase/buildlink3.mk" 33.include "../../x11/qt5-qtbase/buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/security/kwallet/PLIST (expand / switch to unified diff)

--- pkgsrc/security/kwallet/PLIST 2018/01/17 20:06:50 1.6
+++ pkgsrc/security/kwallet/PLIST 2018/02/08 13:49:03 1.7
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1@comment $NetBSD: PLIST,v 1.6 2018/01/17 20:06:50 markd Exp $ 1@comment $NetBSD: PLIST,v 1.7 2018/02/08 13:49:03 jperkin Exp $
2bin/kwallet-query 2bin/kwallet-query
3bin/kwalletd5 3bin/kwalletd5
4include/KF5/KWallet/KWallet 4include/KF5/KWallet/KWallet
5include/KF5/KWallet/kwallet.h 5include/KF5/KWallet/kwallet.h
6include/KF5/KWallet/kwallet_export.h 6include/KF5/KWallet/kwallet_export.h
7include/KF5/kwallet_version.h 7include/KF5/kwallet_version.h
8lib/cmake/KF5Wallet/KF5WalletConfig.cmake 8lib/cmake/KF5Wallet/KF5WalletConfig.cmake
9lib/cmake/KF5Wallet/KF5WalletConfigVersion.cmake 9lib/cmake/KF5Wallet/KF5WalletConfigVersion.cmake
10lib/cmake/KF5Wallet/KF5WalletTargets-noconfig.cmake 10lib/cmake/KF5Wallet/KF5WalletTargets-noconfig.cmake
11lib/cmake/KF5Wallet/KF5WalletTargets.cmake 11lib/cmake/KF5Wallet/KF5WalletTargets.cmake
12lib/libKF5Wallet.so 12lib/libKF5Wallet.so
13lib/libKF5Wallet.so.5 13lib/libKF5Wallet.so.5
14lib/libKF5Wallet.so.${PKGVERSION} 14lib/libKF5Wallet.so.${PKGVERSION}
15lib/libkwalletbackend5.so 15lib/libkwalletbackend5.so
16lib/libkwalletbackend5.so.5 16lib/libkwalletbackend5.so.5
17lib/libkwalletbackend5.so.${PKGVERSION} 17lib/libkwalletbackend5.so.${PKGVERSION}
18man/man1/kwallet-query.1 18man/man1/kwallet-query.1
19qt5/mkspecs/modules/qt_KWallet.pri 19qt5/mkspecs/modules/qt_KWallet.pri
20share/dbus-1/interfaces/kf5_org.kde.KWallet.xml 20share/dbus-1/interfaces/kf5_org.kde.KWallet.xml
21share/dbus-1/services/org.kde.kwalletd.service 21share/dbus-1/services/org.kde.kwalletd.service
22share/dbus-1/services/org.kde.kwalletd5.service 22share/dbus-1/services/org.kde.kwalletd5.service
 23share/examples/kde-xdg/kwallet.categories
23share/knotifications5/kwalletd.notifyrc 24share/knotifications5/kwalletd.notifyrc
24share/kservices5/kwalletd5.desktop 25share/kservices5/kwalletd5.desktop
25share/locale/ar/LC_MESSAGES/kwalletd5.mo 26share/locale/ar/LC_MESSAGES/kwalletd5.mo
26share/locale/ast/LC_MESSAGES/kwallet-query.mo 27share/locale/ast/LC_MESSAGES/kwallet-query.mo
27share/locale/ast/LC_MESSAGES/kwalletd5.mo 28share/locale/ast/LC_MESSAGES/kwalletd5.mo
28share/locale/be/LC_MESSAGES/kwalletd5.mo 29share/locale/be/LC_MESSAGES/kwalletd5.mo
29share/locale/bg/LC_MESSAGES/kwalletd5.mo 30share/locale/bg/LC_MESSAGES/kwalletd5.mo
30share/locale/bn/LC_MESSAGES/kwalletd5.mo 31share/locale/bn/LC_MESSAGES/kwalletd5.mo
31share/locale/bn_IN/LC_MESSAGES/kwalletd5.mo 32share/locale/bn_IN/LC_MESSAGES/kwalletd5.mo
32share/locale/bs/LC_MESSAGES/kwalletd5.mo 33share/locale/bs/LC_MESSAGES/kwalletd5.mo
33share/locale/ca/LC_MESSAGES/kwallet-query.mo 34share/locale/ca/LC_MESSAGES/kwallet-query.mo
34share/locale/ca/LC_MESSAGES/kwalletd5.mo 35share/locale/ca/LC_MESSAGES/kwalletd5.mo
35share/locale/ca@valencia/LC_MESSAGES/kwallet-query.mo 36share/locale/ca@valencia/LC_MESSAGES/kwallet-query.mo
cvs diff -r1.12 -r1.13 pkgsrc/security/kwallet/distinfo (expand / switch to unified diff)

--- pkgsrc/security/kwallet/distinfo 2018/01/17 20:06:50 1.12
+++ pkgsrc/security/kwallet/distinfo 2018/02/08 13:49:03 1.13
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.12 2018/01/17 20:06:50 markd Exp $ 1$NetBSD: distinfo,v 1.13 2018/02/08 13:49:03 jperkin Exp $
2 2
3SHA1 (kwallet-5.41.0.tar.xz) = 6c6eee6baa6a1733d383bb06e1b4163065a9dc8e 3SHA1 (kwallet-5.41.0.tar.xz) = 6c6eee6baa6a1733d383bb06e1b4163065a9dc8e
4RMD160 (kwallet-5.41.0.tar.xz) = e60000156ec099870c4367dcb3a3a05242292b6f 4RMD160 (kwallet-5.41.0.tar.xz) = e60000156ec099870c4367dcb3a3a05242292b6f
5SHA512 (kwallet-5.41.0.tar.xz) = 572b1d145f7092ed8ca581a00ced425f6a6fa4d153853ec591bbe6f91c5851c8476356b907ea1808e93f881a9e24797e894e7621f5627eadaf086a7f92e89e74 5SHA512 (kwallet-5.41.0.tar.xz) = 572b1d145f7092ed8ca581a00ced425f6a6fa4d153853ec591bbe6f91c5851c8476356b907ea1808e93f881a9e24797e894e7621f5627eadaf086a7f92e89e74
6Size (kwallet-5.41.0.tar.xz) = 306496 bytes 6Size (kwallet-5.41.0.tar.xz) = 306496 bytes
 7SHA1 (patch-src_runtime_kwalletd_backend_blowfish.h) = c36149fb54391d3023f37f13d3617a6a3efd6518
File Added: pkgsrc/security/kwallet/patches/Attic/patch-src_runtime_kwalletd_backend_blowfish.h
$NetBSD: patch-src_runtime_kwalletd_backend_blowfish.h,v 1.1 2018/02/08 13:49:04 jperkin Exp $

Avoid macro conflicts.

--- src/runtime/kwalletd/backend/blowfish.h.orig	2017-12-02 20:09:03.000000000 +0000
+++ src/runtime/kwalletd/backend/blowfish.h
@@ -54,6 +54,8 @@ public:
     virtual int decrypt(void *block, int len);
 
 private:
+#undef _S
+#undef _P
     uint32_t _S[4][256];
     uint32_t _P[18];