Click here to go back to the commit logs for dino.

Commit:

---

Hash: 2f24840e4c55334ccbed23155c4af06b9a87bcf9

Message: fix build issues for bullseye

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 467f461..4125d89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,12 +3,13 @@ generated-by = makedeb-makepkg
 pkgbase = dino
 	pkgdesc = Dino - Modern Jabber/XMPP Client using GTK+/Vala
 	pkgver = 0.2.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://dino.im/
 	arch = x86_64
 	license = GPL3
 	makedepends = git
 	makedepends = cmake
+	makedepends = g++
 	makedepends = ninja-build
 	makedepends = valac
 	makedepends = gettext
@@ -29,32 +30,8 @@ pkgbase = dino
 	makedepends = gstreamer1.0-plugins-good
 	makedepends = gstreamer1.0-gtk3
 	makedepends = libsignal-protocol-c-dev
-	depends = libc6>=2.29
-	depends = libcairo2>=1.12.0
-	depends = libgcc-s1>=3.0
-	depends = libgcrypt20>=1.8.0
-	depends = libgdk-pixbuf2.0-0>=2.25.2
-	depends = libgee-0.8-2>=0.20.0
-	depends = libglib2.0-0>=2.59.0
-	depends = libgnutls30>=3.6.12
-	depends = libgpg-error0>=1.14
-	depends = libgpgme11>=1.2.0
-	depends = libgspell-1-2>=1.8.2
-	depends = libgstreamer-plugins-base1.0-0>=1.0.0
-	depends = libgstreamer1.0-0>=1.16.0
-	depends = libgtk-3-0>=3.22.6
-	depends = libicu66>=66.1-1
-	depends = libnice10>=0.1.15
-	depends = libpango-1.0-0>=1.18.0
-	depends = libqrencode4>=3.2.0
-	depends = libsoup2.4-1>=2.41.90
-	depends = libsqlite3-0>=3.6.0
-	depends = libsrtp2-1>=2.0.0+20170516
-	depends = libstdc++6>=5
-	depends = libwebrtc-audio-processing1
-	depends = glib-networking
-	depends = gstreamer1.0-plugins-good
-	depends = gstreamer1.0-gtk3
+	depends = libc6>=2.29[@],
+	depends = libicu66
 	provides = dino
 	provides = dino-im
 	provides = dino-im-common
@@ -75,5 +52,7 @@ pkgbase = dino
 	conflicts = libxmpp-vala0
 	source = dino-0.2.2::https://github.com/dino/dino/releases/download/v0.2.2/dino-0.2.2.tar.gz
 	sha256sums = 3e076f51c65967cfd51cbabf0b7249a7ea36e61afa25f93f82b9348466b2b864
+	bullseye_depends = libc6>=2.29[@]
+	bullseye_depends = libicu67
 
 pkgname = dino
diff --git a/PKGBUILD b/PKGBUILD
index aa5bb48..0e97574 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,20 @@
 
 pkgname=dino
 pkgver=0.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Dino - Modern Jabber/XMPP Client using GTK+/Vala"
 arch=('x86_64')
 url="https://dino.im/"
 license=('GPL3')
-depends=('libc6>=2.29' 'libcairo2>=1.12.0' 'libgcc-s1>=3.0' 'libgcrypt20>=1.8.0' 'libgdk-pixbuf2.0-0>=2.25.2'
+_base_depends=('libc6>=2.29' 'libcairo2>=1.12.0' 'libgcc-s1>=3.0' 'libgcrypt20>=1.8.0' 'libgdk-pixbuf2.0-0>=2.25.2'
         'libgee-0.8-2>=0.20.0' 'libglib2.0-0>=2.59.0' 'libgnutls30>=3.6.12' 'libgpg-error0>=1.14' 'libgpgme11>=1.2.0'
         'libgspell-1-2>=1.8.2' 'libgstreamer-plugins-base1.0-0>=1.0.0' 'libgstreamer1.0-0>=1.16.0' 'libgtk-3-0>=3.22.6'
-        'libicu66>=66.1-1' 'libnice10>=0.1.15' 'libpango-1.0-0>=1.18.0' 'libqrencode4>=3.2.0' 'libsoup2.4-1>=2.41.90'
+        'libnice10>=0.1.15' 'libpango-1.0-0>=1.18.0' 'libqrencode4>=3.2.0' 'libsoup2.4-1>=2.41.90'
         'libsqlite3-0>=3.6.0' 'libsrtp2-1>=2.0.0+20170516' 'libstdc++6>=5' 'libwebrtc-audio-processing1' 'glib-networking'
         'gstreamer1.0-plugins-good' 'gstreamer1.0-gtk3')
-makedepends=('git' 'cmake' 'ninja-build' 'valac' 'gettext' 'libgee-0.8-dev' 'libsqlite3-dev' 'libgtk-3-dev'
+depends=("$_base_depends[@]", 'libicu66')
+bullseye_depends=("$_base_depends[@]" 'libicu67')
+makedepends=('git' 'cmake' 'g++' 'ninja-build' 'valac' 'gettext' 'libgee-0.8-dev' 'libsqlite3-dev' 'libgtk-3-dev'
         'libgpgme-dev' 'libsoup2.4-dev' 'libgcrypt20-dev' 'libqrencode-dev' 'libgspell-1-dev' 'libgstreamer1.0-dev'
         'libgstreamer-plugins-base1.0-dev' 'libwebrtc-audio-processing-dev' 'libsrtp2-dev' 'libnice-dev' 'glib-networking'
         'gstreamer1.0-plugins-good' 'gstreamer1.0-gtk3' 'libsignal-protocol-c-dev')