Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package blobAndConquer for openSUSE:Factory checked in at 2026-07-28 18:06:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blobAndConquer (Old) and /work/SRC/openSUSE:Factory/.blobAndConquer.new.2004 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blobAndConquer" Tue Jul 28 18:06:01 2026 rev:4 rq:1367965 version:1.11 Changes: -------- --- /work/SRC/openSUSE:Factory/blobAndConquer/blobAndConquer.changes 2024-02-22 21:01:54.282596773 +0100 +++ /work/SRC/openSUSE:Factory/.blobAndConquer.new.2004/blobAndConquer.changes 2026-07-28 18:07:00.295637267 +0200 @@ -1,0 +2,7 @@ +Mon Jul 27 09:48:05 UTC 2026 - Dominique Leuenberger <[email protected]> + +- Add 1030-fix-build-with-gcc16.patch: Fix build with GCC 16 + (boo#1261826). +- Rebase blobandconquer-gcc47.patch to apply as -p1. + +------------------------------------------------------------------- New: ---- 1030-fix-build-with-gcc16.patch ----------(New B)---------- New: - Add 1030-fix-build-with-gcc16.patch: Fix build with GCC 16 (boo#1261826). ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blobAndConquer.spec ++++++ --- /var/tmp/diff_new_pack.4shOFX/_old 2026-07-28 18:07:04.499785079 +0200 +++ /var/tmp/diff_new_pack.4shOFX/_new 2026-07-28 18:07:04.503785219 +0200 @@ -1,7 +1,7 @@ # # spec file for package blobAndConquer # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,13 +20,14 @@ Version: 1.11 Release: 0 Summary: Blob Wars: Blob and Conquer - a 3rd person action game -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Amusements/Games/3D/Shoot -Url: http://sourceforge.net/projects/blobandconquer/ +URL: http://sourceforge.net/projects/blobandconquer/ Source0: %{name}-%{version}.tar.gz Source1: %{name}-icons.tar # PATCH-FIX-UPSTREAM for gcc 4.7 Patch0: blobandconquer-gcc47.patch +Patch1: https://sources.debian.org/data/main/b/blobandconquer/1.11-dfsg%2B20-6/debian/patches/1030-fix-build-with-gcc16.patch %if 0%{?suse_version} BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -52,7 +53,7 @@ They're Ready. Will You Be? %prep -%autosetup -p0 -a 1 +%autosetup -p1 -a 1 mv makefile Makefile # Fix paths, add -lX11, remove docs install via files, ++++++ 1030-fix-build-with-gcc16.patch ++++++ Description: Fix build with gcc-16 Author: Marcos Talau <[email protected]> Bug-Debian: https://bugs.debian.org/1133434 Last-Update: 2026-04-20 --- blobandconquer-1.11-dfsg+20.orig/src/cplusplus/CSwitch.cpp +++ blobandconquer-1.11-dfsg+20/src/cplusplus/CSwitch.cpp @@ -54,7 +54,7 @@ void Switch::loadAdditional(Properties * { active = props->getInt("active", active); switchType = props->getInt("switchType", switchType); - requires = props->getString("requires", requires.getText()); + requirement = props->getString("requirement", requirement.getText()); custom = props->getFloat("timeout", custom); independent = props->getInt("independent", independent); puzzleType = props->getInt("puzzleType", puzzleType); @@ -62,7 +62,7 @@ void Switch::loadAdditional(Properties * altModel = props->getInt("altModel", altModel); rotation.z -= props->getFloat("angle", 0); - if (requires != "") + if (requirement != "") { altModel = true; } @@ -93,7 +93,7 @@ void Switch::saveAdditional(Properties * props->setProperty("active", active); props->setProperty("switchType", switchType); - props->setProperty("requires", requires.getText()); + props->setProperty("requirement", requirement.getText()); props->setProperty("independent", independent); props->setProperty("puzzleType", puzzleType); props->setProperty("puzzleSeed", puzzleSeed); --- blobandconquer-1.11-dfsg+20.orig/src/cplusplus/CSwitch.h +++ blobandconquer-1.11-dfsg+20/src/cplusplus/CSwitch.h @@ -33,7 +33,7 @@ class Switch : public Entity { bool altModel; - String requires; + String requirement; int switchType; --- blobandconquer-1.11-dfsg+20.orig/src/entities/blobs.cpp +++ blobandconquer-1.11-dfsg+20/src/entities/blobs.cpp @@ -1164,7 +1164,7 @@ void blobDoOrderUse() swt = (Switch*)entity; - if ((swt->owner != NULL) || (swt->requires != "")) + if ((swt->owner != NULL) || (swt->requirement != "")) { continue; } --- blobandconquer-1.11-dfsg+20.orig/src/entities/switches.cpp +++ blobandconquer-1.11-dfsg+20/src/entities/switches.cpp @@ -267,7 +267,7 @@ void pressurePlateTouch(Entity *other) swt->active = true; - if ((swt->requires == "") || ((swt->requires != "") && (swt->requires == other->getName()))) + if ((swt->requirement == "") || ((swt->requirement != "") && (swt->requirement == other->getName()))) { if (!swt->independent) { @@ -566,21 +566,21 @@ void switchLookForPlayer() { game->resetControl(CTRL_ACTION); - if (swt->requires != "") + if (swt->requirement != "") { - if ((!game->hasItem(swt->requires.getText())) && (!game->cheatItems)) + if ((!game->hasItem(swt->requirement.getText())) && (!game->cheatItems)) { - game->setInfoMessage(INFO_HINT, _("%s required"), swt->requires.getText()); + game->setInfoMessage(INFO_HINT, _("%s required"), swt->requirement.getText()); return; } else { - int i = game->getItemSlot(swt->requires.getText()); - game->setInfoMessage(INFO_HINT, _("Used %s"), swt->requires.getText()); + int i = game->getItemSlot(swt->requirement.getText()); + game->setInfoMessage(INFO_HINT, _("Used %s"), swt->requirement.getText()); if (!swt->altModel) { - game->removeItem(swt->requires.getText()); + game->removeItem(swt->requirement.getText()); } else { @@ -595,7 +595,7 @@ void switchLookForPlayer() } } - swt->requires = ""; + swt->requirement = ""; String s; s.setText("str_item_%d", i); textureManager->removeTexture(s.getText()); ++++++ blobandconquer-gcc47.patch ++++++ --- /var/tmp/diff_new_pack.4shOFX/_old 2026-07-28 18:07:04.559787188 +0200 +++ /var/tmp/diff_new_pack.4shOFX/_new 2026-07-28 18:07:04.563787329 +0200 @@ -1,5 +1,5 @@ ---- src/pak.cpp.orig 2011-08-29 20:32:58.000000000 +0200 -+++ src/pak.cpp 2014-09-23 23:31:08.000000000 +0200 +--- a/src/pak.cpp.orig 2011-08-29 20:32:58.000000000 +0200 ++++ b/src/pak.cpp 2014-09-23 23:31:08.000000000 +0200 @@ -126,8 +126,8 @@ if (!infile) {
