From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Manuel Giraud via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#74606: 31.0.50; Another rsvg API change Date: Mon, 02 Dec 2024 17:03:34 +0100 Message-ID: <87o71uhy21.fsf@ledu-giraud.fr> References: <87ttbmi9fa.fsf@olaptop-dell.mail-host-address-is-not-set> <8734j6fbaq.fsf@ledu-giraud.fr> <87y10ydvrv.fsf@ledu-giraud.fr> <87ttbmdvdt.fsf@ledu-giraud.fr> <86zfle2ll6.fsf@gnu.org> <871pyqjffz.fsf@ledu-giraud.fr> <86wmgi2k8h.fsf@gnu.org> Reply-To: Manuel Giraud Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24261"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 74606@debbugs.gnu.org, osamarebach@gmail.com To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 02 17:04:20 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tI8uI-00060U-N2 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 02 Dec 2024 17:04:19 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tI8u5-00079w-Il; Mon, 02 Dec 2024 11:04:05 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tI8u3-00078v-C5 for bug-gnu-emacs@gnu.org; Mon, 02 Dec 2024 11:04:03 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tI8u3-0000Wk-3O for bug-gnu-emacs@gnu.org; Mon, 02 Dec 2024 11:04:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=nR3xtf2Tbi59GYJBUs9DwqS9u/GsfQQMwLHIK3mIvnw=; b=PX7NW/eoSMp90a2J9tebCfNq9oMSVu6yG1HzTiHIEtCdlHM3Qs8wa3rFVdqUzjlZJ0tIyhK3EQnPmox3Pgii5xGL+NuzAR6733uc1JG+bD198NKdGm0BXzw4tQ7SXfvVcAv3PkPN4GgYUp00gR8cnBRF7RDJT+cPAwoSJgW3LOSFEblFkv3jc5F5DZt46uyBFMc6E854AV7Reow4N5DmNHF8AtCzJlEBI9E6yTvsdpA1l98Aep8hgrsPN0WQYic96+E1hEaHOLd7c+C5GnPrqwlsLFwR7bCqsaausyFxMIZZMracVt78hGWKEm6V6tKv/A5uNd6TywwrwPxe71xm4Q==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tI8u1-0000Cj-Q5 for bug-gnu-emacs@gnu.org; Mon, 02 Dec 2024 11:04:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Manuel Giraud Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 02 Dec 2024 16:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74606 X-GNU-PR-Package: emacs Original-Received: via spool by 74606-submit@debbugs.gnu.org id=B74606.1733155421734 (code B ref 74606); Mon, 02 Dec 2024 16:04:01 +0000 Original-Received: (at 74606) by debbugs.gnu.org; 2 Dec 2024 16:03:41 +0000 Original-Received: from localhost ([127.0.0.1]:56233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tI8tg-0000Bj-Gq for submit@debbugs.gnu.org; Mon, 02 Dec 2024 11:03:41 -0500 Original-Received: from ledu-giraud.fr ([51.159.28.247]:10337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tI8td-0000BQ-HU for 74606@debbugs.gnu.org; Mon, 02 Dec 2024 11:03:38 -0500 DKIM-Signature: v=1; a=ed25519-sha256; c=simple/simple; s=ed25519; bh=3u1Nl7QP rH71ZBVg9zHmdqZdotvdiiGQoXF5xWdVuqY=; h=date:references:in-reply-to: subject:cc:to:from; d=ledu-giraud.fr; b=wxx+hQToZAoXq23mNVM1g7jUyev1Co Ed/6dX3R55CC1LkZgOwJo1pTsDZoTRdsmxkHMWVdHCTu0QFXksrEVCAA== DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=3u1Nl7QPrH71ZBVg 9zHmdqZdotvdiiGQoXF5xWdVuqY=; h=date:references:in-reply-to:subject: cc:to:from; d=ledu-giraud.fr; b=zTHSFv/VwFcnTMobD5ovdGQzmqq5+TZd52rt1z gmUTYvzewwWZHC2LzjJ4Ka5xCDU2cXO0eZu+wp6wLtN7hJ9gCcXoGDBaCnGXrg6MAg9XD1 bqKe+pQggeqgFFGeGoxhH0nijiM/lhhiURT5KkB3i0aMbGCUyyms6xvOwEemOSTHq5SezX TjcGofeSrwKzm2Idv859fffn342qNOTyQ4+2JbpCdSPDxOwtbzGts3XjKoYnnPrOD22lY2 +bsMVbKyzx//Rw8pAFPYSY7ZpaqxDfHaXRo6UzAQSEszCIJegLm/jPASYoK7dJEX9K2guX bXgPRGFe1D+Gb26px4J45d9A== Original-Received: from computer ( [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id c7eb2777 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 2 Dec 2024 17:03:35 +0100 (CET) In-Reply-To: <86wmgi2k8h.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 02 Dec 2024 17:11:10 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:296333 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Manuel Giraud >> Cc: osamarebach@gmail.com, 74606@debbugs.gnu.org >> Date: Mon, 02 Dec 2024 16:02:40 +0100 >> >> Eli Zaretskii writes: >> >> >> From: Manuel Giraud >> >> Cc: Eli Zaretskii , 74606-done@debbugs.gnu.org >> >> Date: Mon, 02 Dec 2024 15:14:54 +0100 >> >> >> >> > On this page, when you unfold the link "Tags containing commit", you can >> >> > see that 2.58.90 is the first one. So maybe, I should use this version >> >> > instead. WDYT? >> >> > >> >> > The "Deprecated: 2.58" from the header looks like a copy/paste >> >> > mistake. >> >> >> >> Here is a patch to be applied on emacs-30. >> > >> > Thanks, but did you verify that 2.58.90 actually has this function? >> > Is the tarball of that version's sources available somewhere we could >> > check? >> >> No I didn't. I've only used the commit log. >> >> > Alternatively, we could use 2.59, since 2.58.90 is a pretest, so I see >> > no catastrophe if someone sees warnings while using it. >> >> I agree: no catastrophe and low probability too. Do you want me to >> modify the patch to check for 2.59? > > Yes, please. Here it is. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fix-the-version-of-librsvg-API-change.patch >From 5f9f676dce22afbc477b555b610dd0adeefa37f2 Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Mon, 2 Dec 2024 15:11:52 +0100 Subject: [PATCH] Fix the version of librsvg API change * src/image.c (init_svg_functions, svg_load_image): The first official version that introduces 'rsvg_handle_get_pixbuf_and_error' is 2.59.0 not 2.58.0. --- src/image.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/image.c b/src/image.c index 43220758324..0012abcb451 100644 --- a/src/image.c +++ b/src/image.c @@ -11688,7 +11688,7 @@ DEF_DLL_FN (void, rsvg_handle_get_dimensions, DEF_DLL_FN (gboolean, rsvg_handle_set_stylesheet, (RsvgHandle *, const guint8 *, gsize, GError **)); # endif -# if LIBRSVG_CHECK_VERSION (2, 58, 0) +# if LIBRSVG_CHECK_VERSION (2, 59, 0) DEF_DLL_FN (GdkPixbuf *, rsvg_handle_get_pixbuf_and_error, (RsvgHandle *, GError **)); # else DEF_DLL_FN (GdkPixbuf *, rsvg_handle_get_pixbuf, (RsvgHandle *)); @@ -11751,7 +11751,7 @@ init_svg_functions (void) #if LIBRSVG_CHECK_VERSION (2, 48, 0) LOAD_DLL_FN (library, rsvg_handle_set_stylesheet); #endif -#if LIBRSVG_CHECK_VERSION (2, 58, 0) +#if LIBRSVG_CHECK_VERSION (2, 59, 0) LOAD_DLL_FN (library, rsvg_handle_get_pixbuf_and_error); #else LOAD_DLL_FN (library, rsvg_handle_get_pixbuf); @@ -11800,7 +11800,7 @@ init_svg_functions (void) # if LIBRSVG_CHECK_VERSION (2, 48, 0) # undef rsvg_handle_set_stylesheet # endif -# if LIBRSVG_CHECK_VERSION (2, 58, 0) +# if LIBRSVG_CHECK_VERSION (2, 59, 0) # undef rsvg_handle_get_pixbuf_and_error # else # undef rsvg_handle_get_pixbuf @@ -11845,7 +11845,7 @@ init_svg_functions (void) # if LIBRSVG_CHECK_VERSION (2, 48, 0) # define rsvg_handle_set_stylesheet fn_rsvg_handle_set_stylesheet # endif -# if LIBRSVG_CHECK_VERSION (2, 58, 0) +# if LIBRSVG_CHECK_VERSION (2, 59, 0) # define rsvg_handle_get_pixbuf_and_error fn_rsvg_handle_get_pixbuf_and_error # else # define rsvg_handle_get_pixbuf fn_rsvg_handle_get_pixbuf @@ -12354,7 +12354,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents, /* We can now get a valid pixel buffer from the svg file, if all went ok. */ -#if LIBRSVG_CHECK_VERSION (2, 58, 0) +#if LIBRSVG_CHECK_VERSION (2, 59, 0) pixbuf = rsvg_handle_get_pixbuf_and_error (rsvg_handle, &err); if (err) goto rsvg_error; #else -- 2.47.0 --=-=-= Content-Type: text/plain -- Manuel Giraud --=-=-=--