[SCM] Emulator of the Super Nintendo Entertainment System (TM) branch, master, updated. debian/1.510+bz2-4-9-g92ef1f4

Fabian Greffrath fabian+debian at greffrath.com
Mon Sep 10 09:19:44 UTC 2012


The following commit has been merged in the master branch:
commit cf4bf9037525824b851346c1e83c4341cc74523d
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Mon Sep 10 11:23:00 2012 +0200

    0001-gcc-fno-rtti.patch: Removed, one less deviation from upstream.

diff --git a/debian/changelog b/debian/changelog
index cd55803..efbf932 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 zsnes (1.510+bz2-5) UNRELEASED; urgency=low
 
   [ Fabian Greffrath ]
+  * 0001-gcc-fno-rtti.patch: Removed, one less deviation from upstream.
   * 0002-replace_crc32.patch: Removed, not actually needed at all.
   * 0013-Fix-sound-with-libao.patch: Replace with the actual patch from
     upstream SVN.
diff --git a/debian/patches/0001-gcc-fno-rtti.patch b/debian/patches/0001-gcc-fno-rtti.patch
deleted file mode 100644
index 813fda9..0000000
--- a/debian/patches/0001-gcc-fno-rtti.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/configure.in
-+++ b/src/configure.in
-@@ -299,7 +299,7 @@ else
-     NFLAGS="$NFLAGS -O1"
-   fi
- fi
--CXXFLAGS="$CFLAGS -fno-rtti"
-+CXXFLAGS="$CFLAGS"
- 
- if test x$enable_jma != xno; then
-   JMA_FILES="\$(JMA_D)/7zlzma.o \$(JMA_D)/crc32.o \$(JMA_D)/iiostrm.o\
diff --git a/debian/patches/series b/debian/patches/series
index ae0e13f..9b29cb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-gcc-fno-rtti.patch
 0003-gcc-4.3-ftbfs.patch
 0004-manpage-in-usr-share-man.patch
 0005-hyphens-as-minus-signs-in-manpage.patch

-- 
Emulator of the Super Nintendo Entertainment System (TM)



More information about the Pkg-games-commits mailing list