- Update geany and geany-plugins to 1.37

- Remove patches included upstream

NOTE: after this release the geany project is phasing out GTK2
support. Most probably the next release will be GTK3 only, and any
plugins not ported to GTK3 will be removed.
This commit is contained in:
Guido Falsi 2020-10-26 08:54:49 +00:00
parent 2ce5a7e7a4
commit 5cbee3bb57
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=553326
8 changed files with 14 additions and 31 deletions

View File

@ -2,12 +2,8 @@
PORTNAME= geany-plugin-git-changebar
PORTVERSION= ${GEANY_VER}
PORTREVISION= 2
CATEGORIES= devel
PATCH_SITES= https://github.com/geany/geany-plugins/commit/
PATCHFILES= 9497d829e1b207eb83575dc6f617feecfb89bc16.patch:-p1
MAINTAINER= madpilot@FreeBSD.org
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}

View File

@ -2,12 +2,8 @@
PORTNAME= geany-plugin-workbench
PORTVERSION= ${GEANY_VER}
PORTREVISION= 2
CATEGORIES= devel
PATCH_SITES= https://github.com/geany/geany-plugins/commit/
PATCHFILES= 9497d829e1b207eb83575dc6f617feecfb89bc16.patch:-p1
MAINTAINER= madpilot@FreeBSD.org
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}

View File

@ -1,5 +1,3 @@
TIMESTAMP = 1584076857
SHA256 (geany-plugins-1.36.tar.bz2) = ebe18dd699292174622e8cb8745b020ada8a5be3b604ab980af36e8518df7ce6
SIZE (geany-plugins-1.36.tar.bz2) = 3379066
SHA256 (9497d829e1b207eb83575dc6f617feecfb89bc16.patch) = ecf3c6725c3d9f482274ecdbce66459d168162690beec2c8ff5b6ae9e0e8b318
SIZE (9497d829e1b207eb83575dc6f617feecfb89bc16.patch) = 2345
TIMESTAMP = 1603653497
SHA256 (geany-plugins-1.37.tar.bz2) = c98f9b1303f4ab9bed7587e749cd0b5594d9136a1bf8ba110900d46a17fa9cd8
SIZE (geany-plugins-1.37.tar.bz2) = 3385143

View File

@ -1,6 +1,6 @@
# $FreeBSD$
GEANY_VER= 1.36
GEANY_VER= 1.37
GEANY_PLUGINS_GTK2= multiterm
GEANY_PLUGINS_GTK3= markdown

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= geany
PORTVERSION= 1.36
PORTREVISION= 1
PORTVERSION= 1.37
CATEGORIES= devel editors
MASTER_SITES= http://download.geany.org/ SF
@ -50,12 +49,12 @@ THEMES_RUN_DEPENDS= ${LOCALBASE}/share/geany/colorschemes/bespin.conf:devel/gean
.if ${FLAVOR} == gtk2
USE_GNOME+= gtk20
VTE_USE= GNOME=vte
CONFIGURE_ARGS+= --disable-gtk3
CONFIGURE_ARGS+= --enable-gtk2
PLIST_SUB+= GTK2="" GTK3="@comment "
.elif ${FLAVOR} == gtk3
USE_GNOME+= gtk30
VTE_USE= GNOME=vte3
CONFIGURE_ARGS+= --enable-gtk3
CONFIGURE_ARGS+= --disable-gtk2
PLIST_SUB+= GTK2="@comment " GTK3=""
.endif

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1569769107
SHA256 (geany-1.36.tar.bz2) = 9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e
SIZE (geany-1.36.tar.bz2) = 4644521
TIMESTAMP = 1603651723
SHA256 (geany-1.37.tar.bz2) = dde52584823b769c56704c27dbedddb7a6bbaf4eacb9587d10bbc387816e3d51
SIZE (geany-1.37.tar.bz2) = 4689385

View File

@ -1,10 +0,0 @@
--- src/vte.c.orig 2019-09-28 12:38:17 UTC
+++ src/vte.c
@@ -399,6 +399,7 @@ void vte_close(void)
g_free(vf);
/* free the vte widget before unloading vte module
* this prevents a segfault on X close window if the message window is hidden */
+ g_signal_handlers_disconnect_by_func(vc->vte, G_CALLBACK(vte_start), NULL);
gtk_widget_destroy(vc->vte);
gtk_widget_destroy(vc->menu);
g_object_unref(vc->menu);

View File

@ -19,6 +19,7 @@ include/geany/plugindata.h
include/geany/pluginutils.h
include/geany/prefs.h
include/geany/project.h
include/geany/scintilla/Compat.h
include/geany/scintilla/SciLexer.h
include/geany/scintilla/Sci_Position.h
include/geany/scintilla/Scintilla.h
@ -104,6 +105,7 @@ share/applications/geany.desktop
%%DATADIR%%/filedefs/filetypes.asciidoc
%%DATADIR%%/filedefs/filetypes.asm
%%DATADIR%%/filedefs/filetypes.batch
%%DATADIR%%/filedefs/filetypes.bibtex
%%DATADIR%%/filedefs/filetypes.c
%%DATADIR%%/filedefs/filetypes.caml
%%DATADIR%%/filedefs/filetypes.cmake
@ -149,6 +151,7 @@ share/applications/geany.desktop
%%DATADIR%%/filedefs/filetypes.ruby
%%DATADIR%%/filedefs/filetypes.rust
%%DATADIR%%/filedefs/filetypes.sh
%%DATADIR%%/filedefs/filetypes.smalltalk
%%DATADIR%%/filedefs/filetypes.sql
%%DATADIR%%/filedefs/filetypes.tcl
%%DATADIR%%/filedefs/filetypes.txt2tags
@ -241,6 +244,7 @@ share/icons/hicolor/scalable/apps/geany.svg
%%NLS%%share/locale/hi/LC_MESSAGES/geany.mo
%%NLS%%share/locale/hu/LC_MESSAGES/geany.mo
%%NLS%%share/locale/id/LC_MESSAGES/geany.mo
%%NLS%%share/locale/ie/LC_MESSAGES/geany.mo
%%NLS%%share/locale/it/LC_MESSAGES/geany.mo
%%NLS%%share/locale/ja/LC_MESSAGES/geany.mo
%%NLS%%share/locale/kk/LC_MESSAGES/geany.mo