Attachment 236638 Details for Bug 266227 – Proposed patch for misc/far2l

[patch] Proposed patch for misc/far2l

0001-misc-far2l-unbreak-on-CURRENT-after-GNU-qsort_r.patch (text/plain), 2.51 KB, created by Xin LI on 2022-09-17 17:54:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xin LI

Created: 2022-09-17 17:54:39 UTC

Size: 2.51 KB

patch

obsolete

>From 376fb7ccc322b48509e9452f8669114e7b52974a Mon Sep 17 00:00:00 2001
>From: Xin LI <delphij@FreeBSD.org>
>Date: Sat, 17 Sep 2022 10:51:50 -0700
>Subject: [PATCH] misc/far2l: unbreak on -CURRENT after GNU qsort_r
>
>PR:		ports/266227
>---
> misc/far2l/files/patch-CMakeLists.txt         | 31 +++++++++++++++++++
> .../files/patch-far2l_src_base_farrtl.cpp     | 11 +++++++
> 2 files changed, 42 insertions(+)
> create mode 100644 misc/far2l/files/patch-CMakeLists.txt
> create mode 100644 misc/far2l/files/patch-far2l_src_base_farrtl.cpp
>
>diff --git a/misc/far2l/files/patch-CMakeLists.txt b/misc/far2l/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..85c238109ea3
>--- /dev/null
>+++ b/misc/far2l/files/patch-CMakeLists.txt
>@@ -0,0 +1,31 @@
>+--- CMakeLists.txt.orig	2022-01-11 23:21:58 UTC
>++++ CMakeLists.txt
>+@@ -1,6 +1,7 @@ cmake_minimum_required (VERSION 3.0.2)
>+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
>+ 
>+ cmake_minimum_required (VERSION 3.0.2)
>++INCLUDE(CheckPrototypeDefinition)
>+ 
>+ project (far2l)
>+ 
>+@@ -144,6 +145,20 @@ if (CMAKE_SYSTEM_NAME MATCHES "CYGWIN")
>+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=600")
>+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=600")
>+   message(STATUS "Running under cygwin, wow!")
>++endif()
>++
>++CHECK_PROTOTYPE_DEFINITION(qsort_r
>++    "void (qsort_r)(void *, size_t, size_t, void *, int (*)(void *, const void *, const void *))"
>++    "" "stdlib.h" HAVE_BSD_QSORT_R)
>++if (HAVE_BSD_QSORT_R)
>++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BSD_QSORT_R")
>++endif()
>++
>++CHECK_PROTOTYPE_DEFINITION(qsort_r
>++    "void (qsort_r)(void *, size_t, size_t, int (*)(const void *, const void *, void *), void *arg)"
>++    "" "stdlib.h" HAVE_GNU_QSORT_R)
>++if (HAVE_GNU_QSORT_R)
>++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_GNU_QSORT_R")
>+ endif()
>+ 
>+ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
>diff --git a/misc/far2l/files/patch-far2l_src_base_farrtl.cpp b/misc/far2l/files/patch-far2l_src_base_farrtl.cpp
>new file mode 100644
>index 000000000000..f5e9039f0e22
>--- /dev/null
>+++ b/misc/far2l/files/patch-far2l_src_base_farrtl.cpp
>@@ -0,0 +1,11 @@
>+--- far2l/src/base/farrtl.cpp.orig	2022-01-11 23:21:58 UTC
>++++ far2l/src/base/farrtl.cpp
>+@@ -31,7 +31,7 @@ wchar_t * __cdecl far_wcsncpy(wchar_t * dest,const wch
>+ 	return tmpsrc;
>+ }
>+ 
>+-#if defined(__APPLE__) || defined(__FreeBSD__)
>++#if defined(HAVE_BSD_QSORT_R)
>+ struct QSortExAdapterArg
>+ {
>+ 	int (*__cdecl comp)(const void *, const void *, void *);
>-- 
>2.37.3
>

Actions: View | Diff

Attachments on bug 266227: 236360 | 236386 | 236388 | 236389 | 236429 | 236470 | 236483 | 236507 | 236621 | 236638 | 236643 | 236644 | 236652 | 236678 | 236744 | 236760