Attachment 207008 Details for Bug 240197 – Upgrade lyx to 2.3.3. Exclude 3rdparty pieces

[patch] Upgrade lyx to 2.3.3. Exclude 3rdparty pieces

lyx-2.3.3.patch (text/plain), 3.03 KB, created by Mikhail Teterin on 2019-08-29 19:17:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Teterin

Created: 2019-08-29 19:17:07 UTC

Size: 3.03 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 510173)
>+++ Makefile	(working copy)
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	lyx
> PORTVERSION=	${MAJOR_VERSION}.${MINOR_VERSION}
>-PORTREVISION=	6
> 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/ \
>@@ -20,7 +19,7 @@
> 		libmythes-1.2.so:textproc/mythes
> 
> MAJOR_VERSION=	2.3
>-MINOR_VERSION=	2
>+MINOR_VERSION=	3
> 
> USES=		compiler:c++11-lang desktop-file-utils gmake iconv pkgconfig \
> 		perl5 python:2.7 qt:5 shebangfix tar:xz
>@@ -33,6 +32,11 @@
> 		--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/listerrors \
>@@ -58,5 +62,7 @@
> 
> post-patch:
> 	@${GREP} -rl "python -tt" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -i '' 's|python -tt|${PYTHON_CMD} -tt|'
>+	@${REINPLACE_CMD} -E '/^ac_config_files=/s,(3rdparty|development)/[^ ]* ,,g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -E 's,(3rdparty|development) ,,g' ${WRKSRC}/Makefile.*
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 510173)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1546601537
>-SHA256 (lyx-2.3.2.tar.xz) = f1a80fc7d0c69e5a28145275dd4f88d2a93bad1033b0cffe953f668fbbe4956c
>-SIZE (lyx-2.3.2.tar.xz) = 15791748
>+TIMESTAMP = 1567101095
>+SHA256 (lyx-2.3.3.tar.xz) = 991eefebddb281d276a7693f8ac119bd971aab3fa9f554cd14e4b68b04284e39
>+SIZE (lyx-2.3.3.tar.xz) = 15998188
>Index: files/patch-boost-1.69
>===================================================================
>--- files/patch-boost-1.69	(revision 510173)
>+++ files/patch-boost-1.69	(nonexistent)
>@@ -1,20 +0,0 @@
>-https://www.lyx.org/trac/ticket/11349
>-
>---- src/support/FileName.cpp.orig	2018-02-25 00:11:18 UTC
>-+++ src/support/FileName.cpp
>-@@ -67,15 +67,6 @@
>- using namespace std;
>- using namespace lyx::support;
>- 
>--// OK, this is ugly, but it is the only workaround I found to compile
>--// with gcc (any version) on a system which uses a non-GNU toolchain.
>--// The problem is that gcc uses a weak symbol for a particular
>--// instantiation and that the system linker usually does not
>--// understand those weak symbols (seen on HP-UX, tru64, AIX and
>--// others). Thus we force an explicit instanciation of this particular
>--// template (JMarc)
>--template struct boost::detail::crc_table_t<32, 0x04C11DB7, true>;
>--
>- namespace lyx {
>- namespace support {
>- 
>
>Property changes on: files/patch-boost-1.69
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

rakuco: maintainer-approval+

Actions: View | Diff

Attachments on bug 240197: 207008