Hello community,
here is the log from the commit of package 0ad for openSUSE:Factory checked in
at 2018-04-20 17:26:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/0ad (Old)
and /work/SRC/openSUSE:Factory/.0ad.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "0ad"
Fri Apr 20 17:26:12 2018 rev:6 rq:595103 version:0.0.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/0ad/0ad.changes 2018-02-05 10:53:56.377701250
+0100
+++ /work/SRC/openSUSE:Factory/.0ad.new/0ad.changes 2018-04-20
17:26:26.253137158 +0200
@@ -1,0 +2,19 @@
+Fri Mar 9 17:07:45 UTC 2018 - stefan.bru...@rwth-aachen.de
+
+- Keep fix_abs_of_unsigned_char_on_arm.patch intact and disable
+ the conflicting/irrelevant hunk in the spec file
+
+-------------------------------------------------------------------
+Sun Feb 25 20:33:53 UTC 2018 - stefan.bru...@rwth-aachen.de
+
+- Revert the changes to use bundled mozjs38 on Leap 42.3 again
+ (no changelog entry), it does not build on 42.3. Use fixed
+ mozjs38 from distribution instead.
+
+-------------------------------------------------------------------
+Sat Feb 24 18:46:33 UTC 2018 - stefan.bru...@rwth-aachen.de
+
+- Add fix_abs_of_unsigned_char_on_arm.patch, fixes build on 32/64
+ bit ARM (and probably PPC)
+
+-------------------------------------------------------------------
New:
----
fix_abs_of_unsigned_char_on_arm.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ 0ad.spec ++++++
--- /var/tmp/diff_new_pack.0ComOY/_old 2018-04-20 17:26:27.685085232 +0200
+++ /var/tmp/diff_new_pack.0ComOY/_new 2018-04-20 17:26:27.689085087 +0200
@@ -34,6 +34,8 @@
Source99: %{name}.changes
# PATCH-FEATURE-UPSTREAM system-tinygettext.patch --
http://trac.wildfiregames.com/ticket/4192
Patch1: system-tinygettext.patch
+# PATCH-FIX-UPSTREAM fix_abs_of_unsigned_char_on_arm.patch
+Patch2:
https://github.com/0ad/0ad/commit/0133d6070bf4c4b2c18c79bf72b53af23403a36d.patch#/fix_abs_of_unsigned_char_on_arm.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libXcursor-devel
@@ -79,6 +81,9 @@
%prep
%setup -q -n %{name}-%{version}-alpha
%patch1 -p1
+# Do not patch files not part of the distributed source
+sed -i -e 's@[-+]\{3\}.*/binaries/@#\0@; s@diff .*/binaries/@#\0@' %{PATCH2}
+%patch2 -p1
# Fix usage of __DATE__ and __TIME__ macros
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE99}")"
@@ -102,7 +107,7 @@
--without-nvtt \
%endif
--with-system-tinygettext \
- --with-system-mozjs38
+ --with-system-mozjs38 \
pushd build/workspaces/gcc
make verbose=1 %{?_smp_mflags}
++++++ fix_abs_of_unsigned_char_on_arm.patch ++++++
>From 0133d6070bf4c4b2c18c79bf72b53af23403a36d Mon Sep 17 00:00:00 2001
From: elexis <elexis@3db68df2-c116-0410-a063-a993310a9797>
Date: Sun, 14 Jan 2018 21:18:37 +0000
Subject: [PATCH] Fix build on armhf with gcc 7.
The abs caused a compiler error in that environment, because wchar_t is
unsigned on armhf, subtracting signed from unsigned results in unsigned and
std::abs does not define an unsigned variant.
Differential Revision: https://code.wildfiregames.com/D1122
Patch By: Peter Michael Green
Uploaded By: Ludovic
git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@20869
3db68df2-c116-0410-a063-a993310a9797
---
binaries/data/mods/public/gui/credits/texts/programming.json | 2 ++
source/gui/CDropDown.cpp | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json
b/binaries/data/mods/public/gui/credits/texts/programming.json
index 8b30612dfd..cac3e81da9 100644
--- a/binaries/data/mods/public/gui/credits/texts/programming.json
+++ b/binaries/data/mods/public/gui/credits/texts/programming.json
@@ -129,6 +129,7 @@
{"nick": "livingaftermidnight", "name": "Will Dull"},
{"nick": "Louhike"},
{"nick": "lsdh"},
+ {"nick": "Ludovic", "name": "Ludovic Rousseau"},
{"nick": "madmax", "name": "Abhijit Nandy"},
{"nick": "madpilot", "name": "Guido Falsi"},
{"nick": "m0l0t0ph", "name": "Christoph Gielisch"},
@@ -171,6 +172,7 @@
{"nick": "PeteVasi", "name": "Pete Vasiliauskas"},
{"nick": "pilino1234"},
{"nick": "PingvinBetyar", "name": "Schronk Tamás"},
+ {"nick": "plugwash", "name": "Peter Michael Green"},
{"nick": "Polakrity"},
{"nick": "Poya", "name": "Poya Manouchehri"},
{"name": "Quentin Pradet"},
diff --git a/source/gui/CDropDown.cpp b/source/gui/CDropDown.cpp
index 09527b2048..5f4ac2710a 100644
--- a/source/gui/CDropDown.cpp
+++ b/source/gui/CDropDown.cpp
@@ -352,7 +352,7 @@ InReaction CDropDown::ManuallyHandleEvent(const SDL_Event_*
ev)
int diff = 0;
for (size_t j = 0; j <
m_InputBuffer.length(); ++j)
{
- diff =
std::abs(pList->m_Items[i].GetRawString().LowerCase()[j] -
(int)m_InputBuffer[j]);
+ diff =
std::abs((int)(pList->m_Items[i].GetRawString().LowerCase()[j]) -
(int)m_InputBuffer[j]);
if (diff == 0)
indexOfDifference = j+1;
else
