From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- gnustep-apps/cenon/Manifest | 7 +- gnustep-apps/cenon/cenon-4.0.2-r1.ebuild | 26 --- gnustep-apps/cenon/cenon-4.0.6.ebuild | 2 +- .../files/cenon-4.0.2-check-return-value.patch | 40 ---- .../cenon-4.0.2-gnustep-gui-0.24-support.patch | 231 --------------------- gnustep-apps/cenon/files/cenon-4.0.2-install.patch | 19 -- 6 files changed, 2 insertions(+), 323 deletions(-) delete mode 100644 gnustep-apps/cenon/cenon-4.0.2-r1.ebuild delete mode 100644 gnustep-apps/cenon/files/cenon-4.0.2-check-return-value.patch delete mode 100644 gnustep-apps/cenon/files/cenon-4.0.2-gnustep-gui-0.24-support.patch delete mode 100644 gnustep-apps/cenon/files/cenon-4.0.2-install.patch (limited to 'gnustep-apps/cenon') diff --git a/gnustep-apps/cenon/Manifest b/gnustep-apps/cenon/Manifest index f5577d5a9aae..6c112dc169c1 100644 --- a/gnustep-apps/cenon/Manifest +++ b/gnustep-apps/cenon/Manifest @@ -1,10 +1,5 @@ -AUX cenon-4.0.2-check-return-value.patch 1416 BLAKE2B fa71100d4dc75119f3b853ad246ce81a9703d26fd1a90ed8a40cf34d1c472f15a94c5328e333b616d820aef9bbf7d6426b612ef1b92c118eeda90595bedbf372 SHA512 07cd48ed24fc791a5b3921cae99b4bcd9a36167b1d4c376881b82f420c7870ea2ae02aaf1cade56bc88b3f306154e60d3e64a9c2b6fe880ead317250e0ada921 -AUX cenon-4.0.2-gnustep-gui-0.24-support.patch 7456 BLAKE2B 87be676970631e905cef75c1d4f7fa4b49449c24987d561851a888e0e510d18ed645047baf8b50db42ef045fc49f2de34a7c6878b2598eca5b5ad67a14b38439 SHA512 a740fda5548284d4d6ad46d972c19b23382b6d0e4b92573c9edebe1eb362f13863bc9e8b50fcfd0c9f450fea979ba781ce3723fe692f862ed23fc0e7f02b23b7 -AUX cenon-4.0.2-install.patch 690 BLAKE2B 64eff078e98b8d4052af2801517c0712384222007eb3af343f92793a42d4f4b5fdcc347b70b8832062471b73a13eb32d811de7a26b18e0b70005d4cc57b3de1c SHA512 fece9ed365b6fa5ca2b897b64c073eb780c6270f6e7f8c7e92748c54626cda3a47872245869f4e3ba8b8fbd9ee8bf8665b0feb1574daca006f828d363e95ad21 AUX cenon-4.0.6-install.patch 719 BLAKE2B 25fba2bfcb4489983513889331ac37e9c556cd7033fab0681cd63a37b79d2a151b0ab114b65881ce88488aa559d83204570b318a67e894a277877229d3c7adc4 SHA512 4e8dc48b32baf8b5624f567ed9b8884735831bac3a6af74828af52b8738fe94bb296e17ea7a6929fd63de36d5f74ddf00cc690151c29483d0aa7373e3cff607d AUX cenon-4.0.6-invalid_array_syntax.patch 828 BLAKE2B c153de2685750ced71862e292d5e754e08b6aa0593d561b02e273a504265c488565c3b30aecdc2d517ea921bcc9dbd1b269baa12caf61fd9e7b42f0ebb5f5fc5 SHA512 f6520c392c4aa54979e669927e9b6e6103446b725a4bc9809f5343f0da70b4f454b2711ecb37fcfbd63f372af045d43d6a6013c885d28581fa29801ace65d471 -DIST Cenon-4.0.2.tar.bz2 4150615 BLAKE2B 75252c6495c0cdba32f18e31674ff1c4f8e3d6c7f94b56ac763bcd7d8bcb401fe6817e0a06642dc927ff87c32956e9277a777a7744a8a33135a4e3a76aa511cc SHA512 94bf95dbdb8fbe9c21fbe80cbc33fbe376c598cf79be295cb1045a0ac888da5363f388f3f051d593ca47f6c1fcbade2825389aec5da328c59158a1e5da89db75 DIST Cenon-4.0.6.tar.bz2 10931177 BLAKE2B 40b62313360833b7ee3677143014e7cbe90b79290e9bdd1afe01c411bd4382d792354c6529f84c89eeb2be1c0e7ac7ce5f9557148014af07f46fc223932b20d4 SHA512 7fe4847cf4b2bc2a8f46e42d9e24e35dc42d0d7688ed02ea844cac562355611c64d3a1f0a90ae379db28415b40bb2fb38c2faf8c67bcc5ef7d5512cbc7452a3a -EBUILD cenon-4.0.2-r1.ebuild 671 BLAKE2B 607643ba25f4b5a7e308392e1acaabdb8bb630d778b7706a0f4b1bab3a4fcc80c82072d7ed9b4d66ef74d950d2acd657534abae893a4d3f03f9f13be9ea59e6e SHA512 f49df99df73d5d76d889b4adf0fc7f422becd606f2a7bd28a3aba31db1969e4f2fbeb822b70aa096ef6b873f5afe787012dc7efe4525747c4996374b6df341f2 -EBUILD cenon-4.0.6.ebuild 539 BLAKE2B b32501c4166381668aa5565d88b2e9989a1cc512d71ec0c8d62eeb7ddedbe27536cf99bcc1b44ca2ee56d7857fdd08d6a02c75a791d71bc015a398a14c974c41 SHA512 8a5772cb8735498478e3b929945c04f447820cba77cf33be6965cc79b260f27fccbaf04c0fd31c271b29696d0ac46aed89144e3a2adadff6ebfd6115cfc4a179 +EBUILD cenon-4.0.6.ebuild 533 BLAKE2B 43b0fc9e2e2b11fda435b11515352ef97717d698bd1dd6c4655982ac70be0a63ff1da420393fb0df6a7488e62b6df11849d56554ed49826bad9c329a986b66e7 SHA512 c2fcd6dae4d719c2aade115aaa765df2c564362c9b1c4f7ef7a15d7206c8d1a59ed27fd873783863bfd0851d4e629a1a18cb4be66f724b603c4ba9dc15ac1ca3 MISC metadata.xml 448 BLAKE2B b172761dfdeafc6761941f5a90a171995c5d62ea94a8824006618e093064f25c2328525aaa192307fc4f1a211f7924db90ae4f52e7fca9d3192abbb0cd091311 SHA512 a8760d8370761076dca9c253a9a828933cc69608ca193b6a39334717008c720b033496b9ee25c7b2ca394dcf70fea00b8aaa9f3595ebcf10a54438cc86c18858 diff --git a/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild b/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild deleted file mode 100644 index 5cf971f7860c..000000000000 --- a/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit gnustep-2 - -S=${WORKDIR}/${PN/c/C} - -DESCRIPTION="Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX" -HOMEPAGE="http://www.cenon.info/" -SRC_URI="http://www.cenon.zone/download/source/${P/c/C}.tar.bz2" -KEYWORDS="amd64 ~x86" -SLOT="0" -LICENSE="Cenon" -IUSE="" - -DEPEND="" -RDEPEND=">=gnustep-libs/cenonlibrary-4.0.0" - -src_prepare() { - # Do not install files already provided by cenonlibrary - epatch "${FILESDIR}"/${P}-install.patch - - epatch "${FILESDIR}"/${P}-check-return-value.patch - epatch "${FILESDIR}"/${P}-gnustep-gui-0.24-support.patch -} diff --git a/gnustep-apps/cenon/cenon-4.0.6.ebuild b/gnustep-apps/cenon/cenon-4.0.6.ebuild index 36e93ec53433..adfd7fb6cc13 100644 --- a/gnustep-apps/cenon/cenon-4.0.6.ebuild +++ b/gnustep-apps/cenon/cenon-4.0.6.ebuild @@ -9,7 +9,7 @@ S=${WORKDIR}/${PN/c/C} DESCRIPTION="Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX" HOMEPAGE="http://www.cenon.info/" SRC_URI="http://www.cenon.zone/download/source/${P/c/C}.tar.bz2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64" SLOT="0" LICENSE="Cenon" IUSE="" diff --git a/gnustep-apps/cenon/files/cenon-4.0.2-check-return-value.patch b/gnustep-apps/cenon/files/cenon-4.0.2-check-return-value.patch deleted file mode 100644 index a23135b3230d..000000000000 --- a/gnustep-apps/cenon/files/cenon-4.0.2-check-return-value.patch +++ /dev/null @@ -1,40 +0,0 @@ -Description: Check the return value of `system'. -Author: Yavor Doganov -Forwarded: yes -Last-Update: 2014-06-25 ---- - ---- cenon.app.orig/VHFImport/PSImport.m -+++ cenon.app/VHFImport/PSImport.m -@@ -143,7 +143,14 @@ - - /* convert pdf to eps */ - commandLine = [NSString stringWithFormat:@"%@ -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=epswrite -sOutputFile=%@ -c save pop -f '%@'", [self gsPath], psFile, pdfFile]; -- system([commandLine UTF8String]); -+ if (system([commandLine UTF8String]) != 0) -+ { -+ NSRunAlertPanel(@"Unable to import file", -+ @"An error occured while importing the file.\n" -+ @"Make sure you have ghostscript installed in PATH.", -+ @"OK", nil, nil); -+ return nil; -+ } - - /* import ps */ - psData = [NSData dataWithContentsOfFile:psFile]; -@@ -330,7 +337,14 @@ - //[data writeToFile:inFile atomically:NO]; // <= 10.4 - - commandLine = [NSString stringWithFormat:@"%@ -dNODISPLAY -dBATCH -dNOSAFER -g1000x1000 '%@'", [self gsPath], inFile]; -- system([commandLine UTF8String]); -+ if (system([commandLine UTF8String]) != 0) -+ { -+ NSRunAlertPanel(@"Unable to import file", -+ @"An error occured while importing the file.\n" -+ @"Make sure you have ghostscript installed in PATH.", -+ @"OK", nil, nil); -+ return nil; -+ } - - /* load generated file */ - //data = [[[NSString alloc] initWithContentsOfFile:outFile] autorelease]; diff --git a/gnustep-apps/cenon/files/cenon-4.0.2-gnustep-gui-0.24-support.patch b/gnustep-apps/cenon/files/cenon-4.0.2-gnustep-gui-0.24-support.patch deleted file mode 100644 index b0799d835175..000000000000 --- a/gnustep-apps/cenon/files/cenon-4.0.2-gnustep-gui-0.24-support.patch +++ /dev/null @@ -1,231 +0,0 @@ -Description: Various fixes for gnustep-base/1.24 and gnustep-gui/0.24. - - Proper intialization. - - Use correct return types for methods and compare functions. - - Likewise for method arguments. - - Avoid conflicting methods by declaring the ivars of a specific type. - - Add mising argument to private method declaration. -Author: Yavor Doganov -Bug-Debian: http://bugs.debian.org/749553 -Forwarded: yes -Last-Update: 2014-06-25 ---- - ---- cenon.app.orig/GraphicObjects.subproj/VCurveFit.m -+++ cenon.app/GraphicObjects.subproj/VCurveFit.m -@@ -87,7 +87,7 @@ - /* turn lines into optimized curves - */ - - (VPath*)fitGraphic:(VGraphic*)g maxError:(double)maxError --{ Point2 *pts = nil; -+{ Point2 *pts = NULL; - int i, nPts = 0; - VPath *path = nil; - ---- cenon.app.orig/GraphicObjects.subproj/VGroup.h -+++ cenon.app/GraphicObjects.subproj/VGroup.h -@@ -67,7 +67,7 @@ - - (float)stepWidth; - - (void)setRadialCenter:(NSPoint)rc; - - (NSPoint)radialCenter; --- (void)setList:(NSArray*)aList; -+- (void)setList:(NSMutableArray*)aList; - - (void)addObject:(VGraphic*)g; - - (void)add:(NSArray*)addList; - - (NSMutableArray*)list; ---- cenon.app.orig/InspectorPanel.subproj/IPAllAcc.h -+++ cenon.app/InspectorPanel.subproj/IPAllAcc.h -@@ -40,7 +40,7 @@ - - @interface IPAllAcc:IPBasicLevel - { -- id accPopup; // the popup to allow the user to select the different accessories -+ NSPopUpButton *accPopup; // the popup to allow the user to select the different accessories - id accView; // the view containing the accessory view - - int levelCnt; // number of accessories ---- cenon.app.orig/InspectorPanel.subproj/IPAllFilling.h -+++ cenon.app/InspectorPanel.subproj/IPAllFilling.h -@@ -39,7 +39,7 @@ - id stepForm; - id colorWell; - id colorWellGraduated; -- id fillPopup; -+ NSPopUpButton *fillPopup; - id sliderBox; - id radialCenterText; - id angleButtonLeft; ---- cenon.app.orig/InspectorPanel.subproj/IPAllStrokeWidth.h -+++ cenon.app/InspectorPanel.subproj/IPAllStrokeWidth.h -@@ -35,7 +35,7 @@ - @interface IPAllStrokeWidth:IPBasicLevel - { - int stroked; -- id strokePopup; -+ NSPopUpButton *strokePopup; - id colorWell; - id widthField; - id widthSlider; ---- cenon.app.orig/LayerObject.h -+++ cenon.app/LayerObject.h -@@ -144,8 +144,8 @@ - - (void)setString:(NSString *)aString; - - (NSString*)string; - --- (void)setTag:(int)newTag; --- (int)tag; -+- (void)setTag:(NSInteger)newTag; -+- (NSInteger)tag; - - - (void)setColor:(NSColor *)aColor; - - (NSColor *)color; ---- cenon.app.orig/LayerObject.m -+++ cenon.app/LayerObject.m -@@ -227,8 +227,8 @@ - - (void)setString:(NSString *)aString { [string release]; string = [aString retain]; } - - (NSString *)string { return string; } - --- (void)setTag:(int)newTag { tag = newTag; } --- (int)tag { return tag; } -+- (void)setTag:(NSInteger)newTag { tag = newTag; } -+- (NSInteger)tag { return tag; } - - - (void)setColor:(NSColor *)aColor { color=aColor; } - - (NSColor *)color { return color; } ---- cenon.app.orig/GraphicObjects.subproj/VPath.h -+++ cenon.app/GraphicObjects.subproj/VPath.h -@@ -58,7 +58,7 @@ - - (NSMutableArray*)list; - - (void)setList:aList; - - (void)setList:aList optimize:(BOOL)optimize; --- (unsigned)count; -+- (NSUInteger)count; - - (unsigned)countRecursive; - - (void)getEndPoints:(NSPoint*)p1 :(NSPoint*)p2; - - (int)selectedKnobIndex; ---- cenon.app.orig/GraphicObjects.subproj/VPath.m -+++ cenon.app/GraphicObjects.subproj/VPath.m -@@ -399,7 +399,7 @@ - *p2 = [[list objectAtIndex:[list count]-1] pointWithNum:MAXINT]; - } - --- (unsigned)count -+- (NSUInteger)count - { - return [list count]; - } ---- cenon.app.orig/InspectorPanel.subproj/IPImage.h -+++ cenon.app/InspectorPanel.subproj/IPImage.h -@@ -43,7 +43,7 @@ - id thumbSwitch; - id nameField; - id factorField; -- id compPopUp; -+ NSPopUpButton *compPopUp; - - VGraphic *graphic; // the loaded graphic or the first of them if multiple - } ---- cenon.app.orig/DINImportSub.m -+++ cenon.app/DINImportSub.m -@@ -46,7 +46,7 @@ - /* created: 2001-06-06 - * performcance map is not used, because we set this later when the layers are added to the view! - */ --static NSInteger sortLayer(id l1, id l2, void *context) -+static NSComparisonResult sortLayer(id l1, id l2, void *context) - { float d1 = 0.0, d2 = 0.0; - VGraphic *g0 = [[l1 list] objectAtIndex:0], *g1 = [[l2 list] objectAtIndex:0]; - ---- cenon.app.orig/DocView.m -+++ cenon.app/DocView.m -@@ -994,7 +994,7 @@ - #define SORT_COL_LRUL 5 - #define SORT_ROW_URLL 6 - #define SORT_ROW_LRUL 7 --NSInteger sortPosition(id g1, id g2, void *context) -+NSComparisonResult sortPosition(id g1, id g2, void *context) - { NSPoint p1 = [g1 bounds].origin, p2 = [g2 bounds].origin; - int sort = *(int*)context; - ---- cenon.app.orig/SVGImportSub.m -+++ cenon.app/SVGImportSub.m -@@ -112,7 +112,7 @@ - /* allocate a group object - * copy the objects in aList to the group, add the group to bList - */ --- (void)addGroupList:(NSArray*)aList toList:bList -+- (void)addGroupList:(NSMutableArray*)aList toList:bList - { VGroup *g = [VGroup group]; - int i; - NSMutableArray *mutArray = [NSMutableArray array]; -@@ -136,7 +136,7 @@ - [bList addObject:g]; - } - --- (void)addGroupList:(NSArray*)aList toList:bList withTransform:(NSAffineTransform*)matrix -+- (void)addGroupList:(NSMutableArray*)aList toList:bList withTransform:(NSAffineTransform*)matrix - { VGroup *g = [VGroup group]; - int i; - NSMutableArray *mutArray = [NSMutableArray array]; ---- cenon.app.orig/MoveCell.h -+++ cenon.app/MoveCell.h -@@ -32,7 +32,7 @@ - - @interface MoveCell:NSCell - { -- int tag; -+ NSInteger tag; - MoveMatrix *moveMatrix; - - float ascender, descender, lineHeight; -@@ -41,8 +41,8 @@ - - (void)setMatrix:(MoveMatrix *)anMatrix; - - (void)setFont:(NSFont *)fontObj; - --- (void)setTag:(int)anInt; --- (int)tag; -+- (void)setTag:(NSInteger)anInt; -+- (NSInteger)tag; - - - (BOOL)dependant; - ---- cenon.app.orig/MoveCell.m -+++ cenon.app/MoveCell.m -@@ -39,14 +39,14 @@ - - /* modified: 13.01.93 - */ --- (void)setTag:(int)anInt -+- (void)setTag:(NSInteger)anInt - { - tag=anInt; - } - - /* modified: 13.01.93 - */ --- (int)tag -+- (NSInteger)tag - { - return tag; - } ---- cenon.app.orig/VHFImport/DXFImport.m -+++ cenon.app/VHFImport/DXFImport.m -@@ -86,7 +86,7 @@ - - (BOOL)getSolid:(NSScanner*)scanner :(NSPoint*)ps :(int*)pCnt; - - (BOOL)getCircle:(NSScanner*)scanner :(NSPoint*)ctr :(NSPoint*)start :(float*)angle; - - (BOOL)getArc:(NSScanner*)scanner :(NSPoint*)ctr :(NSPoint*)start :(float*)angle; --- (BOOL)getText :(NSScanner*)scanner mtext:(BOOL)mext :(NSString**)string :(float*)angle :(NSPoint*)origin :(float*)size :(float*)ar :(int*)alignment; -+- (BOOL)getText :(NSScanner*)scanner mtext:(BOOL)mext :(NSString**)string :(float*)angle :(NSPoint*)origin :(float*)size :(float*)ar :(int*)alignment :(NSString**)fontName; - - (BOOL)get3DFace:(NSScanner*)scanner points:(V3Point*)pts color:(NSColor**)color; - - (BOOL)getInsert:(NSScanner*)scanner :cList; - - (void)updateBounds:(NSPoint)p; ---- cenon.app.orig/TileScrollView.h -+++ cenon.app/TileScrollView.h -@@ -36,7 +36,7 @@ - @interface TileScrollView:NSScrollView - { - id box; -- id resPopupListButton; -+ NSPopUpButton *resPopupListButton; - id document; - VFloat oldScaleFactor; - } diff --git a/gnustep-apps/cenon/files/cenon-4.0.2-install.patch b/gnustep-apps/cenon/files/cenon-4.0.2-install.patch deleted file mode 100644 index 8a75db6ee13a..000000000000 --- a/gnustep-apps/cenon/files/cenon-4.0.2-install.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur Cenon.orig/GNUmakefile.postamble Cenon/GNUmakefile.postamble ---- Cenon.orig/GNUmakefile.postamble 2013-04-23 18:18:19.231871028 +0200 -+++ Cenon/GNUmakefile.postamble 2013-04-23 18:19:31.482864370 +0200 -@@ -18,12 +18,12 @@ - # before-install:: - - # Things to do after installing --after-install:: -+#after-install:: - # copy library - #rm -R $(GNUSTEP_LIBRARY)/$(APP_NAME) -- cp -R Library/$(APP_NAME)/ $(GNUSTEP_LIBRARY)/ -+ #cp -R Library/$(APP_NAME)/ $(GNUSTEP_LIBRARY)/ - # set permissions (rrr) -- chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).* -+ #chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).* - #chmod -R ugo+rX $(GNUSTEP_LIBRARY)/$(APP_NAME) - - # Things to do before uninstalling -- cgit v1.2.3