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 aa4d5224..63614359 100644 Binary files a/English.lproj/GormPrefGeneral.gorm/data.info and b/English.lproj/GormPrefGeneral.gorm/data.info differ diff --git a/English.lproj/GormPrefGeneral.gorm/objects.gorm b/English.lproj/GormPrefGeneral.gorm/objects.gorm index 45cc7a78..bdad8c66 100644 Binary files a/English.lproj/GormPrefGeneral.gorm/objects.gorm and b/English.lproj/GormPrefGeneral.gorm/objects.gorm differ diff --git a/GormCore/GormFilePrefsManager.m b/GormCore/GormFilePrefsManager.m index 18a787cf..b228dc9e 100644 --- a/GormCore/GormFilePrefsManager.m +++ b/GormCore/GormFilePrefsManager.m @@ -85,7 +85,7 @@ NSString *formatVersion(NSInteger version) + (int) currentVersion { - return appVersion(1,2,20); + return appVersion(1,2,22); } - (void) awakeFromNib diff --git a/GormInfo.plist b/GormInfo.plist index dc7fe89a..dd82aef2 100644 --- a/GormInfo.plist +++ b/GormInfo.plist @@ -42,14 +42,14 @@ ApplicationDescription = "[GNUstep | Graphical] Object Relationship Modeller"; ApplicationIcon = "Gorm.tiff"; ApplicationName = "Gorm"; - ApplicationRelease = "Gorm 1.2.18 (Release)"; + ApplicationRelease = "Gorm 1.2.22 (Release)"; Authors = ("Gregory John Casamento ", "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}