[pkgsrc/trunk]: pkgsrc/devel/meld meld: fix bytecode compilation using upstre...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/meld meld: fix bytecode compilation using upstre...
From: wiz <wiz%pkgsrc.org@localhost>
Date: Mon, 19 Dec 2022 08:29:13 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/b7f50895e2ad
branches:  trunk
changeset: 390402:b7f50895e2ad
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Dec 19 07:09:00 2022 +0000

description:
meld: fix bytecode compilation using upstream patch

Bump PKGREVISION.

diffstat:

 devel/meld/Makefile                              |    9 +-
 devel/meld/PLIST                                 |  132 +++++++++++-----------
 devel/meld/distinfo                              |    3 +-
 devel/meld/patches/patch-meson__post__install.py |   31 +++++
 4 files changed, 101 insertions(+), 74 deletions(-)

diffs (278 lines):

diff -r c1b6a437b478 -r b7f50895e2ad devel/meld/Makefile
--- a/devel/meld/Makefile       Mon Dec 19 07:00:31 2022 +0000
+++ b/devel/meld/Makefile       Mon Dec 19 07:09:00 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.123 2022/11/23 16:19:51 adam Exp $
+# $NetBSD: Makefile,v 1.124 2022/12/19 07:09:00 wiz Exp $
 
 DISTNAME=              meld-3.22.0
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=          .tar.xz
@@ -30,11 +30,6 @@
 SUBST_STAGE.python3=   pre-configure
 SUBST_MESSAGE.python3= Fix python binary name.
 
-# compile step in meson_post_install.py does not support DESTDIR
-# https://gitlab.gnome.org/GNOME/meld/-/issues/709
-post-install:
-       ${PYTHONBIN} -m compileall compile_dir ${DESTDIR}${PREFIX}/${PYSITELIB}
-
 .include "../../devel/py-gobject3-common/buildlink3.mk"
 .include "../../graphics/adwaita-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff -r c1b6a437b478 -r b7f50895e2ad devel/meld/PLIST
--- a/devel/meld/PLIST  Mon Dec 19 07:00:31 2022 +0000
+++ b/devel/meld/PLIST  Mon Dec 19 07:09:00 2022 +0000
@@ -1,137 +1,137 @@
-@comment $NetBSD: PLIST,v 1.42 2022/09/13 23:06:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.43 2022/12/19 07:09:00 wiz Exp $
 bin/meld
 ${PYSITELIB}/meld/__init__.py
-${PYSITELIB}/meld/__init__.pyc
+${PYSITELIB}/meld/__init__.pyo
 ${PYSITELIB}/meld/accelerators.py
-${PYSITELIB}/meld/accelerators.pyc
+${PYSITELIB}/meld/accelerators.pyo
 ${PYSITELIB}/meld/actiongutter.py
-${PYSITELIB}/meld/actiongutter.pyc
+${PYSITELIB}/meld/actiongutter.pyo
 ${PYSITELIB}/meld/build_helpers.py
-${PYSITELIB}/meld/build_helpers.pyc
+${PYSITELIB}/meld/build_helpers.pyo
 ${PYSITELIB}/meld/chunkmap.py
-${PYSITELIB}/meld/chunkmap.pyc
+${PYSITELIB}/meld/chunkmap.pyo
 ${PYSITELIB}/meld/conf.py
-${PYSITELIB}/meld/conf.pyc
+${PYSITELIB}/meld/conf.pyo
 ${PYSITELIB}/meld/const.py
-${PYSITELIB}/meld/const.pyc
+${PYSITELIB}/meld/const.pyo
 ${PYSITELIB}/meld/diffgrid.py
-${PYSITELIB}/meld/diffgrid.pyc
+${PYSITELIB}/meld/diffgrid.pyo
 ${PYSITELIB}/meld/dirdiff.py
-${PYSITELIB}/meld/dirdiff.pyc
+${PYSITELIB}/meld/dirdiff.pyo
 ${PYSITELIB}/meld/filediff.py
-${PYSITELIB}/meld/filediff.pyc
+${PYSITELIB}/meld/filediff.pyo
 ${PYSITELIB}/meld/filters.py
-${PYSITELIB}/meld/filters.pyc
+${PYSITELIB}/meld/filters.pyo
 ${PYSITELIB}/meld/gutterrendererchunk.py
-${PYSITELIB}/meld/gutterrendererchunk.pyc
+${PYSITELIB}/meld/gutterrendererchunk.pyo
 ${PYSITELIB}/meld/iohelpers.py
-${PYSITELIB}/meld/iohelpers.pyc
+${PYSITELIB}/meld/iohelpers.pyo
 ${PYSITELIB}/meld/linkmap.py
-${PYSITELIB}/meld/linkmap.pyc
+${PYSITELIB}/meld/linkmap.pyo
 ${PYSITELIB}/meld/matchers/__init__.py
-${PYSITELIB}/meld/matchers/__init__.pyc
+${PYSITELIB}/meld/matchers/__init__.pyo
 ${PYSITELIB}/meld/matchers/diffutil.py
-${PYSITELIB}/meld/matchers/diffutil.pyc
+${PYSITELIB}/meld/matchers/diffutil.pyo
 ${PYSITELIB}/meld/matchers/helpers.py
-${PYSITELIB}/meld/matchers/helpers.pyc
+${PYSITELIB}/meld/matchers/helpers.pyo
 ${PYSITELIB}/meld/matchers/merge.py
-${PYSITELIB}/meld/matchers/merge.pyc
+${PYSITELIB}/meld/matchers/merge.pyo
 ${PYSITELIB}/meld/matchers/myers.py
-${PYSITELIB}/meld/matchers/myers.pyc
+${PYSITELIB}/meld/matchers/myers.pyo
 ${PYSITELIB}/meld/meldapp.py
-${PYSITELIB}/meld/meldapp.pyc
+${PYSITELIB}/meld/meldapp.pyo
 ${PYSITELIB}/meld/meldbuffer.py
-${PYSITELIB}/meld/meldbuffer.pyc
+${PYSITELIB}/meld/meldbuffer.pyo
 ${PYSITELIB}/meld/melddoc.py
-${PYSITELIB}/meld/melddoc.pyc
+${PYSITELIB}/meld/melddoc.pyo
 ${PYSITELIB}/meld/meldwindow.py
-${PYSITELIB}/meld/meldwindow.pyc
+${PYSITELIB}/meld/meldwindow.pyo
 ${PYSITELIB}/meld/menuhelpers.py
-${PYSITELIB}/meld/menuhelpers.pyc
+${PYSITELIB}/meld/menuhelpers.pyo
 ${PYSITELIB}/meld/misc.py
-${PYSITELIB}/meld/misc.pyc
+${PYSITELIB}/meld/misc.pyo
 ${PYSITELIB}/meld/newdifftab.py
-${PYSITELIB}/meld/newdifftab.pyc
+${PYSITELIB}/meld/newdifftab.pyo
 ${PYSITELIB}/meld/patchdialog.py
-${PYSITELIB}/meld/patchdialog.pyc
+${PYSITELIB}/meld/patchdialog.pyo
 ${PYSITELIB}/meld/preferences.py
-${PYSITELIB}/meld/preferences.pyc
+${PYSITELIB}/meld/preferences.pyo
 ${PYSITELIB}/meld/recent.py
-${PYSITELIB}/meld/recent.pyc
+${PYSITELIB}/meld/recent.pyo
 ${PYSITELIB}/meld/settings.py
-${PYSITELIB}/meld/settings.pyc
+${PYSITELIB}/meld/settings.pyo
 ${PYSITELIB}/meld/sourceview.py
-${PYSITELIB}/meld/sourceview.pyc
+${PYSITELIB}/meld/sourceview.pyo
 ${PYSITELIB}/meld/style.py
-${PYSITELIB}/meld/style.pyc
+${PYSITELIB}/meld/style.pyo
 ${PYSITELIB}/meld/task.py
-${PYSITELIB}/meld/task.pyc
+${PYSITELIB}/meld/task.pyo
 ${PYSITELIB}/meld/tree.py
-${PYSITELIB}/meld/tree.pyc
+${PYSITELIB}/meld/tree.pyo
 ${PYSITELIB}/meld/treehelpers.py
-${PYSITELIB}/meld/treehelpers.pyc
+${PYSITELIB}/meld/treehelpers.pyo
 ${PYSITELIB}/meld/ui/__init__.py
-${PYSITELIB}/meld/ui/__init__.pyc
+${PYSITELIB}/meld/ui/__init__.pyo
 ${PYSITELIB}/meld/ui/bufferselectors.py
-${PYSITELIB}/meld/ui/bufferselectors.pyc
+${PYSITELIB}/meld/ui/bufferselectors.pyo
 ${PYSITELIB}/meld/ui/cellrenderers.py
-${PYSITELIB}/meld/ui/cellrenderers.pyc
+${PYSITELIB}/meld/ui/cellrenderers.pyo
 ${PYSITELIB}/meld/ui/emblemcellrenderer.py
-${PYSITELIB}/meld/ui/emblemcellrenderer.pyc
+${PYSITELIB}/meld/ui/emblemcellrenderer.pyo
 ${PYSITELIB}/meld/ui/filebutton.py
-${PYSITELIB}/meld/ui/filebutton.pyc
+${PYSITELIB}/meld/ui/filebutton.pyo
 ${PYSITELIB}/meld/ui/findbar.py
-${PYSITELIB}/meld/ui/findbar.pyc
+${PYSITELIB}/meld/ui/findbar.pyo
 ${PYSITELIB}/meld/ui/gladesupport.py
-${PYSITELIB}/meld/ui/gladesupport.pyc
+${PYSITELIB}/meld/ui/gladesupport.pyo
 ${PYSITELIB}/meld/ui/gtkcompat.py
-${PYSITELIB}/meld/ui/gtkcompat.pyc
+${PYSITELIB}/meld/ui/gtkcompat.pyo
 ${PYSITELIB}/meld/ui/historyentry.py
-${PYSITELIB}/meld/ui/historyentry.pyc
+${PYSITELIB}/meld/ui/historyentry.pyo
 ${PYSITELIB}/meld/ui/listwidget.py
-${PYSITELIB}/meld/ui/listwidget.pyc
+${PYSITELIB}/meld/ui/listwidget.pyo
 ${PYSITELIB}/meld/ui/msgarea.py
-${PYSITELIB}/meld/ui/msgarea.pyc
+${PYSITELIB}/meld/ui/msgarea.pyo
 ${PYSITELIB}/meld/ui/notebook.py
-${PYSITELIB}/meld/ui/notebook.pyc
+${PYSITELIB}/meld/ui/notebook.pyo
 ${PYSITELIB}/meld/ui/notebooklabel.py
-${PYSITELIB}/meld/ui/notebooklabel.pyc
+${PYSITELIB}/meld/ui/notebooklabel.pyo
 ${PYSITELIB}/meld/ui/pathlabel.py
-${PYSITELIB}/meld/ui/pathlabel.pyc
+${PYSITELIB}/meld/ui/pathlabel.pyo
 ${PYSITELIB}/meld/ui/recentselector.py
-${PYSITELIB}/meld/ui/recentselector.pyc
+${PYSITELIB}/meld/ui/recentselector.pyo
 ${PYSITELIB}/meld/ui/statusbar.py
-${PYSITELIB}/meld/ui/statusbar.pyc
+${PYSITELIB}/meld/ui/statusbar.pyo
 ${PYSITELIB}/meld/ui/util.py
-${PYSITELIB}/meld/ui/util.pyc
+${PYSITELIB}/meld/ui/util.pyo
 ${PYSITELIB}/meld/ui/vcdialogs.py
-${PYSITELIB}/meld/ui/vcdialogs.pyc
+${PYSITELIB}/meld/ui/vcdialogs.pyo
 ${PYSITELIB}/meld/undo.py
-${PYSITELIB}/meld/undo.pyc
+${PYSITELIB}/meld/undo.pyo
 ${PYSITELIB}/meld/vc/COPYING
 ${PYSITELIB}/meld/vc/README
 ${PYSITELIB}/meld/vc/__init__.py
-${PYSITELIB}/meld/vc/__init__.pyc
+${PYSITELIB}/meld/vc/__init__.pyo
 ${PYSITELIB}/meld/vc/_null.py
-${PYSITELIB}/meld/vc/_null.pyc
+${PYSITELIB}/meld/vc/_null.pyo
 ${PYSITELIB}/meld/vc/_vc.py
-${PYSITELIB}/meld/vc/_vc.pyc
+${PYSITELIB}/meld/vc/_vc.pyo
 ${PYSITELIB}/meld/vc/bzr.py
-${PYSITELIB}/meld/vc/bzr.pyc
+${PYSITELIB}/meld/vc/bzr.pyo
 ${PYSITELIB}/meld/vc/cvs.py
-${PYSITELIB}/meld/vc/cvs.pyc
+${PYSITELIB}/meld/vc/cvs.pyo
 ${PYSITELIB}/meld/vc/darcs.py
-${PYSITELIB}/meld/vc/darcs.pyc
+${PYSITELIB}/meld/vc/darcs.pyo
 ${PYSITELIB}/meld/vc/git.py
-${PYSITELIB}/meld/vc/git.pyc
+${PYSITELIB}/meld/vc/git.pyo
 ${PYSITELIB}/meld/vc/mercurial.py
-${PYSITELIB}/meld/vc/mercurial.pyc
+${PYSITELIB}/meld/vc/mercurial.pyo
 ${PYSITELIB}/meld/vc/svn.py
-${PYSITELIB}/meld/vc/svn.pyc
+${PYSITELIB}/meld/vc/svn.pyo
 ${PYSITELIB}/meld/vcview.py
-${PYSITELIB}/meld/vcview.pyc
+${PYSITELIB}/meld/vcview.pyo
 ${PYSITELIB}/meld/windowstate.py
-${PYSITELIB}/meld/windowstate.pyc
+${PYSITELIB}/meld/windowstate.pyo
 man/man1/meld.1
 share/applications/org.gnome.Meld.desktop
 share/glib-2.0/schemas/org.gnome.meld.gschema.xml
diff -r c1b6a437b478 -r b7f50895e2ad devel/meld/distinfo
--- a/devel/meld/distinfo       Mon Dec 19 07:00:31 2022 +0000
+++ b/devel/meld/distinfo       Mon Dec 19 07:09:00 2022 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.68 2022/09/13 23:06:21 wiz Exp $
+$NetBSD: distinfo,v 1.69 2022/12/19 07:09:00 wiz Exp $
 
 BLAKE2s (meld-3.22.0.tar.xz) = c1b26cef3ea87c693d2b20d927251fada8ce3835e114792ba199553586531448
 SHA512 (meld-3.22.0.tar.xz) = 4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526
 Size (meld-3.22.0.tar.xz) = 674212 bytes
+SHA1 (patch-meson__post__install.py) = ce20b2f3b64ce8c9e4a048e026c5c82dc463e26d
diff -r c1b6a437b478 -r b7f50895e2ad devel/meld/patches/patch-meson__post__install.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/meld/patches/patch-meson__post__install.py  Mon Dec 19 07:09:00 2022 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-meson__post__install.py,v 1.1 2022/12/19 07:09:00 wiz Exp $
+
+Fix bytecode compilation in DESTDIR.
+https://gitlab.gnome.org/GNOME/meld/-/commit/469ecdc5d48f1e1ef18d81b24a6717cfe93cc3d6
+
+--- meson_post_install.py.orig 2022-09-04 04:26:14.000000000 +0000
++++ meson_post_install.py
+@@ -1,8 +1,9 @@
+ #!/usr/bin/env python3
+ 
++import os
++from os import environ
+ import sys
+ from compileall import compile_dir
+-from os import environ, path
+ from subprocess import call
+ 
+ if not environ.get('DESTDIR', ''):
+@@ -18,5 +19,11 @@ if not environ.get('DESTDIR', ''):
+ # Byte-compilation is enabled by passing the site-packages path to this script
+ if len(sys.argv) > 1:
+     print('Byte-compiling Python module...')
++    destdir = os.getenv("DESTDIR", "")
+     python_source_install_path = sys.argv[1]
+-    compile_dir(path.join(python_source_install_path, 'meld'), optimize=1)
++    if destdir:
++        # The install path here will be absolute, so we can't use join()
++        install_path = destdir + os.path.sep + python_source_install_path
++    else:
++        install_path = python_source_install_path
++    compile_dir(os.path.join(install_path, "meld"), optimize=1)
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/meld to 3.22.0nb2
Next by Date: [pkgsrc/trunk]: pkgsrc/net Add kea-2.2.0
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/meld to 3.22.0nb2
Next by Thread: [pkgsrc/trunk]: pkgsrc/net Add kea-2.2.0
Indexes:
Home | Main Index | Thread Index | Old Index