Mailinglist Archive: opensuse-commit (640 mails)
| < Previous | Next > |
commit physfs for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sun, 03 Apr 2011 12:20:16 +0200
- Message-id: <20110403102016.AEEE7202A6@hilbert.suse.de>
Hello community,
here is the log from the commit of package physfs for openSUSE:Factory
checked in at Sun Apr 3 12:20:16 CEST 2011.
--------
--- physfs/physfs.changes 2011-02-21 22:27:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/physfs/physfs.changes 2011-04-03
08:17:08.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Apr 3 06:12:07 UTC 2011 - reddwarf@xxxxxxxxxxxx
+
+- Fix gcc 4.6 compilation
+- Use %optflags
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
physfs-2.0.2-gcc46.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _service:set_version:physfs.spec ++++++
--- /var/tmp/diff_new_pack.FZ4Pr0/_old 2011-04-03 12:18:31.000000000 +0200
+++ /var/tmp/diff_new_pack.FZ4Pr0/_new 2011-04-03 12:18:31.000000000 +0200
@@ -20,12 +20,14 @@
Name: physfs
Version: 2.0.2
-Release: 1
+Release: 2
License: ZLIB + LGPLv2.1/CPL plus exception
Summary: PhysicsFS file abstraction layer for games
Url: http://www.icculus.org/physfs/
Group: System/Libraries
Source0: %{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM %{name}-2.0.2-gcc46.patch reddwarf@xxxxxxxxxxxx -- Fixes
gcc 4.6 compilation. From upstream trunk.
+Patch0: %{name}-2.0.2-gcc46.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: zlib-devel
@@ -109,19 +111,22 @@
%prep
%setup -q
+%patch0
%build
# just to be sure...
rm -rf zlib123
mkdir build
cd build
+export CFLAGS='%{optflags}'
+export CXXFLAGS='%{optflags}'
cmake -DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \
-DCMAKE_BUILD_TYPE=Release \
-DPHYSFS_BUILD_STATIC=FALSE \
-DPHYSFS_BUILD_TEST=FALSE ..
-make %{?_smp_mflags}
+make %{?_smp_mflags} VERBOSE=1
%install
cd build
++++++ physfs.spec ++++++
--- /var/tmp/diff_new_pack.FZ4Pr0/_old 2011-04-03 12:18:31.000000000 +0200
+++ /var/tmp/diff_new_pack.FZ4Pr0/_new 2011-04-03 12:18:31.000000000 +0200
@@ -20,12 +20,14 @@
Name: physfs
Version: to_be_filled_by_service
-Release: 2
+Release: 3
License: ZLIB + LGPLv2.1/CPL plus exception
Summary: PhysicsFS file abstraction layer for games
Url: http://www.icculus.org/physfs/
Group: System/Libraries
Source0: %{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM %{name}-2.0.2-gcc46.patch reddwarf@xxxxxxxxxxxx -- Fixes
gcc 4.6 compilation. From upstream trunk.
+Patch0: %{name}-2.0.2-gcc46.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: zlib-devel
@@ -109,19 +111,22 @@
%prep
%setup -q
+%patch0
%build
# just to be sure...
rm -rf zlib123
mkdir build
cd build
+export CFLAGS='%{optflags}'
+export CXXFLAGS='%{optflags}'
cmake -DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \
-DCMAKE_BUILD_TYPE=Release \
-DPHYSFS_BUILD_STATIC=FALSE \
-DPHYSFS_BUILD_TEST=FALSE ..
-make %{?_smp_mflags}
+make %{?_smp_mflags} VERBOSE=1
%install
cd build
++++++ physfs-2.0.2-gcc46.patch ++++++
Index: archivers/wad.c
===================================================================
--- archivers/wad.c.orig
+++ archivers/wad.c
@@ -245,9 +245,6 @@ static int wad_load_entries(const char *
PHYSFS_uint32 fileCount;
PHYSFS_uint32 directoryOffset;
WADentry *entry;
- char lastDirectory[9];
-
- lastDirectory[8] = 0; /* Make sure lastDirectory stays null-terminated. */
BAIL_IF_MACRO(!wad_open(name, forWriting, &fh,
&fileCount,&directoryOffset), NULL, 0);
info->entryCount = fileCount;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |