Author: pmatthaei Date: 2009-05-04 16:47:16 +0000 (Mon, 04 May 2009) New Revision: 9663
Added: packages/trunk/libphysfs/debian/patches/03_gcc4.4-ftbfs.diff Modified: packages/trunk/libphysfs/debian/changelog packages/trunk/libphysfs/debian/patches/series Log: * Add 03_gcc4.4-ftbfs.diff patch from upstream, which fixes a FTBFS with gcc 4.4. Closes: #525750 Modified: packages/trunk/libphysfs/debian/changelog =================================================================== --- packages/trunk/libphysfs/debian/changelog 2009-05-04 08:34:06 UTC (rev 9662) +++ packages/trunk/libphysfs/debian/changelog 2009-05-04 16:47:16 UTC (rev 9663) @@ -1,8 +1,11 @@ libphysfs (2.0.0-3) UNRELEASED; urgency=low * Change my email address. + * Add 03_gcc4.4-ftbfs.diff patch from upstream, which fixes a FTBFS with + gcc 4.4. + Closes: #525750 - -- Patrick Matthäi <[email protected]> Sat, 25 Apr 2009 13:45:25 +0200 + -- Patrick Matthäi <[email protected]> Mon, 04 May 2009 18:45:38 +0200 libphysfs (2.0.0-2) unstable; urgency=low Added: packages/trunk/libphysfs/debian/patches/03_gcc4.4-ftbfs.diff =================================================================== --- packages/trunk/libphysfs/debian/patches/03_gcc4.4-ftbfs.diff (rev 0) +++ packages/trunk/libphysfs/debian/patches/03_gcc4.4-ftbfs.diff 2009-05-04 16:47:16 UTC (rev 9663) @@ -0,0 +1,35 @@ +--- a/archivers/zip.c Wed Feb 20 12:24:10 2008 +0000 ++++ b/archivers/zip.c Sun May 03 01:24:41 2009 -0700 +@@ -375,13 +375,13 @@ + static PHYSFS_sint64 zip_find_end_of_central_dir(void *in, PHYSFS_sint64 *len) + { + PHYSFS_uint8 buf[256]; ++ PHYSFS_uint8 extra[4]; + PHYSFS_sint32 i = 0; + PHYSFS_sint64 filelen; + PHYSFS_sint64 filepos; + PHYSFS_sint32 maxread; + PHYSFS_sint32 totalread = 0; + int found = 0; +- PHYSFS_uint32 extra = 0; + + filelen = __PHYSFS_platformFileLength(in); + BAIL_IF_MACRO(filelen == -1, NULL, 0); /* !!! FIXME: unlocalized string */ +@@ -419,7 +419,7 @@ + { + if (__PHYSFS_platformRead(in, buf, maxread - 4, 1) != 1) + return(-1); +- *((PHYSFS_uint32 *) (&buf[maxread - 4])) = extra; ++ memcpy(&buf[maxread - 4], &extra, sizeof (extra)); + totalread += maxread - 4; + } /* if */ + else +@@ -429,7 +429,7 @@ + totalread += maxread; + } /* else */ + +- extra = *((PHYSFS_uint32 *) (&buf[0])); ++ memcpy(&extra, buf, sizeof (extra)); + + for (i = maxread - 4; i > 0; i--) + { Modified: packages/trunk/libphysfs/debian/patches/series =================================================================== --- packages/trunk/libphysfs/debian/patches/series 2009-05-04 08:34:06 UTC (rev 9662) +++ packages/trunk/libphysfs/debian/patches/series 2009-05-04 16:47:16 UTC (rev 9663) @@ -1 +1,2 @@ 01_manpages.diff +03_gcc4.4-ftbfs.diff _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
