From f0654b272b4d03c6c8cf8f246e91c609a477e349afe88d1c0bc139bc8e32d923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 11 Jul 2015 15:04:42 +0000 Subject: [PATCH] Accepting request 316024 from home:bmwiedemann:branches:games add -fpermissive to allow for spidermonkey to auto-typecast a nullptr to bool (with some useless auto-reordering) OBS-URL: https://build.opensuse.org/request/show/316024 OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=54 --- 0ad.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/0ad.spec b/0ad.spec index abfafbd..206011b 100644 --- a/0ad.spec +++ b/0ad.spec @@ -21,35 +21,35 @@ Version: 0.0.18 Release: 0 Url: http://play0ad.com/ Source: http://sourceforge.net/projects/zero-ad/files/releases/%{name}-%{version}-alpha-unix-build.tar.xz -BuildRequires: pkgconfig(IL) BuildRequires: boost-devel BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: pkgconfig(icu-i18n) BuildRequires: mozilla-nspr-devel BuildRequires: xz +BuildRequires: pkgconfig(IL) +BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} >= 1220 BuildRequires: libXcursor-devel %endif -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(gloox) BuildRequires: libjpeg-devel BuildRequires: libminiupnpc-devel BuildRequires: libpng-devel -BuildRequires: pkgconfig(vorbis) BuildRequires: nasm BuildRequires: python BuildRequires: subversion BuildRequires: zip +BuildRequires: pkgconfig(gloox) +BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(vorbis) BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} -BuildRequires: pkgconfig(libenet) -BuildRequires: pkgconfig(openal) BuildRequires: pkg-config BuildRequires: update-desktop-files +BuildRequires: pkgconfig(libenet) +BuildRequires: pkgconfig(openal) %if 0%{?suse_version} >= 1140 BuildRequires: wxWidgets-wxcontainer-devel @@ -115,7 +115,7 @@ history. %build export CFLAGS="%{optflags}" -export CPPFLAGS="%{optflags}" +export CPPFLAGS="%{optflags} -fpermissive" build/workspaces/update-workspaces.sh %{?_smp_mflags} --bindir=%{_bindir} --datadir=%{_datadir}/%{name} --libdir=%{_libdir}/%{name} pushd build/workspaces/gcc make verbose=1 %{?_smp_mflags}