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

- Add lyx-2.3.6-fix-gcc12.patch to fix build with gcc-12

Browse Source 
- Use autosetup

OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=213
This commit is contained in:
Cor Blom 2022-05-14 14:29:53 +00:00 committed by Git OBS Bridge
parent c4bc17c3fd
commit 78cc831caf
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lyx-2.3.6-fix-gcc12.patch Normal file
View File

@ -0,0 +1,24 @@
diff -ur lyx-2.3.6.1.orig/src/insets/InsetListings.cpp lyx-2.3.6.1/src/insets/InsetListings.cpp
--- lyx-2.3.6.1.orig/src/insets/InsetListings.cpp 2020-12-29 16:50:45.000000000 +0000
+++ lyx-2.3.6.1/src/insets/InsetListings.cpp 2022-02-03 16:22:37.983196716 +0000
@@ -44,6 +44,7 @@
#include "support/regex.h"
+#include <cstring>
#include <sstream>
using namespace std;
Only in lyx-2.3.6.1/src/insets: InsetListings.cpp~
diff -ur lyx-2.3.6.1.orig/src/lyxfind.cpp lyx-2.3.6.1/src/lyxfind.cpp
--- lyx-2.3.6.1.orig/src/lyxfind.cpp 2020-12-29 16:50:45.000000000 +0000
+++ lyx-2.3.6.1/src/lyxfind.cpp 2022-02-03 16:01:54.997152176 +0000
@@ -52,6 +52,7 @@
#include "support/lstrings.h"
#include "support/regex.h"
+#include <iterator>
using namespace std;
using namespace lyx::support;
Only in lyx-2.3.6.1/src: lyxfind.cpp~

6
lyx.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat May 14 14:28:50 UTC 2022 - Cor Blom <cornelis@solcon.nl>
- Add lyx-2.3.6-fix-gcc12.patch to fix build with gcc-12
- Use autosetup
-------------------------------------------------------------------
Mon May 31 19:30:43 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

8
lyx.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package lyx
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -36,6 +36,8 @@ Patch0: correct-shebang.patch
# PATCH-FIX-UPSTREAM remove_python_shebang.patch mcepl@suse.com
# remove all instances of python2 shebang lines
Patch1: remove_python_shebang.patch
# Fix build with gcc-12
Patch2: lyx-2.3.6-fix-gcc12.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bc
@ -141,9 +143,7 @@ BuildArch: noarch
A collection of Math symbol fonts for LyX.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%autosetup -q
%build
#./autogen.sh