shithub: choc

Download patch

ref: 893c8dbe922b5ee6ac14c3df3b5020817b6797b3
parent: cd8cf5f1c8c0e6a86ddc3322f33acc29698009f5
author: Simon Howard <fraggle@gmail.com>
date: Fri Jan 15 14:14:02 EST 2010

Fix GNUstep info panel.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1816

--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@
 pkg/Makefile
 pkg/config.make
 pkg/osx/Info.plist
-pkg/osx/Info-GNUstep.plist
+pkg/osx/Info-gnustep.plist
 setup/Makefile
 setup/setup-res.rc
 src/Makefile
--- a/pkg/Makefile.am
+++ b/pkg/Makefile.am
@@ -9,7 +9,7 @@
 osx/Resources/launcher.nib/info.nib                                     \
 osx/Resources/launcher.nib/keyedobjects.nib                             \
 osx/GNUmakefile                                                         \
-osx/Info.plist.in       osx/Info-GNUstep.plist.in                       \
+osx/Info.plist.in       osx/Info-gnustep.plist.in                       \
 osx/PkgInfo                                                             \
 osx/cp-with-libs                                                        \
 osx/main.m                                                              \
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -35,7 +35,7 @@
 ifdef GNUSTEP_MAKEFILES
 APP_TOP_DIR=$(APP_DIR)
 APP_BIN_DIR=$(APP_DIR)
-SRC_INFO_PLIST=Info-GNUstep.plist
+SRC_INFO_PLIST=Info-gnustep.plist
 else
 APP_TOP_DIR=$(APP_DIR)/Contents
 APP_BIN_DIR=$(APP_DIR)/Contents/MacOS
@@ -51,7 +51,7 @@
 	mkdir -p "$(APP_TOP_DIR)"
 	cp -R Resources "$(APP_TOP_DIR)"
 	cp PkgInfo "$(APP_TOP_DIR)"
-	cp $(SRC_INFO_PLIST) "$(APP_TOP_DIR)/Info.plist"
+	cp $(SRC_INFO_PLIST) "$(APP_TOP_DIR)"
 
 	mkdir -p "$(APP_BIN_DIR)"
 
--- a/pkg/osx/Info-GNUstep.plist.in
+++ /dev/null
@@ -1,32 +1,0 @@
-{
-    ApplicationDescription = "@PACKAGE_NAME@";
-    ApplicationIcon = app.png;
-    ApplicationName = "@PACKAGE_NAME@";
-    ApplicationRelease = @PACKAGE_VERSION@;
-    Copyright = "Copyright (C) 2009-2010";
-    CopyrightDescription = "GNU General Public License, version 2";
-    FullVersionID = @PACKAGE_VERSION@;
-    GSMainMarkupFile = "";
-    NSExecutable = "launcher";
-    NSIcon = app.png;
-    NSMainNibFile = launcher.nib;
-    NSPrincipalClass = NSApplication;
-    NSRole = Application;
-    NSTypes = (
-        {
-            NSHumanReadableName = "Doom WAD file";
-            NSUnixExtensions = ( wad );
-            NSRole = Viewer;
-            NSMimeTypes = (
-                "application/x-doom"
-            );
-            NSIcon = "wadfile.png";
-        },
-        {
-            NSHumanReadableName = "Dehacked patch";
-            NSUnixExtensions = ( deh );
-            NSRole = Viewer;
-            NSIcon = "wadfile.png";
-        }
-    );
-}
--- /dev/null
+++ b/pkg/osx/Info-gnustep.plist.in
@@ -1,0 +1,32 @@
+{
+    ApplicationName = "@PACKAGE_NAME@";
+    ApplicationDescription = "Doom source port";
+    ApplicationIcon = app.png;
+    ApplicationRelease = @PACKAGE_VERSION@;
+    Copyright = "Copyright (C) 2009-2010";
+    CopyrightDescription = "GNU General Public License, version 2";
+    FullVersionID = @PACKAGE_VERSION@;
+    GSMainMarkupFile = "";
+    NSExecutable = "launcher";
+    NSIcon = app.png;
+    NSMainNibFile = launcher.nib;
+    NSPrincipalClass = NSApplication;
+    NSRole = Application;
+    NSTypes = (
+        {
+            NSHumanReadableName = "Doom WAD file";
+            NSUnixExtensions = ( wad );
+            NSRole = Viewer;
+            NSMimeTypes = (
+                "application/x-doom"
+            );
+            NSIcon = "wadfile.png";
+        },
+        {
+            NSHumanReadableName = "Dehacked patch";
+            NSUnixExtensions = ( deh );
+            NSRole = Viewer;
+            NSIcon = "wadfile.png";
+        }
+    );
+}