Merge branch 'master' of git+ssh://git.gnunet.org/gnunet

4 files changed, 13 insertions, 24 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 801eacecf..6c1b66c2a 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -58,7 +58,6 @@ PACKAGES_FILES = \
   packages/arch/gnunet-git/gnunet-system.service \
   packages/arch/gnunet-git/gnunet.sysusers \
   packages/arch/gnunet-git/gnunet.tmpfiles \
-  packages/arch/gnunet-git/gnunet-uri.desktop \
   packages/arch/gnunet-git/gnunet-user.conf \
   packages/arch/gnunet-git/gnunet-user.service \
   packages/arch/gnunet-git/PKGBUILD \
@@ -84,7 +83,6 @@ EXTRA_DIST = \
   sounds/vonlynX-bdbG9-lo.wav \
   sounds/vonlynX-ringtones.txt \
   A-Z.ecc \
-  xdg-scheme-handler/gnunet-uri.desktop \
   xdg-scheme-handler/README.md \
   apparmor/gnunet-daemon-testbed-blacklist \
   apparmor/gnunet-service-identity \
@@ -229,7 +227,6 @@ EXTRA_DIST = \
   guix.scm \
   indent_pre-commit \
   Makefile.inc \
-  gnunet.m4 \
   vagrant/Vagrantfile \
   vagrant/bootstrap.ubuntu.sh \
   privacy-sensitive-symbols.mspec \
@@ -263,9 +260,13 @@ test_gnunet_prefix_LDADD = \
   $(LIBLTDL) -lunistring $(XLIB)
 
 aclocaldir = $(datadir)/aclocal
-aclocal_DATA = \
+dist_aclocal_DATA = \
   gnunet.m4
 
+xdgdeentrydir = $(datadir)/applications
+dist_xdgdeentry_DATA = \
+  xdg-scheme-handler/gnunet-uri.desktop
+
 install-data-hook:
         chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_core.sh'
         chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_start.sh'
diff --git a/contrib/packages/arch/gnunet-git/.SRCINFO b/contrib/packages/arch/gnunet-git/.SRCINFO
index b60c26547..82a649530 100644
--- a/contrib/packages/arch/gnunet-git/.SRCINFO
+++ b/contrib/packages/arch/gnunet-git/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by makepkg 6.0.1
+# Fri Aug  5 01:36:05 UTC 2022
 pkgbase = gnunet-git
         pkgdesc = A framework for secure peer-to-peer networking
-        pkgver = 0.17.1.r21.g6a60c7d43
+        pkgver = 0.17.2.r20.g0780c69e9
         pkgrel = 1
         url = http://gnunet.org
         install = gnunet.install
@@ -16,6 +18,8 @@ pkgbase = gnunet-git
         makedepends = pkgconfig
         makedepends = postgresql
         makedepends = python
+        makedepends = python-sphinx
+        makedepends = python-sphinx_rtd_theme
         makedepends = recutils
         depends = brotli
         depends = gettext
@@ -58,14 +62,12 @@ pkgbase = gnunet-git
         source = gnunet-system.service
         source = gnunet.sysusers
         source = gnunet.tmpfiles
-        source = gnunet-uri.desktop
         source = gnunet-user.conf
         source = gnunet-user.service
         sha256sums = SKIP
         sha256sums = 163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262
         sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755
         sha256sums = 5c34e1ecc6208900426f8e399e8c3edbef12cce19eba605fd7364ddb3547d9f0
-        sha256sums = 98e4e1d6d4fd7c7fd05d9e16402c95f1e7afeb4b97c8c68ac63e8abd11ff4ee7
         sha256sums = 3f17b9ed2c1f8cc0f919fe477df99678c17778a31f1eeb56517e285e3cef30f2
         sha256sums = 60caee20b53bcc69522556b35ac3d35d89e28c49b9a22a2ed5121df4a2c33be5
 
diff --git a/contrib/packages/arch/gnunet-git/PKGBUILD b/contrib/packages/arch/gnunet-git/PKGBUILD
index 006412ff5..c0fed77e5 100644
--- a/contrib/packages/arch/gnunet-git/PKGBUILD
+++ b/contrib/packages/arch/gnunet-git/PKGBUILD
@@ -6,7 +6,7 @@
 
 _appname='gnunet'
 pkgname="${_appname}-git"
-pkgver=0.17.1.r21.g6a60c7d43
+pkgver=0.17.2.r20.g0780c69e9
 pkgrel=1
 pkgdesc='A framework for secure peer-to-peer networking'
 arch=('i686' 'x86_64')
@@ -19,7 +19,8 @@ depends=('brotli' 'gettext' 'gnurl' 'gnutls' 'iptables' 'jansson'
          'libtool' 'libunistring' 'miniupnpc' 'nss' 'openssl' 'sqlite' 'which'
          'zlib')
 makedepends=('bluez-libs' 'gettext' 'git' 'libpulse' 'libtool' 'opus'
-             'pkgconfig' 'postgresql' 'python' 'recutils')
+             'pkgconfig' 'postgresql' 'python' 'python-sphinx'
+             'python-sphinx_rtd_theme' 'recutils')
 optdepends=('bluez: for bluetooth transport'
             'gnunet-gtk: for handling the gnunet:// URI scheme'
             'jose: for re:claimID OpenID Connect plugin'
@@ -39,7 +40,6 @@ source=("git+https://git.${_appname}.org/${_appname}.git"
         "${_appname}-system.service"
         "${_appname}.sysusers"
         "${_appname}.tmpfiles"
-        "${_appname}-uri.desktop"
         "${_appname}-user.conf"
         "${_appname}-user.service")
 install="${_appname}.install"
@@ -47,7 +47,6 @@ sha256sums=('SKIP'
             '163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262'
             '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755'
             '5c34e1ecc6208900426f8e399e8c3edbef12cce19eba605fd7364ddb3547d9f0'
-            '98e4e1d6d4fd7c7fd05d9e16402c95f1e7afeb4b97c8c68ac63e8abd11ff4ee7'
             '3f17b9ed2c1f8cc0f919fe477df99678c17778a31f1eeb56517e285e3cef30f2'
             '60caee20b53bcc69522556b35ac3d35d89e28c49b9a22a2ed5121df4a2c33be5')
 
@@ -100,10 +99,6 @@ package() {
         install -Dm644 "${srcdir}/${_appname}.tmpfiles" \
                 "${pkgdir}/usr/lib/tmpfiles.d/${_appname}.conf"
 
-        install -dm755 "${pkgdir}/usr/share/applications"
-        install -Dm644 "${srcdir}/${_appname}-uri.desktop" \
-                "${pkgdir}/usr/share/applications/${_appname}-uri.desktop"
-
         install -dm700 "${pkgdir}/etc/skel/.config"
         install -Dm600 "${srcdir}/${_appname}-user.conf" \
                 "${pkgdir}/etc/skel/.config/${_appname}.conf"
diff --git a/contrib/packages/arch/gnunet-git/gnunet-uri.desktop b/contrib/packages/arch/gnunet-git/gnunet-uri.desktop
deleted file mode 100644
index 4f847d20f..000000000
--- a/contrib/packages/arch/gnunet-git/gnunet-uri.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=GNUnet URI
-Exec=gnunet-uri %u
-GenericName=URI handler for the GNUnet network
-Icon=gnunet
-Type=Application
-Terminal=false
-NoDisplay=true
-MimeType=x-scheme-handler/gnunet;