[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/files/, app-office/lyx/
commit: 8c4c4cb2567ec797af16cbdb1e072ff6fef0c0bf
Author: Sam James gentoo org>
AuthorDate: Sat May 7 03:52:40 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat May 7 03:53:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c4c4cb2
app-office/lyx: fix build with GCC 12
Also, add Python 3.10 (add a patch from Fedora too).
Closes: https://bugs.gentoo.org/841743
Signed-off-by: Sam James gentoo.org>
app-office/lyx/files/lyx-2.3.6.1-gcc12.patch | 22 +++
app-office/lyx/files/lyx-2.3.6.1-python.patch | 50 +++
app-office/lyx/lyx-2.3.6.1-r2.ebuild | 187 ++
3 files changed, 259 insertions(+)
diff --git a/app-office/lyx/files/lyx-2.3.6.1-gcc12.patch
b/app-office/lyx/files/lyx-2.3.6.1-gcc12.patch
new file mode 100644
index ..b1acbdb9087d
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.3.6.1-gcc12.patch
@@ -0,0 +1,22 @@
+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
+ #include
+
+ using namespace std;
+--- a/src/lyxfind.cpp
b/src/lyxfind.cpp
+@@ -52,6 +52,7 @@
+ #include "support/lstrings.h"
+
+ #include "support/regex.h"
++#include
+
+ using namespace std;
+ using namespace lyx::support;
diff --git a/app-office/lyx/files/lyx-2.3.6.1-python.patch
b/app-office/lyx/files/lyx-2.3.6.1-python.patch
new file mode 100644
index ..666d82c06bf8
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.3.6.1-python.patch
@@ -0,0 +1,50 @@
+https://src.fedoraproject.org/rpms/lyx/raw/054d18eb79a8ec3d4480ab4449b3c62b12770d2d/f/lyx-2.3.6-layout2layout.patch
+--- a/lib/scripts/layout2layout.py
b/lib/scripts/layout2layout.py
+@@ -256,7 +256,7 @@
+
+ def trim_bom(line):
+ " Remove byte order mark."
+-if line[0:3] == "\357\273\277":
++if line[0:3] == b"\357\273\277":
+ return line[3:]
+ else:
+ return line
+@@ -345,8 +345,8 @@
+ # for categories
+ re_Declaration = re.compile(b'^#\\s*\\Declare\\w+Class.*$')
+ re_ExtractCategory =
re.compile(b'^(#\\s*\\Declare\\w+Class(?:\\[[^]]*?\\])?){([^(]+?)\\s+\\(([^)]+?)\\)\\s*}\\s*$')
+-ConvDict = {"article": "Articles", "book" : "Books", "letter" :
"Letters", "report": "Reports", \
+-"presentation" : "Presentations", "curriculum vitae" :
"Curricula Vitae", "handout" : "Handouts"}
++ConvDict = {b"article": b"Articles", b"book" : b"Books", b"letter" :
b"Letters", b"report": b"Reports", \
++b"presentation" : b"Presentations", b"curriculum vitae" :
b"Curricula Vitae", b"handout" : b"Handouts"}
+ # Arguments
+ re_OptArgs = re.compile(b'^(\\s*)OptionalArgs(\\s+)(\\d+)\\D*$',
re.IGNORECASE)
+ re_ReqArgs = re.compile(b'^(\\s*)RequiredArgs(\\s+)(\\d+)\\D*$',
re.IGNORECASE)
+@@ -485,7 +485,7 @@
+ continue
+ col = match.group(2)
+ if col == "collapsable":
+-lines[i] = match.group(1) + "collapsible"
++lines[i] = match.group(1) + b"collapsible"
+ i += 1
+ continue
+
+@@ -703,7 +703,7 @@
+ # Insert the required number of arguments at the end of the style
definition
+ match = re_End.match(lines[i])
+ if match:
+-newarg = ['']
++newarg = [b'']
+ # First the optionals (this is the required order pre 2.1)
+ if opts > 0:
+ if opts == 1:
+@@ -1153,7 +1153,7 @@
+ if latextype == b"item_environment" and label.lower() ==
b"counter_enumi":
+ lines[labeltype_line] =
re_LabelType.sub(b'\\1\\2\\3Enumerate', lines[labeltype_line])
+ # Don't add the LabelCounter line later
+-counter = ""
++counter = b""
+
+ # Replace
+ #
diff --git a/app-office/lyx/lyx-2.3.6.1-r2.ebuild
b/app-office/lyx/lyx-2.3.6.1-r2.ebuild
new file mode 100644
index ..a8d622193e27
--- /dev/null
+++ b/app-office/lyx/lyx-2.3.6.1-r2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+MY_P="${P/_}"
+inherit desktop font python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc"
+HOMEPAGE="https://www.lyx.org/;
+SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
+ ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="aspell cups debug dia dot enchant gnumeric html +hunspell +latex
monolithic-build nls rcs rtf svg l10n_he"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bc needed
[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/files/, app-office/lyx/
commit: 68958558486a65b9d47e5a669bf9df1706aaeb9f
Author: David Seifert gentoo org>
AuthorDate: Sat Aug 10 19:13:16 2019 +
Commit: David Seifert gentoo org>
CommitDate: Sat Aug 10 19:13:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68958558
app-office/lyx: Remove old
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: David Seifert gentoo.org>
app-office/lyx/Manifest| 1 -
app-office/lyx/files/lyx-2.3.0-autotools.patch | 27
app-office/lyx/files/lyx-2.3.0-qt-5.11.patch | 16 ---
app-office/lyx/lyx-2.3.0-r1.ebuild | 180 -
app-office/lyx/lyx-2.3.0.ebuild| 179
5 files changed, 403 deletions(-)
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 8e43ccfa565..d86b6c2db58 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,2 +1 @@
-DIST lyx-2.3.0.tar.xz 15676680 BLAKE2B
4b09f4c3979f51a8b30825c07fe3b24f080bfc8f42d54e94809e342087b683ca24edcb835994583b28d5b9c13868736f850d6c88b229e2d7f6f6bc0fd64c722c
SHA512
77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5
DIST lyx-2.3.3.tar.xz 15998188 BLAKE2B
491732d1e567dfc8372a7dc7810cfc46cbe7e3b6a67637f772adddcff96225e174fe8c3db4c7f9e663cf3423da8b4bf08f67679874c9aaf556973ad46159a6cc
SHA512
7b42df9da9f2906f626d568222e559bb921d003674d70c805657488180856a77143b2a3d073686116c95034e84fe8f58ee1ff8a74d47a40bd5fda7564335a0c3
diff --git a/app-office/lyx/files/lyx-2.3.0-autotools.patch
b/app-office/lyx/files/lyx-2.3.0-autotools.patch
deleted file mode 100644
index 31077ef02a6..000
--- a/app-office/lyx/files/lyx-2.3.0-autotools.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: INSTALL
-===
a/INSTALL (revision 9aa280993f159f065da82d5fac30eb86a6599f4d)
-+++ b/INSTALL (revision 3abfd72b2720c21eba51bb2338f0b8b835dae720)
-@@ -38,5 +38,5 @@
-
- If you have checked this out from Git, you need to have:
--* automake (supported versions are 1.14--1.15)
-+* automake (supported versions are 1.14--1.16)
- * autoconf (supported versions are 2.65--2.69)
- Then type "./autogen.sh" to build the needed configuration
-Index: autogen.sh
-===
a/autogen.sh (revision 86ae7dad3fc1cad3744663d0da8034625dc9ffb1)
-+++ b/autogen.sh (revision 3abfd72b2720c21eba51bb2338f0b8b835dae720)
-@@ -17,9 +17,9 @@
-
- case $automake_version in
--*' '1.1[45]*)
-+*' '1.1[456]*)
- ;;
- *)
- echo "This automake version is not supported by LyX."
-- echo "LyX only supports automake 1.14 to 1.15."
-+ echo "LyX only supports automake 1.14 through 1.16."
- exit 1
- ;;
diff --git a/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch
b/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch
deleted file mode 100644
index 6f1848142bb..000
--- a/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch
+++ /dev/null
@@ -1,16 +0,0 @@
a/src/frontends/qt4/GuiDocument.cpp2018-02-25 01:11:18.0
+0100
-+++ b/src/frontends/qt4/GuiDocument.cpp2018-03-30 19:45:47.283928297
+0200
-@@ -68,11 +68,12 @@
- #include "frontends/alert.h"
-
- #include
--#include
-+#include
- #include
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
diff --git a/app-office/lyx/lyx-2.3.0-r1.ebuild
b/app-office/lyx/lyx-2.3.0-r1.ebuild
deleted file mode 100644
index 560ae6538ca..000
--- a/app-office/lyx/lyx-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-MY_P="${P/_}"
-inherit desktop flag-o-matic font python-single-r1 qmake-utils toolchain-funcs
xdg-utils
-
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/;
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
- ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex
monolithic-build nls rcs rtf subversion svg l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- app-text/mythes
- dev-libs/boost:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dev-texlive/texlive-fontsextra
- sys-apps/file
- sys-libs/zlib
- virtual/imagemagick-tools[png,svg?]
- aspell? ( app-text/aspell )
- cups? ( net-print/cups )
- dia? ( app-office/dia )
- docbook? ( app-text/sgmltools-lite )
- dot? ( media-gfx/graphviz )
- enchant? (
[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/files/, app-office/lyx/
commit: 07e82fd1fc07bf055c78b81eaa128f8f837da80d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 30 18:03:13 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Mar 30 18:09:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e82fd1
app-office/lyx: Fix build with Qt 5.11
Bug: https://bugs.gentoo.org/631798
Package-Manager: Portage-2.3.27, Repoman-2.3.9
app-office/lyx/files/lyx-2.3.0-qt-5.11.patch | 16
app-office/lyx/lyx-2.3.0.ebuild | 5 -
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch
b/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch
new file mode 100644
index 000..6f1848142bb
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch
@@ -0,0 +1,16 @@
+--- a/src/frontends/qt4/GuiDocument.cpp2018-02-25 01:11:18.0
+0100
b/src/frontends/qt4/GuiDocument.cpp2018-03-30 19:45:47.283928297
+0200
+@@ -68,11 +68,12 @@
+ #include "frontends/alert.h"
+
+ #include
+-#include
++#include
+ #include
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/app-office/lyx/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild
index a492d69d8b5..ad0929130f0 100644
--- a/app-office/lyx/lyx-2.3.0.ebuild
+++ b/app-office/lyx/lyx-2.3.0.ebuild
@@ -76,7 +76,10 @@ DEPEND="${RDEPEND}
DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-PATCHES=( "${FILESDIR}"/${P}-python.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-python.patch
+ "${FILESDIR}"/${P}-qt-5.11.patch
+)
S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/files/, app-office/lyx/
commit: 6a5c1ebb08049e05bf54297f4570d1d641fc4cea
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Feb 15 00:21:41 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 15 00:23:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a5c1ebb
app-office/lyx: Drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/lyx/Manifest | 2 -
app-office/lyx/files/2.0.8-python.patch | 29 -
app-office/lyx/lyx-2.0.8.1-r1.ebuild| 170 -
app-office/lyx/lyx-2.2.2-r1.ebuild | 183
app-office/lyx/lyx-2.2.3.ebuild | 183
5 files changed, 567 deletions(-)
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 0bb364d3197..852ec4ea1c3 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,4 +1,2 @@
-DIST lyx-2.0.8.1.tar.xz 10481988 BLAKE2B
121a2f5a86f9b2f92fc211c052a26dfeb0c89c3f3ebb6d9e9eab397af7aec1f696806f79d7fc75c03649bbefa06295ad03d7207135308cb14560596b0c0f4790
SHA512
17e313d3118dfe439f5251384f2fffdb45ffef5ec515953b7af0762d35c8e156a9338de698cea91cf8b3cedca1fc08364d8f3c50c9345f304d57004af695f901
DIST lyx-2.1.5.tar.xz 10361112 BLAKE2B
ddc6e10974f495bb465fced0bfe95e0530831e924c12323267feec59e49900efefda154abac927f3129ab0820706a870fb463e749cff2b5c4b47368d954c9d20
SHA512
6f8c62ff96458d0c8c8057ae1e587be4c63bd3bdf2d4f095c24d447017034eda8c6b645efbd258f0956a9bbfe5fde2f90df36515be7b8a94cb63674bc3a58672
-DIST lyx-2.2.2.tar.xz 15490148 BLAKE2B
16d9b1448da76dd0b02ee4cdec38831a0c3aa7a0798b4f99bb6c93717223dfd3c62145afa76324177ed162d4c45ab341a963831855c9607d8544574ae88766da
SHA512
5057a06f0c37cb2beadb92414eec495ba0619f6c8a9fb5372a9feb90fe0d8bf850de5c94bbf618c8e27bd64404ae6687c48ee24aa6e1bd35580eb3b77d71d45e
DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B
08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095
SHA512
b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708
diff --git a/app-office/lyx/files/2.0.8-python.patch
b/app-office/lyx/files/2.0.8-python.patch
deleted file mode 100644
index 5fb21655a69..000
--- a/app-office/lyx/files/2.0.8-python.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/graphics/GraphicsConverter.cpp
b/src/graphics/GraphicsConverter.cpp
-index 97c4f68..8f05e62 100644
a/src/graphics/GraphicsConverter.cpp
-+++ b/src/graphics/GraphicsConverter.cpp
-@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file,
- LYXERR(Debug::GRAPHICS, "build_script ... ");
- typedef Graph::EdgePath EdgePath;
-
-- script << "#!/usr/bin/env python\n"
-+ script << "#!/usr/bin/env python2\n"
- "# -*- coding: utf-8 -*-\n"
- "import os, shutil, sys\n\n"
- "def unlinkNoThrow(file):\n"
-diff --git a/src/support/os.cpp b/src/support/os.cpp
-index 8f60c68..2f1cb91 100644
a/src/support/os.cpp
-+++ b/src/support/os.cpp
-@@ -63,9 +63,9 @@ int timeout_min()
- string const python(bool reset)
- {
- // Check whether the first python in PATH is the right one.
-- static string command = python2("python -tt");
-+ static string command = python2("python2 -tt");
- if (reset) {
-- command = python2("python -tt");
-+ command = python2("python2 -tt");
- }
-
- if (command.empty()) {
diff --git a/app-office/lyx/lyx-2.0.8.1-r1.ebuild
b/app-office/lyx/lyx-2.0.8.1-r1.ebuild
deleted file mode 100644
index 3e87c826bd1..000
--- a/app-office/lyx/lyx-2.0.8.1-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1
toolchain-funcs
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/;
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${MY_P}.tar.xz
- ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/${PV}/${MY_P}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia
subversion rcs svg gnumeric +hunspell aspell enchant l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-COMMONDEPEND="dev-qt/qtgui:4
- dev-qt/qtcore:4
- >=dev-libs/boost-1.34
- ${PYTHON_DEPS}"
-
-RDEPEND="${COMMONDEPEND}
- dev-texlive/texlive-fontsextra
- virtual/imagemagick-tools[png,svg?]
- cups? ( net-print/cups )
- latex? (
- app-text/texlive
-
