From unknown Sat Sep 06 20:03:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#35548: image.c uses deprecated rsvg_handle_write etc. Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 03 May 2019 19:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35548 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 35548@debbugs.gnu.org X-Debbugs-Original-To: Emacs bugs Received: via spool by submit@debbugs.gnu.org id=B.155691142810416 (code B ref -1); Fri, 03 May 2019 19:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 May 2019 19:23:48 +0000 Received: from localhost ([127.0.0.1]:49690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMdme-0002hw-4Q for submit@debbugs.gnu.org; Fri, 03 May 2019 15:23:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMdmc-0002hk-BQ for submit@debbugs.gnu.org; Fri, 03 May 2019 15:23:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:45827) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMdmX-0004cK-7g for submit@debbugs.gnu.org; Fri, 03 May 2019 15:23:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMdmV-0004A1-OU for bug-gnu-emacs@gnu.org; Fri, 03 May 2019 15:23:41 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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 1hMdmT-0004am-Hb for bug-gnu-emacs@gnu.org; Fri, 03 May 2019 15:23:39 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:46720) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMdmR-0004a6-Ug for bug-gnu-emacs@gnu.org; Fri, 03 May 2019 15:23:36 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 397051618F7 for ; Fri, 3 May 2019 12:23:34 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id zS-66dCYgoEd for ; Fri, 3 May 2019 12:23:33 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 17744161911 for ; Fri, 3 May 2019 12:23:33 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id xUsvW1v2swlk for ; Fri, 3 May 2019 12:23:32 -0700 (PDT) Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id F17DC161910 for ; Fri, 3 May 2019 12:23:32 -0700 (PDT) From: Paul Eggert Openpgp: preference=signencrypt Autocrypt: addr=eggert@cs.ucla.edu; prefer-encrypt=mutual; keydata= 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 uNcby4U= Organization: UCLA Computer Science Department Message-ID: Date: Fri, 3 May 2019 12:23:32 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------683BF9C6344994A21CDD0323" Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -1.3 (-) 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 (--) This is a multi-part message in MIME format. --------------683BF9C6344994A21CDD0323 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit I just upgraded my Emacs build platform to Fedora 30 and found that Emacs wouldn't build when configured with --enable-gcc-warnings. The problem is that starting in librsvg 2.45.1, the librsvg functions rsvg_handle_write and rsvg_handle_close are deprecated, and Emacs calls those functions. Although I pacified GCC by installing the attached patch into Emacs master, the underlying problem is still there and an rsvg expert should take a look at this at some point. --------------683BF9C6344994A21CDD0323 Content-Type: text/x-patch; name="0001-Pacify-librsvg-2.45.1-and-later.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Pacify-librsvg-2.45.1-and-later.patch" >From da3897abf1e45741b122b52df37a5cbc68b2ad5d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 3 May 2019 12:16:33 -0700 Subject: [PATCH] Pacify librsvg 2.45.1 and later * src/image.c (svg_load_image): Pacify librsvg 2.45.1 and later, and add a FIXME comment about the deprecated librsvg functions. --- src/image.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/image.c b/src/image.c index bf594987eb..3d724a773b 100644 --- a/src/image.c +++ b/src/image.c @@ -6735,7 +6735,7 @@ my_error_exit (j_common_ptr cinfo) /* Init source method for JPEG data source manager. Called by - jpeg_read_header() before any data is actually read. See + jpeg_read_header before any data is actually read. See libjpeg.doc from the JPEG lib distribution. */ static void @@ -6745,7 +6745,7 @@ our_common_init_source (j_decompress_ptr cinfo) /* Method to terminate data source. Called by - jpeg_finish_decompress() after all data has been processed. */ + jpeg_finish_decompress after all data has been processed. */ static void our_common_term_source (j_decompress_ptr cinfo) @@ -9456,7 +9456,18 @@ svg_load_image (struct frame *f, struct image *img, char *contents, See rsvg bug 596114 - "image refs are relative to curdir, not .svg file" . */ if (filename) - rsvg_handle_set_base_uri(rsvg_handle, filename); + rsvg_handle_set_base_uri (rsvg_handle, filename); + + /* Suppress GCC deprecation warnings starting in librsvg 2.45.1 for + rsvg_handle_write and rsvg_handle_close. FIXME: Use functions + like rsvg_handle_new_from_gfile_sync on newer librsvg versions, + and remove this hack. */ + #if GNUC_PREREQ (4, 6, 0) + #pragma GCC diagnostic push + #endif + #if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif /* Parse the contents argument and fill in the rsvg_handle. */ rsvg_handle_write (rsvg_handle, (unsigned char *) contents, size, &err); @@ -9467,6 +9478,10 @@ svg_load_image (struct frame *f, struct image *img, char *contents, rsvg_handle_close (rsvg_handle, &err); if (err) goto rsvg_error; + #if GNUC_PREREQ (4, 6, 0) + #pragma GCC diagnostic pop + #endif + rsvg_handle_get_dimensions (rsvg_handle, &dimension_data); if (! check_image_size (f, dimension_data.width, dimension_data.height)) { -- 2.21.0 --------------683BF9C6344994A21CDD0323-- From unknown Sat Sep 06 20:03:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#35548: image.c uses deprecated rsvg_handle_write etc. Resent-From: YAMAMOTO Mitsuharu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Jul 2019 03:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35548 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Paul Eggert Cc: 35548@debbugs.gnu.org Received: via spool by 35548-submit@debbugs.gnu.org id=B35548.15622100539901 (code B ref 35548); Thu, 04 Jul 2019 03:15:01 +0000 Received: (at 35548) by debbugs.gnu.org; 4 Jul 2019 03:14:13 +0000 Received: from localhost ([127.0.0.1]:50227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hisCL-0002Zd-D6 for submit@debbugs.gnu.org; Wed, 03 Jul 2019 23:14:13 -0400 Received: from mathmail.math.s.chiba-u.ac.jp ([133.82.132.2]:60664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hisCI-0002ZR-EQ for 35548@debbugs.gnu.org; Wed, 03 Jul 2019 23:14:11 -0400 Received: from mathent.math.s.chiba-u.ac.jp (mathent [192.168.32.5]) by mathmail.math.s.chiba-u.ac.jp (Postfix) with ESMTP id CBF74F08E1; Thu, 4 Jul 2019 12:14:08 +0900 (JST) (envelope-from mituharu@math.s.chiba-u.ac.jp) Date: Thu, 04 Jul 2019 12:14:08 +0900 Message-ID: From: YAMAMOTO Mitsuharu In-Reply-To: References: User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?UTF-8?Q?Goj=C5=8D?=) APEL/10.8 EasyPG/1.0.0 Emacs/25.3 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) Organization: Faculty of Science, Chiba University MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spam-Score: 0.0 (/) 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 (-) On Sat, 04 May 2019 04:23:32 +0900, Paul Eggert wrote: > > I just upgraded my Emacs build platform to Fedora 30 and found that > Emacs wouldn't build when configured with --enable-gcc-warnings. The > problem is that starting in librsvg 2.45.1, the librsvg functions > rsvg_handle_write and rsvg_handle_close are deprecated, and Emacs calls > those functions. Although I pacified GCC by installing the attached > patch into Emacs master, the underlying problem is still there and an > rsvg expert should take a look at this at some point. If we omit Windows DLL stuff, then the patch would be as simple as below. But Eli may dislike this (even with DLL support) for the very reasons he dislikes the patch for Bug#36315 the other participants prefer: 1. If Windows DLL support is completed, then it will add to a new entry to dynamic-library-alist for libgio that librsvg is using as a sub-library. (See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36315#62) 2. It just looks like we are using libgio and not librsvg. (See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36315#56) YAMAMOTO Mitsuharu mituharu@math.s.chiba-u.ac.jp diff --git a/src/image.c b/src/image.c index 6ead12166b6..6d065d66f0f 100644 --- a/src/image.c +++ b/src/image.c @@ -9490,6 +9490,21 @@ svg_load_image (struct frame *f, struct image *img, char *contents, g_type_init (); #endif +#if LIBRSVG_CHECK_VERSION (2, 32, 0) && !defined WINDOWSNT + /* In order to replace rsvg_handle_write and rsvg_handle_close that + are deprecated in librsvg 2.45.1 (Bug#35548), we need + rsvg_handle_new_from_stream_sync that requires librsvg + 2.32.0. */ + GInputStream *input_stream = g_memory_input_stream_new_from_data (contents, + size, NULL); + GFile *base_file = g_file_new_for_path (filename); + rsvg_handle = rsvg_handle_new_from_stream_sync (input_stream, base_file, + RSVG_HANDLE_FLAGS_NONE, + NULL, &err); + g_object_unref (base_file); + g_object_unref (input_stream); + if (err) goto rsvg_error; +#else /* Make a handle to a new rsvg object. */ rsvg_handle = rsvg_handle_new (); @@ -9499,17 +9514,6 @@ svg_load_image (struct frame *f, struct image *img, char *contents, if (filename) rsvg_handle_set_base_uri (rsvg_handle, filename); - /* Suppress GCC deprecation warnings starting in librsvg 2.45.1 for - rsvg_handle_write and rsvg_handle_close. FIXME: Use functions - like rsvg_handle_new_from_gfile_sync on newer librsvg versions, - and remove this hack. */ - #if GNUC_PREREQ (4, 6, 0) - #pragma GCC diagnostic push - #endif - #if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0) - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif - /* Parse the contents argument and fill in the rsvg_handle. */ rsvg_handle_write (rsvg_handle, (unsigned char *) contents, size, &err); if (err) goto rsvg_error; @@ -9518,10 +9522,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents, for further writes. */ rsvg_handle_close (rsvg_handle, &err); if (err) goto rsvg_error; - - #if GNUC_PREREQ (4, 6, 0) - #pragma GCC diagnostic pop - #endif +#endif rsvg_handle_get_dimensions (rsvg_handle, &dimension_data); if (! check_image_size (f, dimension_data.width, dimension_data.height)) From unknown Sat Sep 06 20:03:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#35548: image.c uses deprecated rsvg_handle_write etc. Resent-From: YAMAMOTO Mitsuharu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Jul 2019 04:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35548 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Paul Eggert Cc: 35548@debbugs.gnu.org Received: via spool by 35548-submit@debbugs.gnu.org id=B35548.156221395118620 (code B ref 35548); Thu, 04 Jul 2019 04:20:02 +0000 Received: (at 35548) by debbugs.gnu.org; 4 Jul 2019 04:19:11 +0000 Received: from localhost ([127.0.0.1]:50245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hitDA-0004qD-2u for submit@debbugs.gnu.org; Thu, 04 Jul 2019 00:19:08 -0400 Received: from mathmail.math.s.chiba-u.ac.jp ([133.82.132.2]:60585) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hitD7-0004pz-MA for 35548@debbugs.gnu.org; Thu, 04 Jul 2019 00:19:06 -0400 Received: from mathent.math.s.chiba-u.ac.jp (mathent [192.168.32.5]) by mathmail.math.s.chiba-u.ac.jp (Postfix) with ESMTP id BA0D5F08E1; Thu, 4 Jul 2019 13:19:03 +0900 (JST) (envelope-from mituharu@math.s.chiba-u.ac.jp) Date: Thu, 04 Jul 2019 13:19:03 +0900 Message-ID: From: YAMAMOTO Mitsuharu In-Reply-To: References: User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?UTF-8?Q?Goj=C5=8D?=) APEL/10.8 EasyPG/1.0.0 Emacs/25.3 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) Organization: Faculty of Science, Chiba University MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spam-Score: 0.0 (/) 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 (-) On Thu, 04 Jul 2019 12:14:08 +0900, YAMAMOTO Mitsuharu wrote: > > On Sat, 04 May 2019 04:23:32 +0900, > Paul Eggert wrote: > > > > I just upgraded my Emacs build platform to Fedora 30 and found that > > Emacs wouldn't build when configured with --enable-gcc-warnings. The > > problem is that starting in librsvg 2.45.1, the librsvg functions > > rsvg_handle_write and rsvg_handle_close are deprecated, and Emacs calls > > those functions. Although I pacified GCC by installing the attached > > patch into Emacs master, the underlying problem is still there and an > > rsvg expert should take a look at this at some point. > > If we omit Windows DLL stuff, then the patch would be as simple as > below. Oops, I forgot NULL-check for filename. YAMAMOTO Mitsuharu mituharu@math.s.chiba-u.ac.jp diff --git a/src/image.c b/src/image.c index 6ead12166b6..726edb014dc 100644 --- a/src/image.c +++ b/src/image.c @@ -9490,6 +9490,22 @@ svg_load_image (struct frame *f, struct image *img, char *contents, g_type_init (); #endif +#if LIBRSVG_CHECK_VERSION (2, 32, 0) && !defined WINDOWSNT + /* In order to replace rsvg_handle_write and rsvg_handle_close that + are deprecated in librsvg 2.45.1 (Bug#35548), we need + rsvg_handle_new_from_stream_sync that requires librsvg + 2.32.0. */ + GInputStream *input_stream = g_memory_input_stream_new_from_data (contents, + size, NULL); + GFile *base_file = filename ? g_file_new_for_path (filename) : NULL; + rsvg_handle = rsvg_handle_new_from_stream_sync (input_stream, base_file, + RSVG_HANDLE_FLAGS_NONE, + NULL, &err); + if (base_file) + g_object_unref (base_file); + g_object_unref (input_stream); + if (err) goto rsvg_error; +#else /* Make a handle to a new rsvg object. */ rsvg_handle = rsvg_handle_new (); @@ -9499,17 +9515,6 @@ svg_load_image (struct frame *f, struct image *img, char *contents, if (filename) rsvg_handle_set_base_uri (rsvg_handle, filename); - /* Suppress GCC deprecation warnings starting in librsvg 2.45.1 for - rsvg_handle_write and rsvg_handle_close. FIXME: Use functions - like rsvg_handle_new_from_gfile_sync on newer librsvg versions, - and remove this hack. */ - #if GNUC_PREREQ (4, 6, 0) - #pragma GCC diagnostic push - #endif - #if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0) - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif - /* Parse the contents argument and fill in the rsvg_handle. */ rsvg_handle_write (rsvg_handle, (unsigned char *) contents, size, &err); if (err) goto rsvg_error; @@ -9518,10 +9523,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents, for further writes. */ rsvg_handle_close (rsvg_handle, &err); if (err) goto rsvg_error; - - #if GNUC_PREREQ (4, 6, 0) - #pragma GCC diagnostic pop - #endif +#endif rsvg_handle_get_dimensions (rsvg_handle, &dimension_data); if (! check_image_size (f, dimension_data.width, dimension_data.height)) From unknown Sat Sep 06 20:03:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#35548: image.c uses deprecated rsvg_handle_write etc. Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Jul 2019 12:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35548 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: YAMAMOTO Mitsuharu Cc: 35548@debbugs.gnu.org, eggert@cs.ucla.edu Received: via spool by 35548-submit@debbugs.gnu.org id=B35548.15622448493157 (code B ref 35548); Thu, 04 Jul 2019 12:55:02 +0000 Received: (at 35548) by debbugs.gnu.org; 4 Jul 2019 12:54:09 +0000 Received: from localhost ([127.0.0.1]:50546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hj1FZ-0000or-E7 for submit@debbugs.gnu.org; Thu, 04 Jul 2019 08:54:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hj1FX-0000oV-5B for 35548@debbugs.gnu.org; Thu, 04 Jul 2019 08:54:07 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hj1FQ-000710-EP; Thu, 04 Jul 2019 08:54:00 -0400 Received: from [176.228.60.248] (port=1163 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hj1FP-0005vS-OD; Thu, 04 Jul 2019 08:54:00 -0400 Date: Thu, 04 Jul 2019 15:53:49 +0300 Message-Id: <83h882arky.fsf@gnu.org> From: Eli Zaretskii In-reply-to: (message from YAMAMOTO Mitsuharu on Thu, 04 Jul 2019 12:14:08 +0900) References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) 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: -3.3 (---) > Date: Thu, 04 Jul 2019 12:14:08 +0900 > From: YAMAMOTO Mitsuharu > Cc: 35548@debbugs.gnu.org > > If we omit Windows DLL stuff, then the patch would be as simple as > below. But Eli may dislike this (even with DLL support) for the very > reasons he dislikes the patch for Bug#36315 the other participants > prefer: When we must move to other APIs because the libraries stop supporting the ones we use, my liking or disliking that is hardly relevant. It would be unreasonable for me to put my preferences before development needs, would it not? From unknown Sat Sep 06 20:03:27 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Paul Eggert Subject: bug#35548: closed (Re: bug#35548: image.c uses deprecated rsvg_handle_write etc.) Message-ID: References: X-Gnu-PR-Message: they-closed 35548 X-Gnu-PR-Package: emacs Reply-To: 35548@debbugs.gnu.org Date: Wed, 10 Jul 2019 19:45:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1562787902-23585-1" This is a multi-part message in MIME format... ------------=_1562787902-23585-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #35548: image.c uses deprecated rsvg_handle_write etc. which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 35548@debbugs.gnu.org. --=20 35548: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D35548 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1562787902-23585-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 35548-done) by debbugs.gnu.org; 10 Jul 2019 19:44:39 +0000 Received: from localhost ([127.0.0.1]:36658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlIW6-00067j-MR for submit@debbugs.gnu.org; Wed, 10 Jul 2019 15:44:39 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:55008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlIW3-00067T-Qb for 35548-done@debbugs.gnu.org; Wed, 10 Jul 2019 15:44:37 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 31C001626CF; Wed, 10 Jul 2019 12:44:28 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id HOcDpvJtXdd6; Wed, 10 Jul 2019 12:44:27 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 219991626D2; Wed, 10 Jul 2019 12:44:27 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id fpGBZuBjSH6i; Wed, 10 Jul 2019 12:44:27 -0700 (PDT) Received: from [192.168.1.9] (cpe-23-242-74-103.socal.res.rr.com [23.242.74.103]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id EA6381626CF; Wed, 10 Jul 2019 12:44:26 -0700 (PDT) Subject: Re: bug#35548: image.c uses deprecated rsvg_handle_write etc. To: YAMAMOTO Mitsuharu References: From: Paul Eggert Organization: UCLA Computer Science Department Message-ID: Date: Wed, 10 Jul 2019 12:44:26 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------989D23AD741F96A9D69F59D3" Content-Language: en-US X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 35548-done Cc: 35548-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: -3.3 (---) This is a multi-part message in MIME format. --------------989D23AD741F96A9D69F59D3 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Thanks, I attempted to port that patch to MS-Windows, installed the attached, and am marking this bug as done. --------------989D23AD741F96A9D69F59D3 Content-Type: text/x-patch; name="0001-Avoid-functions-deprecated-in-librsvg-2.45.1.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Avoid-functions-deprecated-in-librsvg-2.45.1.patch" >From 40cd6278ba965f3a9fcdddc568eb9ee7c69cf899 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 10 Jul 2019 12:37:55 -0700 Subject: [PATCH] Avoid functions deprecated in librsvg 2.45.1 * src/image.c (init_svg_functions) [WINDOWSNT]: Load the pre-2.32 or 2.32 functions, depending on LIBRSVG_CHECK_VERSION. (svg_load_image): In librsvg 2.32 or later, use g_memory_input_stream_new_from_data, g_file_new_for_path and rsvg_handle_new_from_stream_sync rather than the deprecated-in-2.45 rsvg_handle_write and rsvg_handle_close. >From a patch by YAMAMOTO Mitsuharu (Bug#35548#11). --- src/image.c | 82 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 28 deletions(-) diff --git a/src/image.c b/src/image.c index e898a7364a..3695342232 100644 --- a/src/image.c +++ b/src/image.c @@ -9300,14 +9300,23 @@ svg_image_p (Lisp_Object object) # endif /* SVG library functions. */ +# if LIBRSVG_CHECK_VERSION (2, 32, 0) +DEF_DLL_FN (GFile *, g_file_new_for_path, (char const *)); +DEF_DLL_FN (GInputStream *, g_memory_input_stream_new_from_data, + (void const *, gssize, GDestroyNotify)); +DEF_DLL_FN (RsvgHandle *, rsvg_handle_new_from_stream_sync, + (GInputStream *, GFile *, RsvgHandleFlags, GCancellable *, + GError **error)); +# else DEF_DLL_FN (RsvgHandle *, rsvg_handle_new, (void)); -DEF_DLL_FN (void, rsvg_handle_get_dimensions, - (RsvgHandle *, RsvgDimensionData *)); +DEF_DLL_FN (void, rsvg_handle_set_base_uri, (RsvgHandle *, const char *)); DEF_DLL_FN (gboolean, rsvg_handle_write, (RsvgHandle *, const guchar *, gsize, GError **)); DEF_DLL_FN (gboolean, rsvg_handle_close, (RsvgHandle *, GError **)); +#endif +DEF_DLL_FN (void, rsvg_handle_get_dimensions, + (RsvgHandle *, RsvgDimensionData *)); DEF_DLL_FN (GdkPixbuf *, rsvg_handle_get_pixbuf, (RsvgHandle *)); -DEF_DLL_FN (void, rsvg_handle_set_base_uri, (RsvgHandle *, const char *)); DEF_DLL_FN (int, gdk_pixbuf_get_width, (const GdkPixbuf *)); DEF_DLL_FN (int, gdk_pixbuf_get_height, (const GdkPixbuf *)); @@ -9340,12 +9349,18 @@ init_svg_functions (void) return 0; } +#if LIBRSVG_CHECK_VERSION (2, 32, 0) + LOAD_DLL_FN (glib, g_file_new_for_path); + LOAD_DLL_FN (glib, g_memory_input_stream_new_from_data); + LOAD_DLL_FN (library, rsvg_handle_new_from_stream_sync); +#else LOAD_DLL_FN (library, rsvg_handle_new); - LOAD_DLL_FN (library, rsvg_handle_get_dimensions); + LOAD_DLL_FN (library, rsvg_handle_set_base_uri); LOAD_DLL_FN (library, rsvg_handle_write); LOAD_DLL_FN (library, rsvg_handle_close); +#endif + LOAD_DLL_FN (library, rsvg_handle_get_dimensions); LOAD_DLL_FN (library, rsvg_handle_get_pixbuf); - LOAD_DLL_FN (library, rsvg_handle_set_base_uri); LOAD_DLL_FN (gdklib, gdk_pixbuf_get_width); LOAD_DLL_FN (gdklib, gdk_pixbuf_get_height); @@ -9379,12 +9394,18 @@ init_svg_functions (void) # undef g_clear_error # undef g_object_unref # undef g_type_init -# undef rsvg_handle_close # undef rsvg_handle_get_dimensions # undef rsvg_handle_get_pixbuf -# undef rsvg_handle_new -# undef rsvg_handle_set_base_uri -# undef rsvg_handle_write +# if LIBRSVG_CHECK_VERSION (2, 32, 0) +# undef g_file_new_for_path +# undef g_memory_input_stream_new_from_data +# undef rsvg_handle_new_from_stream_sync +# else +# undef rsvg_handle_close +# undef rsvg_handle_new +# undef rsvg_handle_set_base_uri +# undef rsvg_handle_write +# endif # define gdk_pixbuf_get_bits_per_sample fn_gdk_pixbuf_get_bits_per_sample # define gdk_pixbuf_get_colorspace fn_gdk_pixbuf_get_colorspace @@ -9399,12 +9420,19 @@ init_svg_functions (void) # if ! GLIB_CHECK_VERSION (2, 36, 0) # define g_type_init fn_g_type_init # endif -# define rsvg_handle_close fn_rsvg_handle_close # define rsvg_handle_get_dimensions fn_rsvg_handle_get_dimensions # define rsvg_handle_get_pixbuf fn_rsvg_handle_get_pixbuf -# define rsvg_handle_new fn_rsvg_handle_new -# define rsvg_handle_set_base_uri fn_rsvg_handle_set_base_uri -# define rsvg_handle_write fn_rsvg_handle_write +# if LIBRSVG_CHECK_VERSION (2, 32, 0) +# define g_file_new_for_path fn_g_file_new_for_path +# define g_memory_input_stream_new_from_data \ + fn_g_memory_input_stream_new_from_data +# define rsvg_handle_new_from_stream_sync fn_rsvg_handle_new_from_stream_sync +# else +# define rsvg_handle_close fn_rsvg_handle_close +# define rsvg_handle_new fn_rsvg_handle_new +# define rsvg_handle_set_base_uri fn_rsvg_handle_set_base_uri +# define rsvg_handle_write fn_rsvg_handle_write +# endif # endif /* !WINDOWSNT */ @@ -9489,6 +9517,18 @@ svg_load_image (struct frame *f, struct image *img, char *contents, g_type_init (); #endif +#if LIBRSVG_CHECK_VERSION (2, 32, 0) + GInputStream *input_stream + = g_memory_input_stream_new_from_data (contents, size, NULL); + GFile *base_file = filename ? g_file_new_for_path (filename) : NULL; + rsvg_handle = rsvg_handle_new_from_stream_sync (input_stream, base_file, + RSVG_HANDLE_FLAGS_NONE, + NULL, &err); + if (base_file) + g_object_unref (base_file); + g_object_unref (input_stream); + if (err) goto rsvg_error; +#else /* Make a handle to a new rsvg object. */ rsvg_handle = rsvg_handle_new (); @@ -9498,17 +9538,6 @@ svg_load_image (struct frame *f, struct image *img, char *contents, if (filename) rsvg_handle_set_base_uri (rsvg_handle, filename); - /* Suppress GCC deprecation warnings starting in librsvg 2.45.1 for - rsvg_handle_write and rsvg_handle_close. FIXME: Use functions - like rsvg_handle_new_from_gfile_sync on newer librsvg versions, - and remove this hack. */ - #if GNUC_PREREQ (4, 6, 0) - #pragma GCC diagnostic push - #endif - #if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0) - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif - /* Parse the contents argument and fill in the rsvg_handle. */ rsvg_handle_write (rsvg_handle, (unsigned char *) contents, size, &err); if (err) goto rsvg_error; @@ -9517,10 +9546,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents, for further writes. */ rsvg_handle_close (rsvg_handle, &err); if (err) goto rsvg_error; - - #if GNUC_PREREQ (4, 6, 0) - #pragma GCC diagnostic pop - #endif +#endif rsvg_handle_get_dimensions (rsvg_handle, &dimension_data); if (! check_image_size (f, dimension_data.width, dimension_data.height)) -- 2.17.1 --------------989D23AD741F96A9D69F59D3-- ------------=_1562787902-23585-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 3 May 2019 19:23:48 +0000 Received: from localhost ([127.0.0.1]:49690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMdme-0002hw-4Q for submit@debbugs.gnu.org; Fri, 03 May 2019 15:23:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMdmc-0002hk-BQ for submit@debbugs.gnu.org; Fri, 03 May 2019 15:23:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:45827) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMdmX-0004cK-7g for submit@debbugs.gnu.org; Fri, 03 May 2019 15:23:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMdmV-0004A1-OU for bug-gnu-emacs@gnu.org; Fri, 03 May 2019 15:23:41 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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 1hMdmT-0004am-Hb for bug-gnu-emacs@gnu.org; Fri, 03 May 2019 15:23:39 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:46720) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMdmR-0004a6-Ug for bug-gnu-emacs@gnu.org; Fri, 03 May 2019 15:23:36 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 397051618F7 for ; Fri, 3 May 2019 12:23:34 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id zS-66dCYgoEd for ; Fri, 3 May 2019 12:23:33 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 17744161911 for ; Fri, 3 May 2019 12:23:33 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id xUsvW1v2swlk for ; Fri, 3 May 2019 12:23:32 -0700 (PDT) Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id F17DC161910 for ; Fri, 3 May 2019 12:23:32 -0700 (PDT) To: Emacs bugs From: Paul Eggert Subject: image.c uses deprecated rsvg_handle_write etc. Openpgp: preference=signencrypt Autocrypt: addr=eggert@cs.ucla.edu; prefer-encrypt=mutual; keydata= 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 uNcby4U= Organization: UCLA Computer Science Department Message-ID: Date: Fri, 3 May 2019 12:23:32 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------683BF9C6344994A21CDD0323" Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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 (--) This is a multi-part message in MIME format. --------------683BF9C6344994A21CDD0323 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit I just upgraded my Emacs build platform to Fedora 30 and found that Emacs wouldn't build when configured with --enable-gcc-warnings. The problem is that starting in librsvg 2.45.1, the librsvg functions rsvg_handle_write and rsvg_handle_close are deprecated, and Emacs calls those functions. Although I pacified GCC by installing the attached patch into Emacs master, the underlying problem is still there and an rsvg expert should take a look at this at some point. --------------683BF9C6344994A21CDD0323 Content-Type: text/x-patch; name="0001-Pacify-librsvg-2.45.1-and-later.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Pacify-librsvg-2.45.1-and-later.patch" >From da3897abf1e45741b122b52df37a5cbc68b2ad5d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 3 May 2019 12:16:33 -0700 Subject: [PATCH] Pacify librsvg 2.45.1 and later * src/image.c (svg_load_image): Pacify librsvg 2.45.1 and later, and add a FIXME comment about the deprecated librsvg functions. --- src/image.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/image.c b/src/image.c index bf594987eb..3d724a773b 100644 --- a/src/image.c +++ b/src/image.c @@ -6735,7 +6735,7 @@ my_error_exit (j_common_ptr cinfo) /* Init source method for JPEG data source manager. Called by - jpeg_read_header() before any data is actually read. See + jpeg_read_header before any data is actually read. See libjpeg.doc from the JPEG lib distribution. */ static void @@ -6745,7 +6745,7 @@ our_common_init_source (j_decompress_ptr cinfo) /* Method to terminate data source. Called by - jpeg_finish_decompress() after all data has been processed. */ + jpeg_finish_decompress after all data has been processed. */ static void our_common_term_source (j_decompress_ptr cinfo) @@ -9456,7 +9456,18 @@ svg_load_image (struct frame *f, struct image *img, char *contents, See rsvg bug 596114 - "image refs are relative to curdir, not .svg file" . */ if (filename) - rsvg_handle_set_base_uri(rsvg_handle, filename); + rsvg_handle_set_base_uri (rsvg_handle, filename); + + /* Suppress GCC deprecation warnings starting in librsvg 2.45.1 for + rsvg_handle_write and rsvg_handle_close. FIXME: Use functions + like rsvg_handle_new_from_gfile_sync on newer librsvg versions, + and remove this hack. */ + #if GNUC_PREREQ (4, 6, 0) + #pragma GCC diagnostic push + #endif + #if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0) + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif /* Parse the contents argument and fill in the rsvg_handle. */ rsvg_handle_write (rsvg_handle, (unsigned char *) contents, size, &err); @@ -9467,6 +9478,10 @@ svg_load_image (struct frame *f, struct image *img, char *contents, rsvg_handle_close (rsvg_handle, &err); if (err) goto rsvg_error; + #if GNUC_PREREQ (4, 6, 0) + #pragma GCC diagnostic pop + #endif + rsvg_handle_get_dimensions (rsvg_handle, &dimension_data); if (! check_image_size (f, dimension_data.width, dimension_data.height)) { -- 2.21.0 --------------683BF9C6344994A21CDD0323-- ------------=_1562787902-23585-1-- From unknown Sat Sep 06 20:03:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#35548: image.c uses deprecated rsvg_handle_write etc. In-Reply-To: Resent-From: Andy Moreton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 11 Jul 2019 12:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35548 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 35548@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156284754011288 (code B ref -1); Thu, 11 Jul 2019 12:19:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jul 2019 12:19:00 +0000 Received: from localhost ([127.0.0.1]:37120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlY2N-0002vz-VV for submit@debbugs.gnu.org; Thu, 11 Jul 2019 08:19:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:53501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlY2L-0002vr-My for submit@debbugs.gnu.org; Thu, 11 Jul 2019 08:18:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50245) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlY2K-0000Nd-6d for bug-gnu-emacs@gnu.org; Thu, 11 Jul 2019 08:18:57 -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.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RDNS_DYNAMIC autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlY2J-0008J7-6v for bug-gnu-emacs@gnu.org; Thu, 11 Jul 2019 08:18:56 -0400 Received: from 195-159-176-226.customer.powertech.no ([195.159.176.226]:37466 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlY2I-0008G4-UO for bug-gnu-emacs@gnu.org; Thu, 11 Jul 2019 08:18:55 -0400 Received: from list by blaine.gmane.org with local (Exim 4.89) (envelope-from ) id 1hlY2E-000nk2-RU for bug-gnu-emacs@gnu.org; Thu, 11 Jul 2019 14:18:50 +0200 X-Injected-Via-Gmane: http://gmane.org/ From: Andy Moreton Date: Thu, 11 Jul 2019 13:18:45 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2.90 (windows-nt) Cancel-Lock: sha1:JEgvmqGkQd08EgUVYmfgFkHWrb0= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 195.159.176.226 X-Spam-Score: -0.8 (/) 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.8 (-) On Wed 10 Jul 2019, Paul Eggert wrote: > Thanks, I attempted to port that patch to MS-Windows, installed the attached, > and am marking this bug as done. This patch breaks SVG support on 64bit MSYS2 Windows builds, using librsvg 2.44.14. AndyM From unknown Sat Sep 06 20:03:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#35548: image.c uses deprecated rsvg_handle_write etc. In-Reply-To: Resent-From: Andy Moreton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 11 Jul 2019 12:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35548 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 35548@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156284959614445 (code B ref -1); Thu, 11 Jul 2019 12:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jul 2019 12:53:16 +0000 Received: from localhost ([127.0.0.1]:37128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlYZX-0003kv-Q7 for submit@debbugs.gnu.org; Thu, 11 Jul 2019 08:53:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:50524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlYZW-0003km-1y for submit@debbugs.gnu.org; Thu, 11 Jul 2019 08:53:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59557) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlYZU-0003WQ-Rp for bug-gnu-emacs@gnu.org; Thu, 11 Jul 2019 08:53:13 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=1.0 required=5.0 tests=BAYES_40,FREEMAIL_FROM, RDNS_DYNAMIC autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlYZT-0007FR-P8 for bug-gnu-emacs@gnu.org; Thu, 11 Jul 2019 08:53:12 -0400 Received: from 195-159-176-226.customer.powertech.no ([195.159.176.226]:59118 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlYZS-0007Dd-GH for bug-gnu-emacs@gnu.org; Thu, 11 Jul 2019 08:53:10 -0400 Received: from list by blaine.gmane.org with local (Exim 4.89) (envelope-from ) id 1hlYZN-000JhX-7a for bug-gnu-emacs@gnu.org; Thu, 11 Jul 2019 14:53:05 +0200 X-Injected-Via-Gmane: http://gmane.org/ From: Andy Moreton Date: Thu, 11 Jul 2019 13:52:58 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2.90 (windows-nt) Cancel-Lock: sha1:pUd3q0Q2zWvss/UDRFGR3jf9FH8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 195.159.176.226 X-Spam-Score: -0.8 (/) 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.8 (-) On Thu 11 Jul 2019, Andy Moreton wrote: > On Wed 10 Jul 2019, Paul Eggert wrote: > >> Thanks, I attempted to port that patch to MS-Windows, installed the attached, >> and am marking this bug as done. > > This patch breaks SVG support on 64bit MSYS2 Windows builds, using > librsvg 2.44.14. The problem is that some of the dynamically loaded functionas are actually in gio, not glib. Please install the following patch to fix it. diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 044b82ed1e..2e45d8623b 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -278,6 +278,7 @@ libgnutls-version '(gif "libgif-5.dll" "giflib4.dll" "libungif4.dll" "libungif.dll"))) '(svg "librsvg-2-2.dll") '(gdk-pixbuf "libgdk_pixbuf-2.0-0.dll") + '(gio "libgio-2.0-0.dll") '(glib "libglib-2.0-0.dll") '(gobject "libgobject-2.0-0.dll") (if (>= libgnutls-version 30400) diff --git a/src/image.c b/src/image.c index 3695342232..8ffb08b147 100644 --- a/src/image.c +++ b/src/image.c @@ -9336,22 +9336,23 @@ DEF_DLL_FN (void, g_clear_error, (GError **)); static bool init_svg_functions (void) { - HMODULE library, gdklib = NULL, glib = NULL, gobject = NULL; + HMODULE library, gdklib = NULL, gio = NULL, glib = NULL, gobject = NULL; - if (!(glib = w32_delayed_load (Qglib)) + if (!(gio = w32_delayed_load (Qgio)) + || !(glib = w32_delayed_load (Qglib)) || !(gobject = w32_delayed_load (Qgobject)) || !(gdklib = w32_delayed_load (Qgdk_pixbuf)) || !(library = w32_delayed_load (Qsvg))) { if (gdklib) FreeLibrary (gdklib); if (gobject) FreeLibrary (gobject); if (glib) FreeLibrary (glib); + if (gio) FreeLibrary (gio); return 0; } #if LIBRSVG_CHECK_VERSION (2, 32, 0) - LOAD_DLL_FN (glib, g_file_new_for_path); - LOAD_DLL_FN (glib, g_memory_input_stream_new_from_data); + LOAD_DLL_FN (gio, g_file_new_for_path); + LOAD_DLL_FN (gio, g_memory_input_stream_new_from_data); LOAD_DLL_FN (library, rsvg_handle_new_from_stream_sync); #else LOAD_DLL_FN (library, rsvg_handle_new); @@ -10228,6 +10229,7 @@ syms_of_image (void) #ifdef HAVE_NTGUI /* Other libraries used directly by svg code. */ DEFSYM (Qgdk_pixbuf, "gdk-pixbuf"); + DEFSYM (Qgio, "gio"); DEFSYM (Qglib, "glib"); DEFSYM (Qgobject, "gobject"); #endif /* HAVE_NTGUI */ From unknown Sat Sep 06 20:03:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#35548: image.c uses deprecated rsvg_handle_write etc. Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 11 Jul 2019 13:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35548 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Andy Moreton Cc: 35548@debbugs.gnu.org Received: via spool by 35548-submit@debbugs.gnu.org id=B35548.156285182418243 (code B ref 35548); Thu, 11 Jul 2019 13:31:02 +0000 Received: (at 35548) by debbugs.gnu.org; 11 Jul 2019 13:30:24 +0000 Received: from localhost ([127.0.0.1]:37160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlZ9T-0004kA-Ux for submit@debbugs.gnu.org; Thu, 11 Jul 2019 09:30:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59045) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlZ9R-0004jy-T8 for 35548@debbugs.gnu.org; Thu, 11 Jul 2019 09:30:22 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36588) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hlZ9M-0003fC-OK; Thu, 11 Jul 2019 09:30:16 -0400 Received: from [176.228.60.248] (port=2827 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hlZ9L-0002Qr-3H; Thu, 11 Jul 2019 09:30:15 -0400 Date: Thu, 11 Jul 2019 16:30:03 +0300 Message-Id: <831ryw4s2s.fsf@gnu.org> From: Eli Zaretskii In-reply-to: (message from Andy Moreton on Thu, 11 Jul 2019 13:18:45 +0100) References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) 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: -3.3 (---) > From: Andy Moreton > Date: Thu, 11 Jul 2019 13:18:45 +0100 > > On Wed 10 Jul 2019, Paul Eggert wrote: > > > Thanks, I attempted to port that patch to MS-Windows, installed the attached, > > and am marking this bug as done. > > This patch breaks SVG support on 64bit MSYS2 Windows builds, using > librsvg 2.44.14. Should be fixed now, thanks. From unknown Sat Sep 06 20:03:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#35548: image.c uses deprecated rsvg_handle_write etc. In-Reply-To: Resent-From: Andy Moreton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 11 Jul 2019 14:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35548 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 35548@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156285533617436 (code B ref -1); Thu, 11 Jul 2019 14:29:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jul 2019 14:28:56 +0000 Received: from localhost ([127.0.0.1]:38347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hla48-0004X9-58 for submit@debbugs.gnu.org; Thu, 11 Jul 2019 10:28:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:39942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hla44-0004X0-7C for submit@debbugs.gnu.org; Thu, 11 Jul 2019 10:28:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34014) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hla43-0006AP-Cf for bug-gnu-emacs@gnu.org; Thu, 11 Jul 2019 10:28:52 -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.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RDNS_DYNAMIC autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hla42-0001lU-HQ for bug-gnu-emacs@gnu.org; Thu, 11 Jul 2019 10:28:51 -0400 Received: from 195-159-176-226.customer.powertech.no ([195.159.176.226]:46710 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hla41-0001jt-NG for bug-gnu-emacs@gnu.org; Thu, 11 Jul 2019 10:28:50 -0400 Received: from list by blaine.gmane.org with local (Exim 4.89) (envelope-from ) id 1hla3z-0012iD-DY for bug-gnu-emacs@gnu.org; Thu, 11 Jul 2019 16:28:47 +0200 X-Injected-Via-Gmane: http://gmane.org/ From: Andy Moreton Date: Thu, 11 Jul 2019 15:28:40 +0100 Message-ID: References: <831ryw4s2s.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (windows-nt) Cancel-Lock: sha1:j3pkKAYbL2SSPYAcNqI2yuAuiiU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 195.159.176.226 X-Spam-Score: -0.8 (/) 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.8 (-) On Thu 11 Jul 2019, Eli Zaretskii wrote: >> From: Andy Moreton >> Date: Thu, 11 Jul 2019 13:18:45 +0100 >> >> On Wed 10 Jul 2019, Paul Eggert wrote: >> >> > Thanks, I attempted to port that patch to MS-Windows, installed the attached, >> > and am marking this bug as done. >> >> This patch breaks SVG support on 64bit MSYS2 Windows builds, using >> librsvg 2.44.14. > > Should be fixed now, thanks. Thanks Eli, all working again. AndyM