Attachment 227280 Details for Bug 257911 – graphics/stamp: patch and unbreak with -fno-common

[patch] graphics/stamp: patch and unbreak with -fno-common

0001-graphics-stamp-patch-and-unbreak-with-fno-common.patch (text/plain), 2.24 KB, created by Robert Clausecker on 2021-08-17 12:29:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2021-08-17 12:29:43 UTC

Size: 2.24 KB

patch

obsolete

>From 8b1d0577b8382786f5a863f74ba6a9f83f0bb51f Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Tue, 17 Aug 2021 14:27:25 +0200
>Subject: [PATCH] graphics/stamp: patch and unbreak with -fno-common
>
>Also set LICENSE.
>---
> graphics/stamp/Makefile                 |  8 ++++----
> graphics/stamp/files/patch-lib_ftplib.c | 10 ++++++++++
> graphics/stamp/files/patch-lib_ftplib.h | 11 +++++++++++
> 3 files changed, 25 insertions(+), 4 deletions(-)
> create mode 100644 graphics/stamp/files/patch-lib_ftplib.c
> create mode 100644 graphics/stamp/files/patch-lib_ftplib.h
>
>diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile
>index 862070517a77..ad1a935aaa74 100644
>--- a/graphics/stamp/Makefile
>+++ b/graphics/stamp/Makefile
>@@ -2,15 +2,15 @@
> 
> PORTNAME=	stamp
> PORTVERSION=	2.0.8
>-PORTREVISION=	11
>+PORTREVISION=	12
> CATEGORIES=	graphics
> MASTER_SITES=	SF
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	fuz@fuz.su
> COMMENT=	Adds a graphical, configurable timestamp to a grayscale image
> 
>-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: DefaultNetbuf
>-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: DefaultNetbuf
>+LICENSE=	GPLv2+
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		jpeg
> GNU_CONFIGURE=	yes
>diff --git a/graphics/stamp/files/patch-lib_ftplib.c b/graphics/stamp/files/patch-lib_ftplib.c
>new file mode 100644
>index 000000000000..64e36df878a6
>--- /dev/null
>+++ b/graphics/stamp/files/patch-lib_ftplib.c
>@@ -0,0 +1,10 @@
>+--- lib/ftplib.c.orig	2021-08-17 12:18:12 UTC
>++++ lib/ftplib.c
>+@@ -77,6 +77,7 @@ static char *version =
>+     "ftplib Release 3 12/xx/97, copyright 1996, 1997 Thomas Pfau";
>+ 
>+ GLOBALDEF int ftplib_debug = 0;
>++netbuf *DefaultNetbuf;
>+ 
>+ #if defined(__unix__) || defined(VMS)
>+ #define net_read read
>diff --git a/graphics/stamp/files/patch-lib_ftplib.h b/graphics/stamp/files/patch-lib_ftplib.h
>new file mode 100644
>index 000000000000..d5aaff23819b
>--- /dev/null
>+++ b/graphics/stamp/files/patch-lib_ftplib.h
>@@ -0,0 +1,11 @@
>+--- lib/ftplib.h.orig	2021-08-17 12:17:32 UTC
>++++ lib/ftplib.h
>+@@ -55,7 +55,7 @@ extern "C" {
>+ typedef struct NetBuf netbuf;
>+ 
>+ /* v1 compatibility stuff */
>+-netbuf *DefaultNetbuf;
>++extern netbuf *DefaultNetbuf;
>+ 
>+ #define ftplib_lastresp FtpLastResponse(DefaultNetbuf)
>+ #define ftpInit FtpInit
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 257911: 227280