Merge pull request #1073 from mariux64/update-keepassxc-from-2.2.2-to…

…-2.4.1

Update keepassxc from 2.2.2 to 2.4.1

argon2.be0

@@ -0,0 +1,35 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION argon2-20171227-0
+
+SRCURL[0]="https://github.com/P-H-C/phc-winner-argon2/archive/${PKGVERSION}.tar.gz argon2-20171227.tar.gz"
+
+# PATCHURL+=()
+
+build_in_sourcedir
+
+# sourcesubdir_append src
+
+
+#mee_extract() {
+#    bee_extract "${@}"
+#}
+
+#mee_patch() {
+#    bee_patch "${@}"
+#}
+
+#mee_configure() {
+#    bee_configure
+#}
+
+mee_build() {
+    bee_build OPTTARGET=generic
+}
+
+mee_install() {
+    bee_install OPTTARGET=generic
+    install -Dm644 man/${PKGNAME}.1 ${D}${MANDIR}/man1/${PKGNAME}.1
+    install -Dm644 lib${PKGNAME}.pc ${D}${LIBDIR}/pkgconfig/lib${PKGNAME}.pc
+}
+## by default this may be 'make install DESTDIR="${D}"'

keepassxc.be0

@@ -1,20 +1,16 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION keepassxc-2.2.2-0
+# BEE_VERSION keepassxc-2.4.1-0
 
-# bee download https://github.com/keepassxreboot/keepassxc.git
+SRCURL[0]="https://github.com/keepassxreboot/keepassxc/archive/${PKGVERSION}.tar.gz keepassxc-2.4.1.tar.gz"
 
-SRCURL[0]="/src/mariux/beeroot/downloads/keepassxc-${PKGVERSION}_p182_b0e6bcfa.tar.bz2"
-
-PATH=/usr/local/qt5/bin:$PATH
-
-# remove buggy cmake git ref settings
-PATCHURL[0]='/src/mariux/beeroot/downloads/keepassxc-2.2.2_p182_b0e6bcfa-git-get-refs.patch'
+# PATCHURL+=()
 
 # build_in_sourcedir
 
 # sourcesubdir_append src
 
+
 #mee_extract() {
 #    bee_extract "${@}"
 #}
@@ -23,9 +19,12 @@ PATCHURL[0]='/src/mariux/beeroot/downloads/keepassxc-2.2.2_p182_b0e6bcfa-git-get
 #    bee_patch "${@}"
 #}
 
-#mee_configure() {
-#    bee_configure
-#}
+mee_configure() {
+    bee_configure -DQt5X11Extras_DIR=/usr/local/qt5/lib/cmake/Qt5X11Extras \
+                  -DCMAKE_BUILD_TYPE=Release \
+                  -DWITH_XC_KEESHARE=ON \
+                  -DKEEPASSXC_BUILD_TYPE=Release
+}
 
 #mee_build() {
 #    bee_build
@@ -34,3 +33,4 @@ PATCHURL[0]='/src/mariux/beeroot/downloads/keepassxc-2.2.2_p182_b0e6bcfa-git-get
 #mee_install() {
 #    bee_install
 #}
+## by default this may be 'make install DESTDIR="${D}"'

libsodium.be0

@@ -0,0 +1,33 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION libsodium-1.0.17-0
+
+SRCURL[0]="https://download.libsodium.org/libsodium/releases/libsodium-${PKGVERSION}.tar.gz"
+
+# PATCHURL+=()
+
+# build_in_sourcedir
+
+# sourcesubdir_append src
+
+
+#mee_extract() {
+#    bee_extract "${@}"
+#}
+
+#mee_patch() {
+#    bee_patch "${@}"
+#}
+
+#mee_configure() {
+#    bee_configure
+#}
+
+#mee_build() {
+#    bee_build
+#}
+
+#mee_install() {
+#    bee_install
+#}
+## by default this may be 'make install DESTDIR="${D}"'