From 122fa03d06de055dca41eaa3574b4314480420df Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Wed, 20 May 2015 10:18:40 +0000 Subject: [PATCH] Disabling repairFile: pending further development. Update version files. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@38513 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 16 +++++++++++++++- Documentation/news.texi | 17 +++++++++++++---- English.lproj/GormPrefGeneral.gorm/data.info | Bin 184 -> 184 bytes .../GormPrefGeneral.gorm/objects.gorm | Bin 4426 -> 4470 bytes GormCore/GormFilePrefsManager.m | 2 +- GormInfo.plist | 6 +++--- GormPrefs/GormGeneralPref.m | 2 +- Plugins/Gorm/GormGormWrapperLoader.m | 3 ++- Version | 6 +++--- 9 files changed, 38 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64165e08..96b1f78e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2015-05-20 06:16-EDT Gregory John Casamento + + * ChangeLog + * Documentation/news.texi + * English.lproj/GormPrefGeneral.gorm + * GormCore/GormFilePrefsManager.m + * GormInfo.plist + * GormPrefs/GormGeneralPref.m + * Plugins/Gorm/GormGormWrapperLoader.m: Remove calls to repairFile: + as some of the logic in it is outdated and could cause issues with + perfectly good gorm files. Disabling pending further development. + * Version + 2015-05-11 Gregory John Casamento - * GormInfo.plist: Don't clain to be able to write XIB files. + * GormInfo.plist: Don't claim to be able to write XIB files. 2013-12-31 Fred Kiefer @@ -225,6 +238,7 @@ * GormCore/GormClassEditor.m some int -> NSInteger and float -> CGFloat transitions spotted by libobjc2 runtime in debug mode + 2013-04-14 13:19-EDT Gregory John Casamento * ANNOUNCE diff --git a/Documentation/news.texi b/Documentation/news.texi index 67ec41c0..d072abaf 100644 --- a/Documentation/news.texi +++ b/Documentation/news.texi @@ -4,6 +4,19 @@ @include version.texi @end ifset +@section Noteworthy changes in version @samp{1.2.22} + +@itemize @bullet +@item Fix for bug#45040: Fix allows Gorm custom class functionality to work normally on OpenBSD/NetBSD/FreeBSD. +@item Fixes for Solaris +@item Memory leak fixes. +@item Objective-C parser improvements. +@end itemize + +@ifclear ANNOUNCE-ONLY +@c ==================================================================== +@c Keep the next line just below the list of changes in most recent version. + @section Noteworthy changes in version @samp{1.2.20} @itemize @bullet @@ -13,10 +26,6 @@ @item Changes to prevent recursive frame change notifications. @end itemize -@ifclear ANNOUNCE-ONLY -@c ==================================================================== -@c Keep the next line just below the list of changes in most recent version. - @section Noteworthy changes in version @samp{1.2.18} @itemize @bullet diff --git a/English.lproj/GormPrefGeneral.gorm/data.info b/English.lproj/GormPrefGeneral.gorm/data.info index aa4d5224dc609ac83fb74124e8ee9f5de5d68312..6361435985184dad1ce4fad2a0260f7d4bae2045 100644 GIT binary patch delta 36 rcmdnNxPwvL-7mDbB(*>xu_!qsvnxu_!qsvn diff --git a/English.lproj/GormPrefGeneral.gorm/objects.gorm b/English.lproj/GormPrefGeneral.gorm/objects.gorm index 45cc7a78f782fc6afcbdb34a714c1aa6ed6980b0..bdad8c6669592f07ea14b9b21688ac450c449211 100644 GIT binary patch literal 4470 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", "Adam Fedor ", "Richard Frith-Macdonald ", "Wolfgang Lux ", "Pierre-Yves Rivaille "); - Copyright = "Copyright (C) 1999-2012 FSF"; + Copyright = "Copyright (C) 1999-2015 FSF"; CopyrightDescription = "Released under the GNU General Public License 3.0"; - NSBuildVersion = "1.2.18 February 6 2012"; + NSBuildVersion = "1.2.22 May 20 2015"; GSDesktopInstallationDomain=SYSTEM; } diff --git a/GormPrefs/GormGeneralPref.m b/GormPrefs/GormGeneralPref.m index 43c456b3..6749d454 100644 --- a/GormPrefs/GormGeneralPref.m +++ b/GormPrefs/GormGeneralPref.m @@ -60,7 +60,7 @@ static NSString *REPAIRFILE=@"GormRepairFileOnLoad"; NSString *intType = [defaults stringForKey: INTTYPE]; [backupButton setState: [defaults integerForKey: BACKUPFILE]]; - [checkConsistency setState: ([defaults boolForKey: REPAIRFILE]?NSOnState:NSOffState)]; + // [checkConsistency setState: ([defaults boolForKey: REPAIRFILE]?NSOnState:NSOffState)]; // set the interface matrix... if([intType isEqual: @"Outline"]) diff --git a/Plugins/Gorm/GormGormWrapperLoader.m b/Plugins/Gorm/GormGormWrapperLoader.m index 493454b2..b7d5eecf 100644 --- a/Plugins/Gorm/GormGormWrapperLoader.m +++ b/Plugins/Gorm/GormGormWrapperLoader.m @@ -584,11 +584,12 @@ /* * Repair the .gorm file, if needed. */ + /* if(repairFile) { [self _repairFile]; } - + */ NSDebugLog(@"nameTable = %@",[container nameTable]); // awaken all elements after the load is completed. diff --git a/Version b/Version index 17606fe6..ea3001e7 100644 --- a/Version +++ b/Version @@ -3,13 +3,13 @@ # Compatible with Bourne shell syntax, so it can included there too. # The minimum gcc version required to compile the library. -GNUSTEP_GCC=2.95.0 +GNUSTEP_GCC=3.3.0 # GNUstep GUI version required -GNUSTEP_CORE_VERSION=0.23.1 +GNUSTEP_CORE_VERSION=0.24.2 # The version number of this release. MAJOR_VERSION=1 MINOR_VERSION=2 -SUBMINOR_VERSION=20 +SUBMINOR_VERSION=22 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}