gnunet-gtk: Attempt to fix building of gnunet-conversation-gtk (not successful).

[nikita <nikita%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Fri Mar 25 15:12:08 2022 +0100
Changeset:	4630b3600e5841d82364a16f09b0122ee65f47ec

Modified Files:
	gnunet-gtk/Makefile
	gnunet-gtk/PLIST
	gnunet-gtk/distinfo
Added Files:
	gnunet-gtk/patches/patch-gnunet-conversation-gtk.patch

Log Message:
gnunet-gtk: Attempt to fix building of gnunet-conversation-gtk (not successful).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4630b3600e5841d82364a16f09b0122ee65f47ec

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnunet-gtk/Makefile                                |  3 +++
 gnunet-gtk/PLIST                                   |  1 -
 gnunet-gtk/distinfo                                |  1 +
 .../patches/patch-gnunet-conversation-gtk.patch    | 29 ++++++++++++++++++++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diffs:
diff --git a/gnunet-gtk/Makefile b/gnunet-gtk/Makefile
index 0a8df1cb52..165fc4e9b1 100644
--- a/gnunet-gtk/Makefile
+++ b/gnunet-gtk/Makefile
@@ -21,6 +21,9 @@ USE_TOOLS+=		pkg-config
 CONFIGURE_ENV+=		LD_LIBRARY_PATH+=${BUILDLINK_PREFIX.gtk3}/lib
 CONFIGURE_ARGS+=	--with-gnunet=${BUILDLINK_PREFIX.gnunet}
 CONFIGURE_ARGS+=	--with-glade=${BUILDLINK_PREFIX.glade}
+# Without this, gnunet-gtk fails to build a file. Fixed upstream,
+# next release won't require LE.
+CONFIGURE_ARGS+=	--with-extractor=${BUILDLINK_PREFIX.libextractor}
 # optional dependency, but x11/libunique says it is deprecated.
 # CONFIGURE_ARGS+=	--with-libunique
 
diff --git a/gnunet-gtk/PLIST b/gnunet-gtk/PLIST
index 60dae0222b..85ef85b921 100644
--- a/gnunet-gtk/PLIST
+++ b/gnunet-gtk/PLIST
@@ -1,5 +1,4 @@
 @comment $NetBSD$
-${PLIST.audio}bin/gnunet-conversation-gtk
 bin/gnunet-fs-gtk
 bin/gnunet-namestore-gtk
 bin/gnunet-peerinfo-gtk
diff --git a/gnunet-gtk/distinfo b/gnunet-gtk/distinfo
index 7a639d90b6..58dacf6f7b 100644
--- a/gnunet-gtk/distinfo
+++ b/gnunet-gtk/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
 BLAKE2s (gnunet-gtk-0.16.0.tar.gz) = 5ac4cfa1c6a3b67a940b96c47229aa707c17c5434ed3896de999a21fcd86c01b
 SHA512 (gnunet-gtk-0.16.0.tar.gz) = 478815504430e130c161b769ade2ad253d7c365a873bb42e619e926fe4550afd91e73a9a8a22f95ef0b0966d82c8addc81cc7c1d6e31ccba6704c594a8fae06c
 Size (gnunet-gtk-0.16.0.tar.gz) = 1566556 bytes
+SHA1 (patch-gnunet-conversation-gtk.patch) = 1ee128eaa029e989fcbf9c321cab1b181c43435e
diff --git a/gnunet-gtk/patches/patch-gnunet-conversation-gtk.patch b/gnunet-gtk/patches/patch-gnunet-conversation-gtk.patch
new file mode 100644
index 0000000000..813af69e86
--- /dev/null
+++ b/gnunet-gtk/patches/patch-gnunet-conversation-gtk.patch
@@ -0,0 +1,29 @@
+# $NetBSD$
+
+Upstream commit c06bc0c449d0a988f2848be8ae2c4779dc6f26d0
+conversation does not require libextractor or libgnunetfs
+
+
+--- configure.ac.orig
++++ configure.ac
+@@ -448,7 +448,7 @@ AS_IF([test "x$gnunet" = "x0"],
+ AC_SUBST(GNUNET_CFLAGS)
+ AC_SUBST(GNUNET_LIBS)
+ 
+-AM_CONDITIONAL(HAVE_CONVERSATION, test x$gnunet_conversation != x0 -a "x$extractor" == "x1")
++AM_CONDITIONAL(HAVE_CONVERSATION, test x$gnunet_conversation != x0)
+ 
+ backup_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$GNUNET_CPPFLAGS $backup_CPPFLAGS"
+
+--- src/conversation/Makefile.am.orig
++++ src/conversation/Makefile.am
+@@ -38,7 +38,7 @@ gnunet_conversation_gtk_LDADD = \
+   $(top_builddir)/src/lib/libgnunetgtk.la \
+   @GTK_LIBS@ \
+   @GLADE_LIBS@ @GNUNET_LIBS@ \
+-  -lgnunetutil -lgnunetidentity -lgnunetconversation -lgnunetspeaker -lgnunetmicrophone -lgnunetnamestore -lgnunetgnsrecord -lgnunetgns -lgnunetfs -lextractor \
++  -lgnunetutil -lgnunetidentity -lgnunetconversation -lgnunetspeaker -lgnunetmicrophone -lgnunetnamestore -lgnunetgnsrecord -lgnunetgns \
+   $(INTLLIBS)
+ gnunet_conversation_gtk_LDFLAGS = \
+   -export-dynamic