* [gentoo-commits] repo/gentoo:master commit in: gnustep-base/gnustep-gui/files/, gnustep-base/gnustep-gui/
@ 2023-11-24 14:33 Bernard Cafarelli
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli @ 2023-11-24 14:33 UTC (permalink / raw
To: gentoo-commits
commit: 1ea42c0e1f0bd21d8cb3024f40d0303cf70b38de
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 14:30:54 2023 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 14:32:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea42c0e
gnustep-base/gnustep-gui: backport fix for simpleagenda
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../files/gnustep-gui-0.30.0-nssound.patch | 24 ++++++++++++++++++++++
...-0.30.0.ebuild => gnustep-gui-0.30.0-r1.ebuild} | 2 ++
2 files changed, 26 insertions(+)
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 <sebastia@l00-bugdead-prods.de>
+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 <AppKit/AppKitDefines.h>
+
+ #import <Foundation/NSObject.h>
+ #import <Foundation/NSBundle.h>
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.30.0.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r1.ebuild
similarity index 96%
rename from gnustep-base/gnustep-gui/gnustep-gui-0.30.0.ebuild
rename to gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r1.ebuild
index 8bbccd8f2ea8..266a0fd9a8f9 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.30.0.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r1.ebuild
@@ -27,6 +27,8 @@ DEPEND="${GNUSTEP_CORE_DEPEND}
speech? ( app-accessibility/flite )"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-nssound.patch )
+
src_prepare() {
gnustep-base_src_prepare
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnustep-base/gnustep-gui/files/, gnustep-base/gnustep-gui/
@ 2024-01-27 10:27 Bernard Cafarelli
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli @ 2024-01-27 10:27 UTC (permalink / raw
To: gentoo-commits
commit: 4461d4661cff53847c66e54bb4c149860328fc95
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 10:22:49 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 10:27:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4461d466
gnustep-base/gnustep-gui: drop 0.28.0-r1
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
gnustep-base/gnustep-gui/Manifest | 1 -
.../files/gnustep-gui-0.28.0-icu68.patch | 15 ------
.../gnustep-gui/gnustep-gui-0.28.0-r1.ebuild | 61 ----------------------
3 files changed, 77 deletions(-)
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index 4cb6898c1409..d3fd7834bdb1 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -1,3 +1,2 @@
-DIST gnustep-gui-0.28.0.tar.gz 2933013 BLAKE2B d6076fde3d90625059907d3fb7a3a8edc9ed37a02f31b249f7d8e84a0f1a11ade6aa5e7aa6ac6bf394f561c98259500b342bb828fb583ce847e402101bb7d0f9 SHA512 9c5b979c908f63c99a6d050c2f2b9f50aedad440645c6e9045e78f631335ab3290ae09f69128d57b8b88ffb063d118d3f62f45ccecde99bb135de6c60b46586f
DIST gnustep-gui-0.29.0.tar.gz 2994299 BLAKE2B 6624321e4df3fa7aef659f5c4d364d4f39790c47f9093ff84a87d7535ff1819b0fa331461d442ad0dcec1dbd5cf27e902972b039f6464b2f1330a54807faeea2 SHA512 bbb413d5b391d2e6e30c2f875913b1c7497d5408e595160e51d3ba5b15dd014b531d411861cb8d094a1a21a8f405ff22c4374874dd52a669d1d9738f4a9ddeef
DIST gnustep-gui-0.30.0.tar.gz 3044530 BLAKE2B 6bd35b579c752a0b949ab1f84b56f96be21a5c3afdb28394fff71399b32f90f7cfbe85c443515b609db4879656c19886a71e5be1bbfcbd4feb79f24fc59f9f5c SHA512 6825c32811ba0e4fb5b97d01055c5fe72a025de8eeb78b75409fe7535e365c9aa7b8146ba22c2ed7b59ae6174c1adabe80f58c9ffb72d8f6bc08ab28a06830f5
diff --git a/gnustep-base/gnustep-gui/files/gnustep-gui-0.28.0-icu68.patch b/gnustep-base/gnustep-gui/files/gnustep-gui-0.28.0-icu68.patch
deleted file mode 100644
index 5bda307b951d..000000000000
--- a/gnustep-base/gnustep-gui/files/gnustep-gui-0.28.0-icu68.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Headers/Additions/GNUstepGUI/GSCharacterPanel.h.old
-+++ b/Headers/Additions/GNUstepGUI/GSCharacterPanel.h
-@@ -26,6 +26,12 @@
- Free Software Foundation, 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-
- #ifndef _GNUstep_H_GSCharacterPanel
- #define _GNUstep_H_GSCharacterPanel
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.28.0-r1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.28.0-r1.ebuild
deleted file mode 100644
index c4d8ccc133a5..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.28.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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.27.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}-icu68.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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnustep-base/gnustep-gui/files/, gnustep-base/gnustep-gui/
@ 2025-03-10 0:03 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-03-10 0:03 UTC (permalink / raw
To: gentoo-commits
commit: ffe6de76dad2cfad3f1a407fb2ed97a424560336
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 9 20:13:28 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 00:02:14 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffe6de76
gnustep-base/gnustep-gui: drop 0.29.0-r2, 0.30.0-r2, destabilising ~sparc
Bug: https://bugs.gentoo.org/938698
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
gnustep-base/gnustep-gui/Manifest | 2 -
.../files/gnustep-gui-0.30.0-nssound.patch | 24 ---------
.../gnustep-gui/gnustep-gui-0.29.0-r2.ebuild | 56 ---------------------
.../gnustep-gui/gnustep-gui-0.30.0-r2.ebuild | 58 ----------------------
4 files changed, 140 deletions(-)
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index 099e33ad79d7..4e11f81d443e 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -1,3 +1 @@
-DIST gnustep-gui-0.29.0.tar.gz 2994299 BLAKE2B 6624321e4df3fa7aef659f5c4d364d4f39790c47f9093ff84a87d7535ff1819b0fa331461d442ad0dcec1dbd5cf27e902972b039f6464b2f1330a54807faeea2 SHA512 bbb413d5b391d2e6e30c2f875913b1c7497d5408e595160e51d3ba5b15dd014b531d411861cb8d094a1a21a8f405ff22c4374874dd52a669d1d9738f4a9ddeef
-DIST gnustep-gui-0.30.0.tar.gz 3044530 BLAKE2B 6bd35b579c752a0b949ab1f84b56f96be21a5c3afdb28394fff71399b32f90f7cfbe85c443515b609db4879656c19886a71e5be1bbfcbd4feb79f24fc59f9f5c SHA512 6825c32811ba0e4fb5b97d01055c5fe72a025de8eeb78b75409fe7535e365c9aa7b8146ba22c2ed7b59ae6174c1adabe80f58c9ffb72d8f6bc08ab28a06830f5
DIST gnustep-gui-0.31.1.tar.gz 3103556 BLAKE2B 633e2dc012c40e56cb62f430631c568b88e6ba5f39d4deb4c89ca9767614dab17793e484e7e77f4cf0b4e764059f2697bd1f531bb2a0f85f3eaeac1a75a2d738 SHA512 82c598d6fc962716c930eb27419c9c8296d663053cfef0f489e1f28dd1fac054d18859e9cc60f246c2a53a175404c1c8db0b36a90ad372c80d0158bc24ff4d69
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
deleted file mode 100644
index 872a12e1169a..000000000000
--- a/gnustep-base/gnustep-gui/files/gnustep-gui-0.30.0-nssound.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f10c0eeb1ba5276d32c70a479f77eff54c6bdba5 Mon Sep 17 00:00:00 2001
-From: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
-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 <AppKit/AppKitDefines.h>
-
- #import <Foundation/NSObject.h>
- #import <Foundation/NSBundle.h>
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.29.0-r2.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.29.0-r2.ebuild
deleted file mode 100644
index 68d961c1b3f3..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.29.0-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 icu jpeg png speech"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
- app-text/aspell
- >=gnustep-base/gnustep-base-1.28.0:=[icu?]
- media-libs/audiofile
- >=media-libs/giflib-4.1:=
- >=media-libs/tiff-3:=
- x11-libs/libXt
- cups? ( >=net-print/cups-1.7.4:= )
- 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
-
- econf \
- $(use_enable cups) \
- $(use_enable icu) \
- $(use_enable jpeg) \
- $(use_enable png) \
- $(use_enable speech) \
- --disable-ungif --enable-libgif \
- --with-tiff-include="${EPREFIX}"/usr/include \
- --with-tiff-library="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_test() {
- virtx default
-}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r2.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r2.ebuild
deleted file mode 100644
index e40c8e4a9731..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 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 icu jpeg png speech"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
- app-text/aspell
- >=gnustep-base/gnustep-base-1.28.0:=[icu?]
- media-libs/audiofile
- >=media-libs/giflib-4.1:=
- >=media-libs/tiff-3:=
- x11-libs/libXt
- cups? ( >=net-print/cups-1.7.4:= )
- 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
-
- econf \
- $(use_enable cups) \
- $(use_enable icu) \
- $(use_enable jpeg) \
- $(use_enable png) \
- $(use_enable speech) \
- --disable-ungif --enable-libgif \
- --with-tiff-include="${EPREFIX}"/usr/include \
- --with-tiff-library="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_test() {
- virtx default
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-10 0:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-10 0:03 [gentoo-commits] repo/gentoo:master commit in: gnustep-base/gnustep-gui/files/, gnustep-base/gnustep-gui/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-01-27 10:27 Bernard Cafarelli
2023-11-24 14:33 Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox