print/lyx: Update to 2.4.2.1

This commit is contained in:
Wen Heping 2024-11-04 13:06:01 +00:00
parent d74f1e0a8d
commit d9d0c0c860
6 changed files with 986 additions and 436 deletions

View File

@ -1,12 +1,11 @@
PORTNAME= lyx
PORTVERSION= ${MAJOR_VERSION}.${MINOR_VERSION}
PORTREVISION= 2
PORTVERSION= ${MAJOR_VERSION}.2
CATEGORIES= print editors
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \
http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \
ftp://ftp.ntua.gr/pub/X11/LyX/stable/${MAJOR_VERSION}.x/ \
http://sunsite.icm.edu.pl/pub/unix/editors/lyx/stable/${MAJOR_VERSION}.x/
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
DISTNAME= ${PORTNAME}-${PORTVERSION}.1
MAINTAINER= wen@FreeBSD.org
COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG)
@ -18,37 +17,34 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libboost_regex.so:devel/boost-libs \
libmythes-1.2.so:textproc/mythes
MAJOR_VERSION= 2.3
MINOR_VERSION= 7
MAJOR_VERSION= 2.4
USES= autoreconf compiler:c++11-lang desktop-file-utils gmake iconv \
pkgconfig perl5 python qt:5 shebangfix tar:xz xorg
pkgconfig perl5 python:build qt:5 shebangfix tar:xz xorg
USE_QT= core concurrent gui svg widgets x11extras buildtools:build qmake:build
USE_XORG= xcb
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
CONFIGURE_ARGS= --without-included-boost \
--without-included-mythes \
--enable-qt5 \
--with-qt-dir=${LOCALBASE}/lib/qt5 \
${ICONV_CONFIGURE_ARG} \
--with-extra-prefix=${LOCALBASE}
EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions \
--exclude 3rdparty \
--exclude cygwin \
--exclude MacOSX \
--exclude Win32
SHEBANG_FILES= lib/configure.py \
lib/lyx2lyx/lyx2lyx \
lib/scripts/lyxpaperview.py \
lib/scripts/listerrors \
lib/scripts/gnuplot2pdf.py \
lib/scripts/spreadsheet_to_docbook.py \
lib/scripts/svg2pdftex.py \
lib/scripts/svg2pstex.py
LIBS+= -lexecinfo
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
OPTIONS_DEFINE= ASPELL ENCHANT HUNSPELL NLS
OPTIONS_DEFAULT= HUNSPELL
OPTIONS_SUB= yes
@ -66,4 +62,7 @@ NLS_USES= gettext
post-patch:
@${GREP} -rl "python -tt" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -i '' 's|python -tt|${PYTHON_CMD} -tt|'
post-stage:
${RM} /usr/local/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.opt-2.pyc
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1677976178
SHA256 (lyx-2.3.7-1.tar.xz) = 39be8864fb86b34e88310e70fb80e5e9e296601f0856cf161aa094171718d8ed
SIZE (lyx-2.3.7-1.tar.xz) = 16158416
TIMESTAMP = 1730710421
SHA256 (lyx-2.4.2.1.tar.xz) = 1d2b1c7abe391e2fb49109de2c8e13a7dfe605f27df68f689bf947dfafc7a4d9
SIZE (lyx-2.4.2.1.tar.xz) = 17876336

View File

@ -1,13 +1,15 @@
--- configure.ac.orig 2019-11-23 15:26:35 UTC
+++ configure.ac
@@ -364,23 +364,9 @@ AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Pat
--- configure.ac.orig 2024-11-04 08:26:47.400346000 +0000
+++ configure.ac 2024-11-04 08:28:53.253697000 +0000
@@ -344,25 +344,10 @@
AC_CONFIG_FILES([Makefile \
lyx.1:lyx.1in \
- 3rdparty/Makefile \
- 3rdparty/boost/Makefile \
- 3rdparty/dtl/Makefile \
- 3rdparty/hunspell/Makefile \
- 3rdparty/mythes/Makefile \
3rdparty/nod/Makefile \
- 3rdparty/libiconv/Makefile \
$ICONV_ICONV_H_IN \
- 3rdparty/zlib/Makefile \

View File

@ -0,0 +1,16 @@
--- development/Makefile.am.orig 2024-11-01 01:12:44.160674000 +0000
+++ development/Makefile.am 2024-11-01 01:13:03.544363000 +0000
@@ -1,13 +1,5 @@
include $(top_srcdir)/config/common.am
-if INSTALL_MACOSX
-SUBDIRS = MacOSX
-endif
-
-if INSTALL_CYGWIN
-SUBDIRS = cygwin
-endif
-
EXTRA_DIST = coding/Rules coding/Recommendations \
coverity_modeling.cpp \
FORMAT lyx.rpm.README \

View File

@ -0,0 +1,11 @@
--- src/support/filetools.cpp.orig 2024-11-04 08:57:40.352928000 +0000
+++ src/support/filetools.cpp 2024-11-04 08:59:06.840603000 +0000
@@ -71,6 +71,8 @@
#include <windows.h>
#endif
+#include <sys/wait.h>
+
using namespace std;
#define USE_QPROCESS

File diff suppressed because it is too large Load Diff