[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/, app-office/lyx/files/
commit: d9cb7d4a49d6e58896eedba2cd4f5595cb6241b8
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Apr 5 13:25:45 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Apr 5 13:29:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9cb7d4a
app-office/lyx: add 2.4.0_rc4
Signed-off-by: Arthur Zamarin gentoo.org>
app-office/lyx/Manifest| 1 +
app-office/lyx/files/lyx-2.4.0-fix-hunspell.patch | 21 +++
.../lyx/files/lyx-2.4.0-prefer-xdg-open.patch | 54 +++
app-office/lyx/lyx-2.4.0_rc4.ebuild| 179 +
4 files changed, 255 insertions(+)
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 22336031684e..e21550afef7a 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1 +1,2 @@
DIST lyx-2.3.7-1.tar.xz 16158416 BLAKE2B
6041280ab0cd4dfa3c10e8ae01253ff657b4ac9ffe4cf61a3a2459b7aef152a7daf8ae306a09aaece799b6e7b6b15bc1aff62ab0f5d46508fbd79fd3e0b1c45b
SHA512
b8aaefb68993032354fea3c6fd87d6da161395c92b5def4ecf92a7d6873ec59e01cdfb45c51ae1aaa62aa54db8e100b00ff9c2c9e0f1307c2f46860cd8c6eefe
+DIST lyx-2.4.0~RC4.tar.xz 17785100 BLAKE2B
15d3785934045e9e3f39426d7a48ae4b200b64f28dc953b69c9b1b6f7c3e6cfe163aeaaaccbea9bb3b89c321a95f3162bab5869a290e4d4be2658bc39d6b2d46
SHA512
fa131ed3323a273529a59266b693381c0123400b7207733398992c99b424831a2918d019353ee0f2e6cce24b47042039f1abdbfe1ceeb28e56e35da4bf9e8c96
diff --git a/app-office/lyx/files/lyx-2.4.0-fix-hunspell.patch
b/app-office/lyx/files/lyx-2.4.0-fix-hunspell.patch
new file mode 100644
index ..265049b46631
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.4.0-fix-hunspell.patch
@@ -0,0 +1,21 @@
+From: Arthur Zamarin
+Date: Fri, 5 Apr 2024 15:40:57 +0300
+Subject: fix find hunspell using pkg-config
+
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -884,6 +884,14 @@ if(NOT LYX_EXTERNAL_HUNSPELL)
+ message(STATUS " * Hunspell:")
+ message(STATUS " - include: ${HUNSPELL_INCLUDE_DIR}")
+ message(STATUS " - library: ${HUNSPELL_LIBRARY}")
++elseif(LYX_HUNSPELL)
++ find_package(PkgConfig)
++ pkg_check_modules(HUNSPELL hunspell)
++ set(HUNSPELL_INCLUDE_DIR ${HUNSPELL_INCLUDE_DIRS})
++ set(HUNSPELL_LIBRARY ${HUNSPELL_LIBRARIES})
++message(STATUS " * Hunspell:")
++message(STATUS " - include: ${HUNSPELL_INCLUDE_DIR}")
++message(STATUS " - library: ${HUNSPELL_LIBRARY}")
+ endif()
+
+ foreach(_spell "ASPELL" "ENCHANT" "HUNSPELL")
diff --git a/app-office/lyx/files/lyx-2.4.0-prefer-xdg-open.patch
b/app-office/lyx/files/lyx-2.4.0-prefer-xdg-open.patch
new file mode 100644
index ..b5a8ef5ced6b
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.4.0-prefer-xdg-open.patch
@@ -0,0 +1,54 @@
+From: Arthur Zamarin
+Date: Fri, 5 Apr 2024 16:05:46 +0300
+Add xdg-open as the first choice whenever this seems to be useful
+
+--- a/lib/configure.py
b/lib/configure.py
+@@ -716,7 +716,7 @@ def checkModule(module):
+ return False
+
+
+-texteditors = ['xemacs', 'gvim', 'kedit', 'kwrite', 'kate',
++texteditors = ['xdg-open', 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate',
+'nedit', 'gedit', 'geany', 'leafpad', 'mousepad',
+'xed', 'notepad', 'WinEdt', 'WinShell', 'PSPad']
+
+@@ -731,7 +731,7 @@ def checkFormatEntries(dtl_tools):
+ checkViewerEditor('a Dia viewer and editor', ['dia'],
+ rc_entry = [r'\Format diadia DIA""
"%%" "%%""vector,zipped=native", "application/x-dia-diagram"'])
+ #
+-checkViewerEditor('an OpenDocument drawing viewer and editor',
['libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'],
++checkViewerEditor('an OpenDocument drawing viewer and editor',
['xdg-open', 'libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'],
+ rc_entry = [r'\Format odg"odg, sxd" "OpenDocument drawing"
"" "%%" "%%""vector,zipped=native"
"application/vnd.oasis.opendocument.graphics"'])
+ #
+ checkViewerEditor('a Grace viewer and editor', ['xmgrace'],
+@@ -756,9 +756,9 @@ def checkFormatEntries(dtl_tools):
+ \Format xbmxbm XBM"" "%s" "%s"""
"image/x-xbitmap"
+ \Format xpmxpm XPM"" "%s" "%s"""
"image/x-xpixmap"'''
+ path, iv = checkViewerNoRC('a raster image viewer',
+-['xv', 'gwenview', 'kview',
++['xdg-open', 'xv', 'gwenview', 'kview',
+ 'eog', 'xviewer', 'ristretto', 'gpicview', 'lximage-qt',
+- 'xdg-open', 'gimp-remote', 'gimp'],
++ 'gimp-remote', 'gimp'],
+ rc_entry = [imageformats])
+ path, ie = checkEditorNoRC('a raster image editor',
+ ['gimp-remote', 'gimp'], rc_entry = [imageformats])
+@@ -815,7 +815,7 @@ def checkFormatEntries(dtl_tools):
+ #checkProg('a Postscript interpreter', ['gs'],
+ # rc_entry = [ r'\ps_command "%%"' ])
+ checkViewer('a
[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/, app-office/lyx/files/
commit: 2b955b4752283cc656dba0674d18e9c376ad76d0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Oct 20 12:06:01 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Oct 20 12:06:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b955b47
app-office/lyx: drop 2.3.6.1-r2
Bug: https://bugs.gentoo.org/909408
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/lyx/Manifest | 1 -
app-office/lyx/files/lyx-2.3.6.1-gcc12.patch | 22
app-office/lyx/lyx-2.3.6.1-r2.ebuild | 187 ---
3 files changed, 210 deletions(-)
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 8ac01ca306a7..22336031684e 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,2 +1 @@
-DIST lyx-2.3.6.1.tar.xz 16242608 BLAKE2B
d59c6db79d7760902f93405e3737974fa9c6bd79c5ab4b02010021532903c76a77701f1f99a0838b4379c548f3f37dcdd9eeb492b733c4162162d868d1d92970
SHA512
233f6c54d4a036ad12f33c6705810bfb99747bdbd015550a8a0a9d7b664d3be50a06dc337191b820c42de4407c5f790efa50c706a45fb2260a71f772fb22c872
DIST lyx-2.3.7-1.tar.xz 16158416 BLAKE2B
6041280ab0cd4dfa3c10e8ae01253ff657b4ac9ffe4cf61a3a2459b7aef152a7daf8ae306a09aaece799b6e7b6b15bc1aff62ab0f5d46508fbd79fd3e0b1c45b
SHA512
b8aaefb68993032354fea3c6fd87d6da161395c92b5def4ecf92a7d6873ec59e01cdfb45c51ae1aaa62aa54db8e100b00ff9c2c9e0f1307c2f46860cd8c6eefe
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
deleted file mode 100644
index b1acbdb9087d..
--- a/app-office/lyx/files/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
- #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/lyx-2.3.6.1-r2.ebuild
b/app-office/lyx/lyx-2.3.6.1-r2.ebuild
deleted file mode 100644
index 3ce28049be21..
--- a/app-office/lyx/lyx-2.3.6.1-r2.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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 http://comments.gmane.org/gmane.editors.lyx.devel/137498 and bug
#787839
-BDEPEND="
- sys-devel/bc
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-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?]
-
- x11-misc/xdg-utils
-
- aspell? ( app-text/aspell )
- cups? ( net-print/cups )
- dia? ( app-office/dia )
- dot? ( media-gfx/graphviz )
- enchant? ( app-text/enchant:2 )
- gnumeric? ( app-office/gnumeric )
- html? ( dev-tex/html2latex )
- hunspell? ( app-text/hunspell )
- l10n_he? ( dev-tex/culmus-latex )
- latex? (
- app-text/dvipng
- app-text/ghostscript-gpl
- app-text/ps2eps
- app-text/texlive
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-mathscience
- dev-texlive/texlive-pictures
- dev-texlive/texlive-plaingeneric
- || (
- dev-tex/hevea
- dev-tex/latex2html
- dev-tex/tex4ht[java]
- dev-tex/tth
- )
- )
- rcs? ( dev-vcs/rcs )
- rtf? (
- app-text/unrtf
- dev-tex/html2latex
- dev-tex/latex2rtf
- )
- svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-"
-DEPEND="${RDEPEND}
- dev-qt/qtconcurrent:5
-"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-S="${WORKDIR}/${MY_P}"
-
-FONT_S="${S}/lib/fonts"
[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/, app-office/lyx/files/
commit: 6876b52c5c009fbb5db4e5c5c23a46551741501c
Author: Pacho Ramos gentoo org>
AuthorDate: Thu May 20 13:06:58 2021 +
Commit: Pacho Ramos gentoo org>
CommitDate: Thu May 20 13:07:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6876b52c
app-office/lyx: Prefer xdg-open over hardcoded tools
Closes: https://bugs.gentoo.org/579418
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Pacho Ramos gentoo.org>
app-office/lyx/files/lyx-prefer-xdg-open.patch | 60 +
app-office/lyx/lyx-2.3.6.1-r1.ebuild | 179 +
2 files changed, 239 insertions(+)
diff --git a/app-office/lyx/files/lyx-prefer-xdg-open.patch
b/app-office/lyx/files/lyx-prefer-xdg-open.patch
new file mode 100644
index 000..5e12f6c2e69
--- /dev/null
+++ b/app-office/lyx/files/lyx-prefer-xdg-open.patch
@@ -0,0 +1,60 @@
+From: "Dr. Tobias Quathamer"
+Date: Wed, 31 Jan 2018 23:27:37 +0100
+Subject: Prefer xdg-open
+
+Add xdg-open as the first choice whenever this seems to be useful.
+---
+ lib/configure.py | 12 ++--
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/lib/configure.py b/lib/configure.py
+index 7fee68d..abc4d53 100644
+--- a/lib/configure.py
b/lib/configure.py
+@@ -657,7 +657,7 @@ def checkFormatEntries(dtl_tools):
+ checkViewerEditor('a Dia viewer and editor', ['dia'],
+ rc_entry = [r'\Format diadia DIA""
"%%" "%%""vector,zipped=native", "application/x-dia-diagram"'])
+ #
+-checkViewerEditor('an OpenDocument drawing viewer and editor',
['libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'],
++checkViewerEditor('an OpenDocument drawing viewer and editor',
['xdg-open', 'libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'],
+ rc_entry = [r'\Format odg"odg, sxd" "OpenDocument drawing"
"" "%%" "%%""vector,zipped=native"
"application/vnd.oasis.opendocument.graphics"'])
+ #
+ checkViewerEditor('a Grace viewer and editor', ['xmgrace'],
+@@ -682,16 +682,16 @@ def checkFormatEntries(dtl_tools):
+ \Format xbmxbm XBM"" "%s" "%s"""
"image/x-xbitmap"
+ \Format xpmxpm XPM"" "%s" "%s"""
"image/x-xpixmap"'''
+ path, iv = checkViewerNoRC('a raster image viewer',
+-['xv', 'gwenview', 'kview',
++['xdg-open', 'xv', 'gwenview', 'kview',
+ 'eog', 'xviewer', 'ristretto', 'gpicview', 'lximage-qt',
+- 'xdg-open', 'gimp-remote', 'gimp'],
++ 'gimp-remote', 'gimp'],
+ rc_entry = [imageformats])
+ path, ie = checkEditorNoRC('a raster image editor',
+ ['gimp-remote', 'gimp'], rc_entry = [imageformats])
+ addToRC(imageformats % ((iv, ie)*10))
+ #
+ checkViewerEditor('a text editor',
+-['xemacs', 'gvim', 'kedit', 'kwrite', 'kate',
++['xdg-open', 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate',
+ 'nedit', 'gedit', 'geany', 'leafpad', 'mousepad', 'xed', 'notepad'],
+ rc_entry = [r'''\Format asciichess asc"Plain text (chess output)"
"" "" "%%""" ""
+ \Format docbooksgmlDocBookB "" "%%"
"document,menu=export" ""
+@@ -745,7 +745,7 @@ def checkFormatEntries(dtl_tools):
+ #checkProg('a Postscript interpreter', ['gs'],
+ # rc_entry = [ r'\ps_command "%%"' ])
+ checkViewer('a Postscript previewer',
+-['kghostview', 'okular', 'qpdfview --unique',
++['xdg-open', 'kghostview', 'okular', 'qpdfview --unique',
+ 'evince', 'xreader',
+ 'gv', 'ghostview -swap', 'gsview64', 'gsview32'],
+ rc_entry = [r'''\Format epseps EPS""
"%%" "" "vector""image/x-eps"
+@@ -756,7 +756,7 @@ def checkFormatEntries(dtl_tools):
+ # maybe use "bestApplication()" from
https://github.com/jleclanche/python-mime
+ # the MIME type is set for pdf6, because that one needs to be
autodetectable by libmime
+ checkViewer('a PDF previewer',
+-['pdfview', 'kpdf', 'okular', 'qpdfview --unique',
++['xdg-open', 'pdfview', 'kpdf', 'okular', 'qpdfview --unique',
+ 'evince', 'xreader', 'kghostview', 'xpdf', 'SumatraPDF',
+ 'acrobat', 'acroread', 'mupdf',
+ 'gv', 'ghostview', 'AcroRd32', 'gsview64', 'gsview32'],
diff --git a/app-office/lyx/lyx-2.3.6.1-r1.ebuild
b/app-office/lyx/lyx-2.3.6.1-r1.ebuild
new file mode 100644
index 000..d9922fde669
--- /dev/null
+++ b/app-office/lyx/lyx-2.3.6.1-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+MY_P="${P/_}"
+inherit desktop flag-o-matic font python-single-r1 qmake-utils toolchain-funcs
xdg-utils
+
+DESCRIPTION="WYSIWYM
[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/, app-office/lyx/files/
commit: 06a00cb506ea38a6749ee5419519c796ca6b6c84
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 26 06:25:46 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 26 15:36:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a00cb5
app-office/lyx: Drop old Qt4-based
Bug: https://bugs.gentoo.org/631798
Package-Manager: Portage-2.3.31, Repoman-2.3.9
app-office/lyx/Manifest | 1 -
app-office/lyx/files/2.1-python.patch | 29 --
app-office/lyx/lyx-2.2.3-r4.ebuild| 186 --
3 files changed, 216 deletions(-)
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 5f82bdf6865..0665f4ecf0a 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,2 +1 @@
-DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B
08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095
SHA512
b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708
DIST lyx-2.3.0.tar.xz 15676680 BLAKE2B
4b09f4c3979f51a8b30825c07fe3b24f080bfc8f42d54e94809e342087b683ca24edcb835994583b28d5b9c13868736f850d6c88b229e2d7f6f6bc0fd64c722c
SHA512
77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5
diff --git a/app-office/lyx/files/2.1-python.patch
b/app-office/lyx/files/2.1-python.patch
deleted file mode 100644
index 5fb21655a69..000
--- a/app-office/lyx/files/2.1-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.2.3-r4.ebuild
b/app-office/lyx/lyx-2.2.3-r4.ebuild
deleted file mode 100644
index 2c715662cfc..000
--- a/app-office/lyx/lyx-2.2.3-r4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils xdg-utils flag-o-matic font python-single-r1 qmake-utils
toolchain-funcs multilib desktop
-
-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.2.x/${MY_P}.tar.xz
- ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos"
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex
monolithic-build nls +qt5 rcs rtf subversion svg l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=
- 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? ( app-text/enchant )
- gnumeric? ( app-office/gnumeric )
- html? ( dev-tex/html2latex )
- hunspell? ( app-text/hunspell )
- latex? (
- app-text/dvipng
- app-text/ghostscript-gpl
- app-text/ps2eps
- app-text/texlive
- dev-tex/chktex
- dev-tex/dvipost
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-mathscience
- dev-texlive/texlive-pictures
- || ( dev-texlive/texlive-plaingeneric
dev-texlive/texlive-genericextra )
- || (
- dev-tex/hevea
-
[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/, app-office/lyx/files/
commit: ceac2c53741cde2446ce458a60b09082e6756c2a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Apr 2 21:08:12 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Apr 2 21:29:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceac2c53
app-office/lyx: Fix build with automake-1.16
Bug: https://bugs.gentoo.org/648318
Bug: https://bugs.gentoo.org/631798
Thanks-to: pavel sanda twin.jikos.cz>
Package-Manager: Portage-2.3.28, Repoman-2.3.9
app-office/lyx/files/lyx-2.3.0-autotools.patch | 27 ++
app-office/lyx/lyx-2.3.0.ebuild| 1 +
2 files changed, 28 insertions(+)
diff --git a/app-office/lyx/files/lyx-2.3.0-autotools.patch
b/app-office/lyx/files/lyx-2.3.0-autotools.patch
new file mode 100644
index 000..31077ef02a6
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.3.0-autotools.patch
@@ -0,0 +1,27 @@
+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/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild
index ad0929130f0..8ae1f6e35db 100644
--- a/app-office/lyx/lyx-2.3.0.ebuild
+++ b/app-office/lyx/lyx-2.3.0.ebuild
@@ -79,6 +79,7 @@ DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
PATCHES=(
"${FILESDIR}"/${P}-python.patch
"${FILESDIR}"/${P}-qt-5.11.patch
+ "${FILESDIR}"/${P}-autotools.patch
)
S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/, app-office/lyx/files/
commit: e3a198c8cee1f6effc78352b2460f7700b74562d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 30 17:28:31 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Mar 30 18:09:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a198c8
app-office/lyx: 2.3.0 version bump
Thanks-to: pavel sanda twin.jikos.cz>
Bug: https://bugs.gentoo.org/631798
Package-Manager: Portage-2.3.27, Repoman-2.3.9
app-office/lyx/Manifest | 1 +
app-office/lyx/files/lyx-2.3.0-python.patch | 30 +
app-office/lyx/lyx-2.3.0.ebuild | 177
3 files changed, 208 insertions(+)
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index f869cb46844..5f82bdf6865 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1 +1,2 @@
DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B
08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095
SHA512
b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708
+DIST lyx-2.3.0.tar.xz 15676680 BLAKE2B
4b09f4c3979f51a8b30825c07fe3b24f080bfc8f42d54e94809e342087b683ca24edcb835994583b28d5b9c13868736f850d6c88b229e2d7f6f6bc0fd64c722c
SHA512
77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5
diff --git a/app-office/lyx/files/lyx-2.3.0-python.patch
b/app-office/lyx/files/lyx-2.3.0-python.patch
new file mode 100644
index 000..e41c2604bf5
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.3.0-python.patch
@@ -0,0 +1,30 @@
+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 8eea49370a..d7a0f81aa3 100644
+--- a/src/support/os.cpp
b/src/support/os.cpp
+@@ -65,10 +65,10 @@ int timeout_min()
+ string const python(bool reset)
+ {
+ // Check whether the first python in PATH is the right one.
+- static string command = python23("python -tt");
++ static string command = python23("python2 -tt");
+ // FIXME THREAD
+ if (reset) {
+- command = python23("python -tt");
++ command = python23("python2 -tt");
+ }
+
+ if (command.empty()) {
diff --git a/app-office/lyx/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild
new file mode 100644
index 000..65930195b6a
--- /dev/null
+++ b/app-office/lyx/lyx-2.3.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2-utils xdg-utils flag-o-matic font python-single-r1 qmake-utils
toolchain-funcs multilib desktop
+
+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.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}
+ 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? ( app-text/enchant )
+ gnumeric? ( app-office/gnumeric )
+ html? ( dev-tex/html2latex )
+ hunspell? ( app-text/hunspell )
+ l10n_he? ( dev-tex/culmus-latex )
+ latex? (
+ app-text/dvipng
+ app-text/ghostscript-gpl
+ app-text/ps2eps
+ app-text/texlive
+ dev-tex/chktex
+ dev-tex/dvipost
+ dev-texlive/texlive-fontsrecommended
+ dev-texlive/texlive-latexextra
+
[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/, app-office/lyx/files/
commit: 627f44c711c355268512ec8a0b93c242b23467c1
Author: Yixun Lan gentoo org>
AuthorDate: Fri May 27 06:56:01 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Fri May 27 07:16:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=627f44c7
app-office/lyx: drop old versions
Package-Manager: portage-2.2.28
app-office/lyx/Manifest | 1 -
app-office/lyx/files/1.6.10-gcc.patch | 142 -
app-office/lyx/files/1.6.7-python.patch | 26 -
app-office/lyx/files/2.0-python.patch | 26 -
app-office/lyx/lyx-2.1.3.ebuild | 179
5 files changed, 374 deletions(-)
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 0179274..0f955ea 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,4 +1,3 @@
DIST lyx-2.0.8.1.tar.xz 10481988 SHA256
fa0a9c6070554e0d12d24e9b3c4a1e5fc2ee853b3fbe83e2a415635cdc973c59 SHA512
17e313d3118dfe439f5251384f2fffdb45ffef5ec515953b7af0762d35c8e156a9338de698cea91cf8b3cedca1fc08364d8f3c50c9345f304d57004af695f901
WHIRLPOOL
6a9ef2df39861d373e1c6288f5443f910632a09ed4d84e409efe06459f2f39d3c30462b3a26aafe37c5216b765882e7ab5189e7d164b71def97f50877784754c
-DIST lyx-2.1.3.tar.xz 10778624 SHA256
2fd52e7e5ee372983eb6b0a7f04765cb0df6f8c1f3420081d9f7761acfc75682 SHA512
c2930d0ff1dfb7dc23e07be7141cd50c4fa023f32fc3653745b4f5031460c6fe5acfc955c0af5b3bf9505d7958b0d1e301eefd0a894bd02bb4c3f966f54332db
WHIRLPOOL
818bba837ed7e63609c1067e94f3281a9d9ef2049ba1792a010372cb544e6ead8bab0ec1906f083e8fa27f8ae8145c1cf7a4772cf3952caccf5bbd2a2c1026be
DIST lyx-2.1.4.tar.xz 10928716 SHA256
d13548cf183f2fc241df8121420933702491a7460c78a0ef6dba0e9e438ef32a SHA512
7547950e3c11e88f0ccf2cacb56709f9722d4cd03a5ee751af4489f6d343e13ee6b4e0ff7b830532572975c6cc9506686ade2afa5093f765d21b4d1b9ee7339d
WHIRLPOOL
a5d8533902fd5dd5a696645941c532bfe35eeaf76f411798a0aafcd01674e678dd65d2c0a58af09a6739adaf80f821a2676c340a349fca61929edfc5a9389938
DIST lyx-2.2.0.tar.xz 14640052 SHA256
d867986870e3f7451f0d4512c60d9c3c7682da59c6c638f18b731f4ad3fa7c80 SHA512
3bc6a3dcd2271d942d1d34cf5f7b7c74d1d58499d070e5b7c056ee03d5195467a4230d18a65e9a591e76655970413370fd6233495c8d3ab977270488082425df
WHIRLPOOL
5cd3b13ad8852d4ed5c59a11872547f0bb602119ce2ddbc29c5f7c240b7ca091cf341c0d22ff13c63980057706abf4a35cf5d03625545f598261c98ec4292497
diff --git a/app-office/lyx/files/1.6.10-gcc.patch
b/app-office/lyx/files/1.6.10-gcc.patch
deleted file mode 100644
index 44e0fc9..000
--- a/app-office/lyx/files/1.6.10-gcc.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
-index 68cf1d2..16a3c94 100644
a/src/insets/InsetInclude.cpp
-+++ b/src/insets/InsetInclude.cpp
-@@ -806,7 +806,7 @@ support::FileNameList const &
- tmp->setParent();
- return cache;
- }
-- static support::FileNameList const empty;
-+ static support::FileNameList const empty = support::FileNameList();
- return empty;
- }
-
-diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
-index 4a267e9..7a165e2 100644
a/src/insets/InsetTabular.cpp
-+++ b/src/insets/InsetTabular.cpp
-@@ -188,62 +188,6 @@ TabularFeature tabularFeature[] =
- };
-
-
--template
--string const write_attribute(string const & name, T const & t)
--{
-- string const s = tostr(t);
-- return s.empty() ? s : " " + name + "=\"" + s + "\"";
--}
--
--template <>
--string const write_attribute(string const & name, string const & t)
--{
-- return t.empty() ? t : " " + name + "=\"" + t + "\"";
--}
--
--
--template <>
--string const write_attribute(string const & name, docstring const & t)
--{
-- return t.empty() ? string() : " " + name + "=\"" + to_utf8(t) + "\"";
--}
--
--
--template <>
--string const write_attribute(string const & name, bool const & b)
--{
-- // we write only true attribute values so we remove a bit of the
-- // file format bloat for tabulars.
-- return b ? write_attribute(name, convert(b)) : string();
--}
--
--
--template <>
--string const write_attribute(string const & name, int const & i)
--{
-- // we write only true attribute values so we remove a bit of the
-- // file format bloat for tabulars.
-- return i ? write_attribute(name, convert(i)) : string();
--}
--
--
--template <>
--string const write_attribute(string const & name, Tabular::idx_type const & i)
--{
-- // we write only true attribute values so we remove a bit of the
-- // file format bloat for tabulars.
-- return i ? write_attribute(name, convert(i)) : string();
--}
--
--
--template <>
--string const write_attribute(string const & name, Length const & value)
--{
-- // we write only the value if we really have one same reson as above.
-- return value.zero() ? string() : write_attribute(name,
value.asString());
--}
--
--
- string const tostr(LyXAlignment const & num)
- {
-
