CVS commit: pkgsrc/chat/srain

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Aug 10 13:18:58 UTC 2024

Modified Files:
        pkgsrc/chat/srain: Makefile distinfo
        pkgsrc/chat/srain/patches: patch-src_lib_path.c
Removed Files:
        pkgsrc/chat/srain/patches: patch-doc_conf.py

Log Message:
srain: updated to 1.7.0

2024-04-26 Version 1.7.0

- Changes:

  - Remove GIMPNet (:pull:`408`)
  - Migrate to libsoup3 (:issue:`409`)

2024-04-26 Version 1.6.1

- Bug fixes:

  - Add developer name to metainfo

2024-02-11 Version 1.6.0

- Features:

  - Use new app indicator provided by libayatana-appindicator_, which has better
    compatibility than ``GtkStatusIcon`` (:pull:`374`, :pull:`401`)

    .. note:: User can still use ``GtkStatusIcon`` if they have trouble installing
       libayatana-appindicator, see :doc:`./install` for more details.

  - Add conf item ``scroll-on-new-message`` to automatically scroll down the
    message list when a new message is incoming even if the application is
    inactive (:issue:`382`)

- Bug fixes:

  - Let conf item ``chat.log`` works as expected (:issue:`402`)

2023-03-26 Version 1.5.1

- Bug fixes:

  - Fix the problem that the URL cannot be opened on MS Windows (:issue:`391`)

2022-10-02 Version 1.5.0

- Features:

  - Able to identify `Nordic GTK Theme`__ as dark theme (:pull:`372`)
  - Activate the corresponding buffer to a response user query (:issue:`381`)

- Changes:

  - No additional sphinx extensions are required to build documentation (:issue:`368`)
  - Cleanup deprecated APIs (:pull:`369`)
  - Suppress error message when connection keeps failing (:pull:`386`)
  - Enable debian release build , thanks to @tomac4t (:issue:`387`)

- Bug fixes:

  - Fix SASL authentication error when connecting to Soju


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/chat/srain/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/chat/srain/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/chat/srain/patches/patch-doc_conf.py
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/srain/patches/patch-src_lib_path.c

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

Modified files:

Index: pkgsrc/chat/srain/Makefile
diff -u pkgsrc/chat/srain/Makefile:1.35 pkgsrc/chat/srain/Makefile:1.36
--- pkgsrc/chat/srain/Makefile:1.35     Sat Aug 10 06:57:59 2024
+++ pkgsrc/chat/srain/Makefile  Sat Aug 10 13:18:58 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2024/08/10 06:57:59 adam Exp $
+# $NetBSD: Makefile,v 1.36 2024/08/10 13:18:58 adam Exp $
 
-DISTNAME=      srain-1.3.2
-PKGREVISION=   16
+DISTNAME=      srain-1.7.0
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=SrainApp/}
 
@@ -16,6 +15,7 @@ USE_TOOLS+=   msgfmt msgmerge pkg-config x
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 38 39 # py-sphinx
 
+MESON_ARGS+=   -Dapp_indicator=false
 MESON_ARGS+=   -Ddoc_builders=man
 
 OWN_DIRS+=     ${PKG_SYSCONFDIR}/srain
@@ -25,7 +25,7 @@ CONF_FILES=   ${EGDIR}/builtin.cfg ${PKG_S
 
 SUBST_CLASSES+=                sphinx
 SUBST_STAGE.sphinx=    pre-configure
-SUBST_FILES.sphinx=    doc/meson.build
+SUBST_FILES.sphinx=    docs/meson.build
 SUBST_MESSAGE.sphinx=  Fixing sphinx binary name.
 SUBST_SED.sphinx+=     -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX},"
 
@@ -39,7 +39,7 @@ post-install:
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/libconfig/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../net/libsoup/buildlink3.mk"
+.include "../../net/libsoup3/buildlink3.mk"
 .include "../../security/libsecret/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/chat/srain/distinfo
diff -u pkgsrc/chat/srain/distinfo:1.13 pkgsrc/chat/srain/distinfo:1.14
--- pkgsrc/chat/srain/distinfo:1.13     Sun May  7 12:39:58 2023
+++ pkgsrc/chat/srain/distinfo  Sat Aug 10 13:18:58 2024
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.13 2023/05/07 12:39:58 wiz Exp $
+$NetBSD: distinfo,v 1.14 2024/08/10 13:18:58 adam Exp $
 
-BLAKE2s (srain-1.3.2.tar.gz) = e898529b5e7e77817a0a6ee089f36abfcad8ba13bb33cdab1d3fc854dd926c3e
-SHA512 (srain-1.3.2.tar.gz) = eb5456f548b89b0c17133c74aee03e1ca02d2e798401be92e542e4b8bf8ccfaf38a15afa0b75cbcbebdbd8f7fa584b809686d41b776a8e32079566d93f8c741d
-Size (srain-1.3.2.tar.gz) = 1931640 bytes
+BLAKE2s (srain-1.7.0.tar.gz) = 63b0ac6a81ba12bb3b1318ea84664dbd26000575bdc06c2c85c9f62fb0068215
+SHA512 (srain-1.7.0.tar.gz) = 0549a08379946cc4ea0c331f212f03b08a0c7248964984d01a64744058d116ec1af05b2aefd0d689438dafa9df4e70179bb8957d9992f02414a462577c5d99dc
+Size (srain-1.7.0.tar.gz) = 2760861 bytes
 SHA1 (patch-data_meson.build) = d24ed2caa3cd36bde4d808014c7bfb309366b6bf
-SHA1 (patch-doc_conf.py) = 2a02caba90fa92acd01826615a1556d799a5022d
-SHA1 (patch-src_lib_path.c) = 5885c65984ebb23a75ae88bc7e52b2b262104588
+SHA1 (patch-src_lib_path.c) = d73af5814198eb60c953fd62bff28717d107a75a

Index: pkgsrc/chat/srain/patches/patch-src_lib_path.c
diff -u pkgsrc/chat/srain/patches/patch-src_lib_path.c:1.2 pkgsrc/chat/srain/patches/patch-src_lib_path.c:1.3
--- pkgsrc/chat/srain/patches/patch-src_lib_path.c:1.2  Wed Mar 17 15:32:24 2021
+++ pkgsrc/chat/srain/patches/patch-src_lib_path.c      Sat Aug 10 13:18:58 2024
@@ -1,44 +1,43 @@
-$NetBSD: patch-src_lib_path.c,v 1.2 2021/03/17 15:32:24 nia Exp $
+$NetBSD: patch-src_lib_path.c,v 1.3 2024/08/10 13:18:58 adam Exp $
+
+Use FreeBSD code for NetBSD.
 
 Use the Linux procfs code path for finding the executable
 name as a portable fallback.
 
-The code for other platforms is wrong.
-
---- src/lib/path.c.orig        2021-02-28 09:19:09.000000000 +0000
+--- src/lib/path.c.orig        2024-04-26 06:04:27.000000000 +0000
 +++ src/lib/path.c
-@@ -50,21 +50,20 @@
+@@ -50,21 +50,21 @@
  #include <mach-o/dyld.h>
  #include <unistd.h>
  
 -#elif defined __linux__
-+#elif defined __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+
-+#else
- #include <limits.h>
- #include <libgen.h>
- #include <unistd.h>
- 
--#define PROC_SELF_EXE "/proc/self/exe"
+-#include <limits.h>
+-#include <libgen.h>
+-#include <unistd.h>
 -
--#elif defined __sun
+-#define PROC_SELF_EXE "/proc/self/exe"
 -
-+#if defined __sun
+ #elif defined __sun
+ 
  #define PROC_SELF_EXE "/proc/self/path/a.out"
--
+ 
 -#elif defined __FreeBSD__
--#include <sys/types.h>
--#include <sys/sysctl.h>
--
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ 
 +#else
++#include <limits.h>
++#include <libgen.h>
++#include <unistd.h>
++
 +#define PROC_SELF_EXE "/proc/self/exe"
-+#endif
++
  #endif
  
  #define DEFAULT_FILE_MODE   (S_IRUSR | S_IWUSR)
-@@ -371,20 +370,6 @@ char *srn_get_executable_dir() {
+@@ -371,20 +371,6 @@ char *srn_get_executable_dir() {
      return executableDir;
  }
  
@@ -59,16 +58,16 @@ The code for other platforms is wrong.
  #elif defined __APPLE__
  char *srn_get_executable_path() {
      char rawPathName[PATH_MAX];
-@@ -404,7 +389,7 @@ char *srn_get_executable_dir() {
+@@ -404,7 +390,7 @@ char *srn_get_executable_dir() {
      return executableDir;
  }
  
 -#elif defined __FreeBSD__
-+
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
  char *srn_get_executable_path() {
      int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
      char rawPath[PATH_MAX];
-@@ -424,4 +409,18 @@ char *srn_get_executable_dir() {
+@@ -424,4 +410,18 @@ char *srn_get_executable_dir() {
      g_free(executablePath);
      return executableDir;
  }