* [gentoo-commits] repo/gentoo:master commit in: gnustep-apps/gworkspace/files/, gnustep-apps/gworkspace/
@ 2017-07-17 12:21 Bernard Cafarelli
0 siblings, 0 replies; 2+ messages in thread
From: Bernard Cafarelli @ 2017-07-17 12:21 UTC (permalink / raw
To: gentoo-commits
commit: e783f1938316c016f7693e096060fdb4346ea3cc
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 10:15:59 2017 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 12:21:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e783f193
gnustep-apps/gworkspace: drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
gnustep-apps/gworkspace/Manifest | 3 --
.../files/gworkspace-0.9.2-rpath-link.patch | 11 ------
gnustep-apps/gworkspace/gworkspace-0.9.1.ebuild | 39 --------------------
gnustep-apps/gworkspace/gworkspace-0.9.2.ebuild | 43 ----------------------
gnustep-apps/gworkspace/gworkspace-0.9.3.ebuild | 39 --------------------
5 files changed, 135 deletions(-)
diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
index 744f6c2ab88..ce06d1959e5 100644
--- a/gnustep-apps/gworkspace/Manifest
+++ b/gnustep-apps/gworkspace/Manifest
@@ -1,4 +1 @@
-DIST gworkspace-0.9.1.tar.gz 3791146 SHA256 c8b1b023621aa83bff3f416485e5c9aa4ecebc90933bf97f3702e0dcfe39cd41 SHA512 7f915ff1b527b088bc91cc062f7178362a2e21bdccb796cad2a76caeb853b56470eb34336a2db6b9adb47977d2fd8a6da9335e8d8a86f15759713772420f43db WHIRLPOOL 69a0f03648d416fa0d4233ac7592291dcbdc111cca68598474e1efab0121a78f3c66453a3b101b2292e43d44f75c9bb1eeb3ef56cea1e0685c840f0558612c37
-DIST gworkspace-0.9.2.tar.gz 4289262 SHA256 5239ef983fd4358e152fcfb5cd1f6c30366d04357c26c74719eb05da849af4fb SHA512 d81476697f83b214c6bed95aa606a8d8fed850dd47ca87d94c151bdb8581d40fde8efa6574f316a6b46c3f2cae3821b9891e984f6d27fc1a155d5c37bd442571 WHIRLPOOL 997eaff5a35dc42f1cce8a1019d1856ce961481698f7e4453655a591e5802ad4bc971968a8c21127b46262eb6d06082afb6f18e4e9c4ef5be4b5c2f3c6bda46c
-DIST gworkspace-0.9.3.tar.gz 3833838 SHA256 238343a8c4e447debec75ff49f4657f74a4256a49862899214a2c80616c79049 SHA512 9a7201252714ebc6a417036cd03f67346d0af7a3b4efbd0b2a7487cc6959b508d152c7a1bac00d4fd7efeb156707512065bdf1891961f96288c13ca5336468e6 WHIRLPOOL 87c937caab0451436440a09859d1f642a50cc2b3ffb0b0bf12da45391046217d4c84c9be827f6addd1bdd1046c18da453315e606421ef66b5e13e09d30c22a50
DIST gworkspace-0.9.4.tar.gz 3855909 SHA256 f3c18371c10d8ca02954017ce5c78d8f6b6ed3101a7adae86d7c557cea405632 SHA512 d2246b87be7d1659ecec3657c314ca333dc983509394c3e383b650056affd108b76241fa0fa59443b183a2e20906d9a7a9d1f2ad601cb569990b5490a6c5d2a7 WHIRLPOOL cf11a748cbe7efe3c5810accdcc441c20fc4c039ce37c769aeeea4c647302a5b32227ec70993c7bddf1b33c57b98b33441f0da7da41c7c06384078a92e3ff1ac
diff --git a/gnustep-apps/gworkspace/files/gworkspace-0.9.2-rpath-link.patch b/gnustep-apps/gworkspace/files/gworkspace-0.9.2-rpath-link.patch
deleted file mode 100644
index 53bd503e9e4..00000000000
--- a/gnustep-apps/gworkspace/files/gworkspace-0.9.2-rpath-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GWMetadata/MDFinder/GNUmakefile.preamble.orig 2013-04-04 11:05:53.208502021 +0200
-+++ GWMetadata/MDFinder/GNUmakefile.preamble 2013-04-04 11:05:55.012501940 +0200
-@@ -13,7 +13,7 @@
-
- ADDITIONAL_LIB_DIRS += -L../MDKit/MDKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
- ADDITIONAL_LIB_DIRS += -L../../FSNode/FSNode.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
--ADDITIONAL_LIB_DIRS += -L../../DBKit/$(GNUSTEP_OBJ_DIR)
-+ADDITIONAL_LIB_DIRS += -Wl,-rpath-link ../../DBKit/$(GNUSTEP_OBJ_DIR)
-
- # Additional LDFLAGS to pass to the linker
- # ADDITIONAL_LDFLAGS +=
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.1.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.1.ebuild
deleted file mode 100644
index 7e05ff6cb67..00000000000
--- a/gnustep-apps/gworkspace/gworkspace-0.9.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit gnustep-2
-
-DESCRIPTION="A workspace manager for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-# GWMetadata compilation broken for now
-#DEPEND=">=gnustep-apps/systempreferences-1.0.1_p24791
-# >=dev-db/sqlite-3.2.8"
-#RDEPEND="${DEPEND}"
-
-src_configure() {
- local myconf=""
- use kernel_linux && myconf="${myconf} --with-inotify"
-
- egnustep_env
- econf --disable-gwmetadata ${myconf}
-}
-
-src_install() {
- egnustep_env
- egnustep_install
-
- if use doc;
- then
- dodir /usr/share/doc/${PF}
- cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
- fi
-}
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.2.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.2.ebuild
deleted file mode 100644
index ccd1ca07557..00000000000
--- a/gnustep-apps/gworkspace/gworkspace-0.9.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-DESCRIPTION="A workspace manager for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+gwmetadata"
-
-DEPEND="gwmetadata? ( >=gnustep-apps/systempreferences-1.0.1_p24791
- >=dev-db/sqlite-3.2.8 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-rpath-link.patch
-}
-
-src_configure() {
- local myconf=""
- use kernel_linux && myconf="${myconf} --with-inotify"
- use gwmetadata && myconf="${myconf} --enable-gwmetadata"
-
- egnustep_env
- econf ${myconf}
-}
-
-src_install() {
- egnustep_env
- egnustep_install
-
- if use doc;
- then
- dodir /usr/share/doc/${PF}
- cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
- fi
-}
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.3.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.3.ebuild
deleted file mode 100644
index e083262d93b..00000000000
--- a/gnustep-apps/gworkspace/gworkspace-0.9.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-DESCRIPTION="A workspace manager for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+gwmetadata"
-
-DEPEND="gwmetadata? ( >=gnustep-apps/systempreferences-1.0.1_p24791
- >=dev-db/sqlite-3.2.8 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local myconf=""
- use kernel_linux && myconf="${myconf} --with-inotify"
- use gwmetadata && myconf="${myconf} --enable-gwmetadata"
-
- egnustep_env
- econf ${myconf}
-}
-
-src_install() {
- egnustep_env
- egnustep_install
-
- if use doc;
- then
- dodir /usr/share/doc/${PF}
- cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnustep-apps/gworkspace/files/, gnustep-apps/gworkspace/
@ 2021-12-06 13:26 Bernard Cafarelli
0 siblings, 0 replies; 2+ messages in thread
From: Bernard Cafarelli @ 2021-12-06 13:26 UTC (permalink / raw
To: gentoo-commits
commit: 8c3c9b3ee65110b260bad3d6f77384cd54151b04
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 6 13:25:32 2021 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Dec 6 13:26:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3c9b3e
gnustep-apps/gworkspace: fix compilation with current gnustep
Thanks Antti Aspinen for the report and patch link
Patch adapted from master commit ea0f7fef5efd798a8bcad59d20fe48eb4232d730
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../gworkspace-0.9.4-ImageViewerProtocol.patch | 186 +++++++++++++++++++++
gnustep-apps/gworkspace/gworkspace-0.9.4-r1.ebuild | 44 +++++
2 files changed, 230 insertions(+)
diff --git a/gnustep-apps/gworkspace/files/gworkspace-0.9.4-ImageViewerProtocol.patch b/gnustep-apps/gworkspace/files/gworkspace-0.9.4-ImageViewerProtocol.patch
new file mode 100644
index 000000000000..d2bfd54e60bf
--- /dev/null
+++ b/gnustep-apps/gworkspace/files/gworkspace-0.9.4-ImageViewerProtocol.patch
@@ -0,0 +1,186 @@
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/ImageViewer.h gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/ImageViewer.h
+--- gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/ImageViewer.h 2016-06-07 18:13:08.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/ImageViewer.h 2021-12-06 14:18:12.024085590 +0100
+@@ -1,8 +1,9 @@
+ /* ImageViewer.h
+ *
+- * Copyright (C) 2004-2016 Free Software Foundation, Inc.
++ * Copyright (C) 2004-2020 Free Software Foundation, Inc.
+ *
+- * Author: Enrico Sersale <enrico@imago.ro>
++ * Authors: Enrico Sersale <enrico@imago.ro>
++ * Riccardo Mottola <rm@gnu.org>
+ * Date: January 2004
+ *
+ * This file is part of the GNUstep Inspector application
+@@ -36,6 +37,7 @@
+ @class NSWorkspace;
+ @class ProgressView;
+ @class ImageResizer;
++
+ @protocol ContentInspectorProtocol
+
+ - (void)contentsReadyAt:(NSString *)path;
+@@ -51,7 +53,7 @@
+
+ @end
+
+-@interface ImageViewer : NSView <ContentViewersProtocol>
++@interface ImageViewer : NSView <ContentViewersProtocol, ImageViewerProtocol>
+ {
+ NSArray *extsarr;
+ BOOL valid;
+@@ -76,9 +78,9 @@
+ NSWorkspace *ws;
+ }
+
+-- (void)setResizer:(id)anObject;
++- (oneway void)setResizer:(id)anObject;
+
+-- (void)imageReady:(NSDictionary *)imginfo;
++- (oneway void)imageReady:(NSDictionary *)imginfo;
+
+ - (void)editFile:(id)sender;
+
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/ImageViewer.m gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/ImageViewer.m
+--- gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/ImageViewer.m 2016-06-07 18:13:08.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/ImageViewer.m 2021-12-06 14:18:12.024085590 +0100
+@@ -198,7 +198,7 @@
+ }
+ }
+
+-- (void)setResizer:(id)anObject
++- (oneway void)setResizer:(id)anObject
+ {
+ NSSize imsize = [imview bounds].size;
+
+@@ -207,6 +207,7 @@
+ [anObject setProtocolForProxy: @protocol(ImageResizerProtocol)];
+ resizer = (ImageResizer *)anObject;
+ RETAIN (resizer);
++ [resizer setProxy: self];
+ [self addSubview: progView];
+ [progView start];
+ [resizer readImageAtPath: imagePath setSize: imsize];
+@@ -214,7 +215,7 @@
+
+
+
+-- (void)imageReady:(NSDictionary *)imginfo
++- (oneway void)imageReady:(NSDictionary *)imginfo
+ {
+ NSData *imgdata;
+ BOOL imgok;
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/Resizer.h gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/Resizer.h
+--- gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/Resizer.h 2016-06-01 18:35:46.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/Resizer.h 2021-12-06 14:18:12.024085590 +0100
+@@ -1,9 +1,10 @@
+ /* Resizer.m
+ h
+ *
+- * Copyright (C) 2005-2016 Free Software Foundation, Inc.
++ * Copyright (C) 2005-2020 Free Software Foundation, Inc.
+ *
+- * Author: Enrico Sersale <enrico@imago.ro>
++ * Authors: Enrico Sersale <enrico@imago.ro>
++ * Riccardo Mottola <rm@gnu.org>
+ * Date: May 2016
+ *
+ * This file is part of the GNUstep Inspector application
+@@ -23,14 +24,15 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+ */
+
+-
+-NSConnection *serverConnection;
++#import "ContentViewersProtocol.h"
+
+ @interface ImageResizer : NSObject
+ {
+-
++ id <ImageViewerProtocol> imageViewerProxy;
+ }
+
++- (void)setProxy:(id <ImageViewerProtocol>)ivp;
++
+ - (void)readImageAtPath:(NSString *)path
+ setSize:(NSSize)imsize;
+
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/Resizer.m gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/Resizer.m
+--- gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/Resizer.m 2016-06-07 17:28:36.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/Resizer.m 2021-12-06 14:18:45.928073537 +0100
+@@ -33,24 +33,13 @@
+ do { if (GW_DEBUG_LOG) \
+ NSLog(format , ## args); } while (0)
+
+-@protocol ImageViewerProtocol
+-
+-- (oneway void)setResizer:(id)anObject;
+-
+-- (oneway void)imageReady:(NSDictionary *)dict;
+-
+-@end
+-
+-
+-
+-
+-
+ @implementation ImageResizer
+
+ + (void)connectWithPorts:(NSArray *)portArray
+ {
+ NSAutoreleasePool *pool;
+ ImageResizer *serverObject;
++ NSConnection *serverConnection;
+
+ pool = [[NSAutoreleasePool alloc] init];
+
+@@ -77,6 +66,11 @@
+
+ #define MIX_LIM 16
+
++- (void)setProxy:(id <ImageViewerProtocol>)ivp
++{
++ imageViewerProxy = ivp;
++}
++
+ - (void)readImageAtPath:(NSString *)path
+ setSize:(NSSize)imsize
+ {
+@@ -191,7 +185,7 @@
+
+ RELEASE (srcImage);
+ }
+- [(id <ImageViewerProtocol>)[serverConnection rootProxy] imageReady: info];
++ [imageViewerProxy imageReady: info];
+ RELEASE (arp);
+ }
+
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewersProtocol.h gworkspace-0.9.4/Inspector/ContentViewersProtocol.h
+--- gworkspace-0.9.4.orig/Inspector/ContentViewersProtocol.h 2010-06-16 19:45:53.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewersProtocol.h 2021-12-06 14:18:12.025085590 +0100
+@@ -1,8 +1,9 @@
+ /* ContentViewersProtocol.h
+ *
+- * Copyright (C) 2004 Free Software Foundation, Inc.
++ * Copyright (C) 2004-2020 Free Software Foundation, Inc.
+ *
+- * Author: Enrico Sersale <enrico@imago.ro>
++ * Authors: Enrico Sersale <enrico@imago.ro>
++ * Riccardo Mottola <rm@gnu.org>
+ * Date: January 2004
+ *
+ * This file is part of the GNUstep GWorkspace application
+@@ -48,4 +49,12 @@
+
+ @end
+
++/* Proxy for DO connection */
+
++@protocol ImageViewerProtocol
++
++- (oneway void)setResizer:(id)anObject;
++
++- (oneway void)imageReady:(NSDictionary *)dict;
++
++@end
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.4-r1.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..774ee0d4ccf5
--- /dev/null
+++ b/gnustep-apps/gworkspace/gworkspace-0.9.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnustep-2
+
+DESCRIPTION="A workspace manager for GNUstep"
+HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+gwmetadata"
+
+DEPEND=">=gnustep-base/gnustep-gui-0.25.0
+ gwmetadata? (
+ >=gnustep-apps/systempreferences-1.0.1_p24791
+ >=dev-db/sqlite-3.2.8
+ )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ImageViewerProtocol.patch )
+
+src_configure() {
+ local myconf=""
+ use kernel_linux && myconf="${myconf} --with-inotify"
+ use gwmetadata && myconf="${myconf} --enable-gwmetadata"
+
+ egnustep_env
+ econf ${myconf}
+}
+
+src_install() {
+ egnustep_env
+ egnustep_install
+
+ if use doc;
+ then
+ dodir /usr/share/doc/${PF}
+ cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
+ fi
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-06 13:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-17 12:21 [gentoo-commits] repo/gentoo:master commit in: gnustep-apps/gworkspace/files/, gnustep-apps/gworkspace/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2021-12-06 13:26 Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox