Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/gedit Update gedit to 3.36.2



details:   https://anonhg.NetBSD.org/pkgsrc/rev/334576eba3dd
branches:  trunk
changeset: 436294:334576eba3dd
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Fri Jul 31 11:05:49 2020 +0000

description:
Update gedit to 3.36.2

python based plugins need libpeas' py-gobject dep to be reinstated

Many changes including:
* Fix compilation on macOS.
* GSettings schema: enable more features by default (auto-indent,
  display-line-numbers, highlight-current-line and bracket-matching) and set
  default style scheme to 'tango'.
* Bump gedit API version to 3.36.
* New dependency: Tepl, which itself depends on Amtk and uchardet.
- Fix segfault in open document selector (Sebastien)
- Fix several crash bugs (Andrea)
- Switch to meson (Martin)
- Drop autotools support (Jeremy)
- Allow closing tabs with middle-click (Corey)
- Migrate to gettext and stop using intltool (Martin)
- Switch from gtksourceview3 to gtksourceview4 (Christian)
- Port GeditFileChooserDialogGtk to GtkFileChooserNative

diffstat:

 editors/gedit/Makefile                        |   39 +-
 editors/gedit/PLIST                           |  370 +++++--------------------
 editors/gedit/distinfo                        |   12 +-
 editors/gedit/options.mk                      |   21 -
 editors/gedit/patches/patch-gedit_meson.build |   16 +
 editors/gedit/patches/patch-meson.build       |   18 +
 6 files changed, 136 insertions(+), 340 deletions(-)

diffs (truncated from 828 to 300 lines):

diff -r aaee4f8c1688 -r 334576eba3dd editors/gedit/Makefile
--- a/editors/gedit/Makefile    Fri Jul 31 10:48:23 2020 +0000
+++ b/editors/gedit/Makefile    Fri Jul 31 11:05:49 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.152 2020/06/02 08:23:43 adam Exp $
+# $NetBSD: Makefile,v 1.153 2020/07/31 11:05:49 prlw1 Exp $
 
-DISTNAME=      gedit-3.22.1
-PKGREVISION=   13
+DISTNAME=      gedit-3.36.2
 CATEGORIES=    editors gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gedit/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -13,40 +12,40 @@
 
 PREV_PKGPATH=  editors/gedit3
 
-USE_LIBTOOL=           yes
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake intltool msgfmt perl pkg-config
-GNU_CONFIGURE=         yes
+USE_TOOLS+=                    gmake gettext msgfmt perl pkg-config
+_TOOLS_USE_PKGSRC.msgfmt=      yes
 
-PKGCONFIG_OVERRIDE+=           data/gedit.pc.in
-PY_PATCHPLIST=                 yes
 PYTHON_VERSIONS_INCOMPATIBLE=  27
+PY_PATCHPLIST=                 yes
 REPLACE_PYTHON+=               plugins/externaltools/data/send-to-fpaste.tool.in
+REPLACE_PYTHON+=               build-aux/meson/post_install.py
 
-CONFIGURE_ARGS+=       --disable-updater
-CONFIGURE_ARGS+=       --disable-deprecations
-CONFIGURE_ARGS+=       --disable-maintainer-mode
-
-.include "options.mk"
+MESON_ARGS+=   -Dvapi=false
+MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/gedit
 
 DEPENDS+=      adwaita-icon-theme-[0-9]*:../../graphics/adwaita-icon-theme
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 BUILD_DEPENDS+=        itstool-[0-9]*:../../textproc/itstool
 
+pre-configure:
+       ${FIND} ${WRKSRC}/help -type f -exec ${CHMOD} 644 {} \;
+
+
 .include "../../devel/gobject-introspection/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libpeas+=        libpeas>=1.14.1
 .include "../../devel/libpeas/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.44.0
+BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.52
 .include "../../devel/glib2/schemas.mk"
-.include "../../devel/py-gobject3-common/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../editors/tepl4/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk3+=   gtk3+>=3.21.3
+.include "../../textproc/gspell/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk3+=   gtk3+>=3.22
 .include "../../x11/gtk3/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtksourceview3+= gtksourceview3>=3.21.2
-.include "../../x11/gtksourceview3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtksourceview4+= gtksourceview4>=4.0.2
+.include "../../x11/gtksourceview4/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 
diff -r aaee4f8c1688 -r 334576eba3dd editors/gedit/PLIST
--- a/editors/gedit/PLIST       Fri Jul 31 10:48:23 2020 +0000
+++ b/editors/gedit/PLIST       Fri Jul 31 11:05:49 2020 +0000
@@ -1,151 +1,79 @@
-@comment $NetBSD: PLIST,v 1.45 2019/10/25 13:58:42 kamil Exp $
+@comment $NetBSD: PLIST,v 1.46 2020/07/31 11:05:49 prlw1 Exp $
 bin/gedit
-bin/gnome-text-editor
-include/gedit-3.14/gedit/gedit-app-activatable.h
-include/gedit-3.14/gedit/gedit-app.h
-include/gedit-3.14/gedit/gedit-commands.h
-include/gedit-3.14/gedit/gedit-debug.h
-include/gedit-3.14/gedit/gedit-document.h
-include/gedit-3.14/gedit/gedit-encodings-combo-box.h
-include/gedit-3.14/gedit/gedit-menu-extension.h
-include/gedit-3.14/gedit/gedit-message-bus.h
-include/gedit-3.14/gedit/gedit-message.h
-include/gedit-3.14/gedit/gedit-progress-info-bar.h
-include/gedit-3.14/gedit/gedit-statusbar.h
-include/gedit-3.14/gedit/gedit-tab.h
-include/gedit-3.14/gedit/gedit-utils.h
-include/gedit-3.14/gedit/gedit-view-activatable.h
-include/gedit-3.14/gedit/gedit-view.h
-include/gedit-3.14/gedit/gedit-window-activatable.h
-include/gedit-3.14/gedit/gedit-window.h
+include/gedit-3.36/gedit/gedit-app-activatable.h
+include/gedit-3.36/gedit/gedit-app.h
+include/gedit-3.36/gedit/gedit-commands.h
+include/gedit-3.36/gedit/gedit-debug.h
+include/gedit-3.36/gedit/gedit-document.h
+include/gedit-3.36/gedit/gedit-encodings-combo-box.h
+include/gedit-3.36/gedit/gedit-menu-extension.h
+include/gedit-3.36/gedit/gedit-message-bus.h
+include/gedit-3.36/gedit/gedit-message.h
+include/gedit-3.36/gedit/gedit-progress-info-bar.h
+include/gedit-3.36/gedit/gedit-statusbar.h
+include/gedit-3.36/gedit/gedit-tab.h
+include/gedit-3.36/gedit/gedit-utils.h
+include/gedit-3.36/gedit/gedit-view-activatable.h
+include/gedit-3.36/gedit/gedit-view.h
+include/gedit-3.36/gedit/gedit-window-activatable.h
+include/gedit-3.36/gedit/gedit-window.h
 lib/gedit/girepository-1.0/Gedit-3.0.typelib
-lib/gedit/libgedit.la
 lib/gedit/plugins/docinfo.plugin
 lib/gedit/plugins/externaltools.plugin
 lib/gedit/plugins/externaltools/__init__.py
-lib/gedit/plugins/externaltools/__init__.pyc
-lib/gedit/plugins/externaltools/__init__.pyo
 lib/gedit/plugins/externaltools/appactivatable.py
-lib/gedit/plugins/externaltools/appactivatable.pyc
-lib/gedit/plugins/externaltools/appactivatable.pyo
 lib/gedit/plugins/externaltools/capture.py
-lib/gedit/plugins/externaltools/capture.pyc
-lib/gedit/plugins/externaltools/capture.pyo
 lib/gedit/plugins/externaltools/filelookup.py
-lib/gedit/plugins/externaltools/filelookup.pyc
-lib/gedit/plugins/externaltools/filelookup.pyo
 lib/gedit/plugins/externaltools/functions.py
-lib/gedit/plugins/externaltools/functions.pyc
-lib/gedit/plugins/externaltools/functions.pyo
 lib/gedit/plugins/externaltools/library.py
-lib/gedit/plugins/externaltools/library.pyc
-lib/gedit/plugins/externaltools/library.pyo
 lib/gedit/plugins/externaltools/linkparsing.py
-lib/gedit/plugins/externaltools/linkparsing.pyc
-lib/gedit/plugins/externaltools/linkparsing.pyo
 lib/gedit/plugins/externaltools/manager.py
-lib/gedit/plugins/externaltools/manager.pyc
-lib/gedit/plugins/externaltools/manager.pyo
 lib/gedit/plugins/externaltools/outputpanel.py
-lib/gedit/plugins/externaltools/outputpanel.pyc
-lib/gedit/plugins/externaltools/outputpanel.pyo
 lib/gedit/plugins/externaltools/windowactivatable.py
-lib/gedit/plugins/externaltools/windowactivatable.pyc
-lib/gedit/plugins/externaltools/windowactivatable.pyo
 lib/gedit/plugins/filebrowser.plugin
-lib/gedit/plugins/libdocinfo.la
-lib/gedit/plugins/libfilebrowser.la
-lib/gedit/plugins/libmodelines.la
-lib/gedit/plugins/libsort.la
-${PLIST.enchant}lib/gedit/plugins/libspell.la
-lib/gedit/plugins/libtime.la
+lib/gedit/plugins/libdocinfo.so
+lib/gedit/plugins/libfilebrowser.so
+lib/gedit/plugins/libmodelines.so
+lib/gedit/plugins/libquickhighlight.so
+lib/gedit/plugins/libsort.so
+lib/gedit/plugins/libspell.so
+lib/gedit/plugins/libtime.so
 lib/gedit/plugins/modelines.plugin
 lib/gedit/plugins/pythonconsole.plugin
 lib/gedit/plugins/pythonconsole/__init__.py
-lib/gedit/plugins/pythonconsole/__init__.pyc
-lib/gedit/plugins/pythonconsole/__init__.pyo
 lib/gedit/plugins/pythonconsole/config.py
-lib/gedit/plugins/pythonconsole/config.pyc
-lib/gedit/plugins/pythonconsole/config.pyo
 lib/gedit/plugins/pythonconsole/console.py
-lib/gedit/plugins/pythonconsole/console.pyc
-lib/gedit/plugins/pythonconsole/console.pyo
+lib/gedit/plugins/quickhighlight.plugin
 lib/gedit/plugins/quickopen.plugin
 lib/gedit/plugins/quickopen/__init__.py
-lib/gedit/plugins/quickopen/__init__.pyc
-lib/gedit/plugins/quickopen/__init__.pyo
 lib/gedit/plugins/quickopen/popup.py
-lib/gedit/plugins/quickopen/popup.pyc
-lib/gedit/plugins/quickopen/popup.pyo
 lib/gedit/plugins/quickopen/virtualdirs.py
-lib/gedit/plugins/quickopen/virtualdirs.pyc
-lib/gedit/plugins/quickopen/virtualdirs.pyo
 lib/gedit/plugins/snippets.plugin
 lib/gedit/plugins/snippets/__init__.py
-lib/gedit/plugins/snippets/__init__.pyc
-lib/gedit/plugins/snippets/__init__.pyo
 lib/gedit/plugins/snippets/appactivatable.py
-lib/gedit/plugins/snippets/appactivatable.pyc
-lib/gedit/plugins/snippets/appactivatable.pyo
 lib/gedit/plugins/snippets/completion.py
-lib/gedit/plugins/snippets/completion.pyc
-lib/gedit/plugins/snippets/completion.pyo
 lib/gedit/plugins/snippets/document.py
-lib/gedit/plugins/snippets/document.pyc
-lib/gedit/plugins/snippets/document.pyo
 lib/gedit/plugins/snippets/exporter.py
-lib/gedit/plugins/snippets/exporter.pyc
-lib/gedit/plugins/snippets/exporter.pyo
 lib/gedit/plugins/snippets/helper.py
-lib/gedit/plugins/snippets/helper.pyc
-lib/gedit/plugins/snippets/helper.pyo
 lib/gedit/plugins/snippets/importer.py
-lib/gedit/plugins/snippets/importer.pyc
-lib/gedit/plugins/snippets/importer.pyo
 lib/gedit/plugins/snippets/languagemanager.py
-lib/gedit/plugins/snippets/languagemanager.pyc
-lib/gedit/plugins/snippets/languagemanager.pyo
 lib/gedit/plugins/snippets/library.py
-lib/gedit/plugins/snippets/library.pyc
-lib/gedit/plugins/snippets/library.pyo
 lib/gedit/plugins/snippets/manager.py
-lib/gedit/plugins/snippets/manager.pyc
-lib/gedit/plugins/snippets/manager.pyo
 lib/gedit/plugins/snippets/parser.py
-lib/gedit/plugins/snippets/parser.pyc
-lib/gedit/plugins/snippets/parser.pyo
 lib/gedit/plugins/snippets/placeholder.py
-lib/gedit/plugins/snippets/placeholder.pyc
-lib/gedit/plugins/snippets/placeholder.pyo
 lib/gedit/plugins/snippets/shareddata.py
-lib/gedit/plugins/snippets/shareddata.pyc
-lib/gedit/plugins/snippets/shareddata.pyo
 lib/gedit/plugins/snippets/signals.py
-lib/gedit/plugins/snippets/signals.pyc
-lib/gedit/plugins/snippets/signals.pyo
 lib/gedit/plugins/snippets/singleton.py
-lib/gedit/plugins/snippets/singleton.pyc
-lib/gedit/plugins/snippets/singleton.pyo
 lib/gedit/plugins/snippets/snippet.py
-lib/gedit/plugins/snippets/snippet.pyc
-lib/gedit/plugins/snippets/snippet.pyo
 lib/gedit/plugins/snippets/substitutionparser.py
-lib/gedit/plugins/snippets/substitutionparser.pyc
-lib/gedit/plugins/snippets/substitutionparser.pyo
 lib/gedit/plugins/snippets/windowactivatable.py
-lib/gedit/plugins/snippets/windowactivatable.pyc
-lib/gedit/plugins/snippets/windowactivatable.pyo
 lib/gedit/plugins/sort.plugin
-${PLIST.enchant}lib/gedit/plugins/spell.plugin
+lib/gedit/plugins/spell.plugin
 lib/gedit/plugins/time.plugin
+lib/libgedit-3.36.so
 lib/pkgconfig/gedit.pc
 ${PYSITELIB}/gi/overrides/Gedit.py
-${PYSITELIB}/gi/overrides/Gedit.pyc
-${PYSITELIB}/gi/overrides/Gedit.pyo
-libexec/gedit/gedit-bugreport.sh
 man/man1/gedit.1
-share/GConf/gsettings/gedit.convert
-share/appdata/org.gnome.gedit.appdata.xml
 share/applications/org.gnome.gedit.desktop
 share/dbus-1/services/org.gnome.gedit.service
 share/gedit/gir-1.0/Gedit-3.0.gir
@@ -191,47 +119,11 @@
 share/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.enums.xml
 share/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml
 share/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml
+share/glib-2.0/schemas/org.gnome.gedit.plugins.spell.gschema.xml
 share/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml
 share/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml
-share/gtk-doc/html/gedit/gedit-GeditApp.html
-share/gtk-doc/html/gedit/gedit-GeditAppActivatable.html
-share/gtk-doc/html/gedit/gedit-GeditDocument.html
-share/gtk-doc/html/gedit/gedit-GeditEncodingsComboBox.html
-share/gtk-doc/html/gedit/gedit-GeditMessage.html
-share/gtk-doc/html/gedit/gedit-GeditMessageBus.html
-share/gtk-doc/html/gedit/gedit-GeditProgressInfoBar.html
-share/gtk-doc/html/gedit/gedit-GeditStatusbar.html
-share/gtk-doc/html/gedit/gedit-GeditViewActivatable.html
-share/gtk-doc/html/gedit/gedit-GeditWindowActivatable.html
-share/gtk-doc/html/gedit/api-index-3-14.html
-share/gtk-doc/html/gedit/api-index-deprecated.html
-share/gtk-doc/html/gedit/api-index-full.html
-share/gtk-doc/html/gedit/ch01.html
-share/gtk-doc/html/gedit/gedit-GeditCommands.html
-share/gtk-doc/html/gedit/gedit-gedit-debug.html
-share/gtk-doc/html/gedit/gedit-gedit-menu-extension.html
-share/gtk-doc/html/gedit/gedit-gedit-tab.html
-share/gtk-doc/html/gedit/gedit-gedit-utils.html
-share/gtk-doc/html/gedit/gedit-gedit-view.html
-share/gtk-doc/html/gedit/gedit-gedit-window.html
-share/gtk-doc/html/gedit/gedit.devhelp2
-share/gtk-doc/html/gedit/home.png
-share/gtk-doc/html/gedit/index.html
-share/gtk-doc/html/gedit/left-insensitive.png
-share/gtk-doc/html/gedit/left.png
-share/gtk-doc/html/gedit/object-tree.html
-share/gtk-doc/html/gedit/right-insensitive.png
-share/gtk-doc/html/gedit/right.png
-share/gtk-doc/html/gedit/style.css
-share/gtk-doc/html/gedit/up-insensitive.png
-share/gtk-doc/html/gedit/up.png
 share/help/C/gedit/figures/gedit-html-snippet.png
 share/help/C/gedit/figures/gedit-icon.png
-share/help/C/gedit/figures/gedit-new-external-tool.png
-share/help/C/gedit/figures/gedit-open-location.png
-share/help/C/gedit/figures/gedit-side-pane1.png
-share/help/C/gedit/figures/gedit-side-pane2.png
-share/help/C/gedit/figures/gedit-side-pane3.png



Home | Main Index | Thread Index | Old Index