Merge ~zhsj/ubuntu/+source/gobject-introspection:ubuntu/noble into ubuntu/+source/gobject-introspection:ubuntu/noble

[Shengjing Zhu]

[Simon Chopin (schopin)]

Hi Shengjing,

While I understand that the practical effect are almost the same, could you please provide this fix as a cherry-pick on top of the version in Noble, rather than a wholesale backport? That's the standard way for SRUs, and makes it easier for observers to understand that it's a standard SRU, not an MRE or any other kind of exceptional process.

review: Needs Fixing

[Shengjing Zhu (zhsj)]

I don't get the idea when there is no difference. This is a targeted fix only. The only difference is the version string. I think you want something like 1.80.1-2ubuntu24.04.1. But compared to 1.80.1-3~ubuntu24.04.1, the latter makes clear that the fix has been proven to work in oracular. It can't be confused with MRE, since the upstream version is not changed. Besides, when people going to fix something in future, they can just start to look at version after 1.8.1-3 in oracular and cherry-pick commits.

[Simon Chopin (schopin)]

Yes, your points are valid, but that's not how we do SRUs. We don't backport versions, we cherry-pick fixes, because we want to ensure we only get the bugfix, nothing else, in order to minimize regression potential. For instance, with your backport, something *could* actually go wrong, since you're adding a .gitignore file. That file could be buggy, and lead to unwanted files being included in the final upload.

The version number is a natural consequence of that process, not the endgoal. If I see an upload with -XubuntuY.Z that's indicative of that minimalistic process. OTOH, -X~ubuntuYY.ZZ is showing that something else happened.

[Shengjing Zhu (zhsj)]

> For instance, with your backport, something *could* actually go wrong, since you're adding a .gitignore file. That file could be buggy, and lead to unwanted files being included in the final upload.

IMO you should compare and review the source package when uploading. There will also be buggy gitignore files globally in your home directory.

So if the new version only has the targeted fixes, what the version number should be used when backporting (or you can call it cherry-pick) to stable release? I don't see it has been written down somewhere. Shall we do it to avoid confusion in future?

[Simon Chopin (schopin)]

https://wiki.ubuntu.com/SecurityTeam/UpdatePreparation#Update_the_packaging is the standard way to do it.

[Shengjing Zhu (zhsj)]

> https://wiki.ubuntu.com/SecurityTeam/UpdatePreparation#Update_the_packaging is the standard way to do it.

I mean it doesn't say if the change is like fast-forward thing.

[Simon Chopin (schopin)]

> > https://wiki.ubuntu.com/SecurityTeam/UpdatePreparation#Update_the_packaging
> is the standard way to do it.
>
> I mean it doesn't say if the change is like fast-forward thing.

There is no notion of fast forward in the general case.

What I'm expecting to happen is a single commit (well, two if you split out the changelog in proper git-ubuntu etiquette) based off ubuntu/noble-devel that contains the fix and *only* the fix. There should be no mention of the 1.80.1-2 and 3 releases, although it'd be polite to credit the Debian contributor in the changelog.

Unmerged commits

d8091bc... by Shengjing Zhu on 2024-05-16

Update changelog for 1.80.1-3~ubuntu24.04.1 release

37c9a18... by Simon McVittie on 2024-05-14

1.80.1-3 (patches unapplied)

Imported using git-ubuntu import.

3aace32... by Jeremy Bícha on 2024-05-04

1.80.1-2 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..7906d36
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,16 @@
+/*.debhelper
+/*.debhelper.log
+/*.substvars
+/.debhelper/
+/debhelper-build-stamp
+/dh_girepository.1
+/extra-substvars
+/files
+/gir1.2-freedesktop/
+/gir1.2-glib-2.0/
+/gobject-introspection/
+/libgirepository-1.0-1.symbols
+/libgirepository-1.0-1/
+/libgirepository1.0-dev/
+/libgirepository1.0-doc/
+/tmp/
diff --git a/debian/changelog b/debian/changelog
index 64a47ee..2812cb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+gobject-introspection (1.80.1-3~ubuntu24.04.1) noble; urgency=medium
+
+  * Rebuild for Noble (LP: #2065902)
+
+ -- Shengjing Zhu <[e-mail]>  Thu, 16 May 2024 21:23:42 +0800
+
+gobject-introspection (1.80.1-3) unstable; urgency=medium
+
+  * d/p/giscanner-Be-more-thorough-about-applying-Wl-no-as-needed.patch:
+    Add proposed patch to apply -Wl,--no-as-needed more thoroughly.
+    This avoids build regressions in libkkc and ibus-anthy, which pass
+    libraries to `g-ir-scanner --library` that do not contain any functions
+    directly called by the dumper.
+    (Closes: #1060951, #1060953) (Mitigates: #1071116)
+
+ -- Simon McVittie <[e-mail]>  Tue, 14 May 2024 18:42:37 +0100
+
+gobject-introspection (1.80.1-2) unstable; urgency=medium
+
+  * Release to unstable
+
+ -- Jeremy Bícha <[e-mail]>  Sat, 04 May 2024 12:39:14 -0400
+
 gobject-introspection (1.80.1-1) experimental; urgency=medium
 
   [ Jeremy Bícha ]
diff --git a/debian/control b/debian/control
index f02016a..43a3ade 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: gobject-introspection
 Section: devel
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Iain Lane <[e-mail]>,
            Jeremy Bícha <[e-mail]>,
            Laurent Bigonville <[e-mail]>,
diff --git a/debian/patches/giscanner-Be-more-thorough-about-applying-Wl-no-as-needed.patch b/debian/patches/giscanner-Be-more-thorough-about-applying-Wl-no-as-needed.patch
new file mode 100644
index 0000000..750e80b
--- /dev/null
+++ b/debian/patches/giscanner-Be-more-thorough-about-applying-Wl-no-as-needed.patch
@@ -0,0 +1,106 @@
+From: Simon McVittie <[e-mail]>
+Date: Sun, 12 May 2024 18:03:17 +0100
+Subject: giscanner: Be more thorough about applying -Wl,--no-as-needed option
+
+Some Linux distributions routinely build all executables and libraries
+with -Wl,--as-needed, either by adding it to LDFLAGS or by making it the
+compiler or linker default.
+
+For installed executables and libraries this is a desirable way to
+drop unnecessary transitive dependencies, minimizing the number of
+rebuilds required if a lower-level library breaks ABI, but for our
+dump executable it's counterproductive and can prevent us from finding
+the SONAMEs of libraries that were passed as explicit -l arguments,
+especially if we use a ldd replacement that is not recursive
+(like the one in gobject-introspection#482).
+
+We already had a special case to add -Wl,--no-as-needed to the linker
+arguments, but only for "internal" libraries and only when not using
+libtool. Extend that to cover "external" libraries and libtool as well,
+and filter out any -Wl,--as-needed from LDFLAGS to avoid it from being
+defeated.
+
+Bug: https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/505
+Bug-Debian: https://bugs.debian.org/1060951
+Bug-Debian: https://bugs.debian.org/1060953
+Signed-off-by: Simon McVittie <[e-mail]>
+Forwarded: https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/463
+---
+ giscanner/ccompiler.py | 28 ++++++++++++++++++++++------
+ giscanner/dumper.py    |  3 ++-
+ 2 files changed, 24 insertions(+), 7 deletions(-)
+
+diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
+index d0ed70a..1938a84 100644
+--- a/giscanner/ccompiler.py
++++ b/giscanner/ccompiler.py
+@@ -35,6 +35,17 @@ from distutils.sysconfig import customize_compiler as orig_customize_compiler
+ from . import utils
+ 
+ 
++def no_as_needed(linker):
++    """\
++    Filter out -Wl,--as-needed from the shell-quoted arguments in linker.
++    """
++    return ' '.join(
++        [shlex.quote(arg)
++         for arg in shlex.split(linker)
++         if arg != '-Wl,--as-needed']
++    )
++
++
+ def customize_compiler(compiler):
+     """This is a version of distutils.sysconfig.customize_compiler, without
+     any macOS specific bits and which tries to avoid using any Python specific
+@@ -88,8 +99,8 @@ def customize_compiler(compiler):
+             compiler=cc_cmd,
+             compiler_so=cc_cmd,
+             compiler_cxx=cxx,
+-            linker_so=ldshared,
+-            linker_exe=cc,
++            linker_so=no_as_needed(ldshared),
++            linker_exe=no_as_needed(cc),
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+@@ -230,10 +241,10 @@ class CCompiler(object):
+                 # https://bugzilla.gnome.org/show_bug.cgi?id=625195
+                 args.append('-Wl,-rpath,.')
+ 
+-                # Ensure libraries are always linked as we are going to use ldd to work
+-                # out their names later
+-                if sys.platform != 'darwin':
+-                    args.append('-Wl,--no-as-needed')
++            # Ensure libraries are always linked as we are going to use ldd to work
++            # out their names later
++            if sys.platform != 'darwin':
++                args.append('-Wl,--no-as-needed')
+ 
+         for library_path in libpaths:
+             # The dumper program needs to look for dynamic libraries
+@@ -279,6 +290,11 @@ class CCompiler(object):
+         # is installed on the system; this case is used for the scanning
+         # of GLib in gobject-introspection itself.
+ 
++        # Ensure libraries are always linked as we are going to use ldd to work
++        # out their names later
++        if os.name != 'nt' and sys.platform != 'darwin':
++            args.append('-Wl,--no-as-needed')
++
+         for library in libraries:
+             if os.path.isfile(library):
+                 # If we get a real filename, just use it as-is
+diff --git a/giscanner/dumper.py b/giscanner/dumper.py
+index 74a494b..e2e7eee 100644
+--- a/giscanner/dumper.py
++++ b/giscanner/dumper.py
+@@ -254,7 +254,8 @@ class DumpCompiler(object):
+ 
+         if not self._compiler.check_is_msvc():
+             for ldflag in shlex.split(os.environ.get('LDFLAGS', '')):
+-                args.append(ldflag)
++                if ldflag != '-Wl,--as-needed':
++                    args.append(ldflag)
+ 
+         dll_dirs = utils.dll_dirs()
+         dll_dirs.add_dll_dirs(self._packages)
diff --git a/debian/patches/series b/debian/patches/series
index 2c51846..f1558b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 meson-Only-generate-typelib-and-install-win32-files-on-wi.patch
+giscanner-Be-more-thorough-about-applying-Wl-no-as-needed.patch
 debian/multiarch_compat.patch