CVS commit: pkgsrc/editors/retext

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Jan 28 02:31:38 UTC 2025

Modified Files:
        pkgsrc/editors/retext: DESCR Makefile distinfo
Added Files:
        pkgsrc/editors/retext/patches: patch-setup.py

Log Message:
retext: enable asciidoc support

While here, apply upstream's version of a fix to install a desktop file
when packaging via a wheel.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/retext/DESCR
cvs rdiff -u -r1.22 -r1.23 pkgsrc/editors/retext/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/editors/retext/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/retext/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/editors/retext/DESCR
diff -u pkgsrc/editors/retext/DESCR:1.1 pkgsrc/editors/retext/DESCR:1.2
--- pkgsrc/editors/retext/DESCR:1.1     Sat Mar  2 20:49:10 2019
+++ pkgsrc/editors/retext/DESCR Tue Jan 28 02:31:38 2025
@@ -1,5 +1,5 @@
-ReText is a text editor for various markup languages (such as Markdown
-and reStructuredText). It gives you the power to control all output
-formatting. The files it works with are plain text files, however it
-can export to PDF, HTML and other formats, and can display content in
+ReText is a text editor for various markup languages (such as Markdown,
+reStructuredText, Textile, and Asciidoc). It gives you the power to control
+all output formatting. The files it works with are plain text files, however
+it can export to PDF, HTML and other formats, and can display content in
 WYSIWYG form.

Index: pkgsrc/editors/retext/Makefile
diff -u pkgsrc/editors/retext/Makefile:1.22 pkgsrc/editors/retext/Makefile:1.23
--- pkgsrc/editors/retext/Makefile:1.22 Thu Jan 16 23:17:40 2025
+++ pkgsrc/editors/retext/Makefile      Tue Jan 28 02:31:38 2025
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.22 2025/01/16 23:17:40 gutteridge Exp $
+# $NetBSD: Makefile,v 1.23 2025/01/28 02:31:38 gutteridge Exp $
 
 DISTNAME=      retext-8.1.0
+PKGREVISION=   1
 CATEGORIES=    editors python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=R/ReText/}
 
 MAINTAINER=    gutteridge%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/retext-project/retext
-COMMENT=       Simple but powerful editor for Markdown and reStructuredText
+COMMENT=       Simple but powerful editor for various markup formats
 LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
+# Technically asciidoc is a dependency of py-markups, but we can't cleanly
+# enable it there.
+DEPENDS+=      asciidoc-[0-9]*:../../textproc/asciidoc
 DEPENDS+=      ${PYPKGPREFIX}-enchant-[0-9]*:../../textproc/py-enchant
 DEPENDS+=      ${PYPKGPREFIX}-markups-[0-9]*:../../textproc/py-markups
 DEPENDS+=      ${PYPKGPREFIX}-qt6-[0-9]*:../../x11/py-qt6
@@ -27,8 +31,6 @@ INSTALLATION_DIRS+=   share/applications
 .include "../../mk/bsd.prefs.mk"
 
 post-install:
-# Upstream egg to wheel definition lost the installation of the desktop file.
-       ${INSTALL_DATA} ${WRKSRC}/data/me.mitya57.ReText.desktop ${DESTDIR}${PREFIX}/share/applications/
 # Workaround for PR#57445/50277 for netbsd-9 & netbsd-10 pre 2023-08-05.
 .if ${OPSYS} == "NetBSD"
        ${MV} ${DESTDIR}${PREFIX}/bin/retext ${DESTDIR}${PREFIX}/bin/retext-py

Index: pkgsrc/editors/retext/distinfo
diff -u pkgsrc/editors/retext/distinfo:1.11 pkgsrc/editors/retext/distinfo:1.12
--- pkgsrc/editors/retext/distinfo:1.11 Thu Jan 16 23:17:40 2025
+++ pkgsrc/editors/retext/distinfo      Tue Jan 28 02:31:38 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2025/01/16 23:17:40 gutteridge Exp $
+$NetBSD: distinfo,v 1.12 2025/01/28 02:31:38 gutteridge Exp $
 
 BLAKE2s (retext-8.1.0.tar.gz) = 06a26c372d6f4120da18562f7f3fff9b47ad39389f1aa1d1e2c3ff443b40572a
 SHA512 (retext-8.1.0.tar.gz) = d4bdb39608b9cd74773255a95c940060b79fe578b045d00b1224d49a94f45e4ffcf8163fc3e9778b92509b7fe425a59d444054814dc2c5f70998dc865b7c7f8d
 Size (retext-8.1.0.tar.gz) = 569692 bytes
+SHA1 (patch-setup.py) = 2a554b05dc50716a94568fafd0da4010e2d70bde

Added files:

Index: pkgsrc/editors/retext/patches/patch-setup.py
diff -u /dev/null pkgsrc/editors/retext/patches/patch-setup.py:1.1
--- /dev/null   Tue Jan 28 02:31:38 2025
+++ pkgsrc/editors/retext/patches/patch-setup.py        Tue Jan 28 02:31:38 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-setup.py,v 1.1 2025/01/28 02:31:38 gutteridge Exp $
+
+Install the desktop file when packaging via a wheel.
+https://github.com/retext-project/retext/issues/655
+
+--- setup.py.orig      2024-12-29 11:06:52.000000000 +0000
++++ setup.py
+@@ -70,8 +70,6 @@ class retext_install(install):
+         if self.root and self.root.endswith('/wheel'):
+             # Desktop files don't allow relative paths, and we don't know the
+             # absolute path when building a wheel.
+-            logging.info('removing the .desktop file from the wheel')
+-            os.remove(desktop_file_path)
+             return
+         # Fix Exec and Icon fields in the desktop file
+         icon_path = join(self.orig_install_lib, 'ReText', 'icons', 'retext.svg')