CVS commit: pkgsrc/editors/lyx

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Mon Aug 22 08:12:47 UTC 2022

Modified Files:
        pkgsrc/editors/lyx: Makefile distinfo
Added Files:
        pkgsrc/editors/lyx/patches: patch-src_insets_InsetListings.cpp
            patch-src_lyxfind.cpp

Log Message:
lyx: has been ported to python3 for a while, and build with gcc 12


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/editors/lyx/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/editors/lyx/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/lyx/patches/patch-src_insets_InsetListings.cpp \
    pkgsrc/editors/lyx/patches/patch-src_lyxfind.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/lyx/Makefile
diff -u pkgsrc/editors/lyx/Makefile:1.109 pkgsrc/editors/lyx/Makefile:1.110
--- pkgsrc/editors/lyx/Makefile:1.109   Tue Aug  9 12:08:30 2022
+++ pkgsrc/editors/lyx/Makefile Mon Aug 22 08:12:47 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2022/08/09 12:08:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.110 2022/08/22 08:12:47 markd Exp $
 
 DISTNAME=              lyx-2.3.6.1
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            editors
 MASTER_SITES=          ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/
 MASTER_SITES+=         ftp://ftp.sdsc.edu/pub/other/lyx/stable/2.3.x/
@@ -63,7 +63,6 @@ GNU_CONFIGURE=                        YES
 USE_TOOLS+=                    gmake perl:run pkg-config xgettext
 USE_LIBTOOL=                   YES
 USE_PKGLOCALEDIR=              YES
-PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 1.6.10
 
 CXXFLAGS.Linux+=       -fpermissive
 
@@ -136,6 +135,7 @@ SUBST_SED.python+=  -e 's,command("python
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"   # for PLIST handling
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"

Index: pkgsrc/editors/lyx/distinfo
diff -u pkgsrc/editors/lyx/distinfo:1.21 pkgsrc/editors/lyx/distinfo:1.22
--- pkgsrc/editors/lyx/distinfo:1.21    Tue Oct 26 10:21:33 2021
+++ pkgsrc/editors/lyx/distinfo Mon Aug 22 08:12:47 2022
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.21 2021/10/26 10:21:33 nia Exp $
+$NetBSD: distinfo,v 1.22 2022/08/22 08:12:47 markd Exp $
 
 BLAKE2s (lyx-2.3.6.1.tar.xz) = c9f7f2712590d37906e50bab1b05f8c57ac38afdd5c006486173e431990b0373
 SHA512 (lyx-2.3.6.1.tar.xz) = 233f6c54d4a036ad12f33c6705810bfb99747bdbd015550a8a0a9d7b664d3be50a06dc337191b820c42de4407c5f790efa50c706a45fb2260a71f772fb22c872
 Size (lyx-2.3.6.1.tar.xz) = 16242608 bytes
 SHA1 (patch-configure) = d68e3329353f2fa0ffdf9633ff0b31649f0114c7
 SHA1 (patch-development_MacOSX_Makefile.in) = 086dddfcd7b2ca498e87b0d3e90a211aca2f64fe
+SHA1 (patch-src_insets_InsetListings.cpp) = d4ecbcf1621bdf349a7472b05e60dfc66ec3ef05
+SHA1 (patch-src_lyxfind.cpp) = 20e41c1b4e754dd643ff2a7b9f0fa7e506ef383e
 SHA1 (patch-src_support_strfwd.h) = 3ebd71772539d6a2cd327c1127fa9ef66cb15b41

Added files:

Index: pkgsrc/editors/lyx/patches/patch-src_insets_InsetListings.cpp
diff -u /dev/null pkgsrc/editors/lyx/patches/patch-src_insets_InsetListings.cpp:1.1
--- /dev/null   Mon Aug 22 08:12:47 2022
+++ pkgsrc/editors/lyx/patches/patch-src_insets_InsetListings.cpp       Mon Aug 22 08:12:47 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_insets_InsetListings.cpp,v 1.1 2022/08/22 08:12:47 markd Exp $
+
+gcc 12
+
+--- src/insets/InsetListings.cpp.orig  2020-12-29 16:50:45.000000000 +0000
++++ src/insets/InsetListings.cpp
+@@ -45,6 +45,7 @@
+ #include "support/regex.h"
+ 
+ #include <sstream>
++#include <cstring>
+ 
+ using namespace std;
+ using namespace lyx::support;
Index: pkgsrc/editors/lyx/patches/patch-src_lyxfind.cpp
diff -u /dev/null pkgsrc/editors/lyx/patches/patch-src_lyxfind.cpp:1.1
--- /dev/null   Mon Aug 22 08:12:47 2022
+++ pkgsrc/editors/lyx/patches/patch-src_lyxfind.cpp    Mon Aug 22 08:12:47 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_lyxfind.cpp,v 1.1 2022/08/22 08:12:47 markd Exp $
+
+gcc 12
+
+--- src/lyxfind.cpp.orig       2020-12-29 16:50:45.000000000 +0000
++++ src/lyxfind.cpp
+@@ -13,6 +13,7 @@
+  */
+ 
+ #include <config.h>
++#include <iterator>
+ 
+ #include "lyxfind.h"
+