- Update geany to 1.34

- Update geany-plugins to 1.34 - Add new vimode geany plugin - Scope plugin now supports gtk3 - Regenerate one patch and rename to conform to rules
svn path=/head/; revision=487752
2024-12-28 05:29:48 +00:00 · 2018-12-18 14:34:34 +00:00 · 2018-12-18 14:34:34 +00:00 · a052a4158e · 2021-03-31 03:12:20 +00:00
commit a052a4158e
parent 3062585b6e
15 changed files with 58 additions and 27 deletions
--- a/devel/Makefile
+++ b/devel/Makefile
@ -744,6 +744,7 @@
    SUBDIR += geany-plugin-treebrowser
    SUBDIR += geany-plugin-updatechecker
    SUBDIR += geany-plugin-utilslib
+    SUBDIR += geany-plugin-vimode
    SUBDIR += geany-plugin-vc
    SUBDIR += geany-plugin-webhelper
    SUBDIR += geany-plugin-workbench
--- a/devel/geany-plugin-ctags/files/patch-geanyctags_src_geanyctags.c
+++ b/devel/geany-plugin-ctags/files/patch-geanyctags_src_geanyctags.c
@ -1,11 +1,11 @@
--- geanyctags/src/geanyctags.c.orig	2015-01-02 18:40:37 UTC
+--- geanyctags/src/geanyctags.c.orig	2018-07-11 18:51:49 UTC
 +++ geanyctags/src/geanyctags.c
-@@ -223,7 +223,7 @@ on_generate_tags(GtkMenuItem *menuitem, 
+@@ -241,7 +241,7 @@ on_generate_tags(GtkMenuItem *menuitem, gpointer user_
 #ifndef G_OS_WIN32
 		gchar *find_string = generate_find_string(prj);
 		cmd = g_strconcat(find_string,
-			" | ctags --totals --fields=fKsSt --extra=-fq --c-kinds=+p --sort=foldcase --excmd=number -L - -f ",
-+			" | exctags --totals --fields=fKsSt --extra=-fq --c-kinds=+p --sort=foldcase --excmd=number -L - -f ",
- 			tag_filename, NULL);
+-			" | ctags --totals --fields=fKsSt --extra=-fq --c-kinds=+p --sort=foldcase --excmd=number -L - -f '",
+			" | exctags --totals --fields=fKsSt --extra=-fq --c-kinds=+p --sort=foldcase --excmd=number -L - -f '",
+ 			tag_filename, "'", NULL);
 		g_free(find_string);
 #else
--- a/devel/geany-plugin-markdown/Makefile
+++ b/devel/geany-plugin-markdown/Makefile
@ -10,7 +10,7 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup

 gtk2_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
-gtk3_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
+gtk3_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3

 OPTIONS_DEFINE=	DOCS

--- a/devel/geany-plugin-scope/Makefile
+++ b/devel/geany-plugin-scope/Makefile
@ -2,18 +2,20 @@

 PORTNAME=	geany-plugin-scope
 PORTVERSION=	${GEANY_VER}
-PKGNAMESUFFIX=	-gtk2
 CATEGORIES=	devel

 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
+USES=		gnome

-LIB_DEPENDS=	libgeany.so:devel/geany@gtk2
-
-FLAVORS=	# intentionally left empty
-
-USE_GNOME=	vte
 USE_XORG=	x11 xext

 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
+
+.if ${FLAVOR} == gtk3
+USE_GNOME+=	vte3
+.else
+USE_GNOME+=	vte
+.endif
+
 .include <bsd.port.mk>
--- a/devel/geany-plugin-scope/pkg-plist
+++ b/devel/geany-plugin-scope/pkg-plist
@ -33,3 +33,4 @@ share/geany-plugins/scope/StepOver.png
 share/geany-plugins/scope/StepOver22.png
 share/geany-plugins/scope/StepOver24.png
 share/geany-plugins/scope/scope.glade
+share/geany-plugins/scope/scope_gtk3.glade
--- a/devel/geany-plugin-vimode/Makefile
+++ b/devel/geany-plugin-vimode/Makefile
@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PORTNAME=	geany-plugin-vimode
+PORTVERSION=	${GEANY_VER}
+CATEGORIES=	devel
+
+MAINTAINER=	madpilot@FreeBSD.org
+COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
+
+.include "${.CURDIR}/../geany-plugins/files/Makefile.common"
+.include <bsd.port.mk>
--- a/devel/geany-plugin-vimode/pkg-descr
+++ b/devel/geany-plugin-vimode/pkg-descr
@ -0,0 +1,16 @@
+Vimode is a Vim-mode plugin for Geany written by a guy who does not
+use Vim.
+
+Despite the limited Vim knowledge of the author, the plugin tries
+to be a reasonably complete Vim mode implementation featuring:
+
+ - normal mode, insert/replace mode, visual mode, line visual mode
+ - repeated commands (e.g. 10dd - delete 10 lines)
+ - "motion" commands (e.g. d10l - delete 10 characters to the right)
+ - "text object" commands (e.g. di( - delete inner contents of parentheses)
+ - visual mode commands (e.g. ~ to swap case of the selected text)
+ - basic ex mode commands like :s, including range specifications
+ - most basic navigation, selection and text manipulation commands
+ - command repetition using "." and repeated insert
+
+WWW: https://plugins.geany.org/vimode.html
--- a/devel/geany-plugin-vimode/pkg-plist
+++ b/devel/geany-plugin-vimode/pkg-plist
@ -0,0 +1 @@
+lib/geany/vimode.so
--- a/devel/geany-plugins/Makefile
+++ b/devel/geany-plugins/Makefile
@ -3,7 +3,6 @@

 PORTNAME=	geany-plugins
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 DISTFILES=	# none

--- a/devel/geany-plugins/distinfo
+++ b/devel/geany-plugins/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1519649178
-SHA256 (geany-plugins-1.33.tar.bz2) = 12825739e2c3caefbc1ad57e62f1e4f691af8db8368f173aa84c43dffb4503a2
-SIZE (geany-plugins-1.33.tar.bz2) = 3299641
+TIMESTAMP = 1545042887
+SHA256 (geany-plugins-1.34.tar.bz2) = 244417c681636e82a63cf6f9901b5b7f3889168f7d9b5ba9b45601767a589c3b
+SIZE (geany-plugins-1.34.tar.bz2) = 3347870
--- a/devel/geany-plugins/files/Makefile.common
+++ b/devel/geany-plugins/files/Makefile.common
@ -2,8 +2,6 @@

 .include "${.CURDIR}/../../devel/geany-plugins/files/bsd.geany-plugins.mk"

-PORTREVISION=	1
-
 MASTER_SITES=	http://plugins.geany.org/geany-plugins/
 DISTNAME=	geany-plugins-${PORTVERSION}
 DISTINFO_FILE=	${.CURDIR}/../../devel/geany-plugins/distinfo
--- a/devel/geany-plugins/files/bsd.geany-plugins.mk
+++ b/devel/geany-plugins/files/bsd.geany-plugins.mk
@ -1,11 +1,10 @@
 # $FreeBSD$

-GEANY_VER=		1.33
+GEANY_VER=		1.34
 GEANY_PLUGINS_GTK2=	debugger \
 			devhelp \
 			geanypy \
-			multiterm \
-			scope
+			multiterm

 GEANY_PLUGINS_ALL=	addons \
 			autoclose \
@ -35,6 +34,7 @@ GEANY_PLUGINS_ALL=	addons \
 			pretty-printer \
 			projectorganizer \
 			prj \
+			scope \
 			sendmail \
 			shiftcolumn \
 			spellcheck \
@ -42,6 +42,7 @@ GEANY_PLUGINS_ALL=	addons \
 			treebrowser \
 			updatechecker \
 			vc \
+			vimode \
 			webhelper \
 			workbench \
 			xmlsnippets
@ -87,6 +88,7 @@ treebrowser_DESC=	alternate file browser
 updatechecker_DESC=	check for new version of Geany
 utilslib_DESC=		utility library
 vc_DESC=		access to different version-control systems
+vimode_DESC=		vim-mode plugin for Geany written by a guy who does not use Vim
 webhelper_DESC=		web development facilities
 workbench_DESC=		manage multiple projects in geany
 xmlsnippets_DESC=	XML/HTML tag autocompletion
@ -110,4 +112,4 @@ vc_DIR=			geanyvc
 git-changebar_SWITCH=	--enable-gitchangebar
 pretty-printer_SWITCH=	--enable-pretty_printer

-GEANY_UTIL=		workbench
+GEANY_UTIL=		scope workbench
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	geany
-PORTVERSION=	1.33
-PORTREVISION=	3
+PORTVERSION=	1.34
 CATEGORIES=	devel editors
 MASTER_SITES=	http://download.geany.org/ SF

--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1519649030
-SHA256 (geany-1.33.tar.bz2) = 66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2
-SIZE (geany-1.33.tar.bz2) = 4106409
+TIMESTAMP = 1545042694
+SHA256 (geany-1.34.tar.bz2) = 63b93d25d037eaffa77895ae6dd29c91bca570e4053eff5cc8490f87e6021f8e
+SIZE (geany-1.34.tar.bz2) = 4474601
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@ -221,6 +221,7 @@ share/icons/hicolor/scalable/apps/geany.svg
 %%NLS%%share/locale/bg/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/da/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/de/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/el/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/geany.mo