* [PR PATCH] lyx: update to 2.3.7, adopt.
@ 2023-01-20 10:59 Eloitor
2023-01-21 19:51 ` [PR REVIEW] " ahesford
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Eloitor @ 2023-01-20 10:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 475 bytes --]
There is a new pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages lyx
https://github.com/void-linux/void-packages/pull/41753
lyx: update to 2.3.7, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41753.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lyx-41753.patch --]
[-- Type: text/x-diff, Size: 2337 bytes --]
From d514fa2733c1d71d01db713983b5e59f28639d0b Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 20 Jan 2023 12:03:10 +0100
Subject: [PATCH] lyx: update to 2.3.7, adopt.
---
srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch | 22 ---------------------
srcpkgs/lyx/template | 9 +++++----
2 files changed, 5 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch
diff --git a/srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch b/srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch
deleted file mode 100644
index b1acbdb9087d..000000000000
--- a/srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://src.fedoraproject.org/rpms/lyx/raw/rawhide/f/lyx-2.3.6-fix-gcc12.patch
-https://bugs.gentoo.org/841743
---- a/src/insets/InsetListings.cpp
-+++ b/src/insets/InsetListings.cpp
-@@ -44,6 +44,7 @@
-
- #include "support/regex.h"
-
-+#include <cstring>
- #include <sstream>
-
- using namespace std;
---- a/src/lyxfind.cpp
-+++ b/src/lyxfind.cpp
-@@ -52,6 +52,7 @@
- #include "support/lstrings.h"
-
- #include "support/regex.h"
-+#include <iterator>
-
- using namespace std;
- using namespace lyx::support;
diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template
index 96dad71fe07e..209758b92f96 100644
--- a/srcpkgs/lyx/template
+++ b/srcpkgs/lyx/template
@@ -1,6 +1,7 @@
# Template file for 'lyx'
pkgname=lyx
-version=2.3.6.1
+version=2.3.7
+_revision=1
revision=1
build_style=gnu-configure
configure_args="--enable-qt5 --without-included-mythes --without-included-boost"
@@ -8,9 +9,9 @@ hostmakedepends="pkg-config bc qt5-devel"
makedepends="file-devel boost-devel mythes-devel enchant2-devel qt5-svg-devel"
depends="virtual?tex GraphicsMagick python3"
short_desc="Document Processor WYSIWYM Editor & Latex frontend"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
license="GPL-2.0-or-later"
homepage="https://www.lyx.org/Home"
-distfiles="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/${pkgname}-${version}.tar.gz"
-checksum=6d6f5458ebaac644cdfa35114d029e9ec57b4d930268d6d40bd9795d5c7e7929
+distfiles="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/${pkgname}-${version}-${_revision}.tar.gz"
+checksum=910bb48d9b19c0cfeb6ec845eb318515f33a63ea7892a99b2e7b67c6b518bacd
python_version=3
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] lyx: update to 2.3.7, adopt.
2023-01-20 10:59 [PR PATCH] lyx: update to 2.3.7, adopt Eloitor
2023-01-21 19:51 ` [PR REVIEW] " ahesford
@ 2023-01-21 19:51 ` ahesford
2023-01-22 13:45 ` [PR PATCH] [Updated] " Eloitor
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2023-01-21 19:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/41753#discussion_r1083328455
Comment:
```suggestion
distfiles="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/${pkgname}-${version/r/-}.tar.gz"
```
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] lyx: update to 2.3.7, adopt.
2023-01-20 10:59 [PR PATCH] lyx: update to 2.3.7, adopt Eloitor
@ 2023-01-21 19:51 ` ahesford
2023-01-21 19:51 ` ahesford
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2023-01-21 19:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/41753#discussion_r1083328594
Comment:
Maybe we should encode the revision in the version string as `r1`, then it more directly relates to the original download package and we can drop `_revision` in favor of a substitution in `distfiles` below:
```suggestion
version=2.3.7r1
```
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] lyx: update to 2.3.7, adopt.
2023-01-20 10:59 [PR PATCH] lyx: update to 2.3.7, adopt Eloitor
2023-01-21 19:51 ` [PR REVIEW] " ahesford
2023-01-21 19:51 ` ahesford
@ 2023-01-22 13:45 ` Eloitor
2023-01-22 13:45 ` Eloitor
2023-01-22 15:48 ` [PR PATCH] [Merged]: " ahesford
4 siblings, 0 replies; 6+ messages in thread
From: Eloitor @ 2023-01-22 13:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages lyx
https://github.com/void-linux/void-packages/pull/41753
lyx: update to 2.3.7, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41753.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lyx-41753.patch --]
[-- Type: text/x-diff, Size: 2337 bytes --]
From e5cf7a8587be17f3e1c68940ab291dc4e4fda37b Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 20 Jan 2023 12:03:10 +0100
Subject: [PATCH] lyx: update to 2.3.7, adopt.
---
srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch | 22 ---------------------
srcpkgs/lyx/template | 9 +++++----
2 files changed, 5 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch
diff --git a/srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch b/srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch
deleted file mode 100644
index b1acbdb9087d..000000000000
--- a/srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://src.fedoraproject.org/rpms/lyx/raw/rawhide/f/lyx-2.3.6-fix-gcc12.patch
-https://bugs.gentoo.org/841743
---- a/src/insets/InsetListings.cpp
-+++ b/src/insets/InsetListings.cpp
-@@ -44,6 +44,7 @@
-
- #include "support/regex.h"
-
-+#include <cstring>
- #include <sstream>
-
- using namespace std;
---- a/src/lyxfind.cpp
-+++ b/src/lyxfind.cpp
-@@ -52,6 +52,7 @@
- #include "support/lstrings.h"
-
- #include "support/regex.h"
-+#include <iterator>
-
- using namespace std;
- using namespace lyx::support;
diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template
index 96dad71fe07e..209758b92f96 100644
--- a/srcpkgs/lyx/template
+++ b/srcpkgs/lyx/template
@@ -1,6 +1,7 @@
# Template file for 'lyx'
pkgname=lyx
-version=2.3.6.1
+version=2.3.7
+_revision=1
revision=1
build_style=gnu-configure
configure_args="--enable-qt5 --without-included-mythes --without-included-boost"
@@ -8,9 +9,9 @@ hostmakedepends="pkg-config bc qt5-devel"
makedepends="file-devel boost-devel mythes-devel enchant2-devel qt5-svg-devel"
depends="virtual?tex GraphicsMagick python3"
short_desc="Document Processor WYSIWYM Editor & Latex frontend"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
license="GPL-2.0-or-later"
homepage="https://www.lyx.org/Home"
-distfiles="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/${pkgname}-${version}.tar.gz"
-checksum=6d6f5458ebaac644cdfa35114d029e9ec57b4d930268d6d40bd9795d5c7e7929
+distfiles="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/${pkgname}-${version}-${_revision}.tar.gz"
+checksum=910bb48d9b19c0cfeb6ec845eb318515f33a63ea7892a99b2e7b67c6b518bacd
python_version=3
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] lyx: update to 2.3.7, adopt.
2023-01-20 10:59 [PR PATCH] lyx: update to 2.3.7, adopt Eloitor
` (2 preceding siblings ...)
2023-01-22 13:45 ` [PR PATCH] [Updated] " Eloitor
@ 2023-01-22 13:45 ` Eloitor
2023-01-22 15:48 ` [PR PATCH] [Merged]: " ahesford
4 siblings, 0 replies; 6+ messages in thread
From: Eloitor @ 2023-01-22 13:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages lyx
https://github.com/void-linux/void-packages/pull/41753
lyx: update to 2.3.7, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41753.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lyx-41753.patch --]
[-- Type: text/x-diff, Size: 2316 bytes --]
From 92fbc46f769e8fc7e913d42d243232031e2a7697 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 20 Jan 2023 12:03:10 +0100
Subject: [PATCH] lyx: update to 2.3.7, adopt.
---
srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch | 22 ---------------------
srcpkgs/lyx/template | 8 ++++----
2 files changed, 4 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch
diff --git a/srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch b/srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch
deleted file mode 100644
index b1acbdb9087d..000000000000
--- a/srcpkgs/lyx/patches/lyx-2.3.6.1-gcc12.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://src.fedoraproject.org/rpms/lyx/raw/rawhide/f/lyx-2.3.6-fix-gcc12.patch
-https://bugs.gentoo.org/841743
---- a/src/insets/InsetListings.cpp
-+++ b/src/insets/InsetListings.cpp
-@@ -44,6 +44,7 @@
-
- #include "support/regex.h"
-
-+#include <cstring>
- #include <sstream>
-
- using namespace std;
---- a/src/lyxfind.cpp
-+++ b/src/lyxfind.cpp
-@@ -52,6 +52,7 @@
- #include "support/lstrings.h"
-
- #include "support/regex.h"
-+#include <iterator>
-
- using namespace std;
- using namespace lyx::support;
diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template
index 96dad71fe07e..f5d818ae98b1 100644
--- a/srcpkgs/lyx/template
+++ b/srcpkgs/lyx/template
@@ -1,6 +1,6 @@
# Template file for 'lyx'
pkgname=lyx
-version=2.3.6.1
+version=2.3.7r1
revision=1
build_style=gnu-configure
configure_args="--enable-qt5 --without-included-mythes --without-included-boost"
@@ -8,9 +8,9 @@ hostmakedepends="pkg-config bc qt5-devel"
makedepends="file-devel boost-devel mythes-devel enchant2-devel qt5-svg-devel"
depends="virtual?tex GraphicsMagick python3"
short_desc="Document Processor WYSIWYM Editor & Latex frontend"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
license="GPL-2.0-or-later"
homepage="https://www.lyx.org/Home"
-distfiles="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/${pkgname}-${version}.tar.gz"
-checksum=6d6f5458ebaac644cdfa35114d029e9ec57b4d930268d6d40bd9795d5c7e7929
+distfiles="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/${pkgname}-${version/r/-}.tar.gz"
+checksum=910bb48d9b19c0cfeb6ec845eb318515f33a63ea7892a99b2e7b67c6b518bacd
python_version=3
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: lyx: update to 2.3.7, adopt.
2023-01-20 10:59 [PR PATCH] lyx: update to 2.3.7, adopt Eloitor
` (3 preceding siblings ...)
2023-01-22 13:45 ` Eloitor
@ 2023-01-22 15:48 ` ahesford
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2023-01-22 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There's a merged pull request on the void-packages repository
lyx: update to 2.3.7, adopt.
https://github.com/void-linux/void-packages/pull/41753
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-22 15:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-20 10:59 [PR PATCH] lyx: update to 2.3.7, adopt Eloitor
2023-01-21 19:51 ` [PR REVIEW] " ahesford
2023-01-21 19:51 ` ahesford
2023-01-22 13:45 ` [PR PATCH] [Updated] " Eloitor
2023-01-22 13:45 ` Eloitor
2023-01-22 15:48 ` [PR PATCH] [Merged]: " ahesford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).