CVS commit: pkgsrc/chat/srain

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Mar 17 15:32:24 UTC 2021

Modified Files:
        pkgsrc/chat/srain: Makefile PLIST distinfo
        pkgsrc/chat/srain/patches: patch-src_lib_path.c
Added Files:
        pkgsrc/chat/srain/patches: patch-data_meson.build
Removed Files:
        pkgsrc/chat/srain/patches: patch-data_Makefile

Log Message:
srain: update to 1.2.0

2021-02-28 Version 1.2.0
========================

- Features:

  - Switch build system from Make to Meson
  - Add FreeBSD implementations for ``srn_get_executable_{path,dir}``,
    thanks to :people:`wahjava`
  - Add ``/quote`` command for sending special IRC commands,
    thanks to :people:`hno`
  - Add support for hiding server buffer

- Bug fixes:

   - Fix an use-after-free BUG
   - Fix implicit declaration error on some systems,
     thanks to :people:`lgbaldoni`


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/chat/srain/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/srain/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/chat/srain/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/chat/srain/patches/patch-data_Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/srain/patches/patch-data_meson.build
cvs rdiff -u -r1.1 -r1.2 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.9 pkgsrc/chat/srain/Makefile:1.10
--- pkgsrc/chat/srain/Makefile:1.9      Tue Nov 24 14:17:53 2020
+++ pkgsrc/chat/srain/Makefile  Wed Mar 17 15:32:24 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2020/11/24 14:17:53 nia Exp $
+# $NetBSD: Makefile,v 1.10 2021/03/17 15:32:24 nia Exp $
 
-DISTNAME=      srain-1.1.3
+DISTNAME=      srain-1.2.0
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=SrainApp/}
 
@@ -9,26 +9,15 @@ HOMEPAGE=     https://srain.im/
 COMMENT=       Modern IRC client written in GTK
 LICENSE=       gnu-gpl-v3
 
-HAS_CONFIGURE= yes
-
-USE_TOOLS+=    pkg-config gmake
+USE_TOOLS+=    pkg-config
 USE_TOOLS+=    msgfmt msgmerge xgettext
 
-CONFIGURE_ARGS+=       --prefix=${PREFIX}
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --disable-debug
-
-BUILD_TARGET=  default
-
-MAKE_FLAGS+=   MAKE=${GMAKE:Q}
-MAKE_FLAGS+=   INSTALL=${INSTALL:Q}
-
-AUTO_MKDIRS=   yes
+MESON_ARGS+=   -Ddoc_builders=man
 
 OWN_DIRS+=     ${PKG_SYSCONFDIR}/srain
 
-CONF_FILES+=   share/examples/srain/builtin.cfg \
-               ${PKG_SYSCONFDIR}/srain/builtin.cfg
+EGDIR=         ${PREFIX}/share/examples/srain
+CONF_FILES=    ${EGDIR}/builtin.cfg ${PKG_SYSCONFDIR}/srain/builtin.cfg
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -37,8 +26,23 @@ CONF_FILES+= share/examples/srain/builti
 TOOLS_PLATFORM.msgfmt=
 .endif
 
+SUBST_CLASSES+=                sphinx
+SUBST_STAGE.sphinx=    pre-configure
+SUBST_FILES.sphinx=    doc/meson.build
+SUBST_MESSAGE.sphinx=  Fixing sphinx binary name.
+SUBST_SED.sphinx+=     -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX},"
+
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
+
+PYTHON_FOR_BUILD_ONLY= tool
+
+post-install:
+       ${RM} -f ${DESTDIR}${PREFIX}/share/srain/themes/meson.build
+
+.include "../../devel/meson/build.mk"
 .include "../../devel/libconfig/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../net/libsoup/buildlink3.mk"
 .include "../../security/libsecret/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/chat/srain/PLIST
diff -u pkgsrc/chat/srain/PLIST:1.3 pkgsrc/chat/srain/PLIST:1.4
--- pkgsrc/chat/srain/PLIST:1.3 Tue May 26 11:11:39 2020
+++ pkgsrc/chat/srain/PLIST     Wed Mar 17 15:32:24 2021
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/26 11:11:39 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/03/17 15:32:24 nia Exp $
 bin/srain
+man/man1/srain.1
 share/applications/im.srain.Srain.desktop
 share/examples/srain/builtin.cfg
+share/icons/hicolor/128x128/apps/im.srain.Srain.Red.png
 share/icons/hicolor/128x128/apps/im.srain.Srain.png
 share/locale/nl/LC_MESSAGES/srain.mo
 share/locale/ru/LC_MESSAGES/srain.mo

Index: pkgsrc/chat/srain/distinfo
diff -u pkgsrc/chat/srain/distinfo:1.6 pkgsrc/chat/srain/distinfo:1.7
--- pkgsrc/chat/srain/distinfo:1.6      Tue Nov 24 14:17:53 2020
+++ pkgsrc/chat/srain/distinfo  Wed Mar 17 15:32:24 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2020/11/24 14:17:53 nia Exp $
+$NetBSD: distinfo,v 1.7 2021/03/17 15:32:24 nia Exp $
 
-SHA1 (srain-1.1.3.tar.gz) = 14c8adbfca3be0edf053c903f64b4d5dbee16316
-RMD160 (srain-1.1.3.tar.gz) = 3225299417aa4bf38ce20a035e727904972f83f8
-SHA512 (srain-1.1.3.tar.gz) = ad1c47bb249dae27cea3d4a044bbd10c034f2bb44fbec34053eeb878405caf9cf6236a03a7ff922f4eb4c189e5ccab4a307c208569bf0fdeb654a9de03a6d4fe
-Size (srain-1.1.3.tar.gz) = 944319 bytes
-SHA1 (patch-data_Makefile) = 5bd5a47d58cf85e6fae220655d539fc2827a46ee
-SHA1 (patch-src_lib_path.c) = 7a329ff26699d4152de176138b8c44ae73f3717e
+SHA1 (srain-1.2.0.tar.gz) = 9ef4a37ea3c3dd39abd23feb0f3d3a5620f044a1
+RMD160 (srain-1.2.0.tar.gz) = 9c6fec91154ccecc8beb4e4ae0c4549031fdfb83
+SHA512 (srain-1.2.0.tar.gz) = 19d838e91b9b8cb85f83906fa17989c81a0f0e19c379dfdc865748335937affb13a9dcc03076f56e93c4b9d9bc97ed0d1578f93d565cf68e1a976711190a7a30
+Size (srain-1.2.0.tar.gz) = 945232 bytes
+SHA1 (patch-data_meson.build) = d24ed2caa3cd36bde4d808014c7bfb309366b6bf
+SHA1 (patch-src_lib_path.c) = 5885c65984ebb23a75ae88bc7e52b2b262104588

Index: pkgsrc/chat/srain/patches/patch-src_lib_path.c
diff -u pkgsrc/chat/srain/patches/patch-src_lib_path.c:1.1 pkgsrc/chat/srain/patches/patch-src_lib_path.c:1.2
--- pkgsrc/chat/srain/patches/patch-src_lib_path.c:1.1  Tue Nov 24 14:17:53 2020
+++ pkgsrc/chat/srain/patches/patch-src_lib_path.c      Wed Mar 17 15:32:24 2021
@@ -1,20 +1,44 @@
-$NetBSD: patch-src_lib_path.c,v 1.1 2020/11/24 14:17:53 nia Exp $
+$NetBSD: patch-src_lib_path.c,v 1.2 2021/03/17 15:32:24 nia Exp $
 
-Use the Linux code for finding the executable filename using
-/proc on other OSes too.
+Use the Linux procfs code path for finding the executable
+name as a portable fallback.
 
---- src/lib/path.c.orig        2020-10-04 01:11:49.000000000 +0000
+The code for other platforms is wrong.
+
+--- src/lib/path.c.orig        2021-02-28 09:19:09.000000000 +0000
 +++ src/lib/path.c
-@@ -48,7 +48,7 @@
+@@ -50,21 +50,20 @@
  #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>
-@@ -364,20 +364,6 @@ char *srn_get_executable_dir() {
+ 
+-#define PROC_SELF_EXE "/proc/self/exe"
+-
+-#elif defined __sun
+-
++#if defined __sun
+ #define PROC_SELF_EXE "/proc/self/path/a.out"
+-
+-#elif defined __FreeBSD__
+-#include <sys/types.h>
+-#include <sys/sysctl.h>
+-
++#else
++#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() {
      return executableDir;
  }
  
@@ -35,7 +59,16 @@ Use the Linux code for finding the execu
  #elif defined __APPLE__
  char *srn_get_executable_path() {
      char rawPathName[PATH_MAX];
-@@ -396,4 +382,18 @@ char *srn_get_executable_dir() {
+@@ -404,7 +389,7 @@ char *srn_get_executable_dir() {
+     return executableDir;
+ }
+ 
+-#elif defined __FreeBSD__
++
+ 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() {
      g_free(executablePath);
      return executableDir;
  }

Added files:

Index: pkgsrc/chat/srain/patches/patch-data_meson.build
diff -u /dev/null pkgsrc/chat/srain/patches/patch-data_meson.build:1.1
--- /dev/null   Wed Mar 17 15:32:24 2021
+++ pkgsrc/chat/srain/patches/patch-data_meson.build    Wed Mar 17 15:32:24 2021
@@ -0,0 +1,12 @@
+$NetBSD: patch-data_meson.build,v 1.1 2021/03/17 15:32:24 nia Exp $
+
+Install config files to examples.
+
+--- data/meson.build.orig      2021-02-28 09:19:09.000000000 +0000
++++ data/meson.build
+@@ -27,4 +27,4 @@ subdir('metainfo')
+ subdir('icons')
+ 
+ install_subdir('themes', install_dir: pkg_data_dir)
+-install_data('builtin.cfg', install_dir: pkg_sys_conf_dir)
++install_data('builtin.cfg', install_dir: join_paths(data_dir, 'examples', 'srain'))