galeb-mkfiles

чување 9787e795674a154a86f458c13f392adc541dc41e
родитељ baf349ea2c657646e9cabe8fd24ecc13c6c865d5
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Thu, 15 Sep 2022 20:39:30 +0200

neomutt: Add SASL, use pkg-config more, break long lines

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
neomutt/mkfile
 | 
16
++++++++++++++--
A
neomutt/pat/neomutt-dont-detect-sasl.patch
 | 
26
++++++++++++++++++++++++++

измењених датотека: 2, додавања: 40(+), брисања: 2(-)
diff --git a/neomutt/mkfile b/neomutt/mkfile
@@ -28,13 +28,25 @@ $PKGBASE:QV:
 		--mandir=$MANDIR \
 		--gpgme \
 		--ssl \
+		--sasl \
 		--notmuch \
 		--disable-idn \
 		--pcre2 \
 		--with-mailpath=$MAILPATH
 	cp Makefile Makefile~
-	sed -e '/^LIBS *=/s/$/ -lnotmuch -lxapian -lgpgme -lassuan -lgpg-error -lssl -lcrypto -lgmime-3.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lm -lffi -ltalloc -lstdc++ -lpcre -lz -lzstd/' \
-		-e '/^LDFLAGS *=/s/$/ -static-libgcc -static-libstdc++/' Makefile~ > Makefile
+	sed -e "/^LIBS *=/s,\$, ./libconn.a -lnotmuch -lnotmuch_util \
+	-lparse-time-string ""$(
+		pkg-config --libs --static xapian-core) ""$(
+		pkg-config --libs --static libsasl2) ""$(
+		pkg-config --libs --static gpgme) ""$(
+		pkg-config --libs --static libssl) ""$(
+		pkg-config --libs --static gmime-3.0) "" -lgdbm \
+	-ltalloc -lstdc++ -lpcre -lz -lzstd," \
+		-e "/^LDFLAGS *=/s/\$/ -static-libgcc -static-libstdc++/" \
+		-e "/^LIBCONNOBJS *+=/s,\$,\nLIBCONNOBJS+=   conn/sasl.o," \
+		-e "/^LIBIMAPOBJS *+=/s,\$,\nLIBIMAPOBJS+= \
+	  imap/auth_sasl.o," \
+		Makefile~ > Makefile
 	printf "  MAKE\n"
 	make
 
diff --git a/neomutt/pat/neomutt-dont-detect-sasl.patch b/neomutt/pat/neomutt-dont-detect-sasl.patch
@@ -0,0 +1,26 @@
+--- a/auto.def	2022-09-15 20:00:43.017899465 +0200
++++ b/auto.def	2022-09-15 20:01:34.485898491 +0200
+@@ -597,15 +597,15 @@
+     define USE_SASL
+     define-feature SASL
+   } else {
+-    foreach sasl_lib {sasl2 sasl} {
+-      if {[check-inc-and-lib sasl [opt-val with-sasl $prefix] \
+-                             sasl/sasl.h sasl_encode64 $sasl_lib]} {
+-        # RHEL6 doesn't have this function yet
+-        cc-check-functions sasl_client_done
++    #foreach sasl_lib {sasl2 sasl} {
++    #  if {[check-inc-and-lib sasl [opt-val with-sasl $prefix] \
++    #                         sasl/sasl.h sasl_encode64 $sasl_lib]} {
++    #    # RHEL6 doesn't have this function yet
++    #    cc-check-functions sasl_client_done
+         define USE_SASL
+-        break
+-      }
+-    }
++    #    break
++    #  }
++    #}
+     if {![get-define USE_SASL]} {
+       user-error "Unable to find SASL"
+     }