Page MenuHomeSolus
Files F11054839

D5798.diff
No OneTemporary
Actions

D5798.diff
View Options

diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,7 +1,9 @@
+libQt5Concurrent.so.5
libQt5Core.so.5
libQt5DBus.so.5
libQt5Gui.so.5
libQt5Network.so.5
+libQt5Svg.so.5
libQt5Widgets.so.5
libQt5X11Extras.so.5
libX11.so.6
@@ -11,6 +13,7 @@
libc.so.6
libgcrypt.so.20
libm.so.6
+libqrencode.so.4
libsodium.so.23
libstdc++.so.6
libykpers-1.so.1
diff --git a/files/0001-Drop-Yubikey-test-since-it-s-assuming-a-Yubikey-exis.patch b/files/0001-Drop-Yubikey-test-since-it-s-assuming-a-Yubikey-exis.patch
deleted file mode 100644
--- a/files/0001-Drop-Yubikey-test-since-it-s-assuming-a-Yubikey-exis.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6ce936e1cb5e39a7f645f1f57c899637892576c3 Mon Sep 17 00:00:00 2001
-From: Joshua Strobl <joshua@stroblindustries.com>
-Date: Wed, 28 Mar 2018 09:30:52 +0300
-Subject: [PATCH 1/1] Drop Yubikey test since it's assuming a Yubikey exists
- and not properly passing when there isn't one.
-
----
- tests/CMakeLists.txt | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index df5c37f8..f57b5e67 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -183,10 +183,6 @@ add_unit_test(NAME testentrysearcher SOURCES TestEntrySearcher.cpp
- add_unit_test(NAME testcsvexporter SOURCES TestCsvExporter.cpp
- LIBS ${TEST_LIBRARIES})
-
--add_unit_test(NAME testykchallengeresponsekey
-- SOURCES TestYkChallengeResponseKey.cpp
-- LIBS ${TEST_LIBRARIES})
--
- add_unit_test(NAME testdatabase SOURCES TestDatabase.cpp
- LIBS ${TEST_LIBRARIES})
-
---
-2.16.3
-
diff --git a/files/0001-Fix-build-if-KeeShare-is-disabled.patch b/files/0001-Fix-build-if-KeeShare-is-disabled.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Fix-build-if-KeeShare-is-disabled.patch
@@ -0,0 +1,35 @@
+From eb9ff677d0c681a86a9ef296f5a363549b94c42c Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 20 Mar 2019 11:53:21 +0100
+Subject: [PATCH] src/gui/DatabaseWidget.cpp: Build fails without
+ WITH_XC_KEESHARE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp: In member function ‘void DatabaseWidget::search(const QString&)’:
+/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp:1115:5: error: ‘m_shareLabel’ was not declared in this scope
+ m_shareLabel->setVisible(false);
+ ^~~~~~~~~~~~
+/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp:1115:5: note: suggested alternative: ‘m_searchingLabel’
+ m_shareLabel->setVisible(false);
+ ^~~~~~~~~~~~
+ m_searchingLabel
+---
+ src/gui/DatabaseWidget.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
+index 8728c331f..e4196734b 100644
+--- a/src/gui/DatabaseWidget.cpp
++++ b/src/gui/DatabaseWidget.cpp
+@@ -1112,7 +1112,9 @@ void DatabaseWidget::search(const QString& searchtext)
+ }
+
+ m_searchingLabel->setVisible(true);
++#ifdef WITH_XC_KEESHARE
+ m_shareLabel->setVisible(false);
++#endif
+
+ emit searchModeActivated();
+ }
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,9 @@
name : keepassx
-version : 2.3.4
-release : 17
+version : 2.4.0
+release : 18
+homepage : https://keepassxc.org
source :
- - https://github.com/keepassxreboot/keepassxc/releases/download/2.3.4/keepassxc-2.3.4-src.tar.xz : 0c24a78895185b9b6b098f08a15b332c600f80aa570d608940fcc2a38e02780a
+ - https://github.com/keepassxreboot/keepassxc/releases/download/2.4.0/keepassxc-2.4.0-src.tar.xz : 081ff1a34da8e0e8db951b5d70824d7a2b3d299ed4ae54e6ddc1e3ac176b95a8
license :
- BSD-3-Clause
- BSL-1.0
@@ -16,10 +17,10 @@
description: |
KeePassXC is a community fork of KeePassX with the goal to extend and improve it with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager.
builddeps :
- - pkgconfig(glu)
- pkgconfig(libargon2)
+ - pkgconfig(libqrencode)
- pkgconfig(libsodium)
- - pkgconfig(Qt5Gui)
+ - pkgconfig(Qt5Svg)
- pkgconfig(Qt5UiTools)
- pkgconfig(Qt5X11Extras)
- pkgconfig(xtst)
@@ -27,16 +28,17 @@
- libgcrypt-devel
- libyubikey-devel
setup : |
- %patch -p1 < $pkgfiles/0001-Drop-Yubikey-test-since-it-s-assuming-a-Yubikey-exis.patch
- %cmake . -DWITH_XC_AUTOTYPE=ON \
- -DWITH_XC_BROWSER=ON \
- -DWITH_XC_NETWORKING=ON \
- -DWITH_XC_YUBIKEY=ON \
- -DWITH_XC_SSHAGENT=ON
+ # The KeeShare patch can be removed once 2.4.1 will be out
+ %patch -p1 < $pkgfiles/0001-Fix-build-if-KeeShare-is-disabled.patch
+ %cmake_ninja -DWITH_XC_AUTOTYPE=ON \
+ -DWITH_XC_BROWSER=ON \
+ -DWITH_XC_NETWORKING=ON \
+ -DWITH_XC_YUBIKEY=ON \
+ -DWITH_XC_SSHAGENT=ON
build : |
- %make
+ %ninja_build
install : |
- %make_install
+ %ninja_install
check : |
- export LC_ALL=en_US.utf8
- %make test
+ set -m
+ %ninja_check
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -1,9 +1,10 @@
<PISI>
<Source>
<Name>keepassx</Name>
+ <Homepage>https://keepassxc.org</Homepage>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Packager>
<License>BSD-3-Clause</License>
<License>BSL-1.0</License>
@@ -63,15 +64,16 @@
<Path fileType="data">/usr/share/icons/hicolor/64x64/apps/keepassxc-unlocked.png</Path>
<Path fileType="data">/usr/share/icons/hicolor/64x64/apps/keepassxc.png</Path>
<Path fileType="data">/usr/share/icons/hicolor/64x64/mimetypes/application-x-keepassxc.png</Path>
- <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/keepassxc-dark.svgz</Path>
- <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/keepassxc-locked.svgz</Path>
- <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/keepassxc-unlocked.svgz</Path>
- <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/keepassxc.svgz</Path>
- <Path fileType="data">/usr/share/icons/hicolor/scalable/mimetypes/application-x-keepassxc.svgz</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/keepassxc-dark.svg</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/keepassxc-locked.svg</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/keepassxc-unlocked.svg</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/keepassxc.svg</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/scalable/mimetypes/application-x-keepassxc.svg</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/128x128/apps/keepassxc-dark.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/128x128/apps/keepassxc-locked.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/128x128/apps/keepassxc-unlocked.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/128x128/apps/keepassxc.png</Path>
+ <Path fileType="data">/usr/share/keepassxc/icons/application/128x128/apps/preferences-system-network-sharing.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/128x128/mimetypes/application-x-keepassxc.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/application-exit.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/auto-type.png</Path>
@@ -90,6 +92,7 @@
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/entry-delete.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/entry-edit.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/entry-new.png</Path>
+ <Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/favicon-download.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/group-delete.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/group-edit.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/group-empty-trash.png</Path>
@@ -102,6 +105,7 @@
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/password-generator.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/password-show-off.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/password-show-on.png</Path>
+ <Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/system-help.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/system-search.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/url-copy.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/16x16/actions/username-copy.png</Path>
@@ -123,6 +127,7 @@
<Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/entry-delete.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/entry-edit.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/entry-new.png</Path>
+ <Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/favicon-download.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/group-empty-trash.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/help-about.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/message-close.png</Path>
@@ -130,6 +135,7 @@
<Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/password-copy.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/password-generate.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/password-generator.png</Path>
+ <Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/system-help.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/system-search.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/url-copy.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/22x22/actions/username-copy.png</Path>
@@ -165,6 +171,7 @@
<Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/entry-delete.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/entry-edit.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/entry-new.png</Path>
+ <Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/favicon-download.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/group-empty-trash.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/help-about.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/key-enter.png</Path>
@@ -174,6 +181,7 @@
<Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/password-generator.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/password-show-off.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/password-show-on.png</Path>
+ <Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/system-help.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/system-search.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/url-copy.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/32x32/actions/username-copy.png</Path>
@@ -197,11 +205,11 @@
<Path fileType="data">/usr/share/keepassxc/icons/application/64x64/apps/keepassxc-unlocked.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/64x64/apps/keepassxc.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/application/64x64/mimetypes/application-x-keepassxc.png</Path>
- <Path fileType="data">/usr/share/keepassxc/icons/application/scalable/apps/keepassxc-dark.svgz</Path>
- <Path fileType="data">/usr/share/keepassxc/icons/application/scalable/apps/keepassxc-locked.svgz</Path>
- <Path fileType="data">/usr/share/keepassxc/icons/application/scalable/apps/keepassxc-unlocked.svgz</Path>
- <Path fileType="data">/usr/share/keepassxc/icons/application/scalable/apps/keepassxc.svgz</Path>
- <Path fileType="data">/usr/share/keepassxc/icons/application/scalable/mimetypes/application-x-keepassxc.svgz</Path>
+ <Path fileType="data">/usr/share/keepassxc/icons/application/scalable/apps/keepassxc-dark.svg</Path>
+ <Path fileType="data">/usr/share/keepassxc/icons/application/scalable/apps/keepassxc-locked.svg</Path>
+ <Path fileType="data">/usr/share/keepassxc/icons/application/scalable/apps/keepassxc-unlocked.svg</Path>
+ <Path fileType="data">/usr/share/keepassxc/icons/application/scalable/apps/keepassxc.svg</Path>
+ <Path fileType="data">/usr/share/keepassxc/icons/application/scalable/mimetypes/application-x-keepassxc.svg</Path>
<Path fileType="data">/usr/share/keepassxc/icons/database/C00_Password.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/database/C01_Package_Network.png</Path>
<Path fileType="data">/usr/share/keepassxc/icons/database/C02_MessageBox_Warning.png</Path>
@@ -284,16 +292,22 @@
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_eu.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_fi.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_fr.qm</Path>
+ <Path fileType="data">/usr/share/keepassxc/translations/keepassx_he.qm</Path>
+ <Path fileType="data">/usr/share/keepassxc/translations/keepassx_hr_HR.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_hu.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_id.qm</Path>
+ <Path fileType="data">/usr/share/keepassxc/translations/keepassx_is_IS.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_it.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_ja.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_kk.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_ko.qm</Path>
+ <Path fileType="data">/usr/share/keepassxc/translations/keepassx_la.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_lt.qm</Path>
+ <Path fileType="data">/usr/share/keepassxc/translations/keepassx_lv.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_nb.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_nl_NL.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_pl.qm</Path>
+ <Path fileType="data">/usr/share/keepassxc/translations/keepassx_pt.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_pt_BR.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_pt_PT.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_ro.qm</Path>
@@ -307,6 +321,7 @@
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_uk.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_zh_CN.qm</Path>
<Path fileType="data">/usr/share/keepassxc/translations/keepassx_zh_TW.qm</Path>
+ <Path fileType="data">/usr/share/keepassxc/wizard/background-pixmap.png</Path>
<Path fileType="data">/usr/share/keepassxc/wordlists/eff_large.wordlist</Path>
<Path fileType="man">/usr/share/man/man1/keepassxc-cli.1</Path>
<Path fileType="data">/usr/share/metainfo/org.keepassxc.KeePassXC.appdata.xml</Path>
@@ -314,12 +329,12 @@
</Files>
</Package>
<History>
- <Update release="17">
- <Date>2018-10-16</Date>
- <Version>2.3.4</Version>
+ <Update release="18">
+ <Date>2019-03-21</Date>
+ <Version>2.4.0</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Sat, Aug 12, 1:14 AM (3 h, 19 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5820460
Default Alt Text
D5798.diff (17 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.