Hi,
The following patches removes RTLD_NODELETE removal patches from few
ports (rsadowski@ raced me for few others ports, thanks !).
I built tested them on amd64.
For inputmethods/fcitx, REVISION bump might not be required, but "in doubt
bump".
Comments or OK ?
--
Sebastien Marie
Index: inputmethods/fcitx/Makefile
===================================================================
RCS file: /cvs/ports/inputmethods/fcitx/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- inputmethods/fcitx/Makefile 27 Aug 2020 00:59:48 -0000 1.15
+++ inputmethods/fcitx/Makefile 5 Jun 2021 09:09:48 -0000
@@ -7,6 +7,7 @@ V = 4.2.9.8
DISTNAME = fcitx-$V
PKGNAME-main = ${PKGNAME}
PKGNAME-gtk3 = fcitx-gtk3-$V
+REVISION = 0
SHARED_LIBS += fcitx-config 0.0 # 4.1
SHARED_LIBS += fcitx-core 0.1 # 0.3
Index: inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h
===================================================================
RCS file: inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h
diff -N inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h
--- inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h 28 Nov
2017 02:56:56 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_lib_fcitx-utils_utils_h,v 1.1.1.1 2017/11/28 02:56:56
kevlo Exp $
-
-Index: src/lib/fcitx-utils/utils.h
---- src/lib/fcitx-utils/utils.h.orig
-+++ src/lib/fcitx-utils/utils.h
-@@ -82,6 +82,10 @@ typedef int32_t boolean;
- #define false (0)
- #endif
-
-+#ifndef RTLD_NODELETE
-+#define RTLD_NODELETE 0
-+#endif
-+
- #define FCITX_INT_LEN ((int)(sizeof(int) * 2.5) + 2)
- #define FCITX_LONG_LEN ((int)(sizeof(long) * 2.5) + 2)
- #define FCITX_INT32_LEN (22)
Index: www/chromium/Makefile
===================================================================
RCS file: /cvs/ports/www/chromium/Makefile,v
retrieving revision 1.570
diff -u -p -r1.570 Makefile
--- www/chromium/Makefile 27 May 2021 18:05:13 -0000 1.570
+++ www/chromium/Makefile 5 Jun 2021 09:09:48 -0000
@@ -15,7 +15,7 @@ DPB_PROPERTIES= parallel parallel2
COMMENT= Chromium browser
V= 91.0.4472.77
-REVISION= 0
+REVISION= 1
DISTNAME= chromium-${V}
Index: www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc
===================================================================
RCS file:
/cvs/ports/www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc,v
retrieving revision 1.20
diff -u -p -r1.20 patch-content_gpu_gpu_sandbox_hook_linux_cc
--- www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc 27 May
2021 04:21:01 -0000 1.20
+++ www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc 5 Jun
2021 09:09:48 -0000
@@ -3,12 +3,9 @@ $OpenBSD: patch-content_gpu_gpu_sandbox_
Index: content/gpu/gpu_sandbox_hook_linux.cc
--- content/gpu/gpu_sandbox_hook_linux.cc.orig
+++ content/gpu/gpu_sandbox_hook_linux.cc
-@@ -99,8 +99,9 @@ static const char kLibV4lEncPluginPath[] =
- "/usr/lib/libv4l/plugins/libv4l-encplugin.so";
- #endif
+@@ -101,6 +101,7 @@ static const char kLibV4lEncPluginPath[] =
--constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
-+constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL;
+ constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
+#if !defined(OS_BSD)
void AddV4L2GpuPermissions(
Index: www/iridium/Makefile
===================================================================
RCS file: /cvs/ports/www/iridium/Makefile,v
retrieving revision 1.110
diff -u -p -r1.110 Makefile
--- www/iridium/Makefile 21 May 2021 19:50:37 -0000 1.110
+++ www/iridium/Makefile 5 Jun 2021 09:09:50 -0000
@@ -19,7 +19,7 @@ V= 2021.03.88
DISTNAME= iridium-browser-${V}
PKGNAME= iridium-${V}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-REVISION= 0
+REVISION= 1
CATEGORIES= www
Index: www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc
===================================================================
RCS file:
/cvs/ports/www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc,v
retrieving revision 1.10
diff -u -p -r1.10 patch-content_gpu_gpu_sandbox_hook_linux_cc
--- www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc 1 Apr
2021 10:24:45 -0000 1.10
+++ www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc 5 Jun
2021 09:09:50 -0000
@@ -3,12 +3,9 @@ $OpenBSD: patch-content_gpu_gpu_sandbox_
Index: content/gpu/gpu_sandbox_hook_linux.cc
--- content/gpu/gpu_sandbox_hook_linux.cc.orig
+++ content/gpu/gpu_sandbox_hook_linux.cc
-@@ -98,8 +98,9 @@ static const char kLibV4lEncPluginPath[] =
- "/usr/lib/libv4l/plugins/libv4l-encplugin.so";
- #endif
+@@ -100,6 +100,7 @@ static const char kLibV4lEncPluginPath[] =
--constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
-+constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL;
+ constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
+#if !defined(OS_BSD)
void AddV4L2GpuPermissions(
