New package: dino-0.1.0 #18648
Merged
New package: dino-0.1.0 #18648
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
As discussed in irc, dino's configure script is not portable. Also, |
|
Ignore the configure script and use cmake directly. |
anjandev
force-pushed
the
dino
branch
2 times, most recently
from
bdf8f74
to
6d23a1c
Compare
|
@Johnnynator This advice fixed alot of the issues I was getting but I still have the following error: Any ideas? |
Johnnynator
reviewed
Jan 30, 2020
srcpkgs/dino/template
Outdated
| distfiles="https://github.com/dino/dino/archive/v${version}.tar.gz" | ||
| checksum="202b7db322d85389b0bebc3c38976e7f7beaceddd1fc46b8123e50c6c7c07b8d" | ||
|
|
||
| do_build() { |
There was a problem hiding this comment.
remove and set build_style=cmake
Johnnynator
reviewed
Jan 30, 2020
Johnnynator
reviewed
Jan 30, 2020
Johnnynator
reviewed
Jan 30, 2020
srcpkgs/dino/template
Outdated
| make_build_target=dino | ||
| hostmakedepends="gettext unzip pkg-config ninja vala" | ||
| makedepends="cmake glib-devel qrencode-devel gtk+3-devel gpgme-devel libgee08-devel libgcrypt-devel libsoup-devel libsignal-protocol-c sqlite-devel" | ||
| depends="gettext glib glib-networking qrencode gtk+3 gpgme libgee08 libgcrypt libqrencode libsoup" |
There was a problem hiding this comment.
They are probably auto detected by shlibs.
Johnnynator
reviewed
Jan 30, 2020
Johnnynator
reviewed
Jan 30, 2020
srcpkgs/dino/template
Outdated
| revision=1 | ||
| make_build_target=dino | ||
| hostmakedepends="gettext unzip pkg-config ninja vala" | ||
| makedepends="cmake glib-devel qrencode-devel gtk+3-devel gpgme-devel libgee08-devel libgcrypt-devel libsoup-devel libsignal-protocol-c sqlite-devel" |
There was a problem hiding this comment.
cmake not needed in here, also add a newline after like 60-70 chars.
anjandev
force-pushed
the
dino
branch
3 times, most recently
from
33e7620
to
c170535
Compare
|
I once tried packaging it with this, don't know if it worked: Maybe this helps. |
|
@anjandev doing |
Im sorry, that didnt work for me. Would you mind posting the full template? Also, what are the implications of @faulesocke The main issue with my template is the make file breaks at If I run There is a |
i had that exact error and it was solved by that flag. it compiles |
|
i made a post (in spanish, but the commands are in english :) about how i compiled it: https://void.partidopirata.com.ar/2020/01/30/instalar-dino-en-void-linux/ |
q66
suggested changes
Feb 2, 2020
|
Maybe https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/dino helps? i think it would make sense to first try to package the easiest possible way. so without plugins, packaging seems easier. That means, try first to get the plain dino package working and when that works, try to get omemo and other plugins working in another PR. |
|
personally i agree with the plugins thing but it's very important that by the time it's on the repos it has the plugins, as without them users will be confused as to why omemo isn't working. |
|
Thanks for the feedback guys. I have half an evening free so I'll see what I can do. |
anjandev
force-pushed
the
dino
branch
3 times, most recently
from
549c65b
to
6bbccf4
Compare
|
@toogley thank you for the example build script. The current commit in this PR compiles dino to completion without plugins. I referenced your build script and Enabling the omemo plugin causes a linking error. Getting dino to compile without plugins is a good stepping stone but as @v0idifier has stated, dino was created to make encrypted communication easy and the default. I need fix omemo before this package can be merged with void repos. Any suggestions or help is much appreciated! |
|
I think i have managed to build dino directly some weeks ago (that means: not as void linux package and instead as a binary directly from the dino repository). I think i have used this command at that time: I tought it would make sense to get dino working that way before packaging it into void to understand how the build script has to look inside voidlinux. Still investigating. Also using |
|
I noticed that the arch linux person also has omemo not made available in their archlinux pkg. Maybe the build also fails for them, when used with omemo? |
|
I ran and it still works for me. check out the deps i installed at https://void.partidopirata.com.ar/2020/01/30/instalar-dino-en-void-linux/ |
|
So I did take a quick look at it. First for indentation use 1 tab in e.g. functions and 1 space for a newline inside a variable. Secondly as I said USE the build style, it seems like the cmake script generates a not fully working Makefile, but the Ninja one seems to work. Pls apply these changes ontop of what the current PR and work from there. diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 763e0b05dd..ed6f81e33c 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -2,10 +2,14 @@
pkgname=dino
version=0.1.0
revision=1
-hostmakedepends="cmake ninja gettext unzip pkg-config vala"
+build_style=cmake
+configure_args="-G Ninja -DDINO_PLUGIN_ENABLED_notification-sound=ON
+ -DDINO_PLUGIN_ENABLED_omemo=OFF"
+make_cmd=ninja
+hostmakedepends="cmake ninja gettext unzip pkg-config vala glib-devel"
makedepends="glib-devel qrencode-devel gtk+3-devel gpgme-devel
- libgee08-devel libgcrypt-devel libsoup-devel
- libsignal-protocol-c sqlite-devel libcanberra-devel"
+ libgee08-devel libgcrypt-devel libsoup-devel
+ libsignal-protocol-c sqlite-devel libcanberra-devel"
short_desc="Modern XMPP (\"Jabber\") Chat Client using GTK+/Vala"
maintainer="Anjandev Momi <anjan@momi.ca>"
license="GPL-3.0-or-later"
@@ -13,14 +17,6 @@ homepage="https://github.com/dino/dino"
distfiles="https://github.com/dino/dino/archive/v${version}.tar.gz"
checksum="202b7db322d85389b0bebc3c38976e7f7beaceddd1fc46b8123e50c6c7c07b8d"
-do_build() {
- cmake -G Ninja -B build -S . \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DDINO_PLUGIN_ENABLED_notification-sound=ON \
- -DDINO_PLUGIN_ENABLED_omemo=OFF
- ninja -C build
-}
-
do_install() {
- vbin build/dino
+ vbin build/dino
} |
|
sgn@120864e From ea2458baae15c6e560a499c8072c8066f1e801e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 6 Feb 2020 16:04:18 +0700
Subject: [PATCH] New package: dino-0.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
common/shlibs | 3 +++
srcpkgs/dino/template | 23 +++++++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 100644 srcpkgs/dino/template
diff --git a/common/shlibs b/common/shlibs
index 78e1d17864..16c430e695 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3798,3 +3798,6 @@ libmdnsd.so.0 libmdnsd-0.8_1
libPtex.so ptex-2.3.2_1
libosdGPU.so.3.4.0 OpenSubdiv-3.4.0_1
libosdCPU.so.3.4.0 OpenSubdiv-3.4.0_1
+libdino.so.0 dino-0.1.0_1
+libxmpp-vala.so.0 dino-0.1.0_1
+libqlite.so.0 dino-0.1.0_1
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
new file mode 100644
index 0000000000..14f1804fa7
--- /dev/null
+++ b/srcpkgs/dino/template
@@ -0,0 +1,23 @@
+# Template file for 'dino'
+pkgname=dino
+version=0.1.0
+revision=1
+build_style=cmake
+configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON
+ -DDINO_PLUGIN_ENABLED_omemo=OFF"
+make_cmd=ninja
+hostmakedepends="cmake ninja gettext unzip pkg-config vala glib-devel"
+makedepends="glib-devel qrencode-devel gtk+3-devel gpgme-devel
+ libgee08-devel libgcrypt-devel libsoup-devel
+ libsignal-protocol-c sqlite-devel libcanberra-devel"
+short_desc='Modern XMPP ("Jabber") Chat Client using GTK+/Vala'
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/dino/dino"
+distfiles="https://github.com/dino/dino/archive/v${version}.tar.gz"
+checksum="202b7db322d85389b0bebc3c38976e7f7beaceddd1fc46b8123e50c6c7c07b8d"
+
+post_install() {
+ rm -rf ${DESTDIR}/usr/include
+ rm -rf ${DESTDIR}/usr/lib/*.so
+}
--
2.25.0.191.gde93cc14ab
|
|
b089612 You should be able to enable omemo now. |
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Co-authored-by: Ogromny <ogromnycoding@gmail.com>
|
I enabled omemo and merged @sgn's changes. I just sent my first omemo message using dino on void! This PR should be ready to be merged. Thanks for helping me everyone. |
|
Doing a build now, let's see. |
|
Built, tested. Works even on a big endian powermac g5 :P |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.