Attachment 232479 Details for Bug 262582 – remote keepassx-devel port

[patch] remote keepassx-devel port

patch_keepassx-devel.diff (text/plain), 15.63 KB, created by Eric Camachat on 2022-03-16 02:37:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Camachat

Created: 2022-03-16 02:37:18 UTC

Size: 15.63 KB

patch

obsolete

>diff --git security/Makefile security/Makefile
>index 3c20119b266a..352e55573cc2 100644
>--- security/Makefile
>+++ security/Makefile
>@@ -264,7 +264,6 @@
>     SUBDIR += kdbxviewer
>     SUBDIR += keepass
>     SUBDIR += keepass-plugin-keepassrpc
>-    SUBDIR += keepassx-devel
>     SUBDIR += keepassxc
>     SUBDIR += keybase
>     SUBDIR += keychain
>diff --git security/keepassx-devel/Makefile security/keepassx-devel/Makefile
>deleted file mode 100644
>index 06877a4f89ca..000000000000
>--- security/keepassx-devel/Makefile
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-# Created by: Eric Camachat <eric@camachat.org>
>-
>-PORTNAME=	keepassx
>-PORTVERSION=	2.0.3
>-PORTREVISION=	7
>-CATEGORIES=	security
>-PKGNAMESUFFIX=	-devel
>-
>-MAINTAINER=	eric@camachat.org
>-COMMENT=	Cross Platform Password Manager
>-
>-LICENSE=	BOOST-1.0 BSD3CLAUSE CC0-1.0 GPLv2 GPLv3 LGPL21 LGPL3 NOKIA-LGPL-EXCEPTION
>-LICENSE_COMB=	multi
>-LICENSE_NAME_BOOST-1.0=	Boost Software License version 1.0
>-LICENSE_NAME_NOKIA-LGPL-EXCEPTION=	Nokia Qt LGPL Exception version 1.1
>-LICENSE_FILE_BOOST-1.0=	${WRKSRC}/LICENSE.BOOST-1.0
>-LICENSE_FILE_NOKIA-LGPL-EXCEPTION=	${WRKSRC}/LICENSE.NOKIA-LGPL-EXCEPTION
>-LICENSE_PERMS_BOOST-1.0=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
>-LICENSE_PERMS_NOKIA-LGPL-EXCEPTION=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
>-
>-LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
>-
>-CONFLICTS_INSTALL=	keepassx-0.* keepassx2 keepassxc
>-
>-USES=		cmake compiler:c++11-lib cpe desktop-file-utils gnome qt:5 \
>-		shared-mime-info xorg
>-USE_LDCONFIG=	yes
>-USE_QT=		buildtools_build concurrent core gui linguisttools qmake_build \
>-		testlib widgets x11extras
>-USE_XORG=	ice xorgproto sm x11 xcursor xext xfixes xi xrandr xrender \
>-		xt xtst
>-
>-USE_GITHUB=	yes
>-GH_TAGNAME=	55869e8
>-
>-CMAKE_ARGS+=	-DZLIB_SUPPORTS_GZIP:BOOL=ON
>-
>-.include <bsd.port.mk>
>diff --git security/keepassx-devel/distinfo security/keepassx-devel/distinfo
>deleted file mode 100644
>index a4f49aa32e1a..000000000000
>--- security/keepassx-devel/distinfo
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1495747868
>-SHA256 (keepassx-keepassx-2.0.3-55869e8_GH0.tar.gz) = 7c0a4cf917171401e67e9889bebacd9b4b62b94e0c824220d316c696e0c36bfe
>-SIZE (keepassx-keepassx-2.0.3-55869e8_GH0.tar.gz) = 1506752
>diff --git security/keepassx-devel/files/patch-PR202 security/keepassx-devel/files/patch-PR202
>deleted file mode 100644
>index 08d3fd0cfdb5..000000000000
>--- security/keepassx-devel/files/patch-PR202
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-Obtained from: https://github.com/keepassx/keepassx/pull/202
>-
>-From 83900e35bd18807ce17c779a570b3c52a182fa95 Mon Sep 17 00:00:00 2001
>-From: Aleix Pol <aleixpol@kde.org>
>-Date: Wed, 29 Mar 2017 01:17:12 +0200
>-Subject: [PATCH] Fix build with Qt branch 5.9
>-
>-keepassx/tests/modeltest.cpp:451: undefined reference to `bool QTest::qCompare<int, unsigned int>(int const&, unsigned int const&, char const*, char const*, char const*, int)'
>----
>- tests/modeltest.cpp | 2 +-
>- 1 file changed, 1 insertion(+), 1 deletion(-)
>-
>---- tests/modeltest.cpp
>-+++ tests/modeltest.cpp
>-@@ -447,7 +447,7 @@ void ModelTest::data()
>-     // Check that the alignment is one we know about
>-     QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
>-     if ( textAlignmentVariant.isValid() ) {
>--        int alignment = textAlignmentVariant.toInt();
>-+        const uint alignment = textAlignmentVariant.toUInt();
>-         QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
>-     }
>- 
>diff --git security/keepassx-devel/files/patch-PR214 security/keepassx-devel/files/patch-PR214
>deleted file mode 100644
>index e1219a45a3a9..000000000000
>--- security/keepassx-devel/files/patch-PR214
>+++ /dev/null
>@@ -1,29 +0,0 @@
>-Obtained from: https://github.com/keepassx/keepassx/pull/214
>-
>-From 40220fd61c4094ae16d8a4d86df2b5d84c16e6e8 Mon Sep 17 00:00:00 2001
>-From: Anuraag Sridhar <anuraag.sridhar@gmail.com>
>-Date: Sun, 12 Aug 2018 14:23:33 +1000
>-Subject: [PATCH] Fix build issues with Qt5.11 on OS X.
>-
>-Minor forward declaration issues.
>-
>---- src/gui/entry/EditEntryWidget.h.orig
>-+++ src/gui/entry/EditEntryWidget.h
>-@@ -18,6 +18,7 @@
>- #ifndef KEEPASSX_EDITENTRYWIDGET_H
>- #define KEEPASSX_EDITENTRYWIDGET_H
>- 
>-+#include <QButtonGroup>
>- #include <QModelIndex>
>- #include <QScopedPointer>
>- 
>---- src/gui/entry/EntryView.h.orig
>-+++ src/gui/entry/EntryView.h
>-@@ -18,6 +18,7 @@
>- #ifndef KEEPASSX_ENTRYVIEW_H
>- #define KEEPASSX_ENTRYVIEW_H
>- 
>-+#include <QHeaderView>
>- #include <QTreeView>
>- 
>- #include "gui/entry/EntryModel.h"
>diff --git security/keepassx-devel/pkg-descr security/keepassx-devel/pkg-descr
>deleted file mode 100644
>index d180241680a2..000000000000
>--- security/keepassx-devel/pkg-descr
>+++ /dev/null
>@@ -1,9 +0,0 @@
>-KeePassX is a free/open-source password manager or safe which helps you
>-to manage your passwords in a secure way.  You can put all your
>-passwords in one database, which is locked with one master key or a
>-key-disk.  So you only have to remember one single master password or
>-insert the key-disk to unlock the whole database.  The databases are
>-encrypted using the best and most secure encryption algorithms currently
>-known (AES and Twofish).
>-
>-WWW: http://www.keepassx.org
>diff --git security/keepassx-devel/pkg-plist security/keepassx-devel/pkg-plist
>deleted file mode 100644
>index 187475ed579a..000000000000
>--- security/keepassx-devel/pkg-plist
>+++ /dev/null
>@@ -1,217 +0,0 @@
>-bin/keepassx
>-lib/keepassx/libkeepassx-autotype-xcb.so
>-share/applications/keepassx.desktop
>-share/icons/hicolor/128x128/apps/keepassx.png
>-share/icons/hicolor/128x128/mimetypes/application-x-keepassx.png
>-share/icons/hicolor/16x16/apps/keepassx.png
>-share/icons/hicolor/16x16/mimetypes/application-x-keepassx.png
>-share/icons/hicolor/22x22/mimetypes/application-x-keepassx.png
>-share/icons/hicolor/24x24/apps/keepassx.png
>-share/icons/hicolor/256x256/apps/keepassx.png
>-share/icons/hicolor/32x32/apps/keepassx.png
>-share/icons/hicolor/32x32/mimetypes/application-x-keepassx.png
>-share/icons/hicolor/48x48/apps/keepassx.png
>-share/icons/hicolor/64x64/apps/keepassx.png
>-share/icons/hicolor/64x64/mimetypes/application-x-keepassx.png
>-share/icons/hicolor/scalable/apps/keepassx.svgz
>-share/mime/packages/keepassx.xml
>-%%DATADIR%%/icons/application/128x128/apps/keepassx.png
>-%%DATADIR%%/icons/application/128x128/mimetypes/application-x-keepassx.png
>-%%DATADIR%%/icons/application/16x16/actions/application-exit.png
>-%%DATADIR%%/icons/application/16x16/actions/auto-type.png
>-%%DATADIR%%/icons/application/16x16/actions/configure.png
>-%%DATADIR%%/icons/application/16x16/actions/database-change-key.png
>-%%DATADIR%%/icons/application/16x16/actions/document-close.png
>-%%DATADIR%%/icons/application/16x16/actions/document-edit.png
>-%%DATADIR%%/icons/application/16x16/actions/document-encrypt.png
>-%%DATADIR%%/icons/application/16x16/actions/document-new.png
>-%%DATADIR%%/icons/application/16x16/actions/document-open.png
>-%%DATADIR%%/icons/application/16x16/actions/document-save-as.png
>-%%DATADIR%%/icons/application/16x16/actions/document-save.png
>-%%DATADIR%%/icons/application/16x16/actions/edit-clear-locationbar-ltr.png
>-%%DATADIR%%/icons/application/16x16/actions/edit-clear-locationbar-rtl.png
>-%%DATADIR%%/icons/application/16x16/actions/entry-clone.png
>-%%DATADIR%%/icons/application/16x16/actions/entry-delete.png
>-%%DATADIR%%/icons/application/16x16/actions/entry-edit.png
>-%%DATADIR%%/icons/application/16x16/actions/entry-new.png
>-%%DATADIR%%/icons/application/16x16/actions/group-delete.png
>-%%DATADIR%%/icons/application/16x16/actions/group-edit.png
>-%%DATADIR%%/icons/application/16x16/actions/group-new.png
>-%%DATADIR%%/icons/application/16x16/actions/help-about.png
>-%%DATADIR%%/icons/application/16x16/actions/password-copy.png
>-%%DATADIR%%/icons/application/16x16/actions/password-generate.png
>-%%DATADIR%%/icons/application/16x16/actions/password-show-off.png
>-%%DATADIR%%/icons/application/16x16/actions/password-show-on.png
>-%%DATADIR%%/icons/application/16x16/actions/system-search.png
>-%%DATADIR%%/icons/application/16x16/actions/username-copy.png
>-%%DATADIR%%/icons/application/16x16/apps/keepassx.png
>-%%DATADIR%%/icons/application/16x16/mimetypes/application-x-keepassx.png
>-%%DATADIR%%/icons/application/22x22/actions/dialog-close.png
>-%%DATADIR%%/icons/application/22x22/actions/dialog-ok.png
>-%%DATADIR%%/icons/application/22x22/actions/document-encrypt.png
>-%%DATADIR%%/icons/application/22x22/actions/document-open.png
>-%%DATADIR%%/icons/application/22x22/actions/document-save.png
>-%%DATADIR%%/icons/application/22x22/actions/entry-delete.png
>-%%DATADIR%%/icons/application/22x22/actions/entry-edit.png
>-%%DATADIR%%/icons/application/22x22/actions/entry-new.png
>-%%DATADIR%%/icons/application/22x22/actions/password-copy.png
>-%%DATADIR%%/icons/application/22x22/actions/system-search.png
>-%%DATADIR%%/icons/application/22x22/actions/username-copy.png
>-%%DATADIR%%/icons/application/22x22/mimetypes/application-x-keepassx.png
>-%%DATADIR%%/icons/application/22x22/status/dialog-error.png
>-%%DATADIR%%/icons/application/22x22/status/dialog-information.png
>-%%DATADIR%%/icons/application/22x22/status/dialog-warning.png
>-%%DATADIR%%/icons/application/24x24/apps/keepassx.png
>-%%DATADIR%%/icons/application/256x256/apps/keepassx.png
>-%%DATADIR%%/icons/application/32x32/apps/keepassx.png
>-%%DATADIR%%/icons/application/32x32/mimetypes/application-x-keepassx.png
>-%%DATADIR%%/icons/application/48x48/apps/keepassx.png
>-%%DATADIR%%/icons/application/64x64/apps/keepassx.png
>-%%DATADIR%%/icons/application/64x64/mimetypes/application-x-keepassx.png
>-%%DATADIR%%/icons/application/scalable/apps/keepassx.svgz
>-%%DATADIR%%/icons/database/C00_Password.png
>-%%DATADIR%%/icons/database/C01_Package_Network.png
>-%%DATADIR%%/icons/database/C02_MessageBox_Warning.png
>-%%DATADIR%%/icons/database/C03_Server.png
>-%%DATADIR%%/icons/database/C04_Klipper.png
>-%%DATADIR%%/icons/database/C05_Edu_Languages.png
>-%%DATADIR%%/icons/database/C06_KCMDF.png
>-%%DATADIR%%/icons/database/C07_Kate.png
>-%%DATADIR%%/icons/database/C08_Socket.png
>-%%DATADIR%%/icons/database/C09_Identity.png
>-%%DATADIR%%/icons/database/C10_Kontact.png
>-%%DATADIR%%/icons/database/C11_Camera.png
>-%%DATADIR%%/icons/database/C12_IRKickFlash.png
>-%%DATADIR%%/icons/database/C13_KGPG_Key3.png
>-%%DATADIR%%/icons/database/C14_Laptop_Power.png
>-%%DATADIR%%/icons/database/C15_Scanner.png
>-%%DATADIR%%/icons/database/C16_Mozilla_Firebird.png
>-%%DATADIR%%/icons/database/C17_CDROM_Unmount.png
>-%%DATADIR%%/icons/database/C18_Display.png
>-%%DATADIR%%/icons/database/C19_Mail_Generic.png
>-%%DATADIR%%/icons/database/C20_Misc.png
>-%%DATADIR%%/icons/database/C21_KOrganizer.png
>-%%DATADIR%%/icons/database/C22_ASCII.png
>-%%DATADIR%%/icons/database/C23_Icons.png
>-%%DATADIR%%/icons/database/C24_Connect_Established.png
>-%%DATADIR%%/icons/database/C25_Folder_Mail.png
>-%%DATADIR%%/icons/database/C26_FileSave.png
>-%%DATADIR%%/icons/database/C27_NFS_Unmount.png
>-%%DATADIR%%/icons/database/C28_QuickTime.png
>-%%DATADIR%%/icons/database/C29_KGPG_Term.png
>-%%DATADIR%%/icons/database/C30_Konsole.png
>-%%DATADIR%%/icons/database/C31_FilePrint.png
>-%%DATADIR%%/icons/database/C32_FSView.png
>-%%DATADIR%%/icons/database/C33_Run.png
>-%%DATADIR%%/icons/database/C34_Configure.png
>-%%DATADIR%%/icons/database/C35_KRFB.png
>-%%DATADIR%%/icons/database/C36_Ark.png
>-%%DATADIR%%/icons/database/C37_KPercentage.png
>-%%DATADIR%%/icons/database/C38_Samba_Unmount.png
>-%%DATADIR%%/icons/database/C39_History.png
>-%%DATADIR%%/icons/database/C40_Mail_Find.png
>-%%DATADIR%%/icons/database/C41_VectorGfx.png
>-%%DATADIR%%/icons/database/C42_KCMMemory.png
>-%%DATADIR%%/icons/database/C43_EditTrash.png
>-%%DATADIR%%/icons/database/C44_KNotes.png
>-%%DATADIR%%/icons/database/C45_Cancel.png
>-%%DATADIR%%/icons/database/C46_Help.png
>-%%DATADIR%%/icons/database/C47_KPackage.png
>-%%DATADIR%%/icons/database/C48_Folder.png
>-%%DATADIR%%/icons/database/C49_Folder_Blue_Open.png
>-%%DATADIR%%/icons/database/C50_Folder_Tar.png
>-%%DATADIR%%/icons/database/C51_Decrypted.png
>-%%DATADIR%%/icons/database/C52_Encrypted.png
>-%%DATADIR%%/icons/database/C53_Apply.png
>-%%DATADIR%%/icons/database/C54_Signature.png
>-%%DATADIR%%/icons/database/C55_Thumbnail.png
>-%%DATADIR%%/icons/database/C56_KAddressBook.png
>-%%DATADIR%%/icons/database/C57_View_Text.png
>-%%DATADIR%%/icons/database/C58_KGPG.png
>-%%DATADIR%%/icons/database/C59_Package_Development.png
>-%%DATADIR%%/icons/database/C60_KFM_Home.png
>-%%DATADIR%%/icons/database/C61_Services.png
>-%%DATADIR%%/icons/database/C62_Tux.png
>-%%DATADIR%%/icons/database/C63_Feather.png
>-%%DATADIR%%/icons/database/C64_Apple.png
>-%%DATADIR%%/icons/database/C65_W.png
>-%%DATADIR%%/icons/database/C66_Money.png
>-%%DATADIR%%/icons/database/C67_Certificate.png
>-%%DATADIR%%/icons/database/C68_BlackBerry.png
>-%%DATADIR%%/translations/keepassx_cs.qm
>-%%DATADIR%%/translations/keepassx_da.qm
>-%%DATADIR%%/translations/keepassx_de.qm
>-%%DATADIR%%/translations/keepassx_el.qm
>-%%DATADIR%%/translations/keepassx_en_plurals.qm
>-%%DATADIR%%/translations/keepassx_es.qm
>-%%DATADIR%%/translations/keepassx_fr.qm
>-%%DATADIR%%/translations/keepassx_id.qm
>-%%DATADIR%%/translations/keepassx_it.qm
>-%%DATADIR%%/translations/keepassx_ja.qm
>-%%DATADIR%%/translations/keepassx_ko.qm
>-%%DATADIR%%/translations/keepassx_lt.qm
>-%%DATADIR%%/translations/keepassx_nl_NL.qm
>-%%DATADIR%%/translations/keepassx_pl.qm
>-%%DATADIR%%/translations/keepassx_pt_BR.qm
>-%%DATADIR%%/translations/keepassx_pt_PT.qm
>-%%DATADIR%%/translations/keepassx_ru.qm
>-%%DATADIR%%/translations/keepassx_sl_SI.qm
>-%%DATADIR%%/translations/keepassx_sv.qm
>-%%DATADIR%%/translations/keepassx_uk.qm
>-%%DATADIR%%/translations/keepassx_zh_CN.qm
>-%%DATADIR%%/translations/keepassx_zh_TW.qm
>-@dir share/icons/hicolor/scalable/apps
>-@dir share/icons/hicolor/scalable
>-@dir share/icons/hicolor/64x64/mimetypes
>-@dir share/icons/hicolor/64x64/apps
>-@dir share/icons/hicolor/64x64
>-@dir share/icons/hicolor/48x48/apps
>-@dir share/icons/hicolor/48x48
>-@dir share/icons/hicolor/32x32/mimetypes
>-@dir share/icons/hicolor/32x32/apps
>-@dir share/icons/hicolor/32x32
>-@dir share/icons/hicolor/256x256/apps
>-@dir share/icons/hicolor/256x256
>-@dir share/icons/hicolor/24x24/apps
>-@dir share/icons/hicolor/24x24
>-@dir share/icons/hicolor/22x22/status
>-@dir share/icons/hicolor/22x22/mimetypes
>-@dir share/icons/hicolor/22x22/actions
>-@dir share/icons/hicolor/22x22
>-@dir share/icons/hicolor/16x16/mimetypes
>-@dir share/icons/hicolor/16x16/apps
>-@dir share/icons/hicolor/16x16/actions
>-@dir share/icons/hicolor/16x16
>-@dir share/icons/hicolor/128x128/mimetypes
>-@dir share/icons/hicolor/128x128/apps
>-@dir share/icons/hicolor/128x128
>-@dir %%DATADIR%%/translations
>-@dir %%DATADIR%%/icons/database
>-@dir %%DATADIR%%/icons/application/scalable/apps
>-@dir %%DATADIR%%/icons/application/scalable
>-@dir %%DATADIR%%/icons/application/64x64/mimetypes
>-@dir %%DATADIR%%/icons/application/64x64/apps
>-@dir %%DATADIR%%/icons/application/64x64
>-@dir %%DATADIR%%/icons/application/48x48/apps
>-@dir %%DATADIR%%/icons/application/48x48
>-@dir %%DATADIR%%/icons/application/32x32/mimetypes
>-@dir %%DATADIR%%/icons/application/32x32/apps
>-@dir %%DATADIR%%/icons/application/32x32
>-@dir %%DATADIR%%/icons/application/256x256/apps
>-@dir %%DATADIR%%/icons/application/256x256
>-@dir %%DATADIR%%/icons/application/24x24/apps
>-@dir %%DATADIR%%/icons/application/24x24
>-@dir %%DATADIR%%/icons/application/22x22/status
>-@dir %%DATADIR%%/icons/application/22x22/mimetypes
>-@dir %%DATADIR%%/icons/application/22x22/actions
>-@dir %%DATADIR%%/icons/application/22x22
>-@dir %%DATADIR%%/icons/application/16x16/mimetypes
>-@dir %%DATADIR%%/icons/application/16x16/apps
>-@dir %%DATADIR%%/icons/application/16x16/actions
>-@dir %%DATADIR%%/icons/application/16x16
>-@dir %%DATADIR%%/icons/application/128x128/mimetypes
>-@dir %%DATADIR%%/icons/application/128x128/apps
>-@dir %%DATADIR%%/icons/application/128x128
>-@dir %%DATADIR%%/icons/application
>-@dir %%DATADIR%%/icons
>-@dir %%DATADIR%%

Flags:

eric: maintainer-approval+

Actions: View | Diff

Attachments on bug 262582: 232479