From 9323524b4d44f4ec3dc923bd8e9ea04bdde8a067 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Apr 2024 00:30:33 +0100 Subject: gentoo auto-resync : 06:04:2024 - 00:30:33 --- app-office/Manifest.gz | Bin 8423 -> 8427 bytes app-office/lyx/Manifest | 6 +- 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 +++++++++++++++++++++ app-office/lyx/metadata.xml | 4 + 6 files changed, 263 insertions(+), 1 deletion(-) create mode 100644 app-office/lyx/files/lyx-2.4.0-fix-hunspell.patch create mode 100644 app-office/lyx/files/lyx-2.4.0-prefer-xdg-open.patch create mode 100644 app-office/lyx/lyx-2.4.0_rc4.ebuild (limited to 'app-office') diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz index ee40a9892dd4..072d7b221ef4 100644 Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index 809cd61a045b..7eb733fa7f97 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -1,5 +1,9 @@ AUX lyx-2.3.6.1-python.patch 2294 BLAKE2B 1980fe19607577d6b7462aaa4a049a41cbc329e881889cdee673df1bf57d7ab0dbfb8bd9aa705e23a88b1c195bd660f04efb519c9371167939e946c099b7784d SHA512 6f41de389bce14d8ef1c695268f6d6540276fe44d4871a14458f7ef38e6b4f4cb90877310d82df5550d537f39f65eded489722de24eb99ea6d83d8ec92dd7b71 +AUX lyx-2.4.0-fix-hunspell.patch 780 BLAKE2B 04c8373fa29e7a1d40901d83104832fe01ca96fca25a99f19d472cfb0387145b14c124fa44a6d2710f0d35e4dc7061c8935b1e03378154de85c2e4c4079269f9 SHA512 992c21e8d3e30bf2c14c006e19c969e93f447a12f0080bf59238ccc66967938fd10fa35387ab3943f0d39ab132b330876e7cf207e49c6ab174a731a2dc4f4ef3 +AUX lyx-2.4.0-prefer-xdg-open.patch 3138 BLAKE2B 95dd25064876a6ab58649249f0a42035bfdb6c91524dc7b6031017eb911efe7534c267e178b0dac26d0090409245962d153f81db3dd28785b11576e988ecef12 SHA512 e2f5a0484742af079bc69aff3056dd2d3afe8f952fd342f3e5da8445894bd8d6c60a575079bdee61a378ce20adba7e31e1e6a5cb6c2b00ba3b7d0b161c55ef12 AUX lyx-prefer-xdg-open.patch 3470 BLAKE2B f989c3455d4cfb332d36edbca9b3bcc0208709d361696f04bdd565ea455104d1809877bdb85a362e950c2d48159c52d9a1a69c92d79f075269cfc9ccfceee4d7 SHA512 d17a2af0d75b6dcca06c1d31e615b814df3e75c3039c7ff5a14ab270b7cb75ab6f42ec851db7c804c90b7724a95eeec02d74de5c7511523c8400f0d50c2c0ce3 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 EBUILD lyx-2.3.7.ebuild 4671 BLAKE2B e92ef48a32f692bc3f4e496e1db3b0fa6278829c62413c49352da62fc6808d30df8afcf5a09e6ba27f14ddc9061be9894e323c0091f5bddb380d39de874a7e7c SHA512 114eb03ddca43df311acc445638daeaa86017ee79d411bff6dbec411a1579c12a0e38a335dc4cd1b6fa0f6c8ef23c6b6450accb4b784f0780a35d6a45bec0030 -MISC metadata.xml 1270 BLAKE2B eaaaa462e91ba2e33dfd7e8507de5b8b2e392f3db01c761580b055407c65844ca4297db70e539b5c7db6a1420f2a30c0f75ddc25d160a78e598475bf36912f32 SHA512 d8f5361766f37c679b58ad329b24632ee11fe0ddce26aaf5cdfb1bd21a56214c6bff6076c8ba9e3584bfbe086e49ce9c4c7e0ba44e38deeaa33e11b6f5a6274a +EBUILD lyx-2.4.0_rc4.ebuild 3897 BLAKE2B 7460f23f5cebde3fb673da91b88833b5cf6894eadbb84c61b12b8c7fc34e46afdcbe701c44a4389c589e8cca0f4fa1b80c5fd07f5fc1ee243b819a7b95ac1408 SHA512 cac2fb007ee9968d1282e43e7f39cdd07080a123e9547e5f42484aee6fda64d3e2c45f6af3b3da5651761057bf404f4696733b4869c048520bbec92537f070d8 +MISC metadata.xml 1381 BLAKE2B dde484f4254356ccea9a7110761d3df4ca0dcbddb1b631e09126a762030638e4e3c53859db19df750467b2de8dbe186142b2464b5db2cc563fc2adb3684d8719 SHA512 40ae608e527af9727fbd077dc3e6e1254cd130f32424356d53479a34b6ffdf25b206e044f4071e32e59a7394fafe53ede429732a099e3c66658f337e77517ac9 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 000000000000..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 000000000000..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 dia dia 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 xbm xbm XBM "" "%s" "%s" "" "image/x-xbitmap" + \Format xpm xpm 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 Postscript previewer', +- ['kghostview', 'okular', 'qpdfview --unique', ++ ['xdg-open', 'kghostview', 'okular', 'qpdfview --unique', + 'evince', 'xreader', + 'gv', 'ghostview -swap', 'gsview64', 'gsview32'], + rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" "image/x-eps" +@@ -826,7 +826,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', 'Skim.app', + 'gv', 'ghostview', 'AcroRd32', 'gsview64', 'gsview32'], diff --git a/app-office/lyx/lyx-2.4.0_rc4.ebuild b/app-office/lyx/lyx-2.4.0_rc4.ebuild new file mode 100644 index 000000000000..ee1f818cff5e --- /dev/null +++ b/app-office/lyx/lyx-2.4.0_rc4.ebuild @@ -0,0 +1,179 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit desktop font optfeature python-single-r1 cmake xdg + +DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX" +HOMEPAGE="https://www.lyx.org/" +SRC_URI="http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P/_rc/~RC}.tar.xz" +S=${WORKDIR}/${P/_rc/~RC} + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + app-text/mythes + dev-libs/boost:= + sys-apps/file + sys-libs/zlib:= + virtual/imagemagick-tools[png,svg?] + x11-misc/xdg-utils + + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qt5compat:6 + dev-qt/qtsvg:6 + + 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 + dev-texlive/texlive-langarabic + ) + 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/latex2html + dev-tex/hevea + 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}" +# bc needed http://comments.gmane.org/gmane.editors.lyx.devel/137498 and bug #787839 +BDEPEND=" + app-alternatives/bc + virtual/pkgconfig + dev-qt/qttools[linguist] + nls? ( sys-devel/gettext ) +" + +DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING ) + +FONT_S="${S}/lib/fonts" +FONT_SUFFIX="ttf" + +PATCHES=( + "${FILESDIR}"/lyx-2.4.0-fix-hunspell.patch + # Try first with xdg-open before hardcoded commands + # Patch from Debian using a similar approach to Fedora + "${FILESDIR}"/lyx-2.4.0-prefer-xdg-open.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + font_pkg_setup +} + +src_prepare() { + sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die + cmake_src_prepare +} + +src_configure() { + #bug 221921 + export VARTEXFONTS="${T}"/fonts + + local mycmakeargs=( + -DLYX_INSTALL=ON + -DLYX_USE_QT=QT6 + -DLYX_INSTALL_PREFIX="${EPREFIX}/usr" + + -DLYX_NLS=$(usex nls) + -DLYX_ASPELL=$(usex aspell) + -DLYX_ENCHANT=$(usex enchant) + -DLYX_HUNSPELL=$(usex hunspell) + + # external dependencies + -DLYX_EXTERNAL_Z=ON + -DLYX_EXTERNAL_ICONV=ON + -DLYX_EXTERNAL_HUNSPELL=$(usex !debug) + -DLYX_EXTERNAL_MYTHES=$(usex !debug) + -DLYX_EXTERNAL_BOOST=$(usex !debug) + -DLYX_PROGRAM_SUFFIX=OFF + + # debug control + -DLYX_NO_OPTIMIZE=OFF + -DLYX_RELEASE=$(usex !debug) + -DLYX_DEBUG=$(usex debug) + -DLYX_DEBUG_GLIBC=$(usex debug) + -DLYX_STDLIB_DEBUG=$(usex debug) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png + doicon -s 48 "lib/images/lyx.png" + doicon -s scalable "lib/images/lyx.svg" + + # fix for bug 91108 + if use latex; then + dosym -r /usr/share/lyx/tex /usr/share/texmf-site/tex/latex/lyx + fi + + # fonts needed for proper math display, see also bug #15629 + font_src_install + + python_fix_shebang "${ED}"/usr/share/${PN} + + if use hunspell; then + dosym ../myspell /usr/share/lyx/dicts + dosym ../myspell /usr/share/lyx/thes + fi +} + +pkg_postinst() { + font_pkg_postinst + xdg_pkg_postinst + + # fix for bug 91108 + if use latex ; then + texhash || die + fi + + optfeature "handling more fonts" dev-texlive/texlive-fontsextra +} + +pkg_postrm() { + font_pkg_postrm + xdg_pkg_postrm + + if use latex ; then + texhash || die + fi +} diff --git a/app-office/lyx/metadata.xml b/app-office/lyx/metadata.xml index 86a1735454a3..7d98136836d7 100644 --- a/app-office/lyx/metadata.xml +++ b/app-office/lyx/metadata.xml @@ -5,6 +5,10 @@ aballier@gentoo.org Alexis Ballier + + arthurzam@gentoo.org + Arthur Zamarin + Add support for aspell spellchecking Add support for enchant spellchecking wrapper -- cgit v1.2.3