pool/inkscape
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1073505 from graphics

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1073505
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=126
This commit is contained in:
Dominique Leuenberger 2023-03-24 14:18:15 +00:00 committed by Git OBS Bridge
commit a9911a2c31
3 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
0001-Fix-build-with-GCC13.patch Normal file
View File

@ -0,0 +1,48 @@
From c68f5f9cade8a890efefcb4c2e0fc57762211286 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 24 Feb 2023 14:01:18 -0500
Subject: [PATCH] Fix build with GCC13
GCC 13 now complains about this line:
```
src/ui/widget/selected-style.cpp:111:6: error: statement-expressions are not allowed outside functions nor in template-argument lists
111 | {g_strdup("application/x-oswb-color"), 0, APP_OSWB_COLOR}
| ^~~~~~~~
```
However, it is not necessary to strdup the string constant as the value
just needs to exist indefinitely, and it will as a constant. While C
doesn't mind the `const` difference, a simple cast will silence C++'s
higher strictness.
And in fact, the other use of `GtkTargetEntry` in
`src/ui/drag-and-drop.cpp` does the same cast.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
src/ui/widget/selected-style.cpp | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 68fe1fc426..7274f1b74c 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -100,14 +100,8 @@ enum ui_drop_target_info {
APP_OSWB_COLOR
};
-//TODO: warning: deprecated conversion from string constant to ‘gchar*’
-//
-//Turn out to be warnings that we should probably leave in place. The
-// pointers/types used need to be read-only. So until we correct the using
-// code, those warnings are actually desired. They say "Hey! Fix this". We
-// definitely don't want to hide/ignore them. --JonCruz
static const GtkTargetEntry ui_drop_target_entries [] = {
- {g_strdup("application/x-oswb-color"), 0, APP_OSWB_COLOR}
+ {(gchar *)"application/x-oswb-color", 0, APP_OSWB_COLOR}
};
static guint nui_drop_target_entries = G_N_ELEMENTS(ui_drop_target_entries);
--
2.39.2

5
inkscape.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 21 08:44:31 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Add 0001-Fix-build-with-GCC13.patch: Fix build with GCC13.
-------------------------------------------------------------------
Sun Dec 18 14:02:37 UTC 2022 - thod_@gmx.de

4
inkscape.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package inkscape
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -31,6 +31,8 @@ Source1: openSUSE.gpl
Source2: inkscape-split-extensions-extra.py
Source98: https://media.inkscape.org/media/resources/sigs/inkscape-%{_version}.tar.xz.sig
Source99: https://inkscape.org/~MarcJeanmougin/gpg#/%name.keyring
# PATCH-FIX-UPSTREAM 0001-Fix-build-with-GCC13.patch -- Fix build with GCC13
Patch0: 0001-Fix-build-with-GCC13.patch
BuildRequires: cmake
BuildRequires: double-conversion-devel