From 528d95026e89bb9efc2a4a40caff8bae041b6ff7 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 20 Jan 2023 08:29:57 +0000
Subject: [PATCH] testing/lyx: upgrade to 2.3.7.1
---
testing/lyx/APKBUILD | 12 ++++++------
testing/lyx/gcc12.patch | 25 -------------------------
2 files changed, 6 insertions(+), 31 deletions(-)
delete mode 100644 testing/lyx/gcc12.patch
diff --git a/testing/lyx/APKBUILD b/testing/lyx/APKBUILD
index c5de58f5707e..a86f373f0eda 100644
--- a/testing/lyx/APKBUILD
+++ b/testing/lyx/APKBUILD
@@ -1,8 +1,9 @@
# Contributor: Eloi Torrents <eloitor@disroot.org>
# Maintainer: Eloi Torrents <eloitor@disroot.org>
pkgname=lyx
-pkgver=2.3.6.1
-pkgrel=3
+_pkgver=2.3.7-1
+pkgver=${_pkgver/-/.}
+pkgrel=0
pkgdesc="Advanced WYSIWYM document processor & LaTeX front-end"
url="https://www.lyx.org"
arch="all"
@@ -20,9 +21,9 @@ depends="
python3
"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/lyx-$pkgver.tar.gz
- gcc12.patch
+source="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/lyx-$_pkgver.tar.xz
"
+builddir="$srcdir/$pkgname-${_pkgver%-*}"
build() {
./configure \
@@ -39,6 +40,5 @@ package() {
}
sha512sums="
-b2f24d32c3716144fc19a5187d59dce86c718e9180b3b33826a04477c5deeed8238c31e0569b8c218164726ab10b66c76c22dc7e0610ca18a7b7e651a3525cbd lyx-2.3.6.1.tar.gz
-d95fa437a420095cdbb3aee1d4240fd1b448316fc7506a90a1df57d4d6b8253b04dfeff4dd3f1beef074ccc2637f12686c378d9abd421dabca4b1a0448dd27db gcc12.patch
+b8aaefb68993032354fea3c6fd87d6da161395c92b5def4ecf92a7d6873ec59e01cdfb45c51ae1aaa62aa54db8e100b00ff9c2c9e0f1307c2f46860cd8c6eefe lyx-2.3.7-1.tar.xz
"
diff --git a/testing/lyx/gcc12.patch b/testing/lyx/gcc12.patch
deleted file mode 100644
index 662b81c64999..000000000000
--- a/testing/lyx/gcc12.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h
-index 4be28f8..d4736a5 100644
---- a/src/insets/InsetListings.h
-+++ b/src/insets/InsetListings.h
-@@ -14,6 +14,7 @@
-
- #include "InsetListingsParams.h"
-
-+#include <cstring>
-
- namespace lyx {
-
-diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
-index a3a0b8b..7feb0eb 100644
---- a/src/lyxfind.cpp
-+++ b/src/lyxfind.cpp
-@@ -33,6 +33,8 @@
- #include "TexRow.h"
- #include "Text.h"
-
-+#include <iterator>
-+
- #include "frontends/Application.h"
- #include "frontends/alert.h"
-
--
GitLab