Index: head/devel/gitg/files/patch-libgitg_gitg-diff-view.vala
===================================================================
--- head/devel/gitg/files/patch-libgitg_gitg-diff-view.vala (revision 507530)
+++ head/devel/gitg/files/patch-libgitg_gitg-diff-view.vala (nonexistent)
@@ -1,75 +0,0 @@
-https://gitlab.gnome.org/GNOME/gitg/issues/213
-https://gitlab.gnome.org/GNOME/gitg/merge_requests/83
-
---- libgitg/gitg-diff-view.vala.orig 2019-05-23 11:02:37 UTC
-+++ libgitg/gitg-diff-view.vala
-@@ -131,8 +131,11 @@ public class Gitg.DiffView : Gtk.Grid
- get { return d_repository; }
- set {
- d_repository = value;
-- config_file = "%s/.git/config".printf(d_repository.get_workdir().get_path());
-- d_commit_details.config_file = config_file;
-+ if (d_repository!=null)
-+ {
-+ config_file = "%s/.git/config".printf(d_repository.get_workdir().get_path());
-+ d_commit_details.config_file = config_file;
-+ }
- }
- }
- public bool new_is_workdir { get; set; }
-@@ -593,34 +596,37 @@ public class Gitg.DiffView : Gtk.Grid
-
- private void read_ini_file(Gtk.TextBuffer buffer)
- {
-- GLib.KeyFile file = new GLib.KeyFile();
--
-- try
-+ if (config_file != null)
- {
-- if (file.load_from_file(config_file , GLib.KeyFileFlags.NONE))
-+ try
- {
-- foreach (string group in file.get_groups())
-+ GLib.KeyFile file = new GLib.KeyFile();
-+ if (file.load_from_file(config_file , GLib.KeyFileFlags.NONE))
- {
-- if (group.has_prefix("gitg.custom-link"))
-+ foreach (string group in file.get_groups())
- {
-- string custom_link_regexp = file.get_string (group, "regexp");
-- string custom_link_replacement = file.get_string (group, "replacement");
-- bool custom_color = file.has_key (group, "color");
-- Gdk.RGBA color = d_color_link;
-- if (custom_color)
-+ if (group.has_prefix("gitg.custom-link"))
- {
-- string custom_link_color = file.get_string (group, "color");
-- color = Gdk.RGBA();
-- color.parse(custom_link_color);
-+ string custom_link_regexp = file.get_string (group, "regexp");
-+ string custom_link_replacement = file.get_string (group, "replacement");
-+ bool custom_color = file.has_key (group, "color");
-+ Gdk.RGBA color = d_color_link;
-+ if (custom_color)
-+ {
-+ string custom_link_color = file.get_string (group, "color");
-+ color = Gdk.RGBA();
-+ color.parse(custom_link_color);
-+ }
-+ apply_link_tags(buffer, new Regex (custom_link_regexp), custom_link_replacement, color, custom_color, true);
- }
-- apply_link_tags(buffer, new Regex (custom_link_regexp), custom_link_replacement, color, custom_color, true);
- }
- }
-+ } catch (Error e)
-+ {
-+ warning ("Cannot read %s: %s", config_file, e.message);
- }
-- } catch (Error e)
-- {
-- warning ("Cannot read %s: %s", config_file, e.message);
- }
-+
- }
-
- private void auto_change_expanded(bool expanded)
Property changes on: head/devel/gitg/files/patch-libgitg_gitg-diff-view.vala
___________________________________________________________________
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: head/devel/gitg/files/patch-libgitg_gitg-repository-list-box.vala
===================================================================
--- head/devel/gitg/files/patch-libgitg_gitg-repository-list-box.vala (revision 507530)
+++ head/devel/gitg/files/patch-libgitg_gitg-repository-list-box.vala (nonexistent)
@@ -1,20 +0,0 @@
-https://gitlab.gnome.org/GNOME/gitg/issues/213
-https://gitlab.gnome.org/GNOME/gitg/merge_requests/83
-
-
---- libgitg/gitg-repository-list-box.vala.orig 2019-05-23 11:02:37 UTC
-+++ libgitg/gitg-repository-list-box.vala
-@@ -407,9 +407,12 @@ namespace Gitg
- return ((Row)b).time.compare(((Row)a).time);
- }
-
-+ [CCode (cname = "g_bookmark_file_get_uris", array_length_type = "gsize")]
-+ extern static string[] bookmark_file_get_uris (BookmarkFile bookmark);
-+
- public void populate_bookmarks()
- {
-- var uris = d_bookmark_file.get_uris();
-+ var uris = bookmark_file_get_uris(d_bookmark_file);
-
- foreach (var uri in uris)
- {
Property changes on: head/devel/gitg/files/patch-libgitg_gitg-repository-list-box.vala
___________________________________________________________________
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: head/devel/gitg/files/patch-libgitg_gitg-diff-view-commit-details.vala
===================================================================
--- head/devel/gitg/files/patch-libgitg_gitg-diff-view-commit-details.vala (revision 507530)
+++ head/devel/gitg/files/patch-libgitg_gitg-diff-view-commit-details.vala (nonexistent)
@@ -1,117 +0,0 @@
-https://gitlab.gnome.org/GNOME/gitg/issues/213
-https://gitlab.gnome.org/GNOME/gitg/merge_requests/83
-
---- libgitg/gitg-diff-view-commit-details.vala.orig 2019-05-23 11:02:37 UTC
-+++ libgitg/gitg-diff-view-commit-details.vala
-@@ -281,65 +281,69 @@ class Gitg.DiffViewCommitDetails : Gtk.Grid
-
- private string parse_ini_file(string subject_text)
- {
-- string result = subject_text.dup();
-- GLib.KeyFile file = new GLib.KeyFile();
--
-- try
-+ string result = subject_text;
-+ if (config_file!=null)
- {
-- debug ("parsing %s", config_file);
-- if (file.load_from_file(config_file , GLib.KeyFileFlags.NONE))
-+ try
- {
-- foreach (string group in file.get_groups())
-+ debug ("parsing %s", config_file);
-+ GLib.KeyFile file = new GLib.KeyFile();
-+ if (file.load_from_file(config_file , GLib.KeyFileFlags.NONE))
- {
-- if (group.has_prefix("gitg.custom-link"))
-+ result = subject_text.dup();
-+ foreach (string group in file.get_groups())
- {
-- string custom_link_regexp = file.get_string (group, "regexp");
-- string custom_link_replacement = file.get_string (group, "replacement");
-- debug ("found group: %s", custom_link_regexp);
-- bool custom_color = file.has_key (group, "color");
-- string color = null;
-- if (custom_color)
-+ if (group.has_prefix("gitg.custom-link"))
- {
-- string custom_link_color = file.get_string (group, "color");
-- color = custom_link_color;
-- }
-+ string custom_link_regexp = file.get_string (group, "regexp");
-+ string custom_link_replacement = file.get_string (group, "replacement");
-+ debug ("found group: %s", custom_link_regexp);
-+ bool custom_color = file.has_key (group, "color");
-+ string color = null;
-+ if (custom_color)
-+ {
-+ string custom_link_color = file.get_string (group, "color");
-+ color = custom_link_color;
-+ }
-
-- var custom_regex = new Regex (custom_link_regexp);
-- try
-- {
-- GLib.MatchInfo matchInfo;
-+ var custom_regex = new Regex (custom_link_regexp);
-+ try
-+ {
-+ GLib.MatchInfo matchInfo;
-
-- custom_regex.match (subject_text, 0, out matchInfo);
-+ custom_regex.match (subject_text, 0, out matchInfo);
-
-- while (matchInfo.matches ())
-- {
-- string text = matchInfo.fetch(0);
-- string link = text.dup();
-- debug ("found: %s", link);
-- if (custom_link_replacement != null)
-+ while (matchInfo.matches ())
- {
-- link = custom_regex.replace(link, text.length, 0, custom_link_replacement);
-- }
-- if (color != null) {
-- result = result.replace(text, "%s".printf(link, link, color, text));
-- } else {
-- result = result.replace(text, "%s".printf(link, link, text));
-- }
-+ string text = matchInfo.fetch(0);
-+ string link = text.dup();
-+ debug ("found: %s", link);
-+ if (custom_link_replacement != null)
-+ {
-+ link = custom_regex.replace(link, text.length, 0, custom_link_replacement);
-+ }
-+ if (color != null) {
-+ result = result.replace(text, "%s".printf(link, link, color, text));
-+ } else {
-+ result = result.replace(text, "%s".printf(link, link, text));
-+ }
-
-- matchInfo.next();
-+ matchInfo.next();
-+ }
- }
-+ catch(Error e)
-+ {
-+ }
- }
-- catch(Error e)
-- {
-- }
- }
- }
-+ } catch (Error e)
-+ {
-+ warning ("Cannot read %s %s", config_file, e.message);
- }
-- } catch (Error e)
-- {
-- warning ("Cannot read %s %s", config_file, e.message);
- }
- return result;
-+
- }
-
- private void update_avatar()
Property changes on: head/devel/gitg/files/patch-libgitg_gitg-diff-view-commit-details.vala
___________________________________________________________________
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: head/devel/gitg/Makefile
===================================================================
--- head/devel/gitg/Makefile (revision 507530)
+++ head/devel/gitg/Makefile (revision 507531)
@@ -1,58 +1,57 @@
# Created by: kipz
# $FreeBSD$
PORTNAME= gitg
-PORTVERSION= 3.32.0
-PORTREVISION= 1
+PORTVERSION= 3.32.1
CATEGORIES= devel deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= kwm@FreeBSD.org
COMMENT= GTK-based git repository viewer
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
valac:lang/vala
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libenchant.so:textproc/enchant \
libgee-0.8.so:devel/libgee \
libgit2.so:devel/libgit2 \
libgit2-glib-1.0.so:devel/libgit2-glib \
libpeas-1.0.so:devel/libpeas \
libgtkspell3-3.so:textproc/gtkspell3 \
libdazzle-1.0.so:x11-toolkits/libdazzle \
libsecret-1.so:security/libsecret
RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
CONFLICTS= gitg0-[0-9]*
PORTSCOUT= limitw:1,even
USES= compiler:c11 desktop-file-utils gettext gnome localbase \
meson pathfix pkgconfig python:3.4+,build tar:xz
USE_GNOME= cairo gtk30 gtksourceview3 intltool introspection
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
GLIB_SCHEMAS= org.gnome.gitg.gschema.xml
BINARY_ALIAS= python3=${PYTHON_VERSION}
OPTIONS_DEFINE= PYTHON
OPTIONS_SUB= yes
PYTHON_USES= python:3.2+
PYTHON_MESON_TRUE= python
PYTHON_USE= GNOME=pygobject3
post-patch:
@${REINPLACE_CMD} -e 's|0.27.0|0.28.0|g' \
${WRKSRC}/meson.build
post-install-PYTHON-on:
(cd ${STAGEDIR}${PREFIX} \
&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
.include
Index: head/devel/gitg/distinfo
===================================================================
--- head/devel/gitg/distinfo (revision 507530)
+++ head/devel/gitg/distinfo (revision 507531)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558695574
-SHA256 (gnome/gitg-3.32.0.tar.xz) = 01d9b5ac385b383f3060c5d0b8c6cd7ef6b4d6bf13a2911c385c2800d7d9faf3
-SIZE (gnome/gitg-3.32.0.tar.xz) = 10613356
+TIMESTAMP = 1564345809
+SHA256 (gnome/gitg-3.32.1.tar.xz) = 24a4aabf8a42aa2e783e1fb5996ebb3c2a82a01b9689269f1329517ef124ef5a
+SIZE (gnome/gitg-3.32.1.tar.xz) = 10613836