From unknown Thu Sep 11 19:19:57 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#36535 <36535@debbugs.gnu.org> To: bug#36535 <36535@debbugs.gnu.org> Subject: Status: [PATCH] gnu: gobject-introspection: Update absolute-shlib-path.patch. Reply-To: bug#36535 <36535@debbugs.gnu.org> Date: Fri, 12 Sep 2025 02:19:57 +0000 retitle 36535 [PATCH] gnu: gobject-introspection: Update absolute-shlib-pat= h.patch. reassign 36535 guix-patches submitter 36535 Christopher Baines severity 36535 normal tag 36535 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 07 06:48:32 2019 Received: (at submit) by debbugs.gnu.org; 7 Jul 2019 10:48:32 +0000 Received: from localhost ([127.0.0.1]:56180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hk4iY-0004fI-6Q for submit@debbugs.gnu.org; Sun, 07 Jul 2019 06:48:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:58441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hk4iW-0004f9-5i for submit@debbugs.gnu.org; Sun, 07 Jul 2019 06:48:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38606) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hk4iT-00027Q-2V for guix-patches@gnu.org; Sun, 07 Jul 2019 06:48:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hk4iO-0005Au-BL for guix-patches@gnu.org; Sun, 07 Jul 2019 06:48:18 -0400 Received: from mira.cbaines.net ([212.71.252.8]:35216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hk4iO-00056p-2R for guix-patches@gnu.org; Sun, 07 Jul 2019 06:48:16 -0400 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id CF5E3163F3 for ; Sun, 7 Jul 2019 11:48:03 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id d4936012 for ; Sun, 7 Jul 2019 10:48:03 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] gnu: gobject-introspection: Update absolute-shlib-path.patch. Date: Sun, 7 Jul 2019 11:48:03 +0100 Message-Id: <20190707104803.23662-1-mail@cbaines.net> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.71.252.8 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Incorporate some changes from nixpkgs to the gobject-introspection packag= e patches. This is motivated by looking at issues with libsoup and lollypo= p. This changes means that the share/gir-1.0/Soup-2.4.gir file within libsou= p references libsoup-2.4.so.1 with an absolute filename, whereas previously= , the filename wasn't absolute. * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Incorporate changes from nixpkgs. --- ...ct-introspection-absolute-shlib-path.patch | 141 +++++++++++++++++- 1 file changed, 137 insertions(+), 4 deletions(-) diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-pa= th.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path= .patch index d00cc5a420..3c0bb1c6cf 100644 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patc= h +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patc= h @@ -2,10 +2,131 @@ # add the full path. # # This patch was provided by Luca Bruno for=20 -# 'gobject-introspection' 1.40.0 in Nix.=20 ---- ./giscanner/utils.py.orig 2014-08-14 22:05:05.055334080 +0200 -+++ ./giscanner/utils.py 2014-08-14 22:05:24.687497334 +0200 -@@ -110,17 +110,11 @@ +# 'gobject-introspection' 1.40.0 in Nix. +# +# It has since been updated to work with newer versions of +# gobject-introspection. +--- a/giscanner/scannermain.py ++++ b/giscanner/scannermain.py +@@ -95,6 +95,39 @@ def get_windows_option_group(parser): + return group +=20 +=20 ++def _get_default_fallback_libpath(): ++ # Newer multiple-output-optimized stdenv has an environment variabl= e ++ # $outputLib which in turn specifies another variable which then is= used as ++ # the destination for the library contents (${!outputLib}/lib). ++ store_path =3D os.environ.get(os.environ.get("outputLib")) if "outp= utLib" in os.environ else None ++ if store_path is None: ++ outputs =3D os.environ.get("outputs", "out").split() ++ if "lib" in outputs: ++ # For multiple output derivations let's try whether there i= s a $lib ++ # environment variable and use that as the base store path. ++ store_path =3D os.environ.get("lib") ++ elif "out" in outputs: ++ # Otherwise we have a single output derivation, so the libr= aries ++ # most certainly will end up in "$out/lib". ++ store_path =3D os.environ.get("out") ++ ++ if store_path is not None: ++ # Even if we have a $lib as output, there still should be a $li= b/lib ++ # directory. ++ return os.path.join(store_path, 'lib') ++ else: ++ # If we haven't found a possible scenario, let's return an empt= y string ++ # so that the shared library won't be prepended with a path. ++ # ++ # Note that this doesn't mean that all hope is lost, because af= ter all ++ # we can still use --fallback-library-path to set one. ++ # ++ # Also, we're not returning None, because that would make it ve= ry ++ # difficult to disable adding fallback paths altogether using s= omething ++ # like: --fallback-library-path=3D"" ++ return "" ++ ++ + def _get_option_parser(): + parser =3D optparse.OptionParser('%prog [options] sources', + version=3D'%prog ' + giscanner.__ver= sion__) +@@ -205,6 +238,10 @@ match the namespace prefix.""") + parser.add_option("", "--filelist", + action=3D"store", dest=3D"filelist", default=3D[]= , + help=3D"file containing headers and sources to be= scanned") ++ parser.add_option("", "--fallback-library-path", ++ action=3D"store", dest=3D"fallback_libpath", ++ default=3D_get_default_fallback_libpath(), ++ help=3D"Path to prepend to unknown shared librari= es") +=20 + group =3D get_preprocessor_option_group(parser) + parser.add_option_group(group) +--- a/giscanner/shlibs.py ++++ b/giscanner/shlibs.py +@@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): + $""" % re.escape(library_name), re.VERBOSE) +=20 +=20 ++def _ldd_library_guix_pattern(library_name): ++ store_dir =3D re.escape('/gnu/store') ++ pattern =3D r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' ++ return re.compile(pattern % (store_dir, re.escape(library_name))) ++ ++ + # This is a what we do for non-la files. We assume that we are on an + # ELF-like system where ldd exists and the soname extracted with ldd is + # a filename that can be opened with dlopen(). +@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries)= : + output =3D output.decode("utf-8", "replace") +=20 + shlibs =3D resolve_from_ldd_output(libraries, output) +- return list(map(sanitize_shlib_path, shlibs)) ++ fallback_libpath =3D options.fallback_libpath or ""; ++ return list(map(lambda p: os.path.join(fallback_libpath, p), ma= p(sanitize_shlib_path, shlibs))) +=20 +=20 + def sanitize_shlib_path(lib): +@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): + # In case we get relative paths on macOS (like @rpath) then we fall + # back to the basename as well: + # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 +- if sys.platform =3D=3D "darwin": +- if not os.path.isabs(lib): +- return os.path.basename(lib) +- return lib +- else: ++ ++ # Always use absolute paths if available ++ if not os.path.isabs(lib): + return os.path.basename(lib) ++ return lib +=20 +=20 + def resolve_from_ldd_output(libraries, output): + patterns =3D {} + for library in libraries: + if not os.path.isfile(library): +- patterns[library] =3D _ldd_library_pattern(library) ++ patterns[library] =3D (_ldd_library_pattern(library), _ldd_= library_guix_pattern(library)) + if len(patterns) =3D=3D 0: + return [] +=20 +@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output): + if line.endswith(':'): + continue + for word in line.split(): +- for library, pattern in patterns.items(): +- m =3D pattern.match(word) ++ for library, (pattern, guix_pattern) in patterns.items(): ++ if line.find('/gnu/store') !=3D -1: ++ m =3D guix_pattern.match(word) ++ else: ++ m =3D pattern.match(word) + if m: + del patterns[library] + shlibs.append(m.group()) + +--- a/giscanner/utils.py ++++ b/giscanner/utils.py +@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file): if dlname is None: return None =20 @@ -28,3 +149,15 @@ =20 =20 def extract_libtool(la_file): +--- a/tests/scanner/test_shlibs.py ++++ b/tests/scanner/test_shlibs.py +@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase): +=20 + self.assertEqual( + sanitize_shlib_path('/foo/bar'), +- '/foo/bar' if sys.platform =3D=3D 'darwin' else 'bar') ++ # Always use an absolute filename for Guix ++ '/foo/bar') +=20 + def test_unresolved_library(self): +output =3D '' --=20 2.22.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 08 03:46:54 2019 Received: (at 36535-done) by debbugs.gnu.org; 8 Jul 2019 07:46:54 +0000 Received: from localhost ([127.0.0.1]:57691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkOMO-0000sl-FZ for submit@debbugs.gnu.org; Mon, 08 Jul 2019 03:46:52 -0400 Received: from mira.cbaines.net ([212.71.252.8]:40004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkOMK-0000sb-Tg for 36535-done@debbugs.gnu.org; Mon, 08 Jul 2019 03:46:50 -0400 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 274A61717C for <36535-done@debbugs.gnu.org>; Mon, 8 Jul 2019 08:46:47 +0100 (BST) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 041859bf for <36535-done@debbugs.gnu.org>; Mon, 8 Jul 2019 07:46:46 +0000 (UTC) References: <20190707104803.23662-1-mail@cbaines.net> User-agent: mu4e 1.2.0; emacs 26.2 From: Christopher Baines To: 36535-done@debbugs.gnu.org Subject: Re: [bug#36535] [PATCH] gnu: gobject-introspection: Update absolute-shlib-path.patch. In-reply-to: <20190707104803.23662-1-mail@cbaines.net> Date: Mon, 08 Jul 2019 08:46:46 +0100 Message-ID: <87d0il9deh.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 36535-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Christopher Baines writes: > Incorporate some changes from nixpkgs to the gobject-introspection package > patches. This is motivated by looking at issues with libsoup and lollypop. > This changes means that the share/gir-1.0/Soup-2.4.gir file within libsoup > references libsoup-2.4.so.1 with an absolute filename, whereas previously, the > filename wasn't absolute. > > * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: > Incorporate changes from nixpkgs. > --- > ...ct-introspection-absolute-shlib-path.patch | 141 +++++++++++++++++- > 1 file changed, 137 insertions(+), 4 deletions(-) > I've pushed this as [1] to core-updates now, as I wanted to get it in before the freeze. 1: 8747477deb765571c300d3eb9a4012a3c36cf7f7 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl0i9OZfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XdBZQ/+Jfyw4pkvn02+DSf0SoEdD4OCoR+TpJK6S8VHCUOWuYQH5WSl8YXv5sX7 5/AvVgbwkCGIFR0jobUx2qCKvO0dIPizbDfEoAIDymZFdRU04e2hY0ow1MU4w5pR c7x22iO86wR8NUqJ/Ff+/GMGPcnj0I8brczEN6gccjf8v4GGKgBpcd1mRKpr9tZv dpzfiFniQzM+wiSIQyM+zqAWdG77n2s/XiMOiwTkpIq3NmIbgdeyT8+L42KQTnBO kiBnZbsXPXzV+U1Nn+2FItM9Su+wJTGXO+FGFGcI67JGALB7+ResaWkFl8f5oOog piqTfwMdo1HRBUiitXQVMG1iqpHg3AyZO7uf4EpeO5kkxld1K9wvXpdCHvt46LiT lBPkZw3glUC6k/oJTklKJkUVMkuVFGfz5EdEVYR11w/Gj0+7W1tLXFF4bbjdHDrc 7QmAdfQEO52QQdS3eTUQGeyfe4mJPiX+4eE6XRKj2nciGosh55SoanGGdIVCcjRY qeLI9q5qX2nLSslajPzttWMBAIh3M/AxWtBfyO4/RSa4t4QHvvzEd8ThYQnomgUt TU4rjygkgkhQGZr3I1k0OxZ4HIq/iPcOwdmsWWlKyCK0mL+3yFPjCnbG0meyREHV d7IkHqDOptfEKT5riyAoajPoaLVpQZHGLpv42RwO/U5lO2C2V0g= =zjdF -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 08 10:22:18 2019 Received: (at 36535-done) by debbugs.gnu.org; 8 Jul 2019 14:22:18 +0000 Received: from localhost ([127.0.0.1]:59287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkUWy-0007bS-AI for submit@debbugs.gnu.org; Mon, 08 Jul 2019 10:22:18 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:58675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkUWs-0007aj-Bd for 36535-done@debbugs.gnu.org; Mon, 08 Jul 2019 10:22:11 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id DAF10200E3; Mon, 8 Jul 2019 10:22:00 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 08 Jul 2019 10:22:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=tDHl6GCmYD9qlqLNUoFa43QAK7 sTpojJq1S03IH8UiM=; b=RIWepkSuSinLOChMKOZEtAF9VCgI99vtwQPKqLL1do ZNsqQdXSYidtlkXIGjDFGkPYXBXlLMw7Q8aHM+3I4onpYE7uYwdGVmJ4e+e3g6iW n+JZT8VpYBQoSc+bud3dixJD7Zg0TA0UJmTXKMaftJX6e7NLworS81va7rk75wyF 4yZjyfoSW5V2JkdpWKaq8N1opw6UDH/BaHRFh3WfWL+D7VarrjmQzRMv1kmSb9nI pJz27fXBOtchORcQxD0Zod79vuKJNSbJtMvt324k+EHXpn5xMnsNZdxQ50lsh7m7 NLdxSp4LCm2DwPE3zA8sIWOsHA/zhuRAjz+yfj8pjRNg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=tDHl6G CmYD9qlqLNUoFa43QAK7sTpojJq1S03IH8UiM=; b=S2sbSMBejsYfPMQsDezgAh TK2xSK5CmCRpbNaW4NGdGK70Omd8c7dnmPP11CsspsjjiYA5IWVKp4zcMOim8F2N CBGriWCPEuWRk80NwSqvmLgqvdaUs4A2k8qQtGMzoSlxQ1QCrAT5UnHu443FFpv3 wFe8c6seVFWv3maBLMtPQZRIQre1XZtIadTyEM588Nn/2PjjyOBNg1cDtVtDc1ci KmYAoBgK01CuIfCSkqat3WhxQuXQYl2HRTlprh9fb8sOk5Ga+WHVVRKOv0iE7ch+ W/7SBvKyKDpger1oUJhm8L/QX68t7ee0hOnrRXQO3FYN82llUtuiXnECvY6oZ4LA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrgedtgdejjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufgjfhgffffkgggtsehgtderre dtredtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhepghhnohhmvgdrohhrghenucfkphepiedvrd duiedrvddviedrudegtdenucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehf rghsthhmrghilhdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 370B5380084; Mon, 8 Jul 2019 10:22:00 -0400 (EDT) From: Marius Bakke To: Christopher Baines , 36535-done@debbugs.gnu.org Subject: Re: bug#36535: [PATCH] gnu: gobject-introspection: Update absolute-shlib-path.patch. In-Reply-To: <87d0il9deh.fsf@cbaines.net> References: <20190707104803.23662-1-mail@cbaines.net> <87d0il9deh.fsf@cbaines.net> User-Agent: Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) Date: Mon, 08 Jul 2019 16:21:58 +0200 Message-ID: <875zocr4hl.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 36535-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Chris, Christopher Baines writes: > Christopher Baines writes: > >> Incorporate some changes from nixpkgs to the gobject-introspection packa= ge >> patches. This is motivated by looking at issues with libsoup and lollyp= op. >> This changes means that the share/gir-1.0/Soup-2.4.gir file within libso= up >> references libsoup-2.4.so.1 with an absolute filename, whereas previousl= y, the >> filename wasn't absolute. >> >> * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: >> Incorporate changes from nixpkgs. >> --- >> ...ct-introspection-absolute-shlib-path.patch | 141 +++++++++++++++++- >> 1 file changed, 137 insertions(+), 4 deletions(-) >> > > I've pushed this as [1] to core-updates now, as I wanted to get it in > before the freeze. Thank you for addressing this. IIUC previously lollypop failed to retain a reference to libsoup-2.4.so.1, whereas with this patch it does? A few comments about the patch: > diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-pa= th.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.p= atch > index d00cc5a420..3c0bb1c6cf 100644 > --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch > +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch > @@ -2,10 +2,131 @@ > # add the full path. > # > # This patch was provided by Luca Bruno for=20 > -# 'gobject-introspection' 1.40.0 in Nix.=20 > ---- ./giscanner/utils.py.orig 2014-08-14 22:05:05.055334080 +0200 > -+++ ./giscanner/utils.py 2014-08-14 22:05:24.687497334 +0200 > -@@ -110,17 +110,11 @@ > +# 'gobject-introspection' 1.40.0 in Nix. > +# > +# It has since been updated to work with newer versions of > +# gobject-introspection. > +--- a/giscanner/scannermain.py > ++++ b/giscanner/scannermain.py > +@@ -95,6 +95,39 @@ def get_windows_option_group(parser): > + return group > +=20 > +=20 > ++def _get_default_fallback_libpath(): > ++ # Newer multiple-output-optimized stdenv has an environment variable > ++ # $outputLib which in turn specifies another variable which then is= used as > ++ # the destination for the library contents (${!outputLib}/lib). > ++ store_path =3D os.environ.get(os.environ.get("outputLib")) if "outp= utLib" in os.environ else None > ++ if store_path is None: > ++ outputs =3D os.environ.get("outputs", "out").split() gnu-build-system does not currently export an "outputs" variable. Perhaps it should? > ++ if "lib" in outputs: > ++ # For multiple output derivations let's try whether there i= s a $lib > ++ # environment variable and use that as the base store path. > ++ store_path =3D os.environ.get("lib") > ++ elif "out" in outputs: > ++ # Otherwise we have a single output derivation, so the libr= aries > ++ # most certainly will end up in "$out/lib". > ++ store_path =3D os.environ.get("out") Consequently, this is the only ever matching case, and "lib" outputs are ignored, counter to what one might expect from glancing over this patch. That is, unless one sets an "outputs" or "outputLib" variable in a package recipe, so maybe we don't have to do anything here. > ++ > ++ if store_path is not None: > ++ # Even if we have a $lib as output, there still should be a $li= b/lib > ++ # directory. > ++ return os.path.join(store_path, 'lib') > ++ else: > ++ # If we haven't found a possible scenario, let's return an empt= y string > ++ # so that the shared library won't be prepended with a path. > ++ # > ++ # Note that this doesn't mean that all hope is lost, because af= ter all > ++ # we can still use --fallback-library-path to set one. > ++ # > ++ # Also, we're not returning None, because that would make it ve= ry > ++ # difficult to disable adding fallback paths altogether using s= omething > ++ # like: --fallback-library-path=3D"" > ++ return "" > ++ > ++ > + def _get_option_parser(): > + parser =3D optparse.OptionParser('%prog [options] sources', > + version=3D'%prog ' + giscanner.__ver= sion__) > +@@ -205,6 +238,10 @@ match the namespace prefix.""") > + parser.add_option("", "--filelist", > + action=3D"store", dest=3D"filelist", default=3D[], > + help=3D"file containing headers and sources to be= scanned") > ++ parser.add_option("", "--fallback-library-path", > ++ action=3D"store", dest=3D"fallback_libpath", > ++ default=3D_get_default_fallback_libpath(), > ++ help=3D"Path to prepend to unknown shared librari= es") > +=20 > + group =3D get_preprocessor_option_group(parser) > + parser.add_option_group(group) > +--- a/giscanner/shlibs.py > ++++ b/giscanner/shlibs.py > +@@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): > + $""" % re.escape(library_name), re.VERBOSE) > +=20 > +=20 > ++def _ldd_library_guix_pattern(library_name): > ++ store_dir =3D re.escape('/gnu/store') Here we should use: os.environ.get("NIX_STORE") if "NIX_STORE" in os.environ else "/gnu/store" So that it works for non-default store prefixes. > ++ pattern =3D r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' > ++ return re.compile(pattern % (store_dir, re.escape(library_name))) > ++ > ++ > + # This is a what we do for non-la files. We assume that we are on an > + # ELF-like system where ldd exists and the soname extracted with ldd is > + # a filename that can be opened with dlopen(). > +@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries): > + output =3D output.decode("utf-8", "replace") > +=20 > + shlibs =3D resolve_from_ldd_output(libraries, output) > +- return list(map(sanitize_shlib_path, shlibs)) > ++ fallback_libpath =3D options.fallback_libpath or ""; > ++ return list(map(lambda p: os.path.join(fallback_libpath, p), ma= p(sanitize_shlib_path, shlibs))) > +=20 > +=20 > + def sanitize_shlib_path(lib): > +@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): > + # In case we get relative paths on macOS (like @rpath) then we fall > + # back to the basename as well: > + # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 > +- if sys.platform =3D=3D "darwin": > +- if not os.path.isabs(lib): > +- return os.path.basename(lib) > +- return lib > +- else: > ++ > ++ # Always use absolute paths if available > ++ if not os.path.isabs(lib): > + return os.path.basename(lib) > ++ return lib > +=20 > +=20 > + def resolve_from_ldd_output(libraries, output): > + patterns =3D {} > + for library in libraries: > + if not os.path.isfile(library): > +- patterns[library] =3D _ldd_library_pattern(library) > ++ patterns[library] =3D (_ldd_library_pattern(library), _ldd_= library_guix_pattern(library)) > + if len(patterns) =3D=3D 0: > + return [] > +=20 > +@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output): > + if line.endswith(':'): > + continue > + for word in line.split(): > +- for library, pattern in patterns.items(): > +- m =3D pattern.match(word) > ++ for library, (pattern, guix_pattern) in patterns.items(): > ++ if line.find('/gnu/store') !=3D -1: Use $NIX_STORE here, too. Other than that LGTM. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl0jUYYACgkQoqBt8qM6 VPoxlwgAvgaRHOLYSc/d0jreL57XpLIli70duhyKOFcLJN7ylPdNIUbPF29US5Z0 Yswa0mvyZo4VOEIobCnfPiJrf/dmpDCYOTepANaz9ybqnuwPlkriq7xEvOxlz8L7 qhkTttqVZoFK6OVkRBA1MM3LEmXf49UKiVLH19wjSH/T+eNijULZzvYF5kdH4Sc0 OioafwMLlqpe3KkM5QJxByV/pEpGmbMrnhhUX089m8Cq4lAV3Ml3+eRbKAUNG24j aqLqPaE9MqqymINk0N7jyy927uRhNBm6brYOoB4geyQ+HpqlZAz3AhDpASOMsOP/ 6y6NN48sGwU5ZrYoMZP8Jue9dX0xBw== =yx8y -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 08 11:59:27 2019 Received: (at 36535) by debbugs.gnu.org; 8 Jul 2019 15:59:27 +0000 Received: from localhost ([127.0.0.1]:59351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkW2z-0001fI-D2 for submit@debbugs.gnu.org; Mon, 08 Jul 2019 11:59:27 -0400 Received: from mira.cbaines.net ([212.71.252.8]:40562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkW2w-0001f7-PQ for 36535@debbugs.gnu.org; Mon, 08 Jul 2019 11:59:20 -0400 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 4FBB0171DB; Mon, 8 Jul 2019 16:59:16 +0100 (BST) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a4adbc23; Mon, 8 Jul 2019 15:59:15 +0000 (UTC) References: <20190707104803.23662-1-mail@cbaines.net> <87d0il9deh.fsf@cbaines.net> <875zocr4hl.fsf@devup.no> User-agent: mu4e 1.2.0; emacs 26.2 From: Christopher Baines To: Marius Bakke Subject: Re: bug#36535: [PATCH] gnu: gobject-introspection: Update absolute-shlib-path.patch. In-reply-to: <875zocr4hl.fsf@devup.no> Date: Mon, 08 Jul 2019 16:59:13 +0100 Message-ID: <87bly4a566.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 36535 Cc: 36535@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Marius Bakke writes: > Hi Chris, > > Christopher Baines writes: > >> Christopher Baines writes: >> >>> Incorporate some changes from nixpkgs to the gobject-introspection pack= age >>> patches. This is motivated by looking at issues with libsoup and lolly= pop. >>> This changes means that the share/gir-1.0/Soup-2.4.gir file within libs= oup >>> references libsoup-2.4.so.1 with an absolute filename, whereas previous= ly, the >>> filename wasn't absolute. >>> >>> * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: >>> Incorporate changes from nixpkgs. >>> --- >>> ...ct-introspection-absolute-shlib-path.patch | 141 +++++++++++++++++- >>> 1 file changed, 137 insertions(+), 4 deletions(-) >>> >> >> I've pushed this as [1] to core-updates now, as I wanted to get it in >> before the freeze. > > Thank you for addressing this. IIUC previously lollypop failed to > retain a reference to libsoup-2.4.so.1, whereas with this patch it does? Not quite... I think lollypop was reading the typelib in libsoup, but the shared library was just referenced by filename, not the absolute filename, and I think this was causing issues when trying to use libsoup from lollypop. On master: grep shared-library /gnu/store/bafaiiblr2vmmf1zvidkw1137ndqnqg2-libsoup-2.6= 6.2/share/gir-1.0/Soup-2.4.gir shared-library=3D"libsoup-2.4.so.1" On core-updates: grep shared-library /gnu/store/b1ykh6xj11v7zav4r68v8qflk31cnddm-libsoup-2.6= 6.2/share/gir-1.0/Soup-2.4.gir shared-library=3D"/gnu/store/b1ykh6xj11v7zav4r68v8qflk31cnddm-= libsoup-2.66.2/lib/libsoup-2.4.so.1" > A few comments about the patch: > >> diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-p= ath.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.= patch >> index d00cc5a420..3c0bb1c6cf 100644 >> --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.pat= ch >> +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.pat= ch >> @@ -2,10 +2,131 @@ >> # add the full path. >> # >> # This patch was provided by Luca Bruno for >> -# 'gobject-introspection' 1.40.0 in Nix. >> ---- ./giscanner/utils.py.orig 2014-08-14 22:05:05.055334080 +0200 >> -+++ ./giscanner/utils.py 2014-08-14 22:05:24.687497334 +0200 >> -@@ -110,17 +110,11 @@ >> +# 'gobject-introspection' 1.40.0 in Nix. >> +# >> +# It has since been updated to work with newer versions of >> +# gobject-introspection. >> +--- a/giscanner/scannermain.py >> ++++ b/giscanner/scannermain.py >> +@@ -95,6 +95,39 @@ def get_windows_option_group(parser): >> + return group >> + >> + >> ++def _get_default_fallback_libpath(): >> ++ # Newer multiple-output-optimized stdenv has an environment variab= le >> ++ # $outputLib which in turn specifies another variable which then i= s used as >> ++ # the destination for the library contents (${!outputLib}/lib). >> ++ store_path =3D os.environ.get(os.environ.get("outputLib")) if "out= putLib" in os.environ else None >> ++ if store_path is None: >> ++ outputs =3D os.environ.get("outputs", "out").split() > > gnu-build-system does not currently export an "outputs" variable. > Perhaps it should? Ah, I didn't realise this part of the patch was as Nix specific as it is... At least for the change I was trying to affect, this seems to be probably redundant, or somehow doing the job. Maybe this part of the patch relating to the fallback_libpath should be removed. >> ++ if "lib" in outputs: >> ++ # For multiple output derivations let's try whether there = is a $lib >> ++ # environment variable and use that as the base store path. >> ++ store_path =3D os.environ.get("lib") >> ++ elif "out" in outputs: >> ++ # Otherwise we have a single output derivation, so the lib= raries >> ++ # most certainly will end up in "$out/lib". >> ++ store_path =3D os.environ.get("out") > > Consequently, this is the only ever matching case, and "lib" outputs are > ignored, counter to what one might expect from glancing over this patch. > > That is, unless one sets an "outputs" or "outputLib" variable in a > package recipe, so maybe we don't have to do anything here. > >> ++ >> ++ if store_path is not None: >> ++ # Even if we have a $lib as output, there still should be a $l= ib/lib >> ++ # directory. >> ++ return os.path.join(store_path, 'lib') >> ++ else: >> ++ # If we haven't found a possible scenario, let's return an emp= ty string >> ++ # so that the shared library won't be prepended with a path. >> ++ # >> ++ # Note that this doesn't mean that all hope is lost, because a= fter all >> ++ # we can still use --fallback-library-path to set one. >> ++ # >> ++ # Also, we're not returning None, because that would make it v= ery >> ++ # difficult to disable adding fallback paths altogether using = something >> ++ # like: --fallback-library-path=3D"" >> ++ return "" >> ++ >> ++ >> + def _get_option_parser(): >> + parser =3D optparse.OptionParser('%prog [options] sources', >> + version=3D'%prog ' + giscanner.__ve= rsion__) >> +@@ -205,6 +238,10 @@ match the namespace prefix.""") >> + parser.add_option("", "--filelist", >> + action=3D"store", dest=3D"filelist", default=3D[= ], >> + help=3D"file containing headers and sources to b= e scanned") >> ++ parser.add_option("", "--fallback-library-path", >> ++ action=3D"store", dest=3D"fallback_libpath", >> ++ default=3D_get_default_fallback_libpath(), >> ++ help=3D"Path to prepend to unknown shared librar= ies") >> + >> + group =3D get_preprocessor_option_group(parser) >> + parser.add_option_group(group) >> +--- a/giscanner/shlibs.py >> ++++ b/giscanner/shlibs.py >> +@@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): >> + $""" % re.escape(library_name), re.VERBOSE) >> + >> + >> ++def _ldd_library_guix_pattern(library_name): >> ++ store_dir =3D re.escape('/gnu/store') > > Here we should use: > > os.environ.get("NIX_STORE") if "NIX_STORE" in os.environ else "/gnu/stor= e" > > So that it works for non-default store prefixes. Given NIX_STORE is set at build time, and this code is mostly used at build time, then that would work. Before I was thinking about how to actually put the store path in the code at build time, but that's probably not necessary. >> ++ pattern =3D r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' >> ++ return re.compile(pattern % (store_dir, re.escape(library_name))) >> ++ >> ++ >> + # This is a what we do for non-la files. We assume that we are on an >> + # ELF-like system where ldd exists and the soname extracted with ldd is >> + # a filename that can be opened with dlopen(). >> +@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries= ): >> + output =3D output.decode("utf-8", "replace") >> + >> + shlibs =3D resolve_from_ldd_output(libraries, output) >> +- return list(map(sanitize_shlib_path, shlibs)) >> ++ fallback_libpath =3D options.fallback_libpath or ""; >> ++ return list(map(lambda p: os.path.join(fallback_libpath, p), m= ap(sanitize_shlib_path, shlibs))) >> + >> + >> + def sanitize_shlib_path(lib): >> +@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): >> + # In case we get relative paths on macOS (like @rpath) then we fall >> + # back to the basename as well: >> + # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 >> +- if sys.platform =3D=3D "darwin": >> +- if not os.path.isabs(lib): >> +- return os.path.basename(lib) >> +- return lib >> +- else: >> ++ >> ++ # Always use absolute paths if available >> ++ if not os.path.isabs(lib): >> + return os.path.basename(lib) >> ++ return lib >> + >> + >> + def resolve_from_ldd_output(libraries, output): >> + patterns =3D {} >> + for library in libraries: >> + if not os.path.isfile(library): >> +- patterns[library] =3D _ldd_library_pattern(library) >> ++ patterns[library] =3D (_ldd_library_pattern(library), _ldd= _library_guix_pattern(library)) >> + if len(patterns) =3D=3D 0: >> + return [] >> + >> +@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output): >> + if line.endswith(':'): >> + continue >> + for word in line.split(): >> +- for library, pattern in patterns.items(): >> +- m =3D pattern.match(word) >> ++ for library, (pattern, guix_pattern) in patterns.items(): >> ++ if line.find('/gnu/store') !=3D -1: > > Use $NIX_STORE here, too. > > Other than that LGTM. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl0jaFFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XcFcRAAltWo2Jsf7FqUhdceW/U47N1X7pCQLFsYD5xD0z4tRKGOwOiS3kelqb7f RAAA8cjOqOYN1t0uFamcL82EkZ+RWAj0CJQn4cP81S5p/YrhwWXbMVH4CX2XrX44 okFdpyvkEnRxZ1O30VdlMrtTdgWxG/qQkK/9ZFgLCvxn2Qnw6zIpEuZnm8rrIBft WCz3fmFzd69NN2JM60MOVyta0i6zI4cFOL0i+LqtZCIQGurh3nMvAhN+GE+9/uQ2 OdrZTRN6PNny6rcpN4ZOZ6NE10s5uBHMw9MMUN9A2Lj+1BqAv2nBSzqvmZrmfkGH 6O6e13Y19RYPaNIXPH4W3KaycDRYu2xYhd018PVmBZ1kA4A7P5hll7Vgwv70vH4n wkUDpeKEjl9F7SMnsv28vyDZyV+FiY7rsnXyq6N08+DHH9BJllwgfkqdx5ktRgB+ 54WCETrkG5cZNQ1lqniySXVQIsyEAYpwBaQBOhKILx+zuA4RWTuy6kitwNYWQ0FA eLibQY8UL7iPo38ZuVHuWxIn3ntZkxhJ6qv5kECG+055FF2ZKSorVu9Y3q4XVkRu naWHbTTD6DGOwZ/+Z24/3FL78QN9x8xkfu/4R5Ou5/dAvwgpQO0rbD4sqYaPEnsm DFRA/jzykptvEawfQzjxuFaYxqLeeAefx01G587HPDk159H7dPE= =/I0h -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 08 12:30:12 2019 Received: (at 36535) by debbugs.gnu.org; 8 Jul 2019 16:30:12 +0000 Received: from localhost ([127.0.0.1]:59382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkWWl-0002ee-0U for submit@debbugs.gnu.org; Mon, 08 Jul 2019 12:30:12 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:33217) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkWWj-0002db-1E for 36535@debbugs.gnu.org; Mon, 08 Jul 2019 12:30:05 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 1552D21ADD; Mon, 8 Jul 2019 12:29:59 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 08 Jul 2019 12:29:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=qo6rLz2asrAEuXtZDyB0SvnNNj strWGsBQd0RJ8hZO0=; b=aNz7t7Ux1/I7vbGRpFWFv0gIOYE7P6xA1BfXoPPEyc HYTpf7iSRZrtdUMSjDdV+auYctzeDeAZf3XtUoQa3QYdVrLpWeAeWhPQFvnIjnp5 Y5tU8tHC0Hwx0VuzXKo5egO7pG0woFeJiTmOtMvI3gjG4wwO4RETo0INCflkJ+iD ZkwgoJ2OTpoujLJeqYxovQ9GIz5+BtsEGYYXJ8Rh2+siHKeTh+irWxZsfi5NW1+L uHcjwpDo4b1ihaEsrAbj+QI8q9y7Cy0kv1/L0KOJJ6jkIh4JU36CooH8zHoMWWmp bRtSSRUl1kn357d96GFsJgl9MAV37QTLnNiUHuNMFl6Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=qo6rLz 2asrAEuXtZDyB0SvnNNjstrWGsBQd0RJ8hZO0=; b=gl4lVf0foV55kQKiKchSg1 8SzOJF25XeHNr2oFuZxawt6cBw9luhqDTJ76suslz6wu8At3FLyCCsocxdhcPm8w zqt34rQEkvtC/7D/VVpEM4/gej20sja4O+j0s/DfHRRMGee1D0OPmcjTA1nhS1E0 DuSvPx0iiSoUu3RkGi+7RfVXsx0EOzyvngJDiCeAh7E1FHD0N0UJMhb8g1PoZAjR lPeUNkS9zmjBETU6NpWKk8dmhM5Ao5GZgKL0xwmfXKgRsfdBhbqcfKUX6x10hZ2a NtW1Ac9HTu+g9Bu0X94Y78PxHccUtX/Fwt0WmFbsgw0FQplIwEBjZexS34Tv7ksw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrgedtgddutdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffujghffgffkfggtgesghdtre ertdertdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecukfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhs thgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 4E24280065; Mon, 8 Jul 2019 12:29:58 -0400 (EDT) From: Marius Bakke To: Christopher Baines Subject: Re: bug#36535: [PATCH] gnu: gobject-introspection: Update absolute-shlib-path.patch. In-Reply-To: <87bly4a566.fsf@cbaines.net> References: <20190707104803.23662-1-mail@cbaines.net> <87d0il9deh.fsf@cbaines.net> <875zocr4hl.fsf@devup.no> <87bly4a566.fsf@cbaines.net> User-Agent: Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) Date: Mon, 08 Jul 2019 18:29:56 +0200 Message-ID: <87zhlopjzv.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 36535 Cc: 36535@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Christopher Baines writes: > Marius Bakke writes: > >> Hi Chris, >> >> Christopher Baines writes: >> >>> Christopher Baines writes: >>> >>>> Incorporate some changes from nixpkgs to the gobject-introspection package >>>> patches. This is motivated by looking at issues with libsoup and lollypop. >>>> This changes means that the share/gir-1.0/Soup-2.4.gir file within libsoup >>>> references libsoup-2.4.so.1 with an absolute filename, whereas previously, the >>>> filename wasn't absolute. >>>> >>>> * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: >>>> Incorporate changes from nixpkgs. >>>> --- >>>> ...ct-introspection-absolute-shlib-path.patch | 141 +++++++++++++++++- >>>> 1 file changed, 137 insertions(+), 4 deletions(-) >>>> >>> >>> I've pushed this as [1] to core-updates now, as I wanted to get it in >>> before the freeze. >> >> Thank you for addressing this. IIUC previously lollypop failed to >> retain a reference to libsoup-2.4.so.1, whereas with this patch it does? > > Not quite... I think lollypop was reading the typelib in libsoup, but > the shared library was just referenced by filename, not the absolute > filename, and I think this was causing issues when trying to use libsoup > from lollypop. I see, thanks for explaining. In Guix, we usually resolve these situations by native-search-paths, do you know if gobject-introspection supports looking up the 'share/gir-1.0' directory from an environment variable (similar to how GI_TYPELIB_PATH works today)? However... > > On master: > > grep shared-library /gnu/store/bafaiiblr2vmmf1zvidkw1137ndqnqg2-libsoup-2.66.2/share/gir-1.0/Soup-2.4.gir > shared-library="libsoup-2.4.so.1" > > On core-updates: > > grep shared-library /gnu/store/b1ykh6xj11v7zav4r68v8qflk31cnddm-libsoup-2.66.2/share/gir-1.0/Soup-2.4.gir > shared-library="/gnu/store/b1ykh6xj11v7zav4r68v8qflk31cnddm-libsoup-2.66.2/lib/libsoup-2.4.so.1" ...this is even better, so I am mostly just curious :-) >> A few comments about the patch: >> >>> diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch >>> index d00cc5a420..3c0bb1c6cf 100644 >>> --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch >>> +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch >>> @@ -2,10 +2,131 @@ >>> # add the full path. >>> # >>> # This patch was provided by Luca Bruno for >>> -# 'gobject-introspection' 1.40.0 in Nix. >>> ---- ./giscanner/utils.py.orig 2014-08-14 22:05:05.055334080 +0200 >>> -+++ ./giscanner/utils.py 2014-08-14 22:05:24.687497334 +0200 >>> -@@ -110,17 +110,11 @@ >>> +# 'gobject-introspection' 1.40.0 in Nix. >>> +# >>> +# It has since been updated to work with newer versions of >>> +# gobject-introspection. >>> +--- a/giscanner/scannermain.py >>> ++++ b/giscanner/scannermain.py >>> +@@ -95,6 +95,39 @@ def get_windows_option_group(parser): >>> + return group >>> + >>> + >>> ++def _get_default_fallback_libpath(): >>> ++ # Newer multiple-output-optimized stdenv has an environment variable >>> ++ # $outputLib which in turn specifies another variable which then is used as >>> ++ # the destination for the library contents (${!outputLib}/lib). >>> ++ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None >>> ++ if store_path is None: >>> ++ outputs = os.environ.get("outputs", "out").split() >> >> gnu-build-system does not currently export an "outputs" variable. >> Perhaps it should? > > Ah, I didn't realise this part of the patch was as Nix specific as it > is... > > At least for the change I was trying to affect, this seems to be > probably redundant, or somehow doing the job. Maybe this part of the > patch relating to the fallback_libpath should be removed. I'd keep the "$outputs" logic, it sounds like a useful and easy change to do in gnu-build-system, although maybe not for this 'core-updates' round. We can use it in package recipes for fun and profit meanwhile. However I doubt we'll ever use "outputLib", so it would be good to remove that. If you are updating the patch, could you also add a link to the upstream patch, as well as one to this discussion? Thank you! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl0jb4QACgkQoqBt8qM6 VPqcDAgAzh5OBm920W7x3miCb3EamzZSzWij+OMp0q+3vl0UU5bYaOQeUNlOJiZO REkwR9cVwVobqiUAgBi5YOOsNa5tk6g/brC/1Pr4Z8QBtewmy6BR0hw5q40ywCaw pf2Y4h2JR5rWBbMmoltN5ltJQv4kbbBAGZe0DQUDFNNhDFctTS/A9DXJB72bLPot ag7xy6wYow2xUnYz7SAmfU1g835Mm9VhsaMHrvBL5/+nejHmt6dTarr+pszRqIRu oEFznl+8MoK3z1W6R6GiYLezyR6RkMwOp1+H8gEVwJN1AWgiWgobKAbH4BjcWFxk MFEZ8Mai3Pv7nr/BfxlzKWFOq+U3GQ== =N53A -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 10 13:35:32 2019 Received: (at 36535) by debbugs.gnu.org; 10 Jul 2019 17:35:32 +0000 Received: from localhost ([127.0.0.1]:36573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlGVA-0001lh-DW for submit@debbugs.gnu.org; Wed, 10 Jul 2019 13:35:32 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:38241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlGV7-0001lT-Mb for 36535@debbugs.gnu.org; Wed, 10 Jul 2019 13:35:30 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 5C8D5210D8; Wed, 10 Jul 2019 13:35:24 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 10 Jul 2019 13:35:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=FVf9gjswjhOx48RFqTEGhO8ea5 twLHbgAcV6ldCbhkg=; b=YGdt4K8xNUsVNlkhMMMJY0eul++EsfBC38nM0eXSPX YoY5ofmYgt9F7MrEMbVemJQuMJ+G+/iwTDVJjGG90PrSA8UGktk0ryyIWpPGybHk 5amS0kVHHcKg9YCodPoGLlEUQX8PoxxL20HiICHLrL6RJoaCk57FCVJxbMRvQDHs g7N4fPusIy7eDAP7qODFDCYy2lNgQxZEUdM/YI5WvtRd+2f1IqFLIm8YKhJ0LuAX evrBQgArsw4xuW+rcebCaZoLexi3tbIOfJjTfSUW5vWgeBhRIZl43MgZ3VEgMCis KNBk1MdVtrQ7sUdN3OYMn+3UeLGukeUOwZot8odCS7tg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=FVf9gj swjhOx48RFqTEGhO8ea5twLHbgAcV6ldCbhkg=; b=EYloYzm0kHefzjNjPkijqB YTNP2xpeFwYfA3dfJW6wyOz8YhQCs+G05o4h4AS3J4C7nFyzaNvOVZoPzk/LHgsM dx+d5LZKVfU4K21OjRegKCVPnH+P7m1prrZMPXLLgiZWHlFuNT2lHraLxSthovaK CYO96as/OlZm2Q0qatWVg2u/opSCS7ukaGDOF1biKEcZ2TqHQB+9isZwPPEvWNeO /+TQg510nhsASHZYlTMOH4X7dmMep1I4s4pWPCFNqIQhX6Q0CEzRW7JC03qtf1X9 TU2smbUDirRlOXhIRi2sFxlNCe0DAyDIWPx9yN9plrAhsMR645lbNLiRCcRjCLnw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrgeeigdduudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffujghffgffkfggtgesghdtre ertdertdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecukfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhs thgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id BA89E380079; Wed, 10 Jul 2019 13:35:23 -0400 (EDT) From: Marius Bakke To: Christopher Baines Subject: Re: bug#36535: [PATCH] gnu: gobject-introspection: Update absolute-shlib-path.patch. In-Reply-To: <87zhlopjzv.fsf@devup.no> References: <20190707104803.23662-1-mail@cbaines.net> <87d0il9deh.fsf@cbaines.net> <875zocr4hl.fsf@devup.no> <87bly4a566.fsf@cbaines.net> <87zhlopjzv.fsf@devup.no> User-Agent: Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) Date: Wed, 10 Jul 2019 19:35:21 +0200 Message-ID: <87tvbtn67a.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 36535 Cc: 36535@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Marius Bakke writes: > Christopher Baines writes: > >> Marius Bakke writes: >> >>> Hi Chris, >>> >>> Christopher Baines writes: >>> >>>> Christopher Baines writes: >>>> >>>>> Incorporate some changes from nixpkgs to the gobject-introspection package >>>>> patches. This is motivated by looking at issues with libsoup and lollypop. >>>>> This changes means that the share/gir-1.0/Soup-2.4.gir file within libsoup >>>>> references libsoup-2.4.so.1 with an absolute filename, whereas previously, the >>>>> filename wasn't absolute. >>>>> >>>>> * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: >>>>> Incorporate changes from nixpkgs. >>>>> --- >>>>> ...ct-introspection-absolute-shlib-path.patch | 141 +++++++++++++++++- >>>>> 1 file changed, 137 insertions(+), 4 deletions(-) >>>>> >>>> >>>> I've pushed this as [1] to core-updates now, as I wanted to get it in >>>> before the freeze. >>> >>> Thank you for addressing this. IIUC previously lollypop failed to >>> retain a reference to libsoup-2.4.so.1, whereas with this patch it does? >> >> Not quite... I think lollypop was reading the typelib in libsoup, but >> the shared library was just referenced by filename, not the absolute >> filename, and I think this was causing issues when trying to use libsoup >> from lollypop. > > I see, thanks for explaining. In Guix, we usually resolve these > situations by native-search-paths, do you know if gobject-introspection > supports looking up the 'share/gir-1.0' directory from an environment > variable (similar to how GI_TYPELIB_PATH works today)? However... Errh, ignore this, I need to study the GObject stuff one of these days... Do you think you'll have time to update the patch within the coming days? The only important part is the NIX_STORE bits; the rest can be dealt with later. TIA! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl0mIdkACgkQoqBt8qM6 VPpGzQf/eOscS/CyNZCfeOiA2+4+hRCC3Bo4MEv6wbG/7pyrPdqagRUxQIL7pa57 7fJJl2P2yb9gohelnLe5BlJSleiqGBcfSCpHzOATIR8z92nc1JTIRPg6XkC4+Ib0 fwYQ2tkgMkRIWp5BJLMWkSR1d3OVgniCQ0A+RX/S3A8yZW2b3q1MpRXVy6i/gfLS T9vxP6IThfj5CL+NZ+jOkBxfiq80mYlWsmt2vH3P068ds3ZZ/pYyFNrII/JMLYNp 2cluEKRUCFr1HM22Pj3xFBQUHjfkSQvlXCwRCQg0vW9RTsRArPAjmIy7Ze6I+x+/ 2/dmMahu9fZc+72TozU65yYhX55+rQ== =mrFo -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Sep 11 19:19:57 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: Did not alter fixed versions and reopened. Date: Thu, 11 Jul 2019 18:25:02 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # Did not alter fixed versions and reopened. thanks # This fakemail brought to you by your local debbugs # administrator From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 12 14:44:22 2019 Received: (at 36535) by debbugs.gnu.org; 12 Jul 2019 18:44:22 +0000 Received: from localhost ([127.0.0.1]:40731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hm0Ws-0001jy-9Q for submit@debbugs.gnu.org; Fri, 12 Jul 2019 14:44:22 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:41459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hm0Wq-0001ji-PR for 36535@debbugs.gnu.org; Fri, 12 Jul 2019 14:44:21 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 051C62207F; Fri, 12 Jul 2019 14:44:15 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 12 Jul 2019 14:44:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=2Chi+B4qx5CPALatNtZLcXX/7Z e70c7x/XpAFKKJZoc=; b=N742Oh8ySXySxK1z6xNZnEaZ+B+gg4hefkic/pQUVU EgPdAAIsR9LNHQGBeoljdWQbR0zFVtITS/Vlu0PnaUxig/NNH9QPr71j3FdQQg3P e2OeByfdrLDs1XyxwNHEyjsh0ptR9I0c7WjtpymPIRbyJmpEMSzP837qH9/T8X2B YlLjPqMC6NamY29fv9elAKwdbKfkUbTmBVftR3sC2m/HXvQkX1hEkxF2kR+80NaU A84mhGmHFINVF9H84XMF6w8JYxiwm/4FY75h1LCCtYOTRPLEFUMzhkMAeVHmdT2T LcZkQC/Li4Q1Ytyv81B24b0vRvVBEI0TlRhc7lOAD00w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=2Chi+B 4qx5CPALatNtZLcXX/7Ze70c7x/XpAFKKJZoc=; b=nokoZRSwn746Kj5osAr6pP bRW+f4JtPNV45wiK+6Xt6eDndCxNywF2DQtT9bN/czN32Opv2m/hUK5rhAqkG3JE XjcjU7w5sbRGxHMEeTfjMgvLKkrVvWqeDEHdABzEPReqtBn8M5a98QAwG5wmue+k hAnZRuQnNiN6Qswn2AaqG2jlSXxEiuEh2lsoxUg1LBd8f668EKnCDbiDVXK2pSVq hJTYtmq82wMWOesRXaGQRB+JT0UKG15UZ0muD4XpXkCCf3WKxIRnfoGg3CRNV/+/ eudGbVWnTXEfwWUcoqGM/Cpt90zOg3h/ZN9YE6OYa7HhU1pzDscM38cYqa0evaFg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrhedtgdduvdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffujghffgffkfggtgesthdtre dttdertdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecuffhomhgrihhnpehgnhhurdhorhhgnecukfhppeeivddrud eirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgr shhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 53308380075; Fri, 12 Jul 2019 14:44:14 -0400 (EDT) From: Marius Bakke To: Christopher Baines Subject: Re: bug#36535: [PATCH] gnu: gobject-introspection: Update absolute-shlib-path.patch. In-Reply-To: <87zhlopjzv.fsf@devup.no> References: <20190707104803.23662-1-mail@cbaines.net> <87d0il9deh.fsf@cbaines.net> <875zocr4hl.fsf@devup.no> <87bly4a566.fsf@cbaines.net> <87zhlopjzv.fsf@devup.no> User-Agent: Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) Date: Fri, 12 Jul 2019 20:44:08 +0200 Message-ID: <87zhljks93.fsf@devup.no> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 36535 Cc: 36535@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) severity 36535 important >>>> ++def _get_default_fallback_libpath(): >>>> ++ # Newer multiple-output-optimized stdenv has an environment variable >>>> ++ # $outputLib which in turn specifies another variable which then is used as >>>> ++ # the destination for the library contents (${!outputLib}/lib). >>>> ++ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None >>>> ++ if store_path is None: >>>> ++ outputs = os.environ.get("outputs", "out").split() >>> >>> gnu-build-system does not currently export an "outputs" variable. >>> Perhaps it should? >> >> Ah, I didn't realise this part of the patch was as Nix specific as it >> is... >> >> At least for the change I was trying to affect, this seems to be >> probably redundant, or somehow doing the job. Maybe this part of the >> patch relating to the fallback_libpath should be removed. > > I'd keep the "$outputs" logic, it sounds like a useful and easy change > to do in gnu-build-system, although maybe not for this 'core-updates' > round. We can use it in package recipes for fun and profit meanwhile. We now have a user of the $outputs variable: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=7555d539245ff3456848c02d61f9e601ee5af463 Incidentally, the package was broken because of the very same feature :-) But we can not merge this with the hard-coded /gnu/store paths, as that is likely to cause strange problems for users with a non-default store prefix. Unless someone steps up to fix it within a few days, I think we'll have to revert it for now. From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 12 19:23:07 2019 Received: (at 36535) by debbugs.gnu.org; 12 Jul 2019 23:23:07 +0000 Received: from localhost ([127.0.0.1]:40922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hm4sd-0002Vw-Df for submit@debbugs.gnu.org; Fri, 12 Jul 2019 19:23:07 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hm4sb-0002Vn-7m for 36535@debbugs.gnu.org; Fri, 12 Jul 2019 19:23:06 -0400 Received: from localhost (148.185.93.209.dyn.plus.net [209.93.185.148]) by mira.cbaines.net (Postfix) with ESMTPSA id 7CDAA17210; Sat, 13 Jul 2019 00:23:03 +0100 (BST) Received: from phact (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 6809005c; Fri, 12 Jul 2019 23:23:03 +0000 (UTC) References: <20190707104803.23662-1-mail@cbaines.net> <87d0il9deh.fsf@cbaines.net> <875zocr4hl.fsf@devup.no> <87bly4a566.fsf@cbaines.net> <87zhlopjzv.fsf@devup.no> <87zhljks93.fsf@devup.no> User-agent: mu4e 1.2.0; emacs 26.2 From: Christopher Baines To: Marius Bakke Subject: Re: bug#36535: [PATCH] gnu: gobject-introspection: Update absolute-shlib-path.patch. In-reply-to: <87zhljks93.fsf@devup.no> Date: Sat, 13 Jul 2019 00:22:59 +0100 Message-ID: <87v9w6zvl8.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 36535 Cc: 36535@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Marius Bakke writes: > severity 36535 important > >>>>> ++def _get_default_fallback_libpath(): >>>>> ++ # Newer multiple-output-optimized stdenv has an environment var= iable >>>>> ++ # $outputLib which in turn specifies another variable which the= n is used as >>>>> ++ # the destination for the library contents (${!outputLib}/lib). >>>>> ++ store_path =3D os.environ.get(os.environ.get("outputLib")) if "= outputLib" in os.environ else None >>>>> ++ if store_path is None: >>>>> ++ outputs =3D os.environ.get("outputs", "out").split() >>>> >>>> gnu-build-system does not currently export an "outputs" variable. >>>> Perhaps it should? >>> >>> Ah, I didn't realise this part of the patch was as Nix specific as it >>> is... >>> >>> At least for the change I was trying to affect, this seems to be >>> probably redundant, or somehow doing the job. Maybe this part of the >>> patch relating to the fallback_libpath should be removed. >> >> I'd keep the "$outputs" logic, it sounds like a useful and easy change >> to do in gnu-build-system, although maybe not for this 'core-updates' >> round. We can use it in package recipes for fun and profit meanwhile. > > We now have a user of the $outputs variable: > > https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D7555d539245ff3456= 848c02d61f9e601ee5af463 Ooh, interesting :) > Incidentally, then package was broken because of the very same feature :-) > > But we can not merge this with the hard-coded /gnu/store paths, as that > is likely to cause strange problems for users with a non-default store > prefix. > > Unless someone steps up to fix it within a few days, I think we'll have > to revert it for now. I have some time now to look at this, I'm currently building libsoup with these changes to the patch. modified gnu/packages/patches/gobject-introspection-absolute-shlib-path.p= atch @@ -61,12 +61,14 @@ parser.add_option_group(group) --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py =2D@@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): +@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): $""" % re.escape(library_name), re.VERBOSE) =20=20 =20=20 +def _ldd_library_guix_pattern(library_name): =2D+ store_dir =3D re.escape('/gnu/store') ++ store_dir =3D re.escape( ++ os.environ.get("NIX_STORE", default=3D"/gnu/store") ++ ) + pattern =3D r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' + return re.compile(pattern % (store_dir, re.escape(library_name))) + @@ -109,14 +111,15 @@ if len(patterns) =3D=3D 0: return [] =20=20 =2D@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output): +@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output): if line.endswith(':'): continue for word in line.split(): - for library, pattern in patterns.items(): - m =3D pattern.match(word) + for library, (pattern, guix_pattern) in patterns.items(): =2D+ if line.find('/gnu/store') !=3D -1: ++ store_dir =3D os.environ.get("NIX_STORE", default=3D"/gnu= /store") ++ if line.find(store_dir) !=3D -1: + m =3D guix_pattern.match(word) + else: + m =3D pattern.match(word) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl0pFlNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XdLag//dOnNp6O2zgepM3LtiryRdbIkyVslnNr9kWdZ0X463x1lZKoIQLFCji1q BXsgRo7yNZ8eqaAOXSoLM4MQD8rk90/s1x5jGmUb0Cs1LfX2PHo14UWdPWTvhSxy jTgRu71CFCFvhBuzxrEkhea+GHo7hQc3N63y+fVQhAGO6TLzBGhditWioQPSMF/3 Lnsku0Wt3EUfms3xIpdDA20lfEBL6dvGKWvWy1rYNFpSDUAQpComDBvp9allz/0D WYs/Q23Hw7QD2SkvTzKUJtMhSbCskoEUAEj3IjDmrsEQdbevhDBisUzJXn9/zuls ybf0B+lNSFEQJv1deJM4YOlPOFBTDWcZAwn+OzPbvhR87nmoqwHFZ79W7vXXeC0z Alg8EDHW+segc+r3lOqF92RsAAnq4NhCzVDU2aI9SKKi4MzEFfrAAsbI1PkUp2DH z0ZiJLP+b3wa3ygHOpBS1smy92OmK67yG9Wpkbq2fSE7PIYzC2Eah8ZFmmpgXZ8k 8OU9oHQdNM53Vs2CXx1LkyOcgGNyToHrnFiV6accdkl6/LqNwph6Mb5r6t/6pi20 dvZhAZx0r7BP7Fm+V9IVGnK9okyemggFpWTW27InGWbLfDd/7GaLdkBH1tHBw4Y4 ce5L8P/ajMXf+Ot44UjQ/QjTHRFh04jXLyFf7ezSlkYFIeMUB2Q= =DfBw -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 07:09:57 2019 Received: (at 36535) by debbugs.gnu.org; 13 Jul 2019 11:09:57 +0000 Received: from localhost ([127.0.0.1]:41511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmFuf-0003CU-1m for submit@debbugs.gnu.org; Sat, 13 Jul 2019 07:09:57 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmFuc-0003CL-OD for 36535@debbugs.gnu.org; Sat, 13 Jul 2019 07:09:56 -0400 Received: from localhost (148.185.93.209.dyn.plus.net [209.93.185.148]) by mira.cbaines.net (Postfix) with ESMTPSA id BD04B171AA; Sat, 13 Jul 2019 12:09:50 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id c0ca7f87; Sat, 13 Jul 2019 11:09:50 +0000 (UTC) From: Christopher Baines To: Marius Bakke Subject: [PATCH] gnu: gobject-introspection: Remove hardcoded store from patch. Date: Sat, 13 Jul 2019 12:09:50 +0100 Message-Id: <20190713110950.13428-1-mail@cbaines.net> X-Mailer: git-send-email 2.22.0 In-Reply-To: <87v9w6zvl8.fsf@cbaines.net> References: <87v9w6zvl8.fsf@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 36535 Cc: 36535@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Use the NIX_STORE environment variable, rather than hardcoding the store directory. --- .../gobject-introspection-absolute-shlib-path.patch | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch index 3c0bb1c6cf..956fa617c3 100644 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch @@ -61,12 +61,14 @@ parser.add_option_group(group) --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py -@@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): +@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): $""" % re.escape(library_name), re.VERBOSE) +def _ldd_library_guix_pattern(library_name): -+ store_dir = re.escape('/gnu/store') ++ store_dir = re.escape( ++ os.environ.get("NIX_STORE", default="/gnu/store") ++ ) + pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' + return re.compile(pattern % (store_dir, re.escape(library_name))) + @@ -109,14 +111,15 @@ if len(patterns) == 0: return [] -@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output): +@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output): if line.endswith(':'): continue for word in line.split(): - for library, pattern in patterns.items(): - m = pattern.match(word) + for library, (pattern, guix_pattern) in patterns.items(): -+ if line.find('/gnu/store') != -1: ++ store_dir = os.environ.get("NIX_STORE", default="/gnu/store") ++ if line.find(store_dir) != -1: + m = guix_pattern.match(word) + else: + m = pattern.match(word) -- 2.22.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 07:11:14 2019 Received: (at 36535) by debbugs.gnu.org; 13 Jul 2019 11:11:14 +0000 Received: from localhost ([127.0.0.1]:41515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmFvu-0003Er-FH for submit@debbugs.gnu.org; Sat, 13 Jul 2019 07:11:14 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmFvs-0003Ej-Js for 36535@debbugs.gnu.org; Sat, 13 Jul 2019 07:11:13 -0400 Received: from localhost (148.185.93.209.dyn.plus.net [209.93.185.148]) by mira.cbaines.net (Postfix) with ESMTPSA id 3B0E9171AA; Sat, 13 Jul 2019 12:11:12 +0100 (BST) Received: from phact (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 836c35df; Sat, 13 Jul 2019 11:11:12 +0000 (UTC) References: <20190707104803.23662-1-mail@cbaines.net> <87d0il9deh.fsf@cbaines.net> <875zocr4hl.fsf@devup.no> <87bly4a566.fsf@cbaines.net> <87zhlopjzv.fsf@devup.no> <87zhljks93.fsf@devup.no> <87v9w6zvl8.fsf@cbaines.net> User-agent: mu4e 1.2.0; emacs 26.2 From: Christopher Baines To: Marius Bakke Subject: Re: [bug#36535] [PATCH] gnu: gobject-introspection: Update absolute-shlib-path.patch. In-reply-to: <87v9w6zvl8.fsf@cbaines.net> Date: Sat, 13 Jul 2019 12:11:09 +0100 Message-ID: <87tvbqyysy.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 36535 Cc: 36535@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Christopher Baines writes: > I have some time now to look at this, I'm currently building libsoup > with these changes to the patch. I've now send a patch with these changes. I've managed to build libsoup with it, and the .gir files look good. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl0pvE1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XcaXxAAlhYD8GGPYVERbMXkTXlEyrRW94KlemLdNUSxomFXuTtMyhmVQ/oTvT1c MrDzVCH4yysv0MUSA+2h29wHC87Mklqs/4hwSOCU36IloJ+gyhkmWFlIi4qIydkN HVhOaDXahaQLAnWrgmoTiSiELZ9bZjbWZVg/MAlso1Zg9rA4GhwOwwGWAyUIT2Fa vn2CMfpduMr8JSb9b8/hsoq9rFuDjR7A777lbrvpwJQBzz2X54Pe4TYK5KHB4Mp6 +/ozi76NjcqOmeOMBVXlFd/a1nb44vyekUhoRqo29ZGdsRlvTh3rVK0aNrpSj4pz 703C02/LHn6YDbivW0X5C2Ocr8sQqJ1E+p3sldKPPASdz0I+5P9g6w6K+XO2mwPW jc5aSPKHJsreoWL9NbyHakjnxeR52ar9Y2yenuxkpOo4aP0QwOywIQwisQjCqIHw 4TfO479YsfE9DshyM508bI7GoSq/oefrGTrwxoDfh/SuBBOSMztqAQ/gM+Aym568 Hdl1QfkJqfW9QjB8ceKI8T1BviCnDvvcnAbZHR5kVR+FV8BwQLcUP6nowzNMR8jb 7mFFJjIGfz3SS6fBTtCwq+XWtItsV2q1N2x1CDCtP1zVi7gfisP+PMlDsdrSptDV 7UPJ+FP8FY/2/3h9nyd6yzZK+5yqEdYR+QU8hSGOfkI5rDnrZ2s= =LPCr -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 12:46:35 2019 Received: (at 36535) by debbugs.gnu.org; 13 Jul 2019 16:46:35 +0000 Received: from localhost ([127.0.0.1]:43277 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmLAQ-0003eh-Ly for submit@debbugs.gnu.org; Sat, 13 Jul 2019 12:46:35 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:43471) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmLAM-0003X3-Rc for 36535@debbugs.gnu.org; Sat, 13 Jul 2019 12:46:32 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 73D6121B36; Sat, 13 Jul 2019 12:46:25 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sat, 13 Jul 2019 12:46:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=BnNXJhjI13+lhTl/WXTtTmnDSG jVu7SnvbGrIIWBKWQ=; b=eX/2orAoOWOcwT9QnzzDwPYtSOm0RPp33lnwXXTTWl ff6vaz6JPmuh8C7u/BuuQR+pCM3OCCk9yVnAlv7C3kHbT5nywmsnFLhOhA+NS3g/ wNv18YNwBGG5oIMIdDISiuqiaBgCcvKqsf4FKAA57zFu82kS30wm/ycDXlGIEMb9 7Ls88blMMVL6oNINBKMfK7IXO1sg05TlA3wGCRkcw/rRZZZvXu+xsjV0e2BI7TIC XWGZNCm8wP8Tu53Xqv+qUrAQMZFXHGofUDedqzhNsSxSBheZZSMdr9kbq1qScjMc y/v3ysSOwVwekdCjLCbuosiQMNPO5lpxfOLZ2pXmwCnw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=BnNXJh jI13+lhTl/WXTtTmnDSGjVu7SnvbGrIIWBKWQ=; b=wvWIOwQhCv70X7wTIf9HY+ Iq6SiUhT5xkivn+EP0MrejWuQUldND6NzVO/pphGI78sXC2kmvmZPnFmAOCvL7gP ZzheAkxs4Q0pcJlH369UAGEx8A+VQCGmQu3KYij8C9bKpVZsDkGLGRcBBrBVxd4f o74kPccPGS18Es29nMFwNCPqAru8EI2ypdpIdPJuPOvrdT4hmQKjN4gzQEEeAASK GVmuswSFqkvVOXhZt22DYxM3VdXF55txauFTrohWiAWOiqbrb9CvKThPUJ0WU5HX CZKLvJJTTn60eOF9JXEUiUcefq5L9f0RKnEE1aEji7KRQzbQsUhK4uOqw2eYzOFw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrhedvgddutdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffujghffgffkfggtgesghdtre ertdertdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecukfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhs thgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id BF8C2380079; Sat, 13 Jul 2019 12:46:24 -0400 (EDT) From: Marius Bakke To: Christopher Baines Subject: Re: [bug#36535] [PATCH] gnu: gobject-introspection: Update absolute-shlib-path.patch. In-Reply-To: <87tvbqyysy.fsf@cbaines.net> References: <20190707104803.23662-1-mail@cbaines.net> <87d0il9deh.fsf@cbaines.net> <875zocr4hl.fsf@devup.no> <87bly4a566.fsf@cbaines.net> <87zhlopjzv.fsf@devup.no> <87zhljks93.fsf@devup.no> <87v9w6zvl8.fsf@cbaines.net> <87tvbqyysy.fsf@cbaines.net> User-Agent: Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) Date: Sat, 13 Jul 2019 18:46:23 +0200 Message-ID: <87tvbplw68.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 36535 Cc: 36535@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Christopher Baines writes: > Christopher Baines writes: > >> I have some time now to look at this, I'm currently building libsoup >> with these changes to the patch. > > I've now send a patch with these changes. I've managed to build libsoup > with it, and the .gir files look good. Thank you! The changes LGTM. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl0qCt8ACgkQoqBt8qM6 VPpAfAf/Uz2Sz5qrOm8ShcnPSlFJD8pn/UZlK11lpg7TBK9Rrx/4JCmUyID0jgTZ nVHbGQOpHZ1lYJLSLwQhrCDl2OHAb8/dN0gsU660Q0zoGF7rdfp5mdhTwkrP7pnK cTZ1B7um5IuyiinQLAr9VgK1z2NnaA/mwYC4xjF4XU4iq0NWQgX7WeJUu1vTCayy c65MtTRW3Zanqu7JqBVOMz2bhWezXsfwwI3q/MjwWPH7L/i+upi8bmGUG2RcAuzZ e+owoX1zrI3AA+r7cUqeYi84XTt/2EjwyovOB+kvZdZ4wnHwe/OpXY37s5Yvb/d2 DmO0cu5AK8z353TBdrIxvXsczUTxTg== =v58H -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 13 18:14:21 2019 Received: (at 36535-done) by debbugs.gnu.org; 13 Jul 2019 22:14:21 +0000 Received: from localhost ([127.0.0.1]:43505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmQHc-0008VD-UR for submit@debbugs.gnu.org; Sat, 13 Jul 2019 18:14:21 -0400 Received: from mira.cbaines.net ([212.71.252.8]:44110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmQHb-0008V6-Dx for 36535-done@debbugs.gnu.org; Sat, 13 Jul 2019 18:14:19 -0400 Received: from localhost (148.185.93.209.dyn.plus.net [209.93.185.148]) by mira.cbaines.net (Postfix) with ESMTPSA id 0C6D517220; Sat, 13 Jul 2019 23:14:19 +0100 (BST) Received: from phact (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f4e58f12; Sat, 13 Jul 2019 22:14:18 +0000 (UTC) References: <20190707104803.23662-1-mail@cbaines.net> <87d0il9deh.fsf@cbaines.net> <875zocr4hl.fsf@devup.no> <87bly4a566.fsf@cbaines.net> <87zhlopjzv.fsf@devup.no> <87zhljks93.fsf@devup.no> <87v9w6zvl8.fsf@cbaines.net> <87tvbqyysy.fsf@cbaines.net> <87tvbplw68.fsf@devup.no> User-agent: mu4e 1.2.0; emacs 26.2 From: Christopher Baines To: Marius Bakke Subject: Re: [bug#36535] [PATCH] gnu: gobject-introspection: Update absolute-shlib-path.patch. In-reply-to: <87tvbplw68.fsf@devup.no> Date: Sat, 13 Jul 2019 23:14:18 +0100 Message-ID: <87r26tzio5.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 36535-done Cc: 36535-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Marius Bakke writes: > Christopher Baines writes: > >> Christopher Baines writes: >> >>> I have some time now to look at this, I'm currently building libsoup >>> with these changes to the patch. >> >> I've now send a patch with these changes. I've managed to build libsoup >> with it, and the .gir files look good. > > Thank you! The changes LGTM. Great, I've pushed this to core-updates now. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl0qV7pfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XcQtA//VosNsVi3qknUbrW4g0bkLERoWG4po3XnfTxvyD/YZzpWYmz36LLxG0dh JB+uyHPoyjxh167KwlzSdOzrn+2vH/VE8tQTIrQi66NBq2/M2nIX1lS8x+K4Ubo+ MLWh8cQ0qj/geT81ImVhNZVW9jG4ocDmtdCEsZkLhLYJES7KiKmsT1GXSNdN2sNB hERgekVsANsIb2AVGFDNMcHmu+6aBv8fDeLAriry9efsiRlsGtcvHpfgLpgVAyw9 kWUkjT/MroKAbTTUgclTxIxhB9jZOFhaQMpRaRhbK5pN4D/nariMyIuM9hStaMj8 RFGLMWRfuC/hrDLo+GwkiaQxy+8/g/CRDcbRawO6FS+aOQjRlgc1ziFvAd0IEhBj uE1dbX2uPNNZY72f+/m+oyoqcQnP1xqo0XfdHPIAFoKoAZuDKUfq0xEoVodgrT5V XYKmVgR0lVt2x2OFtOErkcOwhR7TYLqDY9ylqBENaZXS8jlwBITaPCo4/JKXOCec HfUH3Ji/AGXKSZvwLqr7nGYMv3M8bKjT69xKPWJ/kSdkxgCR0wYZvZRLV1ctqZnB vjrlu8Oh9oYqTTIjjGw3VPbJBU+IWAoV3nq7cAU5brXAEC6kAca6v4qbB7YyvVD0 wdxCMC1/lz1NjkJGbOU+RmBslgIufxwBNviRMGgQ05LM8mEf1LY= =dR/1 -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Sep 11 19:19:57 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 11 Aug 2019 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator