Index | Thread | Search

From:
Kirill A. Korinsky <kirill@korins.ky>
Subject:
Re: devel/protobuf: revert undef some macroses
To:
Theo Buehler <tb@theobuehler.org>
Cc:
ports@openbsd.org
Date:
Sat, 29 Mar 2025 14:54:22 +0100

Download raw body.

Thread
On Sat, 29 Mar 2025 14:41:38 +0100,
Theo Buehler <tb@theobuehler.org> wrote:
> 
> Please revert this change. This is pointless
>

Like this?

Index: devel/protobuf/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/protobuf/Makefile,v
diff -u -p -r1.86 Makefile
--- devel/protobuf/Makefile	22 Mar 2025 17:07:06 -0000	1.86
+++ devel/protobuf/Makefile	29 Mar 2025 12:22:01 -0000
@@ -2,6 +2,7 @@ COMMENT =		c++ protocol buffers
 
 CPPMAJOR =		5
 PROTOBUF_VERSION =	29.4
+REVISION =		0
 V =			${CPPMAJOR}.${PROTOBUF_VERSION}
 TAG =			v${PROTOBUF_VERSION:S/rc-/rc/}
 DISTNAME =		protobuf-${PROTOBUF_VERSION}
Index: devel/protobuf/patches/patch-src_google_protobuf_port_undef_inc
===================================================================
RCS file: devel/protobuf/patches/patch-src_google_protobuf_port_undef_inc
diff -N devel/protobuf/patches/patch-src_google_protobuf_port_undef_inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ devel/protobuf/patches/patch-src_google_protobuf_port_undef_inc	29 Mar 2025 13:53:55 -0000
@@ -0,0 +1,12 @@
+Index: src/google/protobuf/port_undef.inc
+--- src/google/protobuf/port_undef.inc.orig
++++ src/google/protobuf/port_undef.inc
+@@ -141,7 +141,7 @@
+ #pragma pop_macro("FALSE")
+ #endif
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__OpenBSD__)
+ #pragma pop_macro("TRUE")
+ #pragma pop_macro("FALSE")
+ #pragma pop_macro("UID_MAX")