haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

KeePassXC: bump version

Browse Source
This commit is contained in:
Sergei Reznikov
2017-12-18 16:57:19 +03:00
parent 371e19b930
commit 41559b5298
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app-admin/keepassxc/keepassxc-2.2.0.recipe → app-admin/keepassxc/keepassxc-2.2.4.recipe
View File

@@ -30,7 +30,7 @@ COPYRIGHT="
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/keepassxreboot/keepassxc/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="9d9d39b9c056955fe5d7a5212efe1703be02fa4731c36e2b1e06a78174b0a7b8"
CHECKSUM_SHA256="e884439ed3ad461e426a25f0492f5fa78ab8ba06fb718977b3867d8f098ccd0a"
PATCHES="keepassxc-$portVersion.patchset"
ADDITIONAL_FILES="keepassxc.rdef.in"
@@ -39,8 +39,7 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
keepassxc$secondaryArchSuffix = $portVersion
cmd:keepassxc$secondaryArchSuffix = $portVersion
cmd:keepassxc_cli$secondaryArchSuffix = $portVersion
cmd:keepassxc_cli
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -70,14 +69,12 @@ BUILD_REQUIRES="
devel:libQt5Test$secondaryArchSuffix
devel:libQt5Widgets$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:g++
cmd:g++$secondaryArchSuffix
cmd:make
cmd:moc
cmd:qmake
cmd:qmake$secondaryArchSuffix >= 5
"
BUILD()
@@ -94,7 +91,7 @@ INSTALL()
{
# TODO: adjust path for /boot/home/.config/keepassxc/keepassxc.ini
# TODO: replace icon with the one from keepassxc.svgz
# TODO: replace toolbar icons with http://zumi.xoom.it/myhaiku/btoolbar/index.html
# TODO: replace toolbar icons with https://github.com/HaikuArchives/ZumisIcons/tree/master/myhaiku/btoolbar
make install
appIconsDir=$dataDir/keepassxc/icons/application
@@ -106,7 +103,7 @@ INSTALL()
done
mkdir -p $appsDir
mv $binDir/keepassxc $appsDir/KeePassXC
mv $prefix/bin/keepassxc $appsDir/KeePassXC
local APP_SIGNATURE="application/x-vnd.qt5-keepassxc"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"

24
app-admin/keepassxc/patches/keepassxc-2.2.0.patchset → app-admin/keepassxc/patches/keepassxc-2.2.4.patchset
View File

@@ -1,14 +1,14 @@
From a315bcb09ed0f9ea79de6a9855d5704bf8e84188 Mon Sep 17 00:00:00 2001
From 7ddd3be455c9a683ea48d9dfd056e0ce5db7cb99 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 30 Aug 2017 20:23:38 +0300
Date: Mon, 18 Dec 2017 16:14:39 +0300
Subject: Haiku patch
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6276761..78b8714 100644
index 479ea86..28dfdb8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,11 +89,13 @@ add_gcc_compiler_flags("-Wformat=2 -Wmissing-format-attribute")
@@ -101,11 +101,13 @@ add_gcc_compiler_flags("-Wformat=2 -Wmissing-format-attribute")
add_gcc_compiler_flags("-fvisibility=hidden")
add_gcc_compiler_cxxflags("-fvisibility-inlines-hidden")
@@ -23,7 +23,7 @@ index 6276761..78b8714 100644
add_gcc_compiler_cxxflags("-fno-exceptions -fno-rtti")
add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual")
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index a609add..1c69d2e 100644
index 81bb269..686af27 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -23,7 +23,7 @@ file(GLOB DATABASE_ICONS icons/database/*.png)
@@ -35,9 +35,9 @@ index a609add..1c69d2e 100644
install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svgz"
PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE PATTERN "categories" EXCLUDE)
@@ -32,7 +32,7 @@ if(UNIX AND NOT APPLE)
PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE PATTERN "categories" EXCLUDE)
install(FILES linux/keepassxc.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
@@ -33,7 +33,7 @@ if(UNIX AND NOT APPLE)
install(FILES linux/org.keepassxc.KeePassXC.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
install(FILES linux/org.keepassxc.KeePassXC.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
install(FILES linux/keepassxc.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
-endif(UNIX AND NOT APPLE)
+endif(UNIX AND NOT APPLE AND NOT HAIKU)
@@ -45,7 +45,7 @@ index a609add..1c69d2e 100644
if(APPLE)
install(FILES macosx/keepassxc.icns DESTINATION ${DATA_INSTALL_DIR})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7916855..4e55730 100644
index 5255186..5be9c3c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -230,6 +230,9 @@ target_link_libraries(keepassx_core
@@ -59,10 +59,10 @@ index 7916855..4e55730 100644
target_link_libraries(keepassx_core Qt5::DBus)
endif()
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 7027d94..e95ff9f 100644
index e37a7d2..49e4ac9 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -331,10 +331,10 @@ MainWindow::MainWindow()
@@ -333,10 +333,10 @@ MainWindow::MainWindow()
connect(m_ui->tabWidget, SIGNAL(messageDismissGlobal()), this, SLOT(hideGlobalMessage()));
connect(m_ui->tabWidget, SIGNAL(messageTab(QString,MessageWidget::MessageType)), this, SLOT(displayTabMessage(QString, MessageWidget::MessageType)));
connect(m_ui->tabWidget, SIGNAL(messageDismissTab()), this, SLOT(hideTabMessage()));
@@ -76,5 +76,5 @@ index 7027d94..e95ff9f 100644
if (config()->hasAccessError()) {
--
2.13.1
2.15.0