Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package godot3 for openSUSE:Factory checked 
in at 2023-09-25 20:03:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/godot3 (Old)
 and      /work/SRC/openSUSE:Factory/.godot3.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "godot3"

Mon Sep 25 20:03:14 2023 rev:4 rq:1113294 version:3.5.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/godot3/godot3.changes    2023-05-05 
15:57:31.176165738 +0200
+++ /work/SRC/openSUSE:Factory/.godot3.new.1770/godot3.changes  2023-09-25 
20:47:25.177993249 +0200
@@ -1,0 +2,6 @@
+Sat Sep 23 12:00:00 UTC 2023 - cu...@mail.de
+
+- removed scons_regression.patch - scons 4.5.2 is deployed
+- added improve_linker_detection.patch for pck embedding with runner
+
+-------------------------------------------------------------------

Old:
----
  scons_regression.patch

New:
----
  improve_linker_detection.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ godot3.spec ++++++
--- /var/tmp/diff_new_pack.yHQ58O/_old  2023-09-25 20:47:26.954057410 +0200
+++ /var/tmp/diff_new_pack.yHQ58O/_new  2023-09-25 20:47:26.954057410 +0200
@@ -46,7 +46,8 @@
 Patch2:         tinyexr_thirdparty_upstream.patch
 # branch specific seperate config files and so on
 Patch3:         rename_to_godot3.patch
-Patch4:         scons_regression.patch
+# better linker version detection for pck embedding with runner
+Patch4:         improve_linker_detection.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes

++++++ improve_linker_detection.patch ++++++
From: cu...@mail.de
Date: 2023-09-21 12:00:00
Subject: regex in linker detection for template builds fails sometimes to 
recognize correct ld version
References: https://github.com/godotengine/godot/issues/82078

distro added stuff to "ld --version" output prevents correct
version detection.
regex adjusted to improve detection of linker to include
pck embadding code in template builds.

---

diff -r -U 5 a/platform/x11/detect.py b/platform/x11/detect.py
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -406,11 +406,11 @@
         import re
 
         linker_version_str = subprocess.check_output(
             [env.subst(env["LINK"]), "-Wl,--version"] + 
env.subst(env["LINKFLAGS"])
         ).decode("utf-8")
-        gnu_ld_version = re.search("^GNU ld [^$]*(\d+\.\d+)$", 
linker_version_str, re.MULTILINE)
+        gnu_ld_version = re.search("^GNU ld \(GNU Binutils.*\) (\d+\.\d+)", 
linker_version_str, re.MULTILINE)
         if not gnu_ld_version:
             print(
                 "Warning: Creating template binaries enabled for PCK embedding 
is currently only supported with GNU ld, not gold or LLD."
             )
         else:

Reply via email to