Attachment 236389 Details for Bug 266227 – Patch for textproc/raptor2

[patch] Patch for textproc/raptor2

0001-textproc-raptor2-Improve-sort_r-3-API-detection.patch (text/plain), 2.72 KB, created by Xin LI on 2022-09-06 07:48:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xin LI

Created: 2022-09-06 07:48:16 UTC

Size: 2.72 KB

patch

obsolete

>From 83cfc992927792b9c5b433ddc0023a298db3fd84 Mon Sep 17 00:00:00 2001
>From: Ed Schouten <ed@FreeBSD.org>
>Date: Tue, 6 Sep 2022 00:36:18 -0700
>Subject: [PATCH] textproc/raptor2: Improve sort_r(3) API detection.
>
>In a future version of FreeBSD, we would adopt POSIX qsort_r(3) API
>which is different from traditional FreeBSD qsort_r(3).
>
>PR:		ports/231256
>---
> textproc/raptor2/Makefile                  |  2 +-
> textproc/raptor2/files/patch-src_sort__r.h | 34 ++++++++++++++++++++++
> 2 files changed, 35 insertions(+), 1 deletion(-)
> create mode 100644 textproc/raptor2/files/patch-src_sort__r.h
>
>diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
>index 56072a671261..5ed64bb7c30d 100644
>--- a/textproc/raptor2/Makefile
>+++ b/textproc/raptor2/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	raptor2
> PORTVERSION=	2.0.15
>-PORTREVISION=	22
>+PORTREVISION=	23
> CATEGORIES=	textproc
> MASTER_SITES=	http://download.librdf.org/source/ \
> 		SF/librdf/${PORTNAME}/${PORTVERSION}
>diff --git a/textproc/raptor2/files/patch-src_sort__r.h b/textproc/raptor2/files/patch-src_sort__r.h
>new file mode 100644
>index 000000000000..70878740f4a6
>--- /dev/null
>+++ b/textproc/raptor2/files/patch-src_sort__r.h
>@@ -0,0 +1,34 @@
>+--- src/sort_r.h.orig	2014-10-09 23:00:44 UTC
>++++ src/sort_r.h
>+@@ -24,10 +24,11 @@ void sort_r(void *base, size_t nel, size_t width,
>+      defined OpenBSD3_1 || defined OpenBSD3_9 || defined __OpenBSD__ || \
>+      defined __NetBSD__ || \
>+      defined __DragonFly__ || \
>+-     defined AMIGA)
>++     defined AMIGA) && !defined(qsort_r)
>+ #  define _SORT_R_BSD
>+ #elif (defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ || \
>+-       defined __linux__ || defined __MINGW32__ || defined __GLIBC__)
>++       defined __linux__ || defined __MINGW32__ || defined __GLIBC__) || \
>++       defined(qsort_r)
>+ #  define _SORT_R_LINUX
>+ #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
>+ #  define _SORT_R_WINDOWS
>+@@ -64,7 +65,7 @@ void sort_r(void *base, size_t nel, size_t width,
>+   #if defined _SORT_R_BSD
>+ 
>+     /* BSD requires argument swap */
>+-    extern void qsort_r(void *base, size_t nel, size_t width, void *thunk,
>++    extern void (qsort_r)(void *base, size_t nel, size_t width, void *thunk,
>+                         int (*compar)(void *_thunk, const void *_a, const void *_b));
>+ 
>+     struct sort_r_data
>+@@ -82,7 +83,7 @@ void sort_r(void *base, size_t nel, size_t width,
>+   #elif defined _SORT_R_LINUX
>+ 
>+     typedef int(* __compar_d_fn_t)(const void *, const void *, void *);
>+-    extern void qsort_r(void *base, size_t nel, size_t width,
>++    extern void (qsort_r)(void *base, size_t nel, size_t width,
>+                         __compar_d_fn_t __compar, void *arg)
>+       __attribute__((nonnull (1, 4)));
>+ 
>-- 
>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