Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / dino
Commits: a0607fb9 by Robin Candau at 2024-05-10T15:05:36+02:00 upgpkg: 0.4.3-5: Switch license to SPDX identifier + switch libsoup dep to libsoup3 + Add a temporary patch to fix build with new vala + ignore 'implicit-function-declaration' error during cmake build Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/dino/-/issues/2#note_184485 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + fix_build_with_new_vala.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,10 +1,10 @@ pkgbase = dino pkgdesc = Modern XMPP (Jabber) chat client written in Vala pkgver = 0.4.3 - pkgrel = 4 + pkgrel = 5 url = https://dino.im arch = x86_64 - license = GPL3 + license = GPL-3.0-only makedepends = git makedepends = cmake makedepends = vala @@ -17,7 +17,7 @@ pkgbase = dino depends = libgee depends = libgcrypt depends = libsignal-protocol-c - depends = libsoup + depends = libsoup3 depends = sqlite depends = qrencode depends = gspell @@ -31,8 +31,10 @@ pkgbase = dino depends = gdk-pixbuf2 source = https://github.com/dino/dino/releases/download/v0.4.3/dino-0.4.3.tar.gz source = https://github.com/dino/dino/releases/download/v0.4.3/dino-0.4.3.tar.gz.asc + source = fix_build_with_new_vala.patch validpgpkeys = A32134DD19952FB12EC43E4501FABCC83FEA225E sha256sums = a615fc14d27402316d45036d55471d5ccb68194390e0654efb192f8de57b4b06 sha256sums = SKIP + sha256sums = 5f2de305e36efa4b17bac09f947d09e6c2259ccaa152077e17d613e36da9e16b pkgname = dino ===================================== PKGBUILD ===================================== @@ -3,34 +3,43 @@ pkgname=dino pkgver=0.4.3 -pkgrel=4 +pkgrel=5 pkgdesc="Modern XMPP (Jabber) chat client written in Vala" arch=(x86_64) url="https://dino.im"; -license=(GPL3) +license=('GPL-3.0-only') depends=(glib2 glib-networking gtk4 libadwaita gpgme libgee libgcrypt libsignal-protocol-c - libsoup sqlite qrencode gspell libnice gstreamer gst-plugin-gtk + libsoup3 sqlite qrencode gspell libnice gstreamer gst-plugin-gtk gst-plugins-base gst-plugins-good libsrtp webrtc-audio-processing gdk-pixbuf2) makedepends=(git cmake vala ninja) -source=(https://github.com/dino/dino/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz{,.asc}) +source=(https://github.com/dino/dino/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz{,.asc} + fix_build_with_new_vala.patch) sha256sums=('a615fc14d27402316d45036d55471d5ccb68194390e0654efb192f8de57b4b06' - 'SKIP') + 'SKIP' + '5f2de305e36efa4b17bac09f947d09e6c2259ccaa152077e17d613e36da9e16b') validpgpkeys=(A32134DD19952FB12EC43E4501FABCC83FEA225E) +prepare() { + cd "${pkgname}-${pkgver}" + # Temporary patch to fix build with new vala + patch -Np1 < "${srcdir}/fix_build_with_new_vala.patch" +} + build() { - cmake -G Ninja -B build -S ${pkgname}-${pkgver} \ - -DBUILD_TESTS='ON' \ - -DCMAKE_BUILD_TYPE='None' \ - -DCMAKE_INSTALL_PREFIX='/usr' \ - -Wno-dev - ninja -C build + CFLAGS+=' -Wno-error=implicit-function-declaration' # 'implicit-function-declaration' is now an error in GCC 14, making the build fails + cmake -G Ninja -B build -S ${pkgname}-${pkgver} \ + -DBUILD_TESTS='ON' \ + -DCMAKE_BUILD_TYPE='None' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -Wno-dev + ninja -C build } check() { - build/xmpp-vala-test - build/signal-protocol-vala-test + build/xmpp-vala-test + build/signal-protocol-vala-test } package() { - DESTDIR="${pkgdir}" ninja -C build install + DESTDIR="${pkgdir}" ninja -C build install } ===================================== fix_build_with_new_vala.patch ===================================== @@ -0,0 +1,14 @@ +--- a/plugins/gpgme-vala/vapi/gpgme_public.vapi ++++ b/plugins/gpgme-vala/vapi/gpgme_public.vapi +@@ -22,9 +22,9 @@ public class Key { + public string issuer_name; + public string chain_id; + public Validity owner_trust; +- [CCode(array_null_terminated = true)] ++ [CCode (array_length = false, array_null_terminated = true)] + public SubKey[] subkeys; +- [CCode(array_null_terminated = true)] ++ [CCode (array_length = false, array_null_terminated = true)] + public UserID[] uids; + public KeylistMode keylist_mode; + // public string fpr; // requires gpgme >= 1.7.0 View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/dino/-/commit/a0607fb9edb7d32c92fc347c3c6f3ec39c24e004 -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/dino/-/commit/a0607fb9edb7d32c92fc347c3c6f3ec39c24e004 You're receiving this email because of your account on gitlab.archlinux.org.
