From 1ea42c0e1f0bd21d8cb3024f40d0303cf70b38de Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Fri, 24 Nov 2023 15:30:54 +0100 Subject: gnustep-base/gnustep-gui: backport fix for simpleagenda Signed-off-by: Bernard Cafarelli --- .../files/gnustep-gui-0.30.0-nssound.patch | 24 +++++++++ .../gnustep-gui/gnustep-gui-0.30.0-r1.ebuild | 61 ++++++++++++++++++++++ gnustep-base/gnustep-gui/gnustep-gui-0.30.0.ebuild | 59 --------------------- 3 files changed, 85 insertions(+), 59 deletions(-) create mode 100644 gnustep-base/gnustep-gui/files/gnustep-gui-0.30.0-nssound.patch create mode 100644 gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r1.ebuild delete mode 100644 gnustep-base/gnustep-gui/gnustep-gui-0.30.0.ebuild (limited to 'gnustep-base') diff --git a/gnustep-base/gnustep-gui/files/gnustep-gui-0.30.0-nssound.patch b/gnustep-base/gnustep-gui/files/gnustep-gui-0.30.0-nssound.patch new file mode 100644 index 000000000000..872a12e1169a --- /dev/null +++ b/gnustep-base/gnustep-gui/files/gnustep-gui-0.30.0-nssound.patch @@ -0,0 +1,24 @@ +From f10c0eeb1ba5276d32c70a479f77eff54c6bdba5 Mon Sep 17 00:00:00 2001 +From: Sebastian Reitenbach +Date: Thu, 2 Mar 2023 13:19:39 +0100 +Subject: [PATCH] This broke building SimpleAgenda for me: + +In file included from SoundBackend.m:1: +/usr/local/include/AppKit/NSSound.h:57:1: error: unknown type name 'APPKIT_EXPORT_CLASS' +APPKIT_EXPORT_CLASS +--- + Headers/AppKit/NSSound.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Headers/AppKit/NSSound.h b/Headers/AppKit/NSSound.h +index 4f4438765..c28019f55 100644 +--- a/Headers/AppKit/NSSound.h ++++ b/Headers/AppKit/NSSound.h +@@ -30,6 +30,7 @@ + + #ifndef _GNUstep_H_NSSound + #define _GNUstep_H_NSSound ++#import + + #import + #import diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r1.ebuild new file mode 100644 index 000000000000..266a0fd9a8f9 --- /dev/null +++ b/gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit gnustep-base multilib virtualx + +DESCRIPTION="Library of GUI classes written in Obj-C" +HOMEPAGE="https://gnustep.github.io/" +SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="cups gif icu jpeg png speech" + +DEPEND="${GNUSTEP_CORE_DEPEND} + app-text/aspell + >=gnustep-base/gnustep-base-1.28.0:=[icu?] + media-libs/audiofile + >=media-libs/tiff-3:= + x11-libs/libXt + cups? ( >=net-print/cups-1.7.4:= ) + gif? ( >=media-libs/giflib-4.1:= ) + icu? ( dev-libs/icu:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( >=media-libs/libpng-1.2:= ) + speech? ( app-accessibility/flite )" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-nssound.patch ) + +src_prepare() { + gnustep-base_src_prepare + + # remove hardcoded -g -Werror, bug #378179 + sed -i -e 's/-g -Werror//' \ + Tools/say/GNUmakefile \ + Tools/speech/GNUmakefile \ + || die +} + +src_configure() { + egnustep_env + + local myconf= + use gif && myconf="--disable-ungif --enable-libgif" + + econf \ + $(use_enable cups) \ + $(use_enable icu) \ + $(use_enable jpeg) \ + $(use_enable png) \ + $(use_enable speech) \ + --with-tiff-include="${EPREFIX}"/usr/include \ + --with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \ + ${myconf} +} + +src_test() { + virtx default +} diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.30.0.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.30.0.ebuild deleted file mode 100644 index 8bbccd8f2ea8..000000000000 --- a/gnustep-base/gnustep-gui/gnustep-gui-0.30.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit gnustep-base multilib virtualx - -DESCRIPTION="Library of GUI classes written in Obj-C" -HOMEPAGE="https://gnustep.github.io/" -SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="cups gif icu jpeg png speech" - -DEPEND="${GNUSTEP_CORE_DEPEND} - app-text/aspell - >=gnustep-base/gnustep-base-1.28.0:=[icu?] - media-libs/audiofile - >=media-libs/tiff-3:= - x11-libs/libXt - cups? ( >=net-print/cups-1.7.4:= ) - gif? ( >=media-libs/giflib-4.1:= ) - icu? ( dev-libs/icu:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - png? ( >=media-libs/libpng-1.2:= ) - speech? ( app-accessibility/flite )" -RDEPEND="${DEPEND}" - -src_prepare() { - gnustep-base_src_prepare - - # remove hardcoded -g -Werror, bug #378179 - sed -i -e 's/-g -Werror//' \ - Tools/say/GNUmakefile \ - Tools/speech/GNUmakefile \ - || die -} - -src_configure() { - egnustep_env - - local myconf= - use gif && myconf="--disable-ungif --enable-libgif" - - econf \ - $(use_enable cups) \ - $(use_enable icu) \ - $(use_enable jpeg) \ - $(use_enable png) \ - $(use_enable speech) \ - --with-tiff-include="${EPREFIX}"/usr/include \ - --with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \ - ${myconf} -} - -src_test() { - virtx default -} -- cgit v1.2.3-65-gdbad