Hello community, here is the log from the commit of package armagetron for openSUSE:Factory checked in at 2016-07-01 09:59:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armagetron (Old) and /work/SRC/openSUSE:Factory/.armagetron.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armagetron" Changes: -------- --- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes 2016-04-22 16:24:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes 2016-07-01 09:59:46.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jun 28 02:15:35 UTC 2016 - [email protected] + +- Fixed build on Tumbleweed +- Some cleanup +- Added fix-segv.patch to fix segfault after starting a new game + +------------------------------------------------------------------- New: ---- fix-segv.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armagetron.spec ++++++ --- /var/tmp/diff_new_pack.8fzcGm/_old 2016-07-01 09:59:47.000000000 +0200 +++ /var/tmp/diff_new_pack.8fzcGm/_new 2016-07-01 09:59:47.000000000 +0200 @@ -17,21 +17,28 @@ Name: armagetron -BuildRequires: SDL_image-devel -BuildRequires: SDL_mixer-devel -BuildRequires: kdelibs3-devel -BuildRequires: pkgconfig(glu) -PreReq: sh-utils fileutils -Summary: OpenGL Game Similar to the Film Tron -License: GPL-2.0+ -Group: Amusements/Games Version: 0.2.8.3.3 Release: 0 +Summary: OpenGL Game Similar to the Film Tron +License: GPL-2.0+ +Group: Amusements/Games/Action/Arcade Url: http://armagetronad.sourceforge.net Source: http://sourceforge.net/projects/armagetronad/files/stable/%{version}/armagetronad-%{version}.src.tar.bz2 Source1: armagetron_add.tar.gz # PATCH-FIX-OPENSUSE bmwiedemann -- fix build-compare Patch0: reproducible.patch +# PATCH-FIX-UPSTREAM https://bugs.launchpad.net/armagetronad/+bug/1596771 -- fix nullpointer dereferenceing which leads into segfault +Patch1: fix-segv.patch +BuildRequires: SDL_image-devel +BuildRequires: SDL_mixer-devel +BuildRequires: kdelibs3-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(glu) +%if 0%{?suse_version} > 1315 +BuildRequires: llvm-clang +%endif +Requires(post): fileutils +Requires(post): sh-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -42,15 +49,17 @@ to try to make your enemies hit the walls, while you avoid doing the same. Unlike glTron, this program does not require 3D hardware support. - - %prep -%setup -q -a 1 -n armagetronad-%version +%setup -q -a 1 -n armagetronad-%{version} %patch0 -p1 +%patch1 -p1 %build autoreconf -fi -export CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" +%if 0%{?suse_version} > 1315 +export CC=clang +export CXX=clang++ +%endif %configure \ --enable-music \ --disable-desktop \ @@ -62,13 +71,14 @@ %install # the uninstall_location trick was copied from Fedora. Thanks for debugging it :) -make DESTDIR=%buildroot install uninstall_location=foobar +make DESTDIR=%{buildroot} install uninstall_location=foobar mkdir -p %{buildroot}%{_datadir}/applications/ install armagetron_add/*.desktop %{buildroot}%{_datadir}/applications/ mkdir -p %{buildroot}%{_datadir}/appdata -install armagetron_add/Armagetron.appdata.xml %{buildroot}%{_datadir}/appdata/ +install -m644 armagetron_add/Armagetron.appdata.xml %{buildroot}%{_datadir}/appdata/ mkdir -p %{buildroot}%{_datadir}/pixmaps/ -pushd %buildroot +install -Dm644 armagetron_add/README.SuSE %{buildroot}%{_docdir}/%{name}/README.SUSE +pushd %{buildroot} mv %{buildroot}%{_datadir}/armagetronad/desktop/icons/large/armagetronad.png %{buildroot}%{_datadir}/pixmaps/%{name}.png ln -s %{_datadir}/pixmaps/%{name}.png %{buildroot}%{_datadir}/armagetronad/desktop/icons/large/armagetronad.png popd @@ -82,7 +92,8 @@ %files %defattr(-,root,root) -%doc README armagetron_add/README.SuSE armagetron_doc/* +%doc README armagetron_doc/* +%doc %{_docdir}/%{name}/README.SUSE %config %{_sysconfdir}/armagetronad %{_bindir}/armagetronad %{_datadir}/armagetronad ++++++ fix-segv.patch ++++++ diff -Nur armagetronad-0.2.8.3.3/src/tron/gCycle.cpp new/src/tron/gCycle.cpp --- armagetronad-0.2.8.3.3/src/tron/gCycle.cpp 2015-01-29 23:53:54.000000000 +0100 +++ new/src/tron/gCycle.cpp 2016-06-28 05:31:18.514409180 +0200 @@ -2712,7 +2712,7 @@ gCycleChatBot & bot = gCycleChatBot::Get( this ); bot.Activate( currentTime ); } - else if ( &(*chatBot_) ) + else if ( chatBot_.get() ) { chatBot_->nextChatAI_ = 0; }
