From unknown Thu Sep 11 04:20:51 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#39723 <39723@debbugs.gnu.org> To: bug#39723 <39723@debbugs.gnu.org> Subject: Status: [PATCH] gnu: swig: Update to 4.0.1. Reply-To: bug#39723 <39723@debbugs.gnu.org> Date: Thu, 11 Sep 2025 11:20:51 +0000 retitle 39723 [PATCH] gnu: swig: Update to 4.0.1. reassign 39723 guix-patches submitter 39723 Arun Isaac severity 39723 normal tag 39723 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 21 16:43:39 2020 Received: (at submit) by debbugs.gnu.org; 21 Feb 2020 21:43:39 +0000 Received: from localhost ([127.0.0.1]:48274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5G59-0006Ke-AW for submit@debbugs.gnu.org; Fri, 21 Feb 2020 16:43:39 -0500 Received: from lists.gnu.org ([209.51.188.17]:56070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5G56-0006KW-57 for submit@debbugs.gnu.org; Fri, 21 Feb 2020 16:43:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36019) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5G54-0003rG-Dj for guix-patches@gnu.org; Fri, 21 Feb 2020 16:43:31 -0500 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,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 1j5G50-0006kT-OA for guix-patches@gnu.org; Fri, 21 Feb 2020 16:43:30 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:43620) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j5G50-0006iP-CF for guix-patches@gnu.org; Fri, 21 Feb 2020 16:43:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=aUvhSc8/bPIcvVQOD95vooWeLmz0XyfL2rGTridOGbo=; b=p/mzV9BAZBAX5arZ2Xco2ERFPP v73LbBwh5S1jlZQKRFURh9yoHpjNzLhLEzVugCwj6XTs108yUkDl5pBJmG2Too0tzU5QHdqoACahQ WzeveFPAxkPH+/YrkRRgH6TA0DQNIYumgWGAWuk8j4V/L0O9axAmHvDJk+lNx1B/Cj44=; Received: from [192.168.2.1] (helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1j5G4v-000yLJ-GB; Sat, 22 Feb 2020 03:13:21 +0530 From: Arun Isaac To: guix-patches@gnu.org Subject: [PATCH] gnu: swig: Update to 4.0.1. Date: Sat, 22 Feb 2020 03:13:18 +0530 Message-Id: <20200221214319.14837-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 139.59.75.54 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: submit Cc: Arun Isaac 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: -0.8 (/) * gnu/packages/swig.scm (swig): Update to 4.0.1. [source]: Remove swig-guile-gc.patch. [arguments]: Remove set-env phase. [inputs]: Replace guile-2.0 with guile-3.0. * gnu/packages/patches/swig-guile-gc.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister it. --- gnu/local.mk | 1 - gnu/packages/patches/swig-guile-gc.patch | 76 ------------------------ gnu/packages/swig.scm | 13 ++-- 3 files changed, 4 insertions(+), 86 deletions(-) delete mode 100644 gnu/packages/patches/swig-guile-gc.patch diff --git a/gnu/local.mk b/gnu/local.mk index f2289518e5..552861a515 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1411,7 +1411,6 @@ dist_patch_DATA = \ %D%/packages/patches/superlu-dist-awpm-grid.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ %D%/packages/patches/supertux-unbundle-squirrel.patch \ - %D%/packages/patches/swig-guile-gc.patch \ %D%/packages/patches/swish-e-search.patch \ %D%/packages/patches/swish-e-format-security.patch \ %D%/packages/patches/symmetrica-bruch.patch \ diff --git a/gnu/packages/patches/swig-guile-gc.patch b/gnu/packages/patches/swig-guile-gc.patch deleted file mode 100644 index 0e745a6247..0000000000 --- a/gnu/packages/patches/swig-guile-gc.patch +++ /dev/null @@ -1,76 +0,0 @@ -Fix garbage collection for Guile versions >= 2.0.12. This issue showed -up when running the tests on i686-linux. - -Taken from this upstream commit: -https://github.com/swig/swig/commit/38f2ab0c30e369e63bbd0a6152108488d0de68e1 - -diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg -index 274f197158..0d04cb7c62 100644 ---- a/Lib/guile/guile_scm_run.swg -+++ b/Lib/guile/guile_scm_run.swg -@@ -99,6 +99,7 @@ SWIG_Guile_scm2newstr(SCM str, size_t *len) { - static int swig_initialized = 0; - static scm_t_bits swig_tag = 0; - static scm_t_bits swig_collectable_tag = 0; -+static scm_t_bits swig_finalized_tag = 0; - static scm_t_bits swig_destroyed_tag = 0; - static scm_t_bits swig_member_function_tag = 0; - static SCM swig_make_func = SCM_EOL; -@@ -163,7 +164,19 @@ SWIG_Guile_PointerType(SCM object) - } - else scm_wrong_type_arg("SWIG-Guile-PointerType", 1, object); - } -- -+ -+SWIGINTERN int -+SWIG_Guile_IsValidSmob(SCM smob) -+{ -+ /* We do not accept smobs representing destroyed pointers, but we have to -+ allow finalized smobs because Guile >= 2.0.12 sets all smob instances -+ to the 'finalized' type before calling their 'free' function. This change -+ was introduced to Guile in commit 8dff3af087c6eaa83ae0d72aa8b22aef5c65d65d */ -+ return SCM_SMOB_PREDICATE(swig_tag, smob) -+ || SCM_SMOB_PREDICATE(swig_collectable_tag, smob) -+ || SCM_SMOB_PREDICATE(swig_finalized_tag, smob); -+} -+ - SWIGINTERN int - SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags) - { -@@ -179,8 +192,7 @@ SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags) - *result = SCM_POINTER_VALUE(s); - return SWIG_OK; - #endif /* if SCM_MAJOR_VERSION >= 2 */ -- } else if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { -- /* we do not accept smobs representing destroyed pointers */ -+ } else if (SWIG_Guile_IsValidSmob(smob)) { - from = (swig_type_info *) SCM_CELL_WORD_2(smob); - if (!from) return SWIG_ERROR; - if (type) { -@@ -239,7 +251,7 @@ SWIG_Guile_MarkPointerNoncollectable(SCM s) - { - SCM smob = SWIG_Guile_GetSmob(s); - if (!SCM_NULLP(smob)) { -- if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { -+ if (SWIG_Guile_IsValidSmob(smob)) { - SCM_SET_CELL_TYPE(smob, swig_tag); - } - else scm_wrong_type_arg(NULL, 0, s); -@@ -252,7 +264,7 @@ SWIG_Guile_MarkPointerDestroyed(SCM s) - { - SCM smob = SWIG_Guile_GetSmob(s); - if (!SCM_NULLP(smob)) { -- if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { -+ if (SWIG_Guile_IsValidSmob(smob)) { - SCM_SET_CELL_TYPE(smob, swig_destroyed_tag); - } - else scm_wrong_type_arg(NULL, 0, s); -@@ -419,6 +431,8 @@ SWIG_Guile_Init () - scm_set_smob_print(swig_collectable_tag, print_collectable_swig); - scm_set_smob_equalp(swig_collectable_tag, equalp_swig); - scm_set_smob_free(swig_collectable_tag, free_swig); -+ /* For Guile >= 2.0.12. See libguile/smob.c:clear_smobnum */ -+ swig_finalized_tag = swig_collectable_tag & ~0xff00; - } - if (ensure_smob_tag(swig_module, &swig_destroyed_tag, - "destroyed-swig-pointer", "destroyed-swig-pointer-tag")) { diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index b1b17fc68d..5506a3bd2e 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,25 +34,19 @@ (define-public swig (package (name "swig") - (version "3.0.12") + (version "4.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.gz")) - (patches (search-patches "swig-guile-gc.patch")) (sha256 (base32 - "0kf99ygrjs5616gsqhz1l7bib3a12izmxi7g48bwblbymr3z9ybw")))) + "1ac7g0gd8ndwv3ybqn5vjgqxa7090bby4db164a7mn9ssp8b803s")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'set-env - ;; Required since Perl 5.26.0's removal of the current - ;; working directory from @INC. - ;; TODO Try removing this for later versions of SWIG. - (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1") #t)) (add-before 'configure 'workaround-gcc-bug (lambda _ ;; XXX: Don't add the -isystem flag, or GCCs #include_next @@ -62,7 +57,7 @@ (native-inputs `(("boost" ,boost) ("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(;; Provide these to run the corresponding tests. - ("guile" ,guile-2.0) + ("guile" ,guile-3.0) ("perl" ,perl))) ;; FIXME: reactivate input python as soon as the test failures ;; fatal error: Python.h: No such file or directory -- 2.23.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 22 12:11:24 2020 Received: (at 39723-done) by debbugs.gnu.org; 22 Feb 2020 17:11:24 +0000 Received: from localhost ([127.0.0.1]:49944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5YJH-0000yM-P6 for submit@debbugs.gnu.org; Sat, 22 Feb 2020 12:11:24 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:60050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5YJC-0000y7-9u for 39723-done@debbugs.gnu.org; Sat, 22 Feb 2020 12:11:22 -0500 Received: (qmail 2764 invoked by uid 1009); 22 Feb 2020 18:11:15 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25730. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.023681 secs); 22 Feb 2020 17:11:15 -0000 Received: from unknown (HELO gravity) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 22 Feb 2020 18:11:15 +0100 Date: Sat, 22 Feb 2020 18:11:56 +0100 From: Jakub =?utf-8?B?S8SFZHppb8WCa2E=?= To: Arun Isaac Subject: Re: [PATCH] gnu: swig: Update to 4.0.1. Message-ID: <20200222171156.4fjgcfm4keelgklq@gravity> References: <20200221214319.14837-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mvndockkbk4px4b6" Content-Disposition: inline In-Reply-To: <20200221214319.14837-1-arunisaac@systemreboot.net> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 39723-done Cc: 39723-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 (-) --mvndockkbk4px4b6 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Feb 22, 2020 at 03:13:18AM +0530, Arun Isaac wrote: > * gnu/packages/swig.scm (swig): Update to 4.0.1. > [source]: Remove swig-guile-gc.patch. > [arguments]: Remove set-env phase. > [inputs]: Replace guile-2.0 with guile-3.0. > * gnu/packages/patches/swig-guile-gc.patch: Delete file. > * gnu/local.mk (dist_patch_DATA): Unregister it. Hi, swig is depended upon by 5206 packages. This means that any updates will have to go through the core-updates branch. The branch has swig 4.0.1 since this December. Sorry for the duplicated effort... You might want to send a patch to build swig with guile-3.0 instead of the guile-2.2 used currently on core-updates. If you decide to do so, please use [PATCH core-updates] in the subject. You can do this easily by passing --subject-prefix=3D"PATCH core-updates" to git format-patch. See point 8 of `info '(guix)Submitting Patches'` for more details. Regards, Jakub K=C4=85dzio=C5=82ka --mvndockkbk4px4b6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl5RYNwACgkQ4xWnWEYT FWTcmw/+N3CGTAcV3YcsTDwCMp+wk+ZFd8NO6vhgZs52IT+MFtzvHEWp+D2LZJKw E4wrnUoQl3Ua1TrcW/twnQqZxP0u4Oh1Kg0iBbdHyslLpXQuRB1cJR9XqxkRa96S 0InwJhxTHd01lu6COongMGTYUcIVcdG8dLHem838CXolSGsBOJp7r5I2IMaqLLsL spSOgC5SsbwQZFqlgcMzUJ4gTCGAovpAoSqJvYtUveWyDQxJ9F3e1AkYIAd8EjWq pletBnRGZmiGoR/BkhENuQXeHaghSoAgPdwQhtnm1TocZ9Er6K+kstLfgPFIxnc7 NMUikrNNt91nzzv2VWSEKcqUFmZiQ6vYERI4pvgl6UQ2WAyS+qNWnzua9/5EcXbB CiwXQ37HyzWLNTN7kck895xpJw2kZOr4bqw5CUyrUo4DL4fft4celnhhXAgajG17 GpWmNa+HaWk5FXmBPRYZgPS3yf5V30VI9XDfz7njefMeTXqW5SPx1vJGyZ1/5+Yk oSGzczYsLTJYK7Tcq7GPGud7XNsHUmtY4jGPxD99QZNURjvC5qjflTGawun11MMX MXnWyZYCppif2RaYyVBzlB/hI323G+YG8f5rAFTbl0+lJdgITLynPV3demh2PQ7D 59Ewev7Pyq+xJVUq1zBfp3S/+67j35EcINrsLijTPfyRzaIEpHc= =K9ok -----END PGP SIGNATURE----- --mvndockkbk4px4b6-- From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 22 12:50:42 2020 Received: (at 39723-done) by debbugs.gnu.org; 22 Feb 2020 17:50:42 +0000 Received: from localhost ([127.0.0.1]:49972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5YvK-00043V-HY for submit@debbugs.gnu.org; Sat, 22 Feb 2020 12:50:42 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:42986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5YvH-00043K-Br for 39723-done@debbugs.gnu.org; Sat, 22 Feb 2020 12:50:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=wI8CIPLelM5syA0V9CPZAj8wrvd1x574391SNSsSQjw=; b=d+x9g9VgkACVrW+iUBAbx8azS bidbuDCExYhMCWyeY5vCi4ZIj97OUnuVrY2pxQBUvcHZH3znSeBVUpJQC8s8PFX3+yaBLV/0lXB2Q pnQF4RvaSYrh8MkdeeYsBWMslu1m3S3GUqIMcoXp31U5QebdRJqO3JcH91/FVWwxaMKTI=; Received: from [192.168.2.1] (helo=steel) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1j5YvD-0013aB-1H; Sat, 22 Feb 2020 23:20:35 +0530 From: Arun Isaac To: Jakub =?utf-8?B?S8SFZHppb8WCa2E=?= Subject: Re: [PATCH] gnu: swig: Update to 4.0.1. In-Reply-To: <20200222171156.4fjgcfm4keelgklq@gravity> References: <20200221214319.14837-1-arunisaac@systemreboot.net> <20200222171156.4fjgcfm4keelgklq@gravity> Date: Sat, 22 Feb 2020 23:20:22 +0530 Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 39723-done Cc: 39723-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 > swig is depended upon by 5206 packages. This means that any updates will > have to go through the core-updates branch. True. > The branch has swig 4.0.1 since this December. Sorry for the > duplicated effort... No problem! :-) > You might want to send a patch to build swig with guile-3.0 instead of > the guile-2.2 used currently on core-updates. Ok, will do. > If you decide to do so, please use [PATCH core-updates] in the > subject. You can do this easily by passing --subject-prefix="PATCH > core-updates" to git format-patch. > > See point 8 of `info '(guix)Submitting Patches'` for more details. Sorry, I didn't know I had to do this. Will do for all my future core-updates patches. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl5Rad4ACgkQLiXui2GA K7PObwgAg/gvVSB/lAbMnOA+lc2k6A96rBjOO0rIRzS0S+rB9clgMQlPKxvmNstk F7KszuPzVY686ci7WwLpcv7CSN1NxF4IshvMd7tJtP3c1gBKO6EJPz7w8zhhYTW0 Mrtw17Q0fBmM90nvYQr6e6fJgTJ+iYePV4XcuADfDpiIfFnO5U/W/yEQnpDASEZv U9wOTYSRVRE1+59HJYeNyTYui0ECKR+4EDelkE3GxeWmTeApjhTVFpICh/k6+GEN hqQYGhxUEblg5Ucc7P2/N5BbEA4ZTDVpXfJ3nQT7yer8UrGzepxRK+FVwaezZlhi stvbVd5pRpENTCw/nibkJCvOor1O1w== =NRPY -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Sep 11 04:20:51 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, 22 Mar 2020 11:24:04 +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