cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r552342

Browse Source 
Revert meld update to 3.21.0. This version requires pygobject 3.30
which is not present in the ports tree and fails to start at runtime.

Bump PORTEPOCH.

Reviewed by:		bapt
Approved by:		bapt, portmgr (fixit)
Differential Revision:	https://reviews.freebsd.org/D26775

Approved by:		portmgr (implicit, runtime fix)
This commit is contained in:
Guido Falsi 2020-10-14 16:43:41 +00:00
parent 1e13856a5c
commit d2c45d4fd9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=552343
4 changed files with 82 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
textproc/meld/Makefile
View File

@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= meld
PORTVERSION= 3.21.0
PORTVERSION= 3.20.1
PORTEPOCH= 1
CATEGORIES= textproc devel python
MASTER_SITES= GNOME
@ -18,7 +19,7 @@ RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
USES= desktop-file-utils gettext gnome python:3.4+ shared-mime-info \
shebangfix tar:xz
USE_PYTHON= distutils noflavors
USE_GNOME= gtksourceview4 intltool libxml2:build pygobject3
USE_GNOME= gtksourceview3 intltool libxml2:build pygobject3
SHEBANG_FILES= bin/meld
GLIB_SCHEMAS= org.gnome.meld.gschema.xml

6
textproc/meld/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1592237329
SHA256 (meld-3.21.0.tar.xz) = b680114d5ab793324549fd58f4eb202d8e280c0633a0b765ede6dfb34160a81b
SIZE (meld-3.21.0.tar.xz) = 614744
TIMESTAMP = 1562394516
SHA256 (meld-3.20.1.tar.xz) = a54843bc4d6cb1d31d0a58aa725091622194d50c32ef67026b35c86dda3cb249
SIZE (meld-3.20.1.tar.xz) = 594812

17
textproc/meld/files/patch-setup.py Normal file
View File

@ -0,0 +1,17 @@
--- setup.py.orig 2014-11-22 12:24:31 UTC
+++ setup.py
@@ -37,11 +37,11 @@ setup(
},
scripts=['bin/meld'],
data_files=[
- ('share/man/man1',
+ ('man/man1',
['meld.1']
),
- ('share/doc/meld-' + meld.conf.__version__,
- ['COPYING', 'NEWS']
+ ('share/doc/meld',
+ ['NEWS']
),
('share/meld',
['data/meld.css']

87
textproc/meld/pkg-plist
View File

@ -2,24 +2,22 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/__init__.py
%%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/accelerators.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/accelerators.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/actiongutter.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/actiongutter.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/chunkmap.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/chunkmap.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@ -36,8 +34,6 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/__pycache__/melddoc.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/menuhelpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/menuhelpers.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/newdifftab.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@ -52,8 +48,6 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/style.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/style.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@ -66,15 +60,14 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/__pycache__/vcview.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/accelerators.py
%%PYTHON_SITELIBDIR%%/meld/actiongutter.py
%%PYTHON_SITELIBDIR%%/meld/build_helpers.py
%%PYTHON_SITELIBDIR%%/meld/chunkmap.py
%%PYTHON_SITELIBDIR%%/meld/conf.py
%%PYTHON_SITELIBDIR%%/meld/const.py
%%PYTHON_SITELIBDIR%%/meld/diffgrid.py
%%PYTHON_SITELIBDIR%%/meld/diffmap.py
%%PYTHON_SITELIBDIR%%/meld/dirdiff.py
%%PYTHON_SITELIBDIR%%/meld/filediff.py
%%PYTHON_SITELIBDIR%%/meld/filemerge.py
%%PYTHON_SITELIBDIR%%/meld/filters.py
%%PYTHON_SITELIBDIR%%/meld/gutterrendererchunk.py
%%PYTHON_SITELIBDIR%%/meld/iohelpers.py
@ -98,7 +91,6 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/meldbuffer.py
%%PYTHON_SITELIBDIR%%/meld/melddoc.py
%%PYTHON_SITELIBDIR%%/meld/meldwindow.py
%%PYTHON_SITELIBDIR%%/meld/menuhelpers.py
%%PYTHON_SITELIBDIR%%/meld/misc.py
%%PYTHON_SITELIBDIR%%/meld/newdifftab.py
%%PYTHON_SITELIBDIR%%/meld/patchdialog.py
@ -106,7 +98,6 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/recent.py
%%PYTHON_SITELIBDIR%%/meld/settings.py
%%PYTHON_SITELIBDIR%%/meld/sourceview.py
%%PYTHON_SITELIBDIR%%/meld/style.py
%%PYTHON_SITELIBDIR%%/meld/task.py
%%PYTHON_SITELIBDIR%%/meld/tree.py
%%PYTHON_SITELIBDIR%%/meld/treehelpers.py
@ -125,10 +116,14 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/msgarea.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@ -137,8 +132,6 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/recentselector.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/recentselector.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@ -151,13 +144,14 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/ui/filechooser.py
%%PYTHON_SITELIBDIR%%/meld/ui/findbar.py
%%PYTHON_SITELIBDIR%%/meld/ui/gladesupport.py
%%PYTHON_SITELIBDIR%%/meld/ui/gnomeglade.py
%%PYTHON_SITELIBDIR%%/meld/ui/gtkcompat.py
%%PYTHON_SITELIBDIR%%/meld/ui/historyentry.py
%%PYTHON_SITELIBDIR%%/meld/ui/listselector.py
%%PYTHON_SITELIBDIR%%/meld/ui/listwidget.py
%%PYTHON_SITELIBDIR%%/meld/ui/msgarea.py
%%PYTHON_SITELIBDIR%%/meld/ui/notebook.py
%%PYTHON_SITELIBDIR%%/meld/ui/notebooklabel.py
%%PYTHON_SITELIBDIR%%/meld/ui/recentselector.py
%%PYTHON_SITELIBDIR%%/meld/ui/statusbar.py
%%PYTHON_SITELIBDIR%%/meld/ui/util.py
%%PYTHON_SITELIBDIR%%/meld/ui/vcdialogs.py
@ -173,8 +167,6 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_vc.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/cvs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/cvs.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/git.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@ -186,13 +178,13 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/vc/_null.py
%%PYTHON_SITELIBDIR%%/meld/vc/_vc.py
%%PYTHON_SITELIBDIR%%/meld/vc/bzr.py
%%PYTHON_SITELIBDIR%%/meld/vc/cvs.py
%%PYTHON_SITELIBDIR%%/meld/vc/darcs.py
%%PYTHON_SITELIBDIR%%/meld/vc/git.py
%%PYTHON_SITELIBDIR%%/meld/vc/mercurial.py
%%PYTHON_SITELIBDIR%%/meld/vc/svn.py
%%PYTHON_SITELIBDIR%%/meld/vcview.py
%%PYTHON_SITELIBDIR%%/meld/windowstate.py
man/man1/meld.1.gz
share/applications/org.gnome.meld.desktop
share/help/C/meld/command-line.page
share/help/C/meld/file-changes.page
@ -210,8 +202,18 @@ share/help/C/meld/resolving-conflicts.page
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
@ -258,11 +260,40 @@ 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/man/man1/meld.1.gz
%%DATADIR%%/org.gnome.Meld.gresource
%%DATADIR%%/styles/meld-base.style-scheme.xml
%%DATADIR%%/styles/meld-dark.style-scheme.xml
%%DATADIR%%/icons/COPYING
%%DATADIR%%/icons/COPYING_CCBYSA3
%%DATADIR%%/icons/emblem-meld-newer-file.png
%%DATADIR%%/icons/filter-ignored-24.png
%%DATADIR%%/icons/filter-modified-24.png
%%DATADIR%%/icons/filter-nonvc-24.png
%%DATADIR%%/icons/filter-normal-24.png
%%DATADIR%%/icons/vc-add-24.png
%%DATADIR%%/icons/vc-checkout-24.png
%%DATADIR%%/icons/vc-commit-24.png
%%DATADIR%%/icons/vc-push-24.png
%%DATADIR%%/icons/vc-remove-24.png
%%DATADIR%%/icons/vc-resolve-24.png
%%DATADIR%%/icons/vc-update-24.png
%%DATADIR%%/meld.css
%%DATADIR%%/styles/meld-base.xml
%%DATADIR%%/styles/meld-dark.xml
%%DATADIR%%/ui/EditableList.ui
%%DATADIR%%/ui/application.ui
%%DATADIR%%/ui/appmenu-fallback.xml
%%DATADIR%%/ui/dirdiff-ui.xml
%%DATADIR%%/ui/dirdiff.ui
%%DATADIR%%/ui/encoding-selector.ui
%%DATADIR%%/ui/filediff-ui.xml
%%DATADIR%%/ui/filediff.ui
%%DATADIR%%/ui/findbar.ui
%%DATADIR%%/ui/language-selector.ui
%%DATADIR%%/ui/meldapp-ui.xml
%%DATADIR%%/ui/meldapp.ui
%%DATADIR%%/ui/patch-dialog.ui
%%DATADIR%%/ui/preferences.ui
%%DATADIR%%/ui/shortcuts.ui
%%DATADIR%%/ui/tab-placeholder.ui
%%DATADIR%%/ui/vcview-ui.xml
%%DATADIR%%/ui/vcview.ui
share/metainfo/org.gnome.meld.appdata.xml
share/mime/packages/org.gnome.meld.xml
@dir %%DATADIR%%/icons
@dir %%DATADIR%%/ui