CVS commit: pkgsrc/chat/libomemo-c

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Jun 13 12:27:28 UTC 2026

Modified Files:
        pkgsrc/chat/libomemo-c: Makefile distinfo
Added Files:
        pkgsrc/chat/libomemo-c/patches: patch-CMakeLists.txt

Log Message:
chat/libomemo-c: Add support for choosing cmake

Add an if for build system, that one can easily flip in the Makefile.
The purpose is only making it easier to file upstream bug reports
about the cmake build system.

This commit changes only comments and moves meson into an enabled if,
so there is no change to the build and hence no PKGREVISION++.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/libomemo-c/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/libomemo-c/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/libomemo-c/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/chat/libomemo-c/Makefile
diff -u pkgsrc/chat/libomemo-c/Makefile:1.3 pkgsrc/chat/libomemo-c/Makefile:1.4
--- pkgsrc/chat/libomemo-c/Makefile:1.3 Wed Jan 14 12:57:31 2026
+++ pkgsrc/chat/libomemo-c/Makefile     Sat Jun 13 12:27:28 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2026/01/14 12:57:31 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2026/06/13 12:27:28 gdt Exp $
 
 DISTNAME=      libomemo-c-0.5.1
 PKGREVISION=   2
@@ -12,13 +12,26 @@ HOMEPAGE=   https://github.com/dino/libome
 COMMENT=       OMEMO library (asynchronous ratcheting forward-secrecy)
 LICENSE=       gnu-gpl-v3
 
+USE_LANGUAGES= c
+
 USE_TOOLS+=    pkg-config
 
 PKGCONFIG_OVERRIDE+=   src/libomemo-c.pc.in
 
-# Upstream documents cmake but meson works better.
-# https://github.com/dino/libomemo-c/issues/13
-.include "../../devel/meson/build.mk"
+# Upstream README.md says that the build system is cmake.  However
+# that has multiple problems, and building with meson seems to work.
+#   https://github.com/dino/libomemo-c/issues/13
+
+LIBOMEMO_BUILD=        meson
+
+.if !empty(LIBOMEMO_BUILD:Mmeson)
+.  include "../../devel/meson/build.mk"
+.else
+# The cmake builds tries to use a c++ compiler and exits when that fails.
+# It fails (correctly) if USE_LANGUAGES does not contain c++
+USE_LANGUAGES+=                c++
+.  include "../../devel/cmake/build.mk"
+.endif
 
 .include "../../devel/check/buildlink3.mk"
 .include "../../devel/protobuf-c/buildlink3.mk"

Index: pkgsrc/chat/libomemo-c/distinfo
diff -u pkgsrc/chat/libomemo-c/distinfo:1.1 pkgsrc/chat/libomemo-c/distinfo:1.2
--- pkgsrc/chat/libomemo-c/distinfo:1.1 Wed Aug 13 15:02:26 2025
+++ pkgsrc/chat/libomemo-c/distinfo     Sat Jun 13 12:27:28 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2025/08/13 15:02:26 gdt Exp $
+$NetBSD: distinfo,v 1.2 2026/06/13 12:27:28 gdt Exp $
 
 BLAKE2s (libomemo-c-0.5.1.tar.gz) = 1c897d9c8e5ffbef5e97e3aab77ad9280512198552bda3ae99a5da1af2baf89b
 SHA512 (libomemo-c-0.5.1.tar.gz) = ff59565406c51663f2944e9a7c12c5b0e3fa01073039f5161472dd81f59194b1cf2685bc1e0cc930a141bc409b965c5d93313cfc3e0e237250102af3b5e88826
 Size (libomemo-c-0.5.1.tar.gz) = 239763 bytes
+SHA1 (patch-CMakeLists.txt) = e3969f45226323e6cfa5371765fa039cd4bbe6ad

Added files:

Index: pkgsrc/chat/libomemo-c/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/chat/libomemo-c/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sat Jun 13 12:27:28 2026
+++ pkgsrc/chat/libomemo-c/patches/patch-CMakeLists.txt Sat Jun 13 12:27:28 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2026/06/13 12:27:28 gdt Exp $
+
+pkgsrc cmake in 202606 fails if minimum required is < 3.5.   Just
+increase it.
+
+See https://github.com/dino/libomemo-c/issues/13.
+
+--- CMakeLists.txt.orig        2025-03-29 17:30:00.000000000 +0000
++++ CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.4)
++cmake_minimum_required(VERSION 3.5)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
+ project(omemo-c)
+