From a29d267a42e270e64043e67bbd51180546acb1c2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Oct 2020 17:13:09 +0100 Subject: [PATCH 1/9] gpgme: Update version from 1.13.1 to 1.14.0 --- gpgme.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpgme.be0 b/gpgme.be0 index 2a00af096..464133cbe 100755 --- a/gpgme.be0 +++ b/gpgme.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gpgme-1.13.1-0 +# BEE_VERSION gpgme-1.14.0-0 SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${PKGVERSION}.tar.bz2" From d7cb131f7b91872b601466c1a5a8383a2af25383 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Oct 2020 17:19:13 +0100 Subject: [PATCH 2/9] libgpg-error: Remove trailing space --- libgpg-error.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgpg-error.be0 b/libgpg-error.be0 index 4af7e91f4..bbb54cb12 100755 --- a/libgpg-error.be0 +++ b/libgpg-error.be0 @@ -54,7 +54,7 @@ SRCURL[0]="https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${PKGVERSION}. #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 9136c51b46af024cd03aa9b8720e6c7ff6fd3c95 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Oct 2020 17:18:51 +0100 Subject: [PATCH 3/9] libgpg-error: Update version from 1.29 to 1.39 libgpg-error 1.29 does not ship a pkg-config file, so update to the current version, which has one. /usr/lib/pkgconfig/gpg-error.pc The [Dino instant messenger][1] requires that for plugins/gpgme-vala. [1]: https://dino.im/ --- libgpg-error.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgpg-error.be0 b/libgpg-error.be0 index bbb54cb12..4983c1fde 100755 --- a/libgpg-error.be0 +++ b/libgpg-error.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libgpg-error-1.29-0 +# BEE_VERSION libgpg-error-1.39-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 0d5279004661b791851bd8045ac924eb55aea211 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Oct 2020 17:32:55 +0100 Subject: [PATCH 4/9] vala: Update version 0.36.15 to 0.50.1 [Dino currently fails to build][1], and updating Vala fixes the issue. [1]: https://github.com/dino/dino/issues/932 --- vala.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vala.be0 b/vala.be0 index 68c193782..a215a330c 100755 --- a/vala.be0 +++ b/vala.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION vala-0.36.15-0 +# BEE_VERSION vala-0.50.1-0 SRCURL[0]="https://download.gnome.org/sources/vala/${PKGVERSION[2]}/vala-${PKGVERSION}.tar.xz" From 83c2c18505e314315b9c858231d07ebd958993a6 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Oct 2020 17:39:12 +0100 Subject: [PATCH 5/9] dino: Add version from git (0.1.0_p152_5954f77) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In an effort, to propagate XMPP, a client is needed. We currently have Pidgin, but that is based on GTK 2, and, therefore, does not integrated so well and hurts the user desktop experience. Dino is the default client in GNOME, so let’s try it. [Description][1]: > Dino is a modern open-source chat client for the desktop. It focuses > on providing a clean and reliable Jabber/XMPP experience while having > your privacy in mind. [1]: https://dino.im/ --- dino.be0 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 dino.be0 diff --git a/dino.be0 b/dino.be0 new file mode 100755 index 000000000..43cd9a57e --- /dev/null +++ b/dino.be0 @@ -0,0 +1,36 @@ +#!/usr/bin/env beesh + +# BEE_VERSION dino-0.1.0_p152_5954f77-0 + +# https://github.com/dino/dino/ +SRCURL[0]="/src/mariux/beeroot/downloads/dino-${PKGFULLVERSION}.tar.bz2" + +# 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 +#} + +#mee_install_post() { +# exit +#} From 5c5803d77468f0d16f1e3c28bc84d48eb3359d5b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Oct 2020 17:48:01 +0100 Subject: [PATCH 6/9] dino: Build libsignal-protocol-c MarIuX does not have libsignal-protocol-c, so build it from within Dino. --with-libsignal-in-tree Build libsignal-protocol-c in tree and link it statically. --- dino.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dino.be0 b/dino.be0 index 43cd9a57e..a4f6839cc 100755 --- a/dino.be0 +++ b/dino.be0 @@ -19,9 +19,10 @@ SRCURL[0]="/src/mariux/beeroot/downloads/dino-${PKGFULLVERSION}.tar.bz2" # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --with-libsignal-in-tree +} #mee_build() { # bee_build From ed4d8f67bb99d92ac97d06eb4cb66053404ab0a2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Oct 2020 17:49:19 +0100 Subject: [PATCH 7/9] dino: Build an optimized release version --release Configure to build an optimized release version --- dino.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dino.be0 b/dino.be0 index a4f6839cc..0b3154fd1 100755 --- a/dino.be0 +++ b/dino.be0 @@ -21,7 +21,8 @@ SRCURL[0]="/src/mariux/beeroot/downloads/dino-${PKGFULLVERSION}.tar.bz2" mee_configure() { bee_configure \ - --with-libsignal-in-tree + --with-libsignal-in-tree \ + --release } #mee_build() { From 232f78a9c48a84d15fa757b02d93c0db5ebba63f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Oct 2020 18:01:20 +0100 Subject: [PATCH 8/9] dino: Use autotools --- dino.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dino.be0 b/dino.be0 index 0b3154fd1..33b9e31f4 100755 --- a/dino.be0 +++ b/dino.be0 @@ -11,6 +11,8 @@ SRCURL[0]="/src/mariux/beeroot/downloads/dino-${PKGFULLVERSION}.tar.bz2" # sourcesubdir_append src +BEE_BUILDTYPE=autotools + #mee_extract() { # bee_extract "${@}" #} From f2986bc8ad2f3794a1f6ff5ee3e57c528ce0ac73 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 26 Oct 2020 18:26:05 +0100 Subject: [PATCH 9/9] dino: Build in source directory CMake Error at plugins/signal-protocol/CMakeLists.txt:37 (add_subdirectory): The source directory /dev/shm/bee-root/dino/dino-0.1.0_p152_5954f77-0/source/plugins/signal-protocol/libsignal-protocol-c does not contain a CMakeLists.txt file. CMake Error at plugins/signal-protocol/CMakeLists.txt:38 (set_property): set_property could not find TARGET curve25519. Perhaps it has not yet been created. CMake Error at plugins/signal-protocol/CMakeLists.txt:39 (set_property): set_property could not find TARGET protobuf-c. Perhaps it has not yet been created. CMake Error at plugins/signal-protocol/CMakeLists.txt:40 (set_property): set_property could not find TARGET signal-protocol-c. Perhaps it has not yet been created. -- Configuring incomplete, errors occurred! Upstream issue: https://github.com/dino/dino/issues/933 --- dino.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dino.be0 b/dino.be0 index 33b9e31f4..9cb690c15 100755 --- a/dino.be0 +++ b/dino.be0 @@ -7,7 +7,7 @@ SRCURL[0]="/src/mariux/beeroot/downloads/dino-${PKGFULLVERSION}.tar.bz2" # PATCHURL+=() -# build_in_sourcedir +build_in_sourcedir # sourcesubdir_append src