shithub: choc

--- a/COPYING

+++ b/COPYING

@@ -1,12 +1,12 @@

-		    GNU GENERAL PUBLIC LICENSE

-		       Version 2, June 1991

+                    GNU GENERAL PUBLIC LICENSE

+                       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.

-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,

+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  Everyone is permitted to copy and distribute verbatim copies

  of this license document, but changing it is not allowed.

-			    Preamble

+                            Preamble

   The licenses for most software are designed to take away your

 freedom to share and change it.  By contrast, the GNU General Public

@@ -15,7 +15,7 @@

 General Public License applies to most of the Free Software

 Foundation's software and to any other program whose authors commit to

 using it.  (Some other Free Software Foundation software is covered by

-the GNU Library General Public License instead.)  You can apply it to

+the GNU Lesser General Public License instead.)  You can apply it to

 your programs, too.

   When we speak of free software, we are referring to freedom, not

@@ -55,8 +55,8 @@

   The precise terms and conditions for copying, distribution and

 modification follow.

-		    GNU GENERAL PUBLIC LICENSE

+                    GNU GENERAL PUBLIC LICENSE

    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

   0. This License applies to any program or other work which contains

@@ -110,7 +110,7 @@

     License.  (Exception: if the Program itself is interactive but

     does not normally print such an announcement, your work based on

     the Program is not required to print an announcement.)

 These requirements apply to the modified work as a whole.  If

 identifiable sections of that work are not derived from the Program,

 and can be reasonably considered independent and separate works in

@@ -168,7 +168,7 @@

 access to copy the source code from the same place counts as

 distribution of the source code, even though third parties are not

 compelled to copy the source along with the object code.

   4. You may not copy, modify, sublicense, or distribute the Program

 except as expressly provided under this License.  Any attempt

 otherwise to copy, modify, sublicense or distribute the Program is

@@ -225,7 +225,7 @@

 This section is intended to make thoroughly clear what is believed to

 be a consequence of the rest of this License.

   8. If the distribution and/or use of the Program is restricted in

 certain countries either by patents or by copyrighted interfaces, the

 original copyright holder who places the Program under this License

@@ -255,7 +255,7 @@

 of preserving the free status of all derivatives of our free software and

 of promoting the sharing and reuse of software generally.

-			    NO WARRANTY

+                            NO WARRANTY

   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY

 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN

@@ -277,10 +277,10 @@

 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE

 POSSIBILITY OF SUCH DAMAGES.

-		     END OF TERMS AND CONDITIONS

-	    How to Apply These Terms to Your New Programs

+                     END OF TERMS AND CONDITIONS

+            How to Apply These Terms to Your New Programs

   If you develop a new program, and you want it to be of the greatest

 possible use to the public, the best way to achieve this is to make it

 free software which everyone can redistribute and change under these terms.

@@ -303,17 +303,16 @@

     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

     GNU General Public License for more details.

-    You should have received a copy of the GNU General Public License

-    along with this program; if not, write to the Free Software

-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+    You should have received a copy of the GNU General Public License along

+    with this program; if not, write to the Free Software Foundation, Inc.,

+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 Also add information on how to contact you by electronic and paper mail.

 If the program is interactive, make it output a short notice like this

 when it starts in an interactive mode:

-    Gnomovision version 69, Copyright (C) year  name of author

+    Gnomovision version 69, Copyright (C) year name of author

     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.

     This is free software, and you are welcome to redistribute it

     under certain conditions; type `show c' for details.

@@ -336,5 +335,5 @@

 This General Public License does not permit incorporating your program into

 proprietary programs.  If your program is a subroutine library, you may

 consider it more useful to permit linking proprietary applications with the

-library.  If this is what you want to do, use the GNU Library General

+library.  If this is what you want to do, use the GNU Lesser General

 Public License instead of this License.

--- a/NEWS

+++ b/NEWS

@@ -1,3 +1,9 @@

+     * Fixed gnome-screensaver desktop file (thanks Rahul Sundaram).

+     * Updated COPYING to current version of GPL2 (thanks Rahul

+       Sundaram).

+     * Fix bug with detection of IWAD type by filename (thanks mether).

 1.6.0 (2011-05-17):

      * The instructions in the INSTALL file are now customized for

--- a/configure.in

+++ b/configure.in

@@ -109,6 +109,7 @@

 dnl Automake v1.8.0 is required, please upgrade!

 AM_INIT_AUTOMAKE([1.8.0])

+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

 WINDOWS_RC_VERSION=`echo $PACKAGE_VERSION.0 | sed 's/\./, /g' `

--- a/data/Makefile.am

+++ b/data/Makefile.am

@@ -14,8 +14,8 @@

              @[email protected]

 @[email protected] : doom.png

-	cp $^ $@

+	cp $< $@

 @[email protected] : setup.png

-	cp $^ $@

+	cp $< $@

--- a/data/README

+++ b/data/README

@@ -3,6 +3,10 @@

     http://www.flickr.com/photos/laffy4k/448920776/

+Chris has kindly agreed that the Chocolate Doom icon may be used under

+the GNU GPL, so the copyright status of the icon is the same as that of

+the rest of the project.

 The "foo8.ico" files are 8-bit depth only, while the "foo.ico" files

 contain full 32-bit versions, scaled to different sizes and with proper

 alpha masks (as well as the 8-bit versions).  The 8-bit versions are

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -195,26 +195,26 @@

 app_DATA = @[email protected]

 @[email protected] : doom.desktop

-	cp $^ $@

+	cp $< $@

 screensaverdir = $(prefix)/share/applications/screensavers

 screensaver_DATA = @[email protected]

 @[email protected]: doom-screensaver.desktop

-	cp $^ $@

+	cp $< $@

 .rc.o:

-	$(WINDRES) $^ -o $@

+	$(WINDRES) $< -o $@

 %.o : %.rc

-	$(WINDRES) $^ -o $@

+	$(WINDRES) $< -o $@

 if HAVE_PYTHON

 icon.c : $(top_builddir)/data/doom8.ico

-	$(top_builddir)/data/convert-icon $^ $@

+	$(top_builddir)/data/convert-icon $< $@

 endif

 midiread : midifile.c

-	$(CC) -DTEST $(CFLAGS) @LDFLAGS@ $^ -o $@

+	$(CC) -DTEST $(CFLAGS) @LDFLAGS@ $< -o $@

--- a/src/d_iwad.c

+++ b/src/d_iwad.c

@@ -422,12 +422,20 @@

     size_t i;

     GameMission_t mission;

+    char *p;

+    p = strrchr(name, DIR_SEPARATOR);

+    if (p != NULL)

+    {

+        name = p + 1;

+    }

     mission = none;

     for (i=0; i<arrlen(iwads); ++i)

-        char *iwadname;

+        // Check if the filename is this IWAD name.

         // Only use supported missions:

@@ -434,15 +442,9 @@

         if (((1 << iwads[i].mission) & mask) == 0)

             continue;

-        iwadname = DEH_String(iwads[i].name);

-        if (strlen(name) < strlen(iwadname))

-            continue;

         // Check if it ends in this IWAD name.

-        if (!strcasecmp(name + strlen(name) - strlen(iwadname),

-                        iwadname))

+        if (!strcasecmp(name, iwadname))

             mission = iwads[i].mission;

             break;

--- a/src/doom-screensaver.desktop.in

+++ b/src/doom-screensaver.desktop.in

@@ -1,6 +1,5 @@

 [Desktop Entry]

-Encoding=UTF-8

 Name=@PACKAGE_NAME@

 Comment=@PACKAGE_SHORTDESC@

 TryExec=@PROGRAM_PREFIX@doom

@@ -8,5 +7,6 @@

 StartupNotify=false

 Terminal=false

 Type=Application

-Categories=Screensaver

+OnlyShowIn=GNOME;

+Categories=Screensaver;

--- a/src/i_system.c

+++ b/src/i_system.c

@@ -372,6 +372,7 @@

 #endif

 #ifdef __MACOSX__

+    if (!I_ConsoleStdout())

         CFStringRef message;

         char msgbuf[512];