CVS commit: pkgsrc/x11/libSM

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Dec 26 22:11:05 UTC 2022

Modified Files:
        pkgsrc/x11/libSM: Makefile builtin.mk distinfo

Log Message:
libSM: update to 1.2.4.

The configure script checks for libICE version 1.1.0 or later as one
of the bug fixes in this release depends on the fixed version of the
IceGetHeaderExtra macro defined in the libICE headers to work correctly.

Alan Coopersmith (12):
      Remove obsolete B16 & B32 tags in struct definitions
      Update README for gitlab migration
      Update configure.ac bug URL for gitlab migration
      Fix spelling/wording issues
      Build xz tarballs instead of bzip2
      gitlab CI: add a basic build test
      Add uuid as private dependency to sm.pc for static linking
      SmcCloseConnection: remove unnecessary cast from free()
      gitlab CI: stop requiring Signed-off-by in commits
      gitlab CI: build current libICE, to meet dependency on >= 1.1.0
      Handle arrays too large to fit in iceConn buffers
      libSM 1.2.4

Kim Woelders (1):
      Fix some potential memory leaks in SmcCloseConnection().


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/libSM/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libSM/builtin.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/libSM/distinfo

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

Modified files:

Index: pkgsrc/x11/libSM/Makefile
diff -u pkgsrc/x11/libSM/Makefile:1.19 pkgsrc/x11/libSM/Makefile:1.20
--- pkgsrc/x11/libSM/Makefile:1.19      Wed Nov  9 13:14:20 2022
+++ pkgsrc/x11/libSM/Makefile   Mon Dec 26 22:11:05 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2022/11/09 13:14:20 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2022/12/26 22:11:05 wiz Exp $
 
-DISTNAME=              libSM-1.2.3
+DISTNAME=              libSM-1.2.4
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=lib/}
-EXTRACT_SUFX=          .tar.bz2
+EXTRACT_SUFX=          .tar.xz
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://xorg.freedesktop.org/
@@ -22,6 +22,7 @@ CONFIGURE_ARGS+=      --without-libuuid
 X11_LIB_NAME?=         libSM
 .include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
+BUILDLINK_API_DEPENDS.libICE+= libICE>=1.1.0
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"

Index: pkgsrc/x11/libSM/builtin.mk
diff -u pkgsrc/x11/libSM/builtin.mk:1.3 pkgsrc/x11/libSM/builtin.mk:1.4
--- pkgsrc/x11/libSM/builtin.mk:1.3     Sun Nov  3 09:14:10 2019
+++ pkgsrc/x11/libSM/builtin.mk Mon Dec 26 22:11:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2019/11/03 09:14:10 rillig Exp $
+# $NetBSD: builtin.mk,v 1.4 2022/12/26 22:11:05 wiz Exp $
 
 BUILTIN_PKG:=  libSM
 
@@ -31,10 +31,10 @@ USE_BUILTIN.libSM=  no
 .  else
 USE_BUILTIN.libSM=     ${IS_BUILTIN.libSM}
 .    if defined(BUILTIN_PKG.libSM) && \
-        !empty(IS_BUILTIN.libSM:M[yY][eE][sS])
+        ${IS_BUILTIN.libSM:tl} == yes
 USE_BUILTIN.libSM=     yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.libSM}
-.        if !empty(USE_BUILTIN.libSM:M[yY][eE][sS])
+.        if ${USE_BUILTIN.libSM:tl} == yes
 USE_BUILTIN.libSM!=                                                    \
        if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libSM:Q}; then \
                ${ECHO} yes;                                            \

Index: pkgsrc/x11/libSM/distinfo
diff -u pkgsrc/x11/libSM/distinfo:1.12 pkgsrc/x11/libSM/distinfo:1.13
--- pkgsrc/x11/libSM/distinfo:1.12      Tue Oct 26 11:34:04 2021
+++ pkgsrc/x11/libSM/distinfo   Mon Dec 26 22:11:05 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:34:04 nia Exp $
+$NetBSD: distinfo,v 1.13 2022/12/26 22:11:05 wiz Exp $
 
-BLAKE2s (libSM-1.2.3.tar.bz2) = 59057162d8c85699294dcf64c135fb609183996558ac7c403b5c7ccfa1651ea7
-SHA512 (libSM-1.2.3.tar.bz2) = 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903
-Size (libSM-1.2.3.tar.bz2) = 362595 bytes
+BLAKE2s (libSM-1.2.4.tar.xz) = d4f3329ad433f6eff9a0f0fbf9d0d237a05211e4f4fa436fe6d48fc94b75bed3
+SHA512 (libSM-1.2.4.tar.xz) = 7f1d41b7b6c5dd456c49ccad7740c3ba9791a2793fa50fd94814a4164ce2e20c4a0a0ad42a87708e494ed5c23f611be6d3ccd9ef1e9add6d46ac545e2b0f6f86
+Size (libSM-1.2.4.tar.xz) = 306944 bytes