[0ad] Do not use local valgrind.h bundled (#1141464)
pcpa
pcpa at fedoraproject.org
Sun Sep 14 15:23:22 UTC 2014
commit 9cf44b9c81cf84609d94efc045d2efed2b171423
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Sun Sep 14 11:52:31 2014 -0300
Do not use local valgrind.h bundled (#1141464)
0ad-valgrind.patch | 15 +++++++++++++++
0ad.spec | 11 ++++++++++-
2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/0ad-valgrind.patch b/0ad-valgrind.patch
new file mode 100644
index 0000000..3dbfa49
--- /dev/null
+++ b/0ad-valgrind.patch
@@ -0,0 +1,15 @@
+diff -up 0ad-0.0.16-alpha/build/premake/extern_libs4.lua.orig 0ad-0.0.16-alpha/build/premake/extern_libs4.lua
+--- 0ad-0.0.16-alpha/build/premake/extern_libs4.lua.orig 2014-09-14 11:05:13.723088670 -0300
++++ 0ad-0.0.16-alpha/build/premake/extern_libs4.lua 2014-09-14 11:05:33.262089418 -0300
+@@ -667,10 +667,7 @@ extern_lib_defs = {
+ },
+ valgrind = {
+ compile_settings = function()
+- add_source_include_paths("valgrind")
+- end,
+- link_settings = function()
+- add_source_lib_paths("valgrind")
++ pkgconfig_cflags("valgrind")
+ end,
+ },
+ vorbis = {
diff --git a/0ad.spec b/0ad.spec
index f0fac3a..ffceef9 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -19,7 +19,7 @@
Name: 0ad
Version: 0.0.16
-Release: 10%{?dist}
+Release: 11%{?dist}
# BSD License:
# build/premake/*
# libraries/valgrind/* (not built/used)
@@ -109,6 +109,9 @@ Patch2: %{name}-miniupnpc.patch
# http://trac.wildfiregames.com/changeset/15334
Patch3: changeset_15334.diff
+# https://bugzilla.redhat.com/show_bug.cgi?id=1141464
+Patch4: %{name}-valgrind.patch
+
%description
0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform
real-time strategy (RTS) game of ancient warfare. In short, it is a
@@ -131,11 +134,14 @@ hobbyist game developers, since 2001.
%endif
%patch2 -p1
%patch3 -p3
+%patch4 -p1
%if %{with_system_nvtt}
rm -fr libraries/nvtt
%endif
+rm -fr libraries/source/valgrind
+
#-----------------------------------------------------------------------
%build
export CFLAGS="%{optflags}"
@@ -225,6 +231,9 @@ export STRIP=/bin/true
%{_mandir}/man6/*.6*
%changelog
+* Sun Sep 14 2014 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 0.0.16-11
+- Remove unused valgrind sources and use system valgrind.h (#1141464)
+
* Thu Aug 28 2014 David Tardon <dtardon at redhat.com> - 0.0.16-10
- rebuild for ICU 53.1
More information about the scm-commits
mailing list