CVS commit: pkgsrc/devel/meld

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 26 16:17:47 UTC 2020

Modified Files:
        pkgsrc/devel/meld: Makefile PLIST distinfo

Log Message:
meld: update to 3.21.0nb2.

Update to 3.21.0 again now that the bug in gtksourceview4 is fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/devel/meld/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/meld/PLIST
cvs rdiff -u -r1.62 -r1.63 pkgsrc/devel/meld/distinfo

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

Modified files:

Index: pkgsrc/devel/meld/Makefile
diff -u pkgsrc/devel/meld/Makefile:1.103 pkgsrc/devel/meld/Makefile:1.104
--- pkgsrc/devel/meld/Makefile:1.103    Mon Apr 20 14:47:37 2020
+++ pkgsrc/devel/meld/Makefile  Sun Apr 26 16:17:47 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.103 2020/04/20 14:47:37 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2020/04/26 16:17:47 wiz Exp $
 
-DISTNAME=              meld-3.20.2
+DISTNAME=              meld-3.21.0
 PKGREVISION=           2
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/}
@@ -13,13 +13,33 @@ LICENSE=            gnu-gpl-v2
 
 BUILD_DEPENDS+=                itstool-[0-9]*:../../textproc/itstool
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-distro-[0-9]*:../../devel/py-distro
-DEPENDS+=              ${PYPKGPREFIX}-gobject3>=3.8:../../devel/py-gobject3
+DEPENDS+=              ${PYPKGPREFIX}-gobject3>=3.30:../../devel/py-gobject3
 DEPENDS+=              gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas
 DEPENDS+=              dconf-[0-9]*:../../devel/dconf
 
-USE_TOOLS+=            intltool msgfmt
+USE_TOOLS+=            msgfmt pkg-config
+# only used when building the python way (not meson)
+USE_TOOLS+=            intltool
+
+# Requires --desktop in msgfmt.
+_TOOLS_USE_PKGSRC.msgfmt=      yes
+
+SUBST_CLASSES+=                python3
+SUBST_FILES.python3=   meson.build
+SUBST_SED.python3=     -e "s,python.find_installation('python3',python.find_installation('${PYTHONBIN}',"
+SUBST_SED.python3+=    -e "s,'python3','python-${PYVERSSUFFIX}',"
+SUBST_STAGE.python3=   pre-configure
+SUBST_MESSAGE.python3= Fix python binary name.
+
+# Compiled files are not installed, see
+# https://gitlab.gnome.org/GNOME/meld/-/issues/456
+# post-install:
+# something like:
+# python -m compileall "$pkgdir"/path/to/python3/files
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # not supported any longer
+PLIST_SUBST+=                  PYSITELIB=${PYSITELIB}
+REPLACE_PYTHON+=               bin/meld
 
 SUBST_CLASSES+=                man
 SUBST_FILES.man=       setup.py
@@ -27,15 +47,21 @@ SUBST_SED.man+=             -e "s,share/man/man1,${
 SUBST_STAGE.man=       pre-build
 SUBST_MESSAGE.man=     Fixing man page installation path.
 
+.include "../../devel/py-gobject3-common/buildlink3.mk"
 .include "../../graphics/adwaita-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+BUILDLINK_API_DEPENDS.py-cairo+=       ${PYPKGPREFIX}-cairo>=1.15.0
+.include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../lang/python/distutils.mk"
-BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.36.0
+BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.48.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 BUILDLINK_API_DEPENDS.gtk3+=   gtk3+>=3.20
+.include "../../lang/python/application.mk"
 .include "../../x11/gtk3/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtksourceview3+= gtksourceview3>=3.20
-.include "../../x11/gtksourceview3/buildlink3.mk"
+BUILDLINK_ABI_DEPENDS.gtksourceview4?= gtksourceview4>=4.6.0nb1
+.include "../../x11/gtksourceview4/buildlink3.mk"
+.include "../../lang/python/distutils.mk"
+# not ready yet as of 3.21.0
+#.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/meld/PLIST
diff -u pkgsrc/devel/meld/PLIST:1.35 pkgsrc/devel/meld/PLIST:1.36
--- pkgsrc/devel/meld/PLIST:1.35        Mon Apr 20 14:47:37 2020
+++ pkgsrc/devel/meld/PLIST     Sun Apr 26 16:17:47 2020
@@ -1,12 +1,21 @@
-@comment $NetBSD: PLIST,v 1.35 2020/04/20 14:47:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.36 2020/04/26 16:17:47 wiz Exp $
 bin/meld
 ${PYSITELIB}/${EGG_FILE}
 ${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
@@ -16,18 +25,12 @@ ${PYSITELIB}/meld/const.pyo
 ${PYSITELIB}/meld/diffgrid.py
 ${PYSITELIB}/meld/diffgrid.pyc
 ${PYSITELIB}/meld/diffgrid.pyo
-${PYSITELIB}/meld/diffmap.py
-${PYSITELIB}/meld/diffmap.pyc
-${PYSITELIB}/meld/diffmap.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/filemerge.py
-${PYSITELIB}/meld/filemerge.pyc
-${PYSITELIB}/meld/filemerge.pyo
 ${PYSITELIB}/meld/filters.py
 ${PYSITELIB}/meld/filters.pyc
 ${PYSITELIB}/meld/filters.pyo
@@ -67,6 +70,9 @@ ${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
@@ -88,6 +94,9 @@ ${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
@@ -118,18 +127,12 @@ ${PYSITELIB}/meld/ui/findbar.pyo
 ${PYSITELIB}/meld/ui/gladesupport.py
 ${PYSITELIB}/meld/ui/gladesupport.pyc
 ${PYSITELIB}/meld/ui/gladesupport.pyo
-${PYSITELIB}/meld/ui/gnomeglade.py
-${PYSITELIB}/meld/ui/gnomeglade.pyc
-${PYSITELIB}/meld/ui/gnomeglade.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/listselector.py
-${PYSITELIB}/meld/ui/listselector.pyc
-${PYSITELIB}/meld/ui/listselector.pyo
 ${PYSITELIB}/meld/ui/listwidget.py
 ${PYSITELIB}/meld/ui/listwidget.pyc
 ${PYSITELIB}/meld/ui/listwidget.pyo
@@ -142,6 +145,9 @@ ${PYSITELIB}/meld/ui/notebook.pyo
 ${PYSITELIB}/meld/ui/notebooklabel.py
 ${PYSITELIB}/meld/ui/notebooklabel.pyc
 ${PYSITELIB}/meld/ui/notebooklabel.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
@@ -168,6 +174,9 @@ ${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
@@ -186,6 +195,8 @@ ${PYSITELIB}/meld/vcview.pyo
 ${PYSITELIB}/meld/windowstate.py
 ${PYSITELIB}/meld/windowstate.pyc
 ${PYSITELIB}/meld/windowstate.pyo
+@pkgdir share/meld/icons
+@pkgdir share/meld/ui
 man/man1/meld.1
 share/applications/org.gnome.meld.desktop
 share/doc/${PKGNAME}/COPYING
@@ -207,18 +218,8 @@ share/help/C/meld/resolving-conflicts.pa
 share/help/C/meld/text-filters.page
 share/help/C/meld/vc-mode.page
 share/help/C/meld/vc-supported.page
-share/icons/HighContrast/scalable/apps/org.gnome.meld.svg
-share/icons/hicolor/16x16/actions/meld-change-apply-left.png
-share/icons/hicolor/16x16/actions/meld-change-apply-right.png
-share/icons/hicolor/16x16/actions/meld-change-copy.png
-share/icons/hicolor/16x16/actions/meld-change-delete.png
-share/icons/hicolor/16x16/apps/meld-version-control.png
-share/icons/hicolor/16x16/apps/org.gnome.meld.png
-share/icons/hicolor/22x22/apps/org.gnome.meld.png
-share/icons/hicolor/32x32/apps/org.gnome.meld.png
-share/icons/hicolor/48x48/apps/meld-version-control.png
-share/icons/hicolor/48x48/apps/org.gnome.meld.png
 share/icons/hicolor/scalable/apps/org.gnome.meld.svg
+share/icons/hicolor/symbolic/apps/org.gnome.meld-symbolic.svg
 share/locale/ar/LC_MESSAGES/meld.mo
 share/locale/bg/LC_MESSAGES/meld.mo
 share/locale/bs/LC_MESSAGES/meld.mo
@@ -265,40 +266,8 @@ share/locale/uk/LC_MESSAGES/meld.mo
 share/locale/vi/LC_MESSAGES/meld.mo
 share/locale/zh_CN/LC_MESSAGES/meld.mo
 share/locale/zh_TW/LC_MESSAGES/meld.mo
-share/meld/icons/COPYING
-share/meld/icons/COPYING_CCBYSA3
-share/meld/icons/emblem-meld-newer-file.png
-share/meld/icons/filter-ignored-24.png
-share/meld/icons/filter-modified-24.png
-share/meld/icons/filter-nonvc-24.png
-share/meld/icons/filter-normal-24.png
-share/meld/icons/vc-add-24.png
-share/meld/icons/vc-checkout-24.png
-share/meld/icons/vc-commit-24.png
-share/meld/icons/vc-push-24.png
-share/meld/icons/vc-remove-24.png
-share/meld/icons/vc-resolve-24.png
-share/meld/icons/vc-update-24.png
-share/meld/meld.css
-share/meld/styles/meld-base.xml
-share/meld/styles/meld-dark.xml
-share/meld/ui/EditableList.ui
-share/meld/ui/application.ui
-share/meld/ui/appmenu-fallback.xml
-share/meld/ui/dirdiff-ui.xml
-share/meld/ui/dirdiff.ui
-share/meld/ui/encoding-selector.ui
-share/meld/ui/filediff-ui.xml
-share/meld/ui/filediff.ui
-share/meld/ui/findbar.ui
-share/meld/ui/language-selector.ui
-share/meld/ui/meldapp-ui.xml
-share/meld/ui/meldapp.ui
-share/meld/ui/patch-dialog.ui
-share/meld/ui/preferences.ui
-share/meld/ui/shortcuts.ui
-share/meld/ui/tab-placeholder.ui
-share/meld/ui/vcview-ui.xml
-share/meld/ui/vcview.ui
+share/meld/org.gnome.Meld.gresource
+share/meld/styles/meld-base.style-scheme.xml
+share/meld/styles/meld-dark.style-scheme.xml
 share/metainfo/org.gnome.meld.appdata.xml
 share/mime/packages/org.gnome.meld.xml

Index: pkgsrc/devel/meld/distinfo
diff -u pkgsrc/devel/meld/distinfo:1.62 pkgsrc/devel/meld/distinfo:1.63
--- pkgsrc/devel/meld/distinfo:1.62     Mon Apr 20 14:47:37 2020
+++ pkgsrc/devel/meld/distinfo  Sun Apr 26 16:17:47 2020
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.62 2020/04/20 14:47:37 wiz Exp $
+$NetBSD: distinfo,v 1.63 2020/04/26 16:17:47 wiz Exp $
 
-SHA1 (meld-3.20.2.tar.xz) = 6aa69d9841efe7535f7699e0f5a895034f182e41
-RMD160 (meld-3.20.2.tar.xz) = 95e46ba77c4ee894dc2f2bd8e7287f00e586d0d2
-SHA512 (meld-3.20.2.tar.xz) = 9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa
-Size (meld-3.20.2.tar.xz) = 593948 bytes
+SHA1 (meld-3.21.0.tar.xz) = a95af6fce2f2b0b9ba0aceacf5b4e9c7a6b8c2c2
+RMD160 (meld-3.21.0.tar.xz) = a9d550eda6acbff962941a30a60e9b2a9f655678
+SHA512 (meld-3.21.0.tar.xz) = 1290530d8a127b3a3c8bf17703ec0bc2b286b8c48a9402c51135358217d24f20b4b819e8af398ad1a10af6209689315ebe7d4b6bc46b624ea781ddcc29e9ada4
+Size (meld-3.21.0.tar.xz) = 614744 bytes