Attachment 170261 Details for Bug 209490 – Update diff

[patch] Update diff

geany.diff (text/plain), 10.06 KB, created by Guido Falsi on 2016-05-13 22:08:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2016-05-13 22:08:10 UTC

Size: 10.06 KB

patch

obsolete

>Index: devel/Makefile
>===================================================================
>--- devel/Makefile	(revision 415115)
>+++ devel/Makefile	(working copy)
>@@ -618,6 +618,7 @@
>     SUBDIR += geany-plugin-git-changebar
>     SUBDIR += geany-plugin-insertnum
>     SUBDIR += geany-plugin-latex
>+    SUBDIR += geany-plugin-lineoperations
>     SUBDIR += geany-plugin-lipsum
>     SUBDIR += geany-plugin-lua
>     SUBDIR += geany-plugin-macro
>Index: devel/geany/Makefile
>===================================================================
>--- devel/geany/Makefile	(revision 415115)
>+++ devel/geany/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	geany
>-PORTVERSION=	1.25
>+PORTVERSION=	1.27
> CATEGORIES=	devel editors
> MASTER_SITES=	http://download.geany.org/ SF
> 
>Index: devel/geany/distinfo
>===================================================================
>--- devel/geany/distinfo	(revision 415115)
>+++ devel/geany/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (geany-1.25.tar.bz2) = 8ee41da28cead8c94d433e616d7ababa81727c63e9196ca6758ade3af14a49ef
>-SIZE (geany-1.25.tar.bz2) = 4149876
>+TIMESTAMP = 1463152025
>+SHA256 (geany-1.27.tar.bz2) = 846ff699a5944c5c3c068ae0199d4c13946a668bfc6d03f8c79765667c20cadf
>+SIZE (geany-1.27.tar.bz2) = 4303534
>Index: devel/geany/pkg-plist
>===================================================================
>--- devel/geany/pkg-plist	(revision 415115)
>+++ devel/geany/pkg-plist	(working copy)
>@@ -20,6 +20,7 @@
> include/geany/prefs.h
> include/geany/project.h
> include/geany/scintilla/SciLexer.h
>+include/geany/scintilla/Sci_Position.h
> include/geany/scintilla/Scintilla.h
> include/geany/scintilla/Scintilla.iface
> include/geany/scintilla/ScintillaWidget.h
>@@ -29,6 +30,7 @@
> include/geany/stash.h
> include/geany/support.h
> include/geany/symbols.h
>+include/geany/tagmanager/tm_parser.h
> include/geany/tagmanager/tm_source_file.h
> include/geany/tagmanager/tm_tag.h
> include/geany/tagmanager/tm_tagmanager.h
>Index: devel/geany-plugin-geanypy/pkg-plist
>===================================================================
>--- devel/geany-plugin-geanypy/pkg-plist	(revision 415115)
>+++ devel/geany-plugin-geanypy/pkg-plist	(working copy)
>@@ -1,12 +1,11 @@
> lib/geany/geanypy.so
>+lib/geany/console.py
>+lib/geany/demo.py
>+lib/geany/hello.py
> lib/geany/geanypy/geany/__init__.py
> lib/geany/geanypy/geany/__init__.pyc
> lib/geany/geanypy/geany/console.py
> lib/geany/geanypy/geany/console.pyc
>-lib/geany/geanypy/geany/loader.py
>-lib/geany/geanypy/geany/loader.pyc
>-lib/geany/geanypy/geany/manager.py
>-lib/geany/geanypy/geany/manager.pyc
> lib/geany/geanypy/geany/plugin.py
> lib/geany/geanypy/geany/plugin.pyc
> lib/geany/geanypy/geany/signalmanager.py
>@@ -16,6 +15,3 @@
> %%PORTDOCS%%%%DOCSDIR%%/geanypy/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/geanypy/NEWS
> %%PORTDOCS%%%%DOCSDIR%%/geanypy/README
>-share/geany/geanypy/plugins/console.py
>-share/geany/geanypy/plugins/demo.py
>-share/geany/geanypy/plugins/hello.py
>Index: devel/geany-plugin-geniuspaste/pkg-plist
>===================================================================
>--- devel/geany-plugin-geniuspaste/pkg-plist	(revision 415115)
>+++ devel/geany-plugin-geniuspaste/pkg-plist	(working copy)
>@@ -1,4 +1,11 @@
> lib/geany/geniuspaste.so
>+%%DATADIR%%/geniuspaste/pastebins/codepad.org.conf
>+%%DATADIR%%/geniuspaste/pastebins/dpaste.de.conf
>+%%DATADIR%%/geniuspaste/pastebins/fpaste.org.conf
>+%%DATADIR%%/geniuspaste/pastebins/paste.debian.net.conf
>+%%DATADIR%%/geniuspaste/pastebins/pastebin.geany.org.conf
>+%%DATADIR%%/geniuspaste/pastebins/sprunge.us.conf
>+%%DATADIR%%/geniuspaste/pastebins/tinypaste.com.conf
> %%DOCSDIR%%/geniuspaste/AUTHORS
> %%DOCSDIR%%/geniuspaste/COPYING
> %%DOCSDIR%%/geniuspaste/ChangeLog
>Index: devel/geany-plugin-git-changebar/files/patch-libgit023
>===================================================================
>--- devel/geany-plugin-git-changebar/files/patch-libgit023	(revision 415115)
>+++ devel/geany-plugin-git-changebar/files/patch-libgit023	(nonexistent)
>@@ -1,38 +0,0 @@
>-commit 37aa25a1a4508c3d7559c0a2d00663b9c8d322c6
>-Author: Colomban Wendling <ban@herbesfolles.org>
>-Date:   Thu Sep 10 14:29:14 2015 +0200
>-
>-    git-changebar: Add support for libgit2 >= 0.23
>-    
>-    Closes #283.
>-
>-diff --git git-changebar/src/gcb-plugin.c git-changebar/src/gcb-plugin.c
>-index 81393c2..6f42a3e 100644
>---- git-changebar/src/gcb-plugin.c
>-+++ git-changebar/src/gcb-plugin.c
>-@@ -36,6 +36,15 @@
>- # define git_libgit2_init     git_threads_init
>- # define git_libgit2_shutdown git_threads_shutdown
>- #endif
>-+#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23
>-+/* 0.23 added @p binary_cb */
>-+# define git_diff_buffers(old_buffer, old_len, old_as_path, \
>-+                          new_buffer, new_len, new_as_path, options, \
>-+                          file_cb, binary_cb, hunk_cb, line_cb, payload) \
>-+  git_diff_buffers (old_buffer, old_len, old_as_path, \
>-+                    new_buffer, new_len, new_as_path, options, \
>-+                    file_cb, hunk_cb, line_cb, payload)
>-+#endif
>- 
>- 
>- GeanyPlugin      *geany_plugin;
>-@@ -656,7 +665,8 @@ diff_buf_to_doc (const git_buf   *old_buf,
>-   opts.flags = GIT_DIFF_FORCE_TEXT;
>-   
>-   ret = git_diff_buffers (old_buf->ptr, old_buf->size, NULL,
>--                          buf, len, NULL, &opts, NULL, hunk_cb, NULL, payload);
>-+                          buf, len, NULL, &opts, NULL, NULL, hunk_cb, NULL,
>-+                          payload);
>-   
>-   if (free_buf) {
>-     g_free (buf);
>
>Property changes on: devel/geany-plugin-git-changebar/files/patch-libgit023
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/geany-plugin-lineoperations/Makefile
>===================================================================
>--- devel/geany-plugin-lineoperations/Makefile	(nonexistent)
>+++ devel/geany-plugin-lineoperations/Makefile	(working copy)
>@@ -0,0 +1,11 @@
>+# $FreeBSD$
>+
>+PORTNAME=	geany-plugin-lineoperations
>+PORTVERSION=	${GEANY_VER}
>+CATEGORIES=	devel
>+
>+MAINTAINER=	makc@FreeBSD.org
>+COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
>+
>+.include "${.CURDIR}/../geany-plugins/files/Makefile.common"
>+.include <bsd.port.mk>
>
>Property changes on: devel/geany-plugin-lineoperations/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/geany-plugin-lineoperations/pkg-descr
>===================================================================
>--- devel/geany-plugin-lineoperations/pkg-descr	(nonexistent)
>+++ devel/geany-plugin-lineoperations/pkg-descr	(working copy)
>@@ -0,0 +1,4 @@
>+Line Operations is an assortment of simple line functions that can
>+be applied to an open file.
>+
>+WWW: http://plugins.geany.org/lineoperations.html
>
>Property changes on: devel/geany-plugin-lineoperations/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/geany-plugin-lineoperations/pkg-plist
>===================================================================
>--- devel/geany-plugin-lineoperations/pkg-plist	(nonexistent)
>+++ devel/geany-plugin-lineoperations/pkg-plist	(working copy)
>@@ -0,0 +1,6 @@
>+lib/geany/lineoperations.so
>+%%DOCSDIR%%/lineoperations/AUTHORS
>+%%DOCSDIR%%/lineoperations/COPYING
>+%%DOCSDIR%%/lineoperations/ChangeLog
>+%%DOCSDIR%%/lineoperations/NEWS
>+%%DOCSDIR%%/lineoperations/README
>
>Property changes on: devel/geany-plugin-lineoperations/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/geany-plugins/distinfo
>===================================================================
>--- devel/geany-plugins/distinfo	(revision 415115)
>+++ devel/geany-plugins/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (geany-plugins-1.25.tar.bz2) = 5c13ac1e173284462248ed2faae389a72364c5aa1538de628d2aaa7d286e244b
>-SIZE (geany-plugins-1.25.tar.bz2) = 3230888
>+TIMESTAMP = 1463152201
>+SHA256 (geany-plugins-1.27.tar.bz2) = 03195a0b7a361ddb2ee4138f46fa87b6d9b9801ff00657456ab9c8b8908c0ce0
>+SIZE (geany-plugins-1.27.tar.bz2) = 3196783
>Index: devel/geany-plugins/files/bsd.geany-plugins.mk
>===================================================================
>--- devel/geany-plugins/files/bsd.geany-plugins.mk	(revision 415115)
>+++ devel/geany-plugins/files/bsd.geany-plugins.mk	(working copy)
>@@ -1,6 +1,6 @@
> # $FreeBSD$
> 
>-GEANY_VER=	1.25
>+GEANY_VER=	1.27
> GEANY_PLUGINS_ALL=	addons \
> 			autoclose \
> 			automark \
>@@ -18,6 +18,7 @@
> 			git-changebar \
> 			insertnum \
> 			latex \
>+			lineoperations \
> 			lipsum \
> 			lua \
> 			macro \
>@@ -60,6 +61,7 @@
> git-changebar_DESC=	highlight changed files tracked with Git
> insertnum_DESC=		replace selection with integer numbers
> latex_DESC=		LaTeX support
>+lineoperations_DESC=	Simple line functions that can be applied to an open file
> lipsum_DESC=		Lorem Ipsum generator
> lua_DESC=		Lua scripting
> macro_DESC=		user defined macros
>Index: devel/geany-plugins-l10n/pkg-plist
>===================================================================
>--- devel/geany-plugins-l10n/pkg-plist	(revision 415115)
>+++ devel/geany-plugins-l10n/pkg-plist	(working copy)
>@@ -7,6 +7,7 @@
> share/locale/gl/LC_MESSAGES/geany-plugins.mo
> share/locale/it/LC_MESSAGES/geany-plugins.mo
> share/locale/ja/LC_MESSAGES/geany-plugins.mo
>+share/locale/kk/LC_MESSAGES/geany-plugins.mo
> share/locale/nl/LC_MESSAGES/geany-plugins.mo
> share/locale/pt/LC_MESSAGES/geany-plugins.mo
> share/locale/pt_BR/LC_MESSAGES/geany-plugins.mo

Flags:

madpilot: maintainer-approval? (makc)

Actions: View | Diff

Attachments on bug 209490: 170261