File _service:tar_git:libomemo.patch of Package profanity

diff -Naur a/configure b/configure
--- a/configure	2023-08-03 08:02:09.000000000 +0200
+++ b/configure	2023-10-25 18:07:32.000000000 +0200
@@ -676,8 +676,8 @@
 THEMES_INSTALL_FALSE
 THEMES_INSTALL_TRUE
 THEMES_PATH
-libsignal_LIBS
-libsignal_CFLAGS
+omemo_LIBS
+omemo_CFLAGS
 BUILD_OMEMO_FALSE
 BUILD_OMEMO_TRUE
 gdk_pixbuf_LIBS
@@ -921,8 +921,8 @@
 libotr_LIBS
 gdk_pixbuf_CFLAGS
 gdk_pixbuf_LIBS
-libsignal_CFLAGS
-libsignal_LIBS
+omemo_CFLAGS
+omemo_LIBS
 libqrencode_CFLAGS
 libqrencode_LIBS
 cmocka_CFLAGS
@@ -1653,10 +1653,9 @@
               C compiler flags for gdk_pixbuf, overriding pkg-config
   gdk_pixbuf_LIBS
               linker flags for gdk_pixbuf, overriding pkg-config
-  libsignal_CFLAGS
-              C compiler flags for libsignal, overriding pkg-config
-  libsignal_LIBS
-              linker flags for libsignal, overriding pkg-config
+  omemo_CFLAGS
+              C compiler flags for omemo, overriding pkg-config
+  omemo_LIBS  linker flags for omemo, overriding pkg-config
   libqrencode_CFLAGS
               C compiler flags for libqrencode, overriding pkg-config
   libqrencode_LIBS
@@ -1885,7 +1884,7 @@
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-   which can conflict with char $2 (); below.  */
+   which can conflict with char $2 (void); below.  */
 
 #include <limits.h>
 #undef $2
@@ -1896,7 +1895,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char $2 ();
+char $2 (void);
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
@@ -2275,9 +2274,7 @@
 /* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
 struct buf { int x; };
 struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
+static char *e (char **p, int i)
 {
   return p[i];
 }
@@ -2328,6 +2325,7 @@
 extern int printf (const char *, ...);
 extern int dprintf (int, const char *, ...);
 extern void *malloc (size_t);
+extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
@@ -11404,8 +11402,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -11466,8 +11470,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load (void);
 int
 main (void)
 {
@@ -11510,8 +11520,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -11549,8 +11565,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -11588,8 +11610,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link (void);
 int
 main (void)
 {
@@ -13479,8 +13507,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char fmod ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char fmod (void);
 int
 main (void)
 {
@@ -13928,8 +13962,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char pthread_join ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_join (void);
 int
 main (void)
 {
@@ -16871,19 +16911,19 @@
     OMEMO_LIBS=""
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsignal" >&5
-printf %s "checking for libsignal... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for omemo" >&5
+printf %s "checking for omemo... " >&6; }
 
-if test -n "$libsignal_CFLAGS"; then
-    pkg_cv_libsignal_CFLAGS="$libsignal_CFLAGS"
+if test -n "$omemo_CFLAGS"; then
+    pkg_cv_omemo_CFLAGS="$omemo_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsignal-protocol-c >= 2.3.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libsignal-protocol-c >= 2.3.2") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"omemo-c\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "omemo-c") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libsignal_CFLAGS=`$PKG_CONFIG --cflags "libsignal-protocol-c >= 2.3.2" 2>/dev/null`
+  pkg_cv_omemo_CFLAGS=`$PKG_CONFIG --cflags "omemo-c" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -16891,16 +16931,16 @@
  else
     pkg_failed=untried
 fi
-if test -n "$libsignal_LIBS"; then
-    pkg_cv_libsignal_LIBS="$libsignal_LIBS"
+if test -n "$omemo_LIBS"; then
+    pkg_cv_omemo_LIBS="$omemo_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsignal-protocol-c >= 2.3.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libsignal-protocol-c >= 2.3.2") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"omemo-c\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "omemo-c") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libsignal_LIBS=`$PKG_CONFIG --libs "libsignal-protocol-c >= 2.3.2" 2>/dev/null`
+  pkg_cv_omemo_LIBS=`$PKG_CONFIG --libs "omemo-c" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -16921,26 +16961,26 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        libsignal_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsignal-protocol-c >= 2.3.2" 2>&1`
+	        omemo_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "omemo-c" 2>&1`
         else
-	        libsignal_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsignal-protocol-c >= 2.3.2" 2>&1`
+	        omemo_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "omemo-c" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$libsignal_PKG_ERRORS" >&5
+	echo "$omemo_PKG_ERRORS" >&5
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: libsignal-protocol-c >= 2.3.2 not found, OMEMO support not enabled" >&5
-printf "%s\n" "$as_me: libsignal-protocol-c >= 2.3.2 not found, OMEMO support not enabled" >&6;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: omemo-c not found, OMEMO support not enabled" >&5
+printf "%s\n" "$as_me: omemo-c not found, OMEMO support not enabled" >&6;}
 elif test $pkg_failed = untried; then
      	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: libsignal-protocol-c >= 2.3.2 not found, OMEMO support not enabled" >&5
-printf "%s\n" "$as_me: libsignal-protocol-c >= 2.3.2 not found, OMEMO support not enabled" >&6;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: omemo-c not found, OMEMO support not enabled" >&5
+printf "%s\n" "$as_me: omemo-c not found, OMEMO support not enabled" >&6;}
 else
-	libsignal_CFLAGS=$pkg_cv_libsignal_CFLAGS
-	libsignal_LIBS=$pkg_cv_libsignal_LIBS
+	omemo_CFLAGS=$pkg_cv_omemo_CFLAGS
+	omemo_LIBS=$pkg_cv_omemo_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	OMEMO_LIBS="-lsignal-protocol-c"
+	OMEMO_LIBS="-lomemo-c"
          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gcry_md_extract in -lgcrypt" >&5
 printf %s "checking for gcry_md_extract in -lgcrypt... " >&6; }
 if test ${ac_cv_lib_gcrypt_gcry_md_extract+y}
@@ -16954,8 +16994,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char gcry_md_extract ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gcry_md_extract (void);
 int
 main (void)
 {
@@ -17216,8 +17262,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char stbbr_start ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char stbbr_start (void);
 int
 main (void)
 {
@@ -17274,8 +17326,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char exp_expectl ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char exp_expectl (void);
 int
 main (void)
 {
diff -Naur a/configure.ac b/configure.ac
--- a/configure.ac	2023-08-03 07:57:41.000000000 +0200
+++ b/configure.ac	2023-10-25 18:03:57.000000000 +0200
@@ -324,13 +324,13 @@
 AM_CONDITIONAL([BUILD_OMEMO], [false])
 if test "x$enable_omemo" != xno; then
     OMEMO_LIBS=""
-    PKG_CHECK_MODULES([libsignal], [libsignal-protocol-c >= 2.3.2],
-        [OMEMO_LIBS="-lsignal-protocol-c"
+    PKG_CHECK_MODULES([omemo], [omemo-c],
+        [OMEMO_LIBS="-lomemo-c"
          AC_CHECK_LIB([gcrypt], [gcry_md_extract],
              [OMEMO_LIBS="-lgcrypt $OMEMO_LIBS"
               AM_CONDITIONAL([BUILD_OMEMO], [true])],
              [AC_MSG_NOTICE([gcrypt >= 1.7.0 not found, OMEMO support not enabled])])],
-        [AC_MSG_NOTICE([libsignal-protocol-c >= 2.3.2 not found, OMEMO support not enabled])])
+        [AC_MSG_NOTICE([omemo-c not found, OMEMO support not enabled])])
 
     AM_COND_IF([BUILD_OMEMO],
         [AC_DEFINE([HAVE_OMEMO], [1], [Have OMEMO])
diff -Naur a/Makefile.in b/Makefile.in
--- a/Makefile.in	2023-08-03 08:02:10.000000000 +0200
+++ b/Makefile.in	2023-10-25 18:07:33.000000000 +0200
@@ -1001,8 +1001,6 @@
 libotr_LIBS = @libotr_LIBS@
 libqrencode_CFLAGS = @libqrencode_CFLAGS@
 libqrencode_LIBS = @libqrencode_LIBS@
-libsignal_CFLAGS = @libsignal_CFLAGS@
-libsignal_LIBS = @libsignal_LIBS@
 libstrophe_CFLAGS = @libstrophe_CFLAGS@
 libstrophe_LIBS = @libstrophe_LIBS@
 localedir = @localedir@
@@ -1014,6 +1012,8 @@
 ncursesw_CFLAGS = @ncursesw_CFLAGS@
 ncursesw_LIBS = @ncursesw_LIBS@
 oldincludedir = @oldincludedir@
+omemo_CFLAGS = @omemo_CFLAGS@
+omemo_LIBS = @omemo_LIBS@
 pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@