[SCM] Emulator of the Super Nintendo Entertainment System (TM) branch, master, updated. upstream/1.510+bz2-61-g288d2b0
Etienne Millon
etienne.millon at gmail.com
Mon Apr 4 10:11:08 UTC 2011
The following commit has been merged in the master branch:
commit 8c7dcd34798120c33f676a8232ebae4aa714a258
Author: Etienne Millon <etienne.millon at gmail.com>
Date: Mon Apr 4 11:48:05 2011 +0200
Add comments to patches
diff --git a/debian/patches/0001-gcc-fno-rtti.patch b/debian/patches/0001-gcc-fno-rtti.patch
index 7a8ddd1..af4ddd7 100644
--- a/debian/patches/0001-gcc-fno-rtti.patch
+++ b/debian/patches/0001-gcc-fno-rtti.patch
@@ -2,6 +2,7 @@ From: Etienne Millon <etienne.millon at gmail.com>
Date: Tue, 2 Nov 2010 17:04:53 +0100
Subject: gcc-fno-rtti
+This patch removes -fno-rtti from CXXFLAGS.
---
src/configure | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/debian/patches/0002-replace_crc32.patch b/debian/patches/0002-replace_crc32.patch
index c5ff5d8..3d279a3 100644
--- a/debian/patches/0002-replace_crc32.patch
+++ b/debian/patches/0002-replace_crc32.patch
@@ -2,6 +2,8 @@ From: Etienne Millon <etienne.millon at gmail.com>
Date: Tue, 2 Nov 2010 17:04:53 +0100
Subject: replace_crc32
+This patch converts the CRC32 global variable to RomCRC32, to avoid conflicts
+with the CRC32 opcode.
---
src/initc.c | 6 +++---
src/zmovie.c | 6 +++---
diff --git a/debian/patches/0003-gcc-4.3-ftbfs.patch b/debian/patches/0003-gcc-4.3-ftbfs.patch
index 8e78c0d..2e08b10 100644
--- a/debian/patches/0003-gcc-4.3-ftbfs.patch
+++ b/debian/patches/0003-gcc-4.3-ftbfs.patch
@@ -2,6 +2,11 @@ From: Etienne Millon <etienne.millon at gmail.com>
Date: Tue, 2 Nov 2010 17:04:53 +0100
Subject: gcc-4.3-ftbfs
+Miscellaneous fixes to build with gcc 4.3:
+
+ - missing headers
+ - argc should have type int, not size_t
+
---
src/parsegen.cpp | 3 ++-
src/tools/depbuild.cpp | 3 ++-
diff --git a/debian/patches/0004-manpage-in-usr-share-man.patch b/debian/patches/0004-manpage-in-usr-share-man.patch
index cafe03b..37544c7 100644
--- a/debian/patches/0004-manpage-in-usr-share-man.patch
+++ b/debian/patches/0004-manpage-in-usr-share-man.patch
@@ -2,7 +2,7 @@ From: Etienne Millon <etienne.millon at gmail.com>
Date: Tue, 30 Nov 2010 13:19:05 +0100
Subject: manpage-in-usr-share-man
-Manpage should do in /usr/share/man, not /usr/man.
+Manpage should go in /usr/share/man, not /usr/man.
---
src/Makefile.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/patches/0006-spelling-error-separately.patch b/debian/patches/0006-spelling-error-separately.patch
index 0000ebd..4e9475c 100644
--- a/debian/patches/0006-spelling-error-separately.patch
+++ b/debian/patches/0006-spelling-error-separately.patch
@@ -2,6 +2,7 @@ From: Etienne Millon <etienne.millon at gmail.com>
Date: Tue, 30 Nov 2010 17:29:56 +0100
Subject: spelling-error-separately
+This patch fixes a spelling error in src/md.psr.
---
src/md.psr | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/debian/patches/0007-removed-license-in-html-doc.patch b/debian/patches/0007-removed-license-in-html-doc.patch
index d4ae241..b8be257 100644
--- a/debian/patches/0007-removed-license-in-html-doc.patch
+++ b/debian/patches/0007-removed-license-in-html-doc.patch
@@ -3,8 +3,8 @@ Date: Tue, 30 Nov 2010 19:02:39 +0100
Subject: removed-license-in-html-doc
The license in HTML format is redundant with respect to the copyright
-information available at /usr/share/doc/zsnes/copyright. This patch deletes
-license.htm and replaces references to it by the former.
+information available at /usr/share/doc/zsnes/copyright. This patch prevents the
+installation of license.htm and replaces references to it by the former.
---
docs/readme.htm/about.htm | 8 +-
docs/readme.htm/advanced.htm | 6 +-
--
Emulator of the Super Nintendo Entertainment System (TM)
More information about the Pkg-games-commits
mailing list