[med-svn] r17024 - in trunk/packages/adun.app/trunk/debian: . patches
Yavor Doganov
yavor-guest at moszumanska.debian.org
Sat May 31 01:42:36 UTC 2014
Author: yavor-guest
Date: 2014-05-31 01:42:36 +0000 (Sat, 31 May 2014)
New Revision: 17024
Added:
trunk/packages/adun.app/trunk/debian/patches/enable-scripting-extension.patch
Modified:
trunk/packages/adun.app/trunk/debian/changelog
trunk/packages/adun.app/trunk/debian/control
trunk/packages/adun.app/trunk/debian/patches/series
Log:
enable-scripting-extension.patch: New, self-explanatory.
(Build-Depends): Add libsteptalk-dev for the scripting extension.
(Depends): Add steptalk; temporary solution until it is fixed.
Modified: trunk/packages/adun.app/trunk/debian/changelog
===================================================================
--- trunk/packages/adun.app/trunk/debian/changelog 2014-05-30 19:06:28 UTC (rev 17023)
+++ trunk/packages/adun.app/trunk/debian/changelog 2014-05-31 01:42:36 UTC (rev 17024)
@@ -2,6 +2,7 @@
* debian/patches/gcc-warnings.patch: New, adapt to the new GNUstep API
and fix some important warnings (Closes: #749733).
+ * debian/patches/enable-scripting-extension.patch: New.
* debian/patches/series: Update.
* debian/rules: Enable hardening build.
(CPPFLAGS, CFLAGS): New variables.
@@ -10,6 +11,8 @@
(override_dh_makeshlibs): Add to placate lintian.
* debian/control (Section): Change to "science", more appropriate.
(Standards-Version): Bump to 3.9.5 (no changes needed).
+ (Build-Depends): Add libsteptalk-dev for the scripting extension.
+ (Depends): Add steptalk; temporary solution until it is fixed.
-- Yavor Doganov <yavor at gnu.org> Fri, 30 May 2014 21:27:17 +0300
Modified: trunk/packages/adun.app/trunk/debian/control
===================================================================
--- trunk/packages/adun.app/trunk/debian/control 2014-05-30 19:06:28 UTC (rev 17023)
+++ trunk/packages/adun.app/trunk/debian/control 2014-05-31 01:42:36 UTC (rev 17024)
@@ -7,6 +7,7 @@
Build-Depends: debhelper (>= 9),
gnustep-make,
libgnustep-gui-dev,
+ libsteptalk-dev,
libgsl0-dev,
imagemagick
Standards-Version: 3.9.5
@@ -17,6 +18,7 @@
Package: adun.app
Architecture: any
Depends: ${shlibs:Depends},
+ steptalk,
${misc:Depends},
${gnustep:Depends}
Recommends: gnuplot
Added: trunk/packages/adun.app/trunk/debian/patches/enable-scripting-extension.patch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/enable-scripting-extension.patch (rev 0)
+++ trunk/packages/adun.app/trunk/debian/patches/enable-scripting-extension.patch 2014-05-31 01:42:36 UTC (rev 17024)
@@ -0,0 +1,162 @@
+Description: Enable the scripting extension.
+ Also fixes some problems with building and loading.
+Author: Yavor Doganov <yavor at gnu.org>
+Forwarded: no
+Last-Update: 2014-05-31
+---
+
+--- adun.app-0.81.orig/UL/GNUmakefile
++++ adun.app-0.81/UL/GNUmakefile
+@@ -35,6 +35,7 @@
+ XMLLib \
+ ULFramework \
+ AdunServer \
++Extensions/ULApplicationScripting
+
+ #
+ # Resource files
+--- adun.app-0.81.orig/UL/ViewController.m
++++ adun.app-0.81/UL/ViewController.m
+@@ -108,7 +108,7 @@
+ [[NSUserDefaults standardUserDefaults] synchronize];
+ }
+
+-- (BOOL) _isAvailableApplicationScriptingBundle
++- (BOOL) _loadApplicationScriptingBundle
+ {
+ NSBundle *appScriptingBundle;
+
+@@ -117,43 +117,39 @@
+ [NSHomeDirectory() stringByAppendingPathComponent:
+ @"Library/Bundles/ULApplicationScripting.bundle"]];
+ #else
+-
+- appScriptingBundle = [NSBundle bundleWithPath:
+- [NSHomeDirectory() stringByAppendingPathComponent:
+- @"GNUstep/Library/Bundles/ULApplicationScripting.bundle"]];
++ NSArray *dirs;
++ NSString *path;
++ NSUInteger i;
++
++ dirs = NSSearchPathForDirectoriesInDomains (NSLibraryDirectory,
++ NSAllDomainsMask,
++ YES);
++ for (i = 0; i < [dirs count]; i++)
++ {
++ path = [dirs objectAtIndex:i];
++ appScriptingBundle
++ = [NSBundle bundleWithPath:
++ [path stringByAppendingPathComponent:
++ @"/Bundles/ULApplicationScripting.bundle"]];
++ if (appScriptingBundle)
++ break;
++ }
+ #endif
+ if(appScriptingBundle == nil)
+ {
+ NSWarnLog(@"Application scripting disabled");
+ return NO;
+- }
+- else
+- {
+- NSWarnLog(@"Application scripting enabled");
+- return YES;
+- }
+-}
+-
+-- (void) _loadApplicationScriptingBundle
+-{
+- NSBundle *appScriptingBundle;
+-
+-#ifndef GNUSTEP
+- appScriptingBundle = [NSBundle bundleWithPath:
+- [NSHomeDirectory() stringByAppendingPathComponent:
+- @"Library/Bundles/ULApplicationScripting.bundle"]];
+-#else
++ }
+
+- appScriptingBundle = [NSBundle bundleWithPath:
+- [NSHomeDirectory() stringByAppendingPathComponent:
+- @"GNUstep/Library/Bundles/ULApplicationScripting.bundle"]];
+-#endif
+-
+- if((ULScriptManager = [appScriptingBundle principalClass]))
+- NSDebugLLog(@"ULDatabaseInterface", @"Found application scripting bundle.\n");
++ NSWarnLog(@"Application scripting enabled");
++ if ((ULScriptManager = [appScriptingBundle principalClass]))
++ NSDebugLLog(@"ULDatabaseInterface",
++ @"Found application scripting bundle.\n");
+ else
+- [NSException raise: NSInternalInconsistencyException
+- format: @"Application scripting bundle missing principal class"];
++ [NSException raise: NSInternalInconsistencyException
++ format: @"Application scripting bundle "
++ @"missing principal class"];
++ return YES;
+ }
+
+ - (id)init
+@@ -281,13 +277,10 @@
+ activeDelegate = databaseBrowser;
+
+ //Load application scripting bundle if present
+- if([self _isAvailableApplicationScriptingBundle])
+- {
+- [self _loadApplicationScriptingBundle];
+- scriptManager = [ULScriptManager new];
+- }
++ if([self _loadApplicationScriptingBundle])
++ scriptManager = [ULScriptManager new];
+ else
+- scriptManager = nil;
++ scriptManager = nil;
+
+ //register for notifications
+
+--- adun.app-0.81.orig/UL/Extensions/ULApplicationScripting/GNUmakefile
++++ adun.app-0.81/UL/Extensions/ULApplicationScripting/GNUmakefile
+@@ -10,15 +10,14 @@
+ VERSION = 0.1
+ PACKAGE_NAME = ULApplicationScripting
+ BUNDLE_NAME = ULApplicationScripting
+-ULApplicationScripting_PRINCIPAL_CLASS = ULApplicationScripting
++ULApplicationScripting_PRINCIPAL_CLASS = ULScriptManager
+ BUNDLE_EXTENSION = .bundle
+ GNUSTEP_INSTALLATION_DOMAIN = USER
+
+ #
+ # Libraries
+ #
+-ULApplicationScripting_LIBRARIES_DEPEND_UPON = -lAdunKernel -lULFramework -lStepTalk
+-ULApplicationScripting_LDFLAGS = -lAdunKernel -lULFramework -lStepTalk
++ULApplicationScripting_BUNDLE_LIBS = -lAdunKernel -lULFramework -lStepTalk
+
+ #
+ # Resource files
+--- adun.app-0.81.orig/UL/Extensions/ULApplicationScripting/ULScriptManager.m
++++ adun.app-0.81/UL/Extensions/ULApplicationScripting/ULScriptManager.m
+@@ -61,7 +61,7 @@
+ forName: @"ProcessManager"];
+ [environment setObject: transcript
+ forName: @"Transcript"];
+- [environment setObject: [ULAnalysisManager managerWithDefaultLocation]
++ [environment setObject: [ULAnalysisManager managerWithDefaultLocations]
+ forName: @"AnalysisManager"];
+
+ connections = [NSMutableDictionary new];
+--- adun.app-0.81.orig/UL/Extensions/ULApplicationScripting/GNUmakefile.preamble
++++ adun.app-0.81/UL/Extensions/ULApplicationScripting/GNUmakefile.preamble
+@@ -15,8 +15,11 @@
+ ADDITIONAL_LDFLAGS +=
+
+ # Additional include directories the compiler should search
+-ADDITIONAL_INCLUDE_DIRS += -I$(HOME)/GNUstep/Library/Headers
++ADDITIONAL_INCLUDE_DIRS += -I$(ADUN_SOURCE_DIR) -I$(ADUN_SOURCE_DIR)/UL \
++ -I$(ADUN_SOURCE_DIR)/Kernel \
++ -I$(ADUN_SOURCE_DIR)/Kernel/AdunKernel/Headers
+
+ # Additional library directories the linker should search
+-ADDITIONAL_LIB_DIRS += -L$(HOME)/GNUstep/Library/Libraries
++ADDITIONAL_LIB_DIRS += -L$(ADUN_SOURCE_DIR)/UL/ULFramework/ULFramework.framework/Versions/Current \
++ -L$(ADUN_SOURCE_DIR)/Kernel/AdunKernel/AdunKernel.framework/Versions/Current
+
Modified: trunk/packages/adun.app/trunk/debian/patches/series
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/series 2014-05-30 19:06:28 UTC (rev 17023)
+++ trunk/packages/adun.app/trunk/debian/patches/series 2014-05-31 01:42:36 UTC (rev 17024)
@@ -3,3 +3,4 @@
20_paths.patch
fix-implicit-pointer.patch
gcc-warnings.patch
+enable-scripting-extension.patch
More information about the debian-med-commit
mailing list