On Fri, Jan 13, 2023 at 09:39:04AM +0200, Yavor Doganov wrote: > On Fri, Jan 13, 2023 at 09:28:11AM +0200, Yavor Doganov wrote: > > Tags: patch > > Here it is.
It looks like I made a mistake; please find attached the correct one.
>From e3d7ed13d3b764c834dc25776a8f845756f820f0 Mon Sep 17 00:00:00 2001 From: Yavor Doganov <ya...@gnu.org> Date: Fri, 13 Jan 2023 09:18:57 +0200 Subject: [PATCH] Fix FTBFS with gnustep-base/1.29.0. --- debian/control | 2 +- debian/patches/base-1.29.patch | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 debian/patches/base-1.29.patch diff --git a/debian/control b/debian/control index f361674..172a89f 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Jeroen Dekkers <jer...@dekkers.ch>, Build-Depends: debhelper-compat (= 13), gnustep-make, gobjc, - libgnustep-base-dev, + libgnustep-base-dev (>= 1.29), libxml2-dev, libldap2-dev, libpq-dev, diff --git a/debian/patches/base-1.29.patch b/debian/patches/base-1.29.patch new file mode 100644 index 0000000..b111a31 --- /dev/null +++ b/debian/patches/base-1.29.patch @@ -0,0 +1,25 @@ +Description: Fix FTBFS with gnustep-base/1.29.0 +Bug-Debian: https://bugs.debian.org/1028579 +Author: Yavor Doganov <ya...@gnu.org> +Forwarded: no +Last-Update: 2023-01-13 +--- + +--- sope-5.8.0.orig/sope-mime/NGMime/NGMimeType.m ++++ sope-5.8.0/sope-mime/NGMime/NGMimeType.m +@@ -125,13 +125,13 @@ + encoding = NSKoreanEUCStringEncoding; + } + else if ([charset isEqualToString:@"big5"]) { +- encoding = NSBIG5StringEncoding; ++ encoding = NSBig5StringEncoding; + } + else if ([charset isEqualToString:@"iso-2022-jp"]) { + encoding = NSISO2022JPStringEncoding; + } + else if ([charset isEqualToString:@"gb2312"]) { +- encoding = NSGB2312StringEncoding; ++ encoding = NSHZ_GB_2312StringEncoding; + } + else if ([charset isEqualToString:@"koi8-r"]) { + encoding = NSKOI8RStringEncoding; diff --git a/debian/patches/series b/debian/patches/series index 68fbd93..381749b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-do-not-build-json.patch 0002-Do-not-build-xmlrpc-and-stxsaxdriver.patch 0003-Unset-MAKEFLAGS-and-MFLAGS-in-configure.patch +base-1.29.patch -- 2.39.0
