Page MenuHomeFreeBSD
Files F28867389

D32008-another-followup.patch
jbeich (Jan Beich)
Actions

Authored By
jbeich
Sep 17 2021, 7:06 PM
Size
13 KB
Referenced Files
None
Subscribers
None

D32008-another-followup.patch
View Options

From a175f4781b95442d73a4ab7854e9a8f13eab62ac Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Fri, 17 Sep 2021 19:04:23 +0000
Subject: [PATCH] *: drop unused getline/dprintf knobs after FreeBSD 11 removal
---
..._vstgui_lib_platform_linux_x11fileselector.cpp | 11 -----------
..._vstgui_lib_platform_linux_x11fileselector.cpp | 14 --------------
.../files/patch-src__CMakeLists.txt | 10 ----------
.../ibus-libpinyin/files/patch-src_PYLibPinyin.cc | 11 -----------
chinese/libpinyin/Makefile | 2 +-
devel/android-tools-simpleperf/files/Makefile | 1 -
...urce_intercept_source_report_libexec_Logger.cc | 10 ----------
devel/evemu/Makefile | 2 +-
mail/thunderbird/files/patch-cubeb-oss | 5 +----
misc/lxi-tools/Makefile | 1 -
multimedia/obs-studio/Makefile | 1 -
multimedia/subtitleripper/Makefile | 2 +-
security/libfido2/Makefile | 1 -
.../files/patch-cf-execd_cf-execd-runagent.c | 15 ---------------
.../files/patch-cf-execd_cf-execd-runagent.c | 15 ---------------
sysutils/hexpeek/Makefile | 2 +-
sysutils/netevent/Makefile | 1 -
sysutils/sleuthkit/Makefile | 1 -
textproc/dwdiff/Makefile | 1 -
www/firefox-esr/files/patch-cubeb-oss | 5 +----
x11-drivers/xf86-video-intel/Makefile | 2 --
21 files changed, 6 insertions(+), 107 deletions(-)
delete mode 100644 audio/surge-synthesizer-lv2/files/patch-vstgui.surge_vstgui_lib_platform_linux_x11fileselector.cpp
delete mode 100644 audio/vst3sdk/files/patch-vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp
delete mode 100644 chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt
delete mode 100644 chinese/ibus-libpinyin/files/patch-src_PYLibPinyin.cc
delete mode 100644 devel/bear/files/extra-patch-source_intercept_source_report_libexec_Logger.cc
delete mode 100644 sysutils/cfengine-devel/files/patch-cf-execd_cf-execd-runagent.c
delete mode 100644 sysutils/cfengine318/files/patch-cf-execd_cf-execd-runagent.c
diff --git a/audio/surge-synthesizer-lv2/files/patch-vstgui.surge_vstgui_lib_platform_linux_x11fileselector.cpp b/audio/surge-synthesizer-lv2/files/patch-vstgui.surge_vstgui_lib_platform_linux_x11fileselector.cpp
deleted file mode 100644
index dc29cddf9a82..000000000000
--- a/audio/surge-synthesizer-lv2/files/patch-vstgui.surge_vstgui_lib_platform_linux_x11fileselector.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp.orig 2020-09-24 01:49:47 UTC
-+++ vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp
-@@ -3,6 +3,8 @@
- // distribution and at http://github.com/steinbergmedia/vstgui/LICENSE
-
- #include "../../cfileselector.h"
-+#define _WITH_GETLINE // for FreeBSD 11
-+#include <stdio.h> // https://github.com/surge-synthesizer/vstgui/issues/7
- #include <unistd.h>
- #include <string>
- #include <stdio.h> // Since we use getline below
diff --git a/audio/vst3sdk/files/patch-vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp b/audio/vst3sdk/files/patch-vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp
deleted file mode 100644
index 63c2750dd86c..000000000000
--- a/audio/vst3sdk/files/patch-vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-- fix missing include, see https://github.com/steinbergmedia/vst3sdk/issues/80
-
---- vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp.orig 2020-08-20 14:14:27 UTC
-+++ vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp
-@@ -6,6 +6,9 @@
- #include <unistd.h>
- #include <string>
-
-+#define _WITH_GETLINE // this is still required on FreeBSD 11
-+#include <stdio.h>
-+
- //------------------------------------------------------------------------
- namespace VSTGUI {
- namespace X11 {
diff --git a/chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt b/chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt
deleted file mode 100644
index 5a1d19c76611..000000000000
--- a/chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/CMakeLists.txt.orig 2013-07-16 05:34:05.000000000 +0900
-+++ ./src/CMakeLists.txt 2014-03-19 15:51:24.000000000 +0900
-@@ -22,6 +22,7 @@
- )
-
- add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\" )
-+add_definitions( -D_WITH_GETLINE )
-
- fcitx_add_addon_full(libpinyin DESC
- SOURCES ${fcitx_libpinyin_sources}
diff --git a/chinese/ibus-libpinyin/files/patch-src_PYLibPinyin.cc b/chinese/ibus-libpinyin/files/patch-src_PYLibPinyin.cc
deleted file mode 100644
index 9fbac7843ef2..000000000000
--- a/chinese/ibus-libpinyin/files/patch-src_PYLibPinyin.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/PYLibPinyin.cc.orig 2015-01-23 04:57:48 UTC
-+++ src/PYLibPinyin.cc
-@@ -21,6 +21,8 @@
-
- #include "PYLibPinyin.h"
-
-+#define _WITH_GETLINE
-+#include <stdio.h>
- #include <string.h>
- #include <pinyin.h>
- #include "PYPConfig.h"
diff --git a/chinese/libpinyin/Makefile b/chinese/libpinyin/Makefile
index 4f96ddd947c7..64aabe0140b7 100644
--- a/chinese/libpinyin/Makefile
+++ b/chinese/libpinyin/Makefile
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS+=CPPFLAGS="-I${LOCALBASE}/include \
- -I${BDB_INCLUDE_DIR} -D_WITH_GETLINE" \
+ -I${BDB_INCLUDE_DIR}" \
LDFLAGS="-L${LOCALBASE}/lib -l${BDB_LIB_NAME}"
INSTALL_TARGET=install-strip
diff --git a/devel/android-tools-simpleperf/files/Makefile b/devel/android-tools-simpleperf/files/Makefile
index 5d09c63353fa..84d22861cfb1 100644
--- a/devel/android-tools-simpleperf/files/Makefile
+++ b/devel/android-tools-simpleperf/files/Makefile
@@ -61,7 +61,6 @@ SRCS+= FileMap.cpp
.PATH: ${.CURDIR}/../libziparchive
SRCS+= zip_archive.cc
-CPPFLAGS+= -D_WITH_GETLINE
CPPFLAGS+= -DUSE_BIONIC_UAPI_HEADERS
CPPFLAGS+= -Doff64_t=off_t
CPPFLAGS+= -Dftruncate64=ftruncate
diff --git a/devel/bear/files/extra-patch-source_intercept_source_report_libexec_Logger.cc b/devel/bear/files/extra-patch-source_intercept_source_report_libexec_Logger.cc
deleted file mode 100644
index 91cdee1891a8..000000000000
--- a/devel/bear/files/extra-patch-source_intercept_source_report_libexec_Logger.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- source/intercept/source/report/libexec/Logger.cc.orig 2021-07-22 21:19:02 UTC
-+++ source/intercept/source/report/libexec/Logger.cc
-@@ -20,6 +20,7 @@
- #include "report/libexec/Logger.h"
-
- #include <ctime>
-+#define _WITH_DPRINTF
- #include <cstdio>
- #include <unistd.h>
-
diff --git a/devel/evemu/Makefile b/devel/evemu/Makefile
index 4bd81b9c0404..b6c8a518cdde 100644
--- a/devel/evemu/Makefile
+++ b/devel/evemu/Makefile
@@ -30,7 +30,7 @@ PYTHON_CONFIGURE_ENABLE= python-bindings
PYTHON_USE= PYTHON=py3kplist
GNU_CONFIGURE= yes
-CFLAGS+= -D_WITH_DPRINTF -include stdlib.h -include limits.h
+CFLAGS+= -include stdlib.h -include limits.h
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
REINPLACE_ARGS= -i ''
diff --git a/mail/thunderbird/files/patch-cubeb-oss b/mail/thunderbird/files/patch-cubeb-oss
index 2b151a07fb20..41185cf141fd 100644
--- a/mail/thunderbird/files/patch-cubeb-oss
+++ b/mail/thunderbird/files/patch-cubeb-oss
@@ -61,7 +61,7 @@ https://github.com/kinetiknz/cubeb/pull/600
#endif
--- /dev/null
+++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,1263 @@
+@@ -0,0 +1,1260 @@
+/*
+ * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>
+ * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>
@@ -74,9 +74,6 @@ https://github.com/kinetiknz/cubeb/pull/600
+ * accompanying file LICENSE for details.
+ */
+
-+#if defined(__FreeBSD__) && __FreeBSD__ < 12
-+#define _WITH_GETLINE
-+#endif
+#include <assert.h>
+#include <ctype.h>
+#include <limits.h>
diff --git a/misc/lxi-tools/Makefile b/misc/lxi-tools/Makefile
index 8621a825917e..02be7a061157 100644
--- a/misc/lxi-tools/Makefile
+++ b/misc/lxi-tools/Makefile
@@ -17,7 +17,6 @@ USE_GITHUB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static \
--with-bash-completion-dir=${PREFIX}/etc/bash_completion.d
-CFLAGS+= -D_WITH_GETLINE # enable getline(3) prototype
PORTDOCS= README
diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index e932889a5c3f..9336e33d7833 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -57,7 +57,6 @@ GH_TUPLE= obsproject:obs-browser:f1a61c5:obs_browser/plugins/obs-browser \
CMAKE_ON= UNIX_STRUCTURE
CMAKE_OFF= ENABLE_PIPEWIRE # beginning with 27.0.1 (PR#4287) the linux-capture plugin optionally requires the piperware library and in this case expects the linux/dma-buf.h header
CMAKE_ARGS= -DOBS_VERSION_OVERRIDE:STRING="${PORTVERSION}"
-CFLAGS+= -D_WITH_GETLINE
LDFLAGS+= -fPIC # pending https://github.com/obsproject/obs-studio/issues/3436
diff --git a/multimedia/subtitleripper/Makefile b/multimedia/subtitleripper/Makefile
index 08f88834c423..beaed9b27a75 100644
--- a/multimedia/subtitleripper/Makefile
+++ b/multimedia/subtitleripper/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= gocr:graphics/gocr \
transcode:multimedia/transcode
USES= gmake tar:tgz
-CFLAGS+= -D_WITH_GETLINE=1 -DHAVE_GETLINE=1 \
+CFLAGS+= -DHAVE_GETLINE=1 \
-I${LOCALBASE}/include/netpbm
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/security/libfido2/Makefile b/security/libfido2/Makefile
index 335e0b4854ee..35ae7d707b56 100644
--- a/security/libfido2/Makefile
+++ b/security/libfido2/Makefile
@@ -15,7 +15,6 @@ LIB_DEPENDS= libcbor.so:devel/libcbor
USES= cmake compiler:c11 pkgconfig ssl
-CFLAGS+= -D_WITH_GETLINE
CMAKE_OFF= FUZZ LIBFUZZER NFC_LINUX USE_HIDAPI USE_WINHELLO
CMAKE_ON= BUILD_EXAMPLES BUILD_MANPAGES BUILD_SHARED_LIBS BUILD_STATIC_LIBS BUILD_TOOLS
diff --git a/sysutils/cfengine-devel/files/patch-cf-execd_cf-execd-runagent.c b/sysutils/cfengine-devel/files/patch-cf-execd_cf-execd-runagent.c
deleted file mode 100644
index 2c6b521ef5cf..000000000000
--- a/sysutils/cfengine-devel/files/patch-cf-execd_cf-execd-runagent.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- cf-execd/cf-execd-runagent.c.orig 2021-03-19 07:11:45.000000000 -0700
-+++ cf-execd/cf-execd-runagent.c 2021-03-24 01:35:29.063038000 -0700
-@@ -22,6 +22,12 @@
- included file COSL.txt.
- */
-
-+/*
-+ * XXX: _WITH_GETLINE is required for FreeBSD-11.
-+ * Remove when FreeBSD-11 is EOL.
-+ */
-+#define _WITH_GETLINE
-+
- #include <stdio.h>
-
- #include <logging.h>
diff --git a/sysutils/cfengine318/files/patch-cf-execd_cf-execd-runagent.c b/sysutils/cfengine318/files/patch-cf-execd_cf-execd-runagent.c
deleted file mode 100644
index 2c6b521ef5cf..000000000000
--- a/sysutils/cfengine318/files/patch-cf-execd_cf-execd-runagent.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- cf-execd/cf-execd-runagent.c.orig 2021-03-19 07:11:45.000000000 -0700
-+++ cf-execd/cf-execd-runagent.c 2021-03-24 01:35:29.063038000 -0700
-@@ -22,6 +22,12 @@
- included file COSL.txt.
- */
-
-+/*
-+ * XXX: _WITH_GETLINE is required for FreeBSD-11.
-+ * Remove when FreeBSD-11 is EOL.
-+ */
-+#define _WITH_GETLINE
-+
- #include <stdio.h>
-
- #include <logging.h>
diff --git a/sysutils/hexpeek/Makefile b/sysutils/hexpeek/Makefile
index ccc444712229..5cdf0f72abc0 100644
--- a/sysutils/hexpeek/Makefile
+++ b/sysutils/hexpeek/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= libedit ncurses tar:bzip2
USE_CSTD= c99
-CFLAGS+= -D_WITH_GETLINE -Isrc -L${LOCALBASE}/lib
+CFLAGS+= -Isrc -L${LOCALBASE}/lib
PLIST_FILES= bin/hexdiff \
bin/hexDump \
diff --git a/sysutils/netevent/Makefile b/sysutils/netevent/Makefile
index bfa064494186..59efab4158ed 100644
--- a/sysutils/netevent/Makefile
+++ b/sysutils/netevent/Makefile
@@ -16,7 +16,6 @@ USES= compiler:c++14-lang gmake localbase
USE_GITHUB= yes
GH_ACCOUNT= Blub
HAS_CONFIGURE= yes
-CPPFLAGS+= -D_WITH_GETLINE # XXX Remove after FreeBSD 11 EOL
OPTIONS_DEFINE= EXAMPLES MANPAGES
OPTIONS_DEFAULT= EXAMPLES MANPAGES
diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index 2a82dbc25384..66638629e898 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
CONFLICTS= ja-ls-[0-9]* icat-[0-9]*
-CPPFLAGS+= -D_WITH_GETLINE
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_header_libpq_fe_h=no
USES= compiler:c++11-lang libtool perl5 sqlite
diff --git a/textproc/dwdiff/Makefile b/textproc/dwdiff/Makefile
index 5e5dcb2c4445..24e996eb234e 100644
--- a/textproc/dwdiff/Makefile
+++ b/textproc/dwdiff/Makefile
@@ -28,7 +28,6 @@ UNICODE_LIB_DEPENDS= libicudata.so:devel/icu
UNICODE_USES= localbase:ldflags pkgconfig
HAS_CONFIGURE= yes
-CFLAGS+= -D_WITH_GETLINE
CONFIGURE_ARGS+=--with-verbose-compile
MAKE_ARGS+= prefix=${PREFIX:Q} mandir="${MANPREFIX}/man" docdir=${DOCSDIR:Q}
diff --git a/www/firefox-esr/files/patch-cubeb-oss b/www/firefox-esr/files/patch-cubeb-oss
index 2b151a07fb20..41185cf141fd 100644
--- a/www/firefox-esr/files/patch-cubeb-oss
+++ b/www/firefox-esr/files/patch-cubeb-oss
@@ -61,7 +61,7 @@ https://github.com/kinetiknz/cubeb/pull/600
#endif
--- /dev/null
+++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,1263 @@
+@@ -0,0 +1,1260 @@
+/*
+ * Copyright © 2019-2020 Nia Alarie <nia@NetBSD.org>
+ * Copyright © 2020 Ka Ho Ng <khng300@gmail.com>
@@ -74,9 +74,6 @@ https://github.com/kinetiknz/cubeb/pull/600
+ * accompanying file LICENSE for details.
+ */
+
-+#if defined(__FreeBSD__) && __FreeBSD__ < 12
-+#define _WITH_GETLINE
-+#endif
+#include <assert.h>
+#include <ctype.h>
+#include <limits.h>
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index ff1b17eed08a..3a27beba3c47 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -29,8 +29,6 @@ TEST_TARGET= check
# XXX bug 214593: SNA crashes on pre-SandyBridge hardware
CONFIGURE_ARGS+=--with-default-accel=uxa
-# XXX Remove after FreeBSD 11 EOL
-CPPFLAGS+= -D_WITH_GETLINE
OPTIONS_DEFINE= UDEV XVMC
OPTIONS_DEFAULT=UDEV XVMC

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4066852
Default Alt Text
D32008-another-followup.patch (13 KB)

Event Timeline