Hello community, here is the log from the commit of package openttd for openSUSE:Factory checked in at 2014-12-23 11:50:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openttd (Old) and /work/SRC/openSUSE:Factory/.openttd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openttd" Changes: -------- --- /work/SRC/openSUSE:Factory/openttd/openttd.changes 2014-11-11 10:00:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openttd.new/openttd.changes 2014-12-23 11:49:13.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 22 09:45:17 UTC 2014 - dims...@opensuse.org + +- Add openttd-freetype-2.5.4.patch: Fix build with freetype 2.5.4. +- Move the man page to the binary, where it belongs (and drop + the rpmlintrc-, which is now no longer valid). + +------------------------------------------------------------------- Old: ---- openttd.rpmlintrc New: ---- openttd-freetype-2.5.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openttd.spec ++++++ --- /var/tmp/diff_new_pack.nOLmNV/_old 2014-12-23 11:49:15.000000000 +0100 +++ /var/tmp/diff_new_pack.nOLmNV/_new 2014-12-23 11:49:15.000000000 +0100 @@ -25,7 +25,8 @@ Group: Amusements/Games/Strategy/Other Url: http://www.openttd.org Source: http://binaries.openttd.org/releases/%{version}/%{name}-%{version}-source.tar.xz -Source2: %{name}.rpmlintrc +# PATCH-FIX-UPSTREAM openttd-freetype-2.5.4.patch dims...@opensuse.org -- Fix build with freetype 2.5.4 (http://bugs.openttd.org/task/6185) +Patch0: openttd-freetype-2.5.4.patch BuildRequires: SDL-devel BuildRequires: fontconfig-devel BuildRequires: gcc-c++ @@ -100,6 +101,7 @@ %prep %setup -qn %{name}-%{version} +%patch0 # Remove build time references so build-compare can do its work sed -i "s/__DATE__/\"openSUSE\"/" src/rev.cpp.in @@ -172,6 +174,7 @@ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor %{_datadir}/pixmaps/%{name}.32.xpm +%{_mandir}/man6/%{name}.6.* %files dedicated %defattr(-, root, root) @@ -185,6 +188,5 @@ %{_datadir}/%{name}/baseset %{_datadir}/%{name}/scripts %{_datadir}/%{name}/ai -%doc %{_mandir}/man6/%{name}.6.* %changelog ++++++ openttd-freetype-2.5.4.patch ++++++ Index: src/fontcache.cpp =================================================================== --- src/fontcache.cpp (revision 27078) +++ src/fontcache.cpp (working copy) @@ -536,8 +536,8 @@ aa = (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY); /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */ - int width = max(1, slot->bitmap.width + (this->fs == FS_NORMAL)); - int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL)); + unsigned int width = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL)); + unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL)); /* Limit glyph size to prevent overflows later on. */ if (width > 256 || height > 256) usererror("Font glyph is too large"); @@ -553,8 +553,8 @@ /* Draw shadow for medium size */ if (this->fs == FS_NORMAL && !aa) { - for (int y = 0; y < slot->bitmap.rows; y++) { - for (int x = 0; x < slot->bitmap.width; x++) { + for (unsigned int y = 0; y < slot->bitmap.rows; y++) { + for (unsigned int x = 0; x < slot->bitmap.width; x++) { if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR; sprite.data[1 + x + (1 + y) * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF; @@ -563,8 +563,8 @@ } } - for (int y = 0; y < slot->bitmap.rows; y++) { - for (int x = 0; x < slot->bitmap.width; x++) { + for (unsigned int y = 0; y < slot->bitmap.rows; y++) { + for (unsigned int x = 0; x < slot->bitmap.width; x++) { if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { sprite.data[x + y * sprite.width].m = FACE_COLOUR; sprite.data[x + y * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
