gentoo resync : 22.12.2021

3 files changed, 232 insertions, 0 deletions

diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
index f2124dde65f8..c2825426f960 100644
--- a/gnustep-apps/gworkspace/Manifest
+++ b/gnustep-apps/gworkspace/Manifest
@@ -1,3 +1,5 @@
+AUX gworkspace-0.9.4-ImageViewerProtocol.patch 5624 BLAKE2B fdb61a9ac90d264dfc8e35729d4b20d201cee34634188caeff41660183405c9ed6f30aa25008d9f438d89da3795f7605330003b4d4553f25899fa651c4eb0ceb SHA512 2209941ad0aa46845b50372749560a8b940169cb72685deb4d7cba005b487a31717991982f277100272b42e83bf426f127dc99667c071c6dcff8679ccd495179
 DIST gworkspace-0.9.4.tar.gz 3855909 BLAKE2B 5a636ccfb4fa79acd91bce34d3b5fe8a6d7bccc3f2f1f5a3d9f19c8a91743ec19c2eae0930e81807c6a5f098761b65f17e86a3edc44da155c50c903284ea2b20 SHA512 d2246b87be7d1659ecec3657c314ca333dc983509394c3e383b650056affd108b76241fa0fa59443b183a2e20906d9a7a9d1f2ad601cb569990b5490a6c5d2a7
+EBUILD gworkspace-0.9.4-r1.ebuild 935 BLAKE2B cdcb31c463bdb004f94ca69577d4627737883e017e66fdbe4691b8bedbcfc107282058d1f779e7c775df6a64c2ea61a6dfb48bf4e28ae4effb99d80a29cbdc60 SHA512 8e99501f13dc6d1905d9ca7e41ad5e0f03aeb6c3a0eb5c9cdfb955f73842ab5bfcc76d396bcbfcb4bbee61630d568c833bec7a143ab725cca427a6e0ee9d29f8
 EBUILD gworkspace-0.9.4.ebuild 877 BLAKE2B c7d08f264f2984e9a439332ae869d2d3a712d206139cd609f45d72c28d51ffad872746a1d82dba9aeb581b9f19d6b8268e79e6f2ab22a740465534dd63341a7d SHA512 b1b2fa6096b78e3dc1713da29966e720a37927d45766130a90be609112b973a1a57b74b9bb4089f7df9f56279be7a5a7de906fac5139efb38e95783251a8319e
 MISC metadata.xml 580 BLAKE2B 69183b63130865b14df3c4a8cffa3278e81b9daef6f5495489cd1d80bf3ee06ee38daca9acdd9c0bbb20e9242f175a69b00b5bf5a542c2ea7c90ddf974645cf1 SHA512 4dd48119a2940260a326a78e2d860b98b10575d4e55772647c46beaca04581bf46ffc8ed1342458a6c1bcb2a35f5ced435997a0cd5f677c79fd154e83b64a5e4
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
+}