commit blobwars for openSUSE:Factory
Hello community,
here is the log from the commit of package blobwars for openSUSE:Factory
checked in at 2017-07-21 22:50:13
Comparing /work/SRC/openSUSE:Factory/blobwars (Old)
and /work/SRC/openSUSE:Factory/.blobwars.new (New)
Package is "blobwars"
Fri Jul 21 22:50:13 2017 rev:3 rq:511640 version:2.00
Changes:
--- /work/SRC/openSUSE:Factory/blobwars/blobwars.changes2015-11-28
15:19:23.0 +0100
+++ /work/SRC/openSUSE:Factory/.blobwars.new/blobwars.changes 2017-07-21
22:50:15.453463815 +0200
@@ -1,0 +2,5 @@
+Thu Jul 20 09:08:53 UTC 2017 - bwiedem...@suse.com
+
+- Add reproducible.patch to sort file list to fix build-compare (boo#1041090)
+
+---
New:
reproducible.patch
Other differences:
--
++ blobwars.spec ++
--- /var/tmp/diff_new_pack.nG6Fuz/_old 2017-07-21 22:50:19.252927853 +0200
+++ /var/tmp/diff_new_pack.nG6Fuz/_new 2017-07-21 22:50:19.252927853 +0200
@@ -27,6 +27,8 @@
Source1:%{name}.appdata.xml
# PATCH-FIX-OPENSUSE - blobwars-icons_blobwars.desktop.patch -- Add
GenericName and Category
Patch0: %{name}-icons_blobwars.desktop.patch
+# PATCH-FIX-UPSTREAM https://sourceforge.net/p/blobwars/patches/8/
+Patch1: reproducible.patch
%if 0%{?suse_version}
BuildRequires: hicolor-icon-theme
BuildRequires: update-desktop-files
@@ -56,6 +58,7 @@
%prep
%setup -q
%patch0
+%patch1 -p1
# Correct Permissions
chmod 0644 Makefile*
++ reproducible.patch ++
https://sourceforge.net/p/blobwars/patches/8/ (boo#1041090)
When building blobwars packages for openSUSE, we do so in disposable VMs, which
means every build has a new filesystem and thus ordering of files differs for
the readdir call in src/pak.cpp
See https://reproducible-builds.org for why this matters.
Index: blobwars-2.00/src/pak.cpp
===
--- blobwars-2.00.orig/src/pak.cpp
+++ blobwars-2.00/src/pak.cpp
@@ -76,7 +76,9 @@ void countFiles(const char *dirName)
void recurseDirectory(const char *dirName)
{
- DIR *dirp, *dirp2;
+ DIR *dirp2;
+ int n;
+ struct dirent **namelist;
dirent *dfile;
gzFile fp;
FILE *infile;
@@ -85,9 +87,9 @@ void recurseDirectory(const char *dirNam
uLongf cSize = 0;
uLongf fSize = 0;
- dirp = opendir(dirName);
+ n = scandir(dirName, &namelist, NULL, alphasort);
- if (dirp == NULL)
+ if (n == -1)
{
printf("%s: Directory does not exist or is not accessable\n",
dirName);
return;
@@ -96,10 +98,12 @@ void recurseDirectory(const char *dirNam
float percentage;
long filesize;
- while ((dfile = readdir(dirp)))
+ while (n--)
{
+ dfile = namelist[n];
if (dfile->d_name[0] == '.')
{
+ free(dfile);
continue;
}
@@ -118,7 +122,6 @@ void recurseDirectory(const char *dirNam
if (!infile)
{
printf("Couldn't open %s for reading!\n",
filename);
- closedir(dirp);
fclose(pak);
exit(1);
}
@@ -140,7 +143,6 @@ void recurseDirectory(const char *dirNam
if (!fp)
{
printf("Couldn't open %s for reading!\n",
filename);
- closedir(dirp);
fclose(pak);
exit(1);
}
@@ -171,9 +173,10 @@ void recurseDirectory(const char *dirNam
fflush(stdout);
}
}
+ free(dfile);
}
- closedir(dirp);
+ free(namelist);
dirs++;
}
commit blobwars for openSUSE:Factory
Hello community,
here is the log from the commit of package blobwars for openSUSE:Factory
checked in at 2015-11-28 15:19:19
Comparing /work/SRC/openSUSE:Factory/blobwars (Old)
and /work/SRC/openSUSE:Factory/.blobwars.new (New)
Package is "blobwars"
Changes:
--- /work/SRC/openSUSE:Factory/blobwars/blobwars.changes2015-07-05
18:02:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.blobwars.new/blobwars.changes 2015-11-28
15:19:23.0 +0100
@@ -1,0 +2,20 @@
+Wed Nov 25 17:17:48 UTC 2015 - nemy...@opensuse.org
+
+- Update to 2.00, announce message:
+
+* Changed to SDL 2.0. This also allows the window to be scaled to an arbitrary
+ size, and doesn't change the desktop resolution anymore when going to
+ fullscreen.
+* The joystick/gamepad can now also be used in the menus and on the hub.
+* Updated credits and copyright notices.
+* Added stereo to the sound effects.
+* Cleaned up some graphics.
+* Fixed the machinegun sound.
+* Fixed the behaviour of grenades.
+* Many small fixes.
+
+- Remove icons blobwars-icons.tar, use supplied
+- Change BuildRequires, changed by Upstream for SDL2
+- Change sed, use Makefile instead of makefile, changed by Upstream
+
+---
Old:
blobwars-1.19.tar.gz
blobwars-icons.tar
New:
blobwars-2.00.tar.gz
Other differences:
--
++ blobwars.spec ++
--- /var/tmp/diff_new_pack.8qJgmL/_old 2015-11-28 15:19:27.0 +0100
+++ /var/tmp/diff_new_pack.8qJgmL/_new 2015-11-28 15:19:27.0 +0100
@@ -17,15 +17,14 @@
Name: blobwars
-Version:1.19
+Version:2.00
Release:0
Summary:Mission and Objective based 2D Platform Game
License:GPL-2.0+
Group: Amusements/Games/Action/Arcade
Url:http://sourceforge.net/projects/blobwars/
Source0:
http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:%{name}-icons.tar
-Source2:%{name}.appdata.xml
+Source1:%{name}.appdata.xml
# PATCH-FIX-OPENSUSE - blobwars-icons_blobwars.desktop.patch -- Add
GenericName and Category
Patch0: %{name}-icons_blobwars.desktop.patch
%if 0%{?suse_version}
@@ -36,10 +35,10 @@
BuildRequires: gettext
BuildRequires: pkgconfig
BuildRequires: zlib-devel
-BuildRequires: pkgconfig(SDL_image)
-BuildRequires: pkgconfig(SDL_mixer)
-BuildRequires: pkgconfig(SDL_net)
-BuildRequires: pkgconfig(SDL_ttf)
+BuildRequires: pkgconfig(SDL2_image)
+BuildRequires: pkgconfig(SDL2_mixer)
+BuildRequires: pkgconfig(SDL2_net)
+BuildRequires: pkgconfig(SDL2_ttf)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -55,11 +54,11 @@
%lang_package
%prep
-%setup -q -a 1
+%setup -q
%patch0
# Correct Permissions
-chmod 0644 makefile*
+chmod 0644 Makefile*
# SED-FIX-OPENSUSE -- Fix paths and libraries
sed -i -e 's|USEPAK ?= 0|USEPAK ?= 1|;
@@ -68,8 +67,7 @@
s| -Werror||;
s|$(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)|$(CXX) $(GAMEOBJS) $(LIBS)
-o $(PROG)|;
s|$(CXX) $(LIBS) $(PAKOBJS) -o pak|$(CXX) $(PAKOBJS) $(LIBS) -o
pak|;
- s|$(CXX) $(LIBS) $(MAPOBJS) -o mapeditor|$(CXX) $(MAPOBJS) $(LIBS)
-o mapeditor|;
- s|64x64|48x48|' makefile
+ s|$(CXX) $(LIBS) $(MAPOBJS) -o mapeditor|$(CXX) $(MAPOBJS) $(LIBS)
-o mapeditor|' Makefile
# SED-FIX-OPENSUSE -- Fix pak
sed -i -e 's|gzclose(pak)|gzclose((gzFile)pak)|;
@@ -80,11 +78,12 @@
RELEASE=1 DOCDIR=%{_docdir}/%{name}/
%install
+#make install
%make_install BINDIR=%{_bindir}/ DATADIR=%{_datadir}/%{name}/
DOCDIR=%{_docdir}/%{name}/
# install icons
-for i in 16 22 32 48 ; do
-install -Dm 0644 icons/%{name}_${i}x${i}.png \
+for i in 16 32 48 64; do
+install -Dm 0644 icons/%{name}${i}x${i}.png \
%{buildroot}/%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
done
@@ -92,14 +91,14 @@
# Install appdata
mkdir -p %{buildroot}%{_datadir}/appdata
-install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/appdata
+install -Dm 0644 %{S:1} %{buildroot}%{_datadir}/appdata
%if 0%{?suse_version}
%suse_update_desktop_file %{name}
%endif
%files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
%doc doc/*
%{_bindir}/%{name}
%{_datadir}/%{name}
++ blobwars-1.19.tar.gz -> blobwars-2.00.tar.gz ++
/work/SRC/openSUSE:Factory/blobwars/blobwars-1.19.tar.gz
/work/SRC/openSUSE:Factory/.blobwars.new/blobwars-2.00.tar.gz differ: char 4,
line 1
