Date: Sat, 6 Jul 2019 08:05:03 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505961 - in head/devel/gitg: . files Message-ID: <201907060805.x66853cm076777@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sat Jul 6 08:05:03 2019 New Revision: 505961 URL: https://svnweb.freebsd.org/changeset/ports/505961 Log: Update gitg to 3.32.0. * Add patches to fix segfaults at start when no repository is selected. Obtained from: gitg upstream git [1] Added: head/devel/gitg/files/patch-libgitg_gitg-diff-view-commit-details.vala (contents, props changed) head/devel/gitg/files/patch-libgitg_gitg-diff-view.vala (contents, props changed) Modified: head/devel/gitg/Makefile head/devel/gitg/distinfo head/devel/gitg/files/patch-libgitg_gitg-repository-list-box.vala head/devel/gitg/pkg-plist Modified: head/devel/gitg/Makefile ============================================================================== --- head/devel/gitg/Makefile Sat Jul 6 07:59:54 2019 (r505960) +++ head/devel/gitg/Makefile Sat Jul 6 08:05:03 2019 (r505961) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= gitg -PORTVERSION= 3.30.1 -PORTREVISION= 2 +PORTVERSION= 3.32.0 CATEGORIES= devel deskutils gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome3 +DIST_SUBDIR= gnome MAINTAINER= kwm@FreeBSD.org COMMENT= GTK-based git repository viewer @@ -23,6 +22,7 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ 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 Modified: head/devel/gitg/distinfo ============================================================================== --- head/devel/gitg/distinfo Sat Jul 6 07:59:54 2019 (r505960) +++ head/devel/gitg/distinfo Sat Jul 6 08:05:03 2019 (r505961) @@ -1,3 +1,3 @@ -TIMESTAMP = 1543786956 -SHA256 (gnome3/gitg-3.30.1.tar.xz) = 5a0b9b44aa3b67f6376c8e91e41e750cfaf53780b26da50139d3501c55c0e8bb -SIZE (gnome3/gitg-3.30.1.tar.xz) = 10555888 +TIMESTAMP = 1558695574 +SHA256 (gnome/gitg-3.32.0.tar.xz) = 01d9b5ac385b383f3060c5d0b8c6cd7ef6b4d6bf13a2911c385c2800d7d9faf3 +SIZE (gnome/gitg-3.32.0.tar.xz) = 10613356 Added: head/devel/gitg/files/patch-libgitg_gitg-diff-view-commit-details.vala ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gitg/files/patch-libgitg_gitg-diff-view-commit-details.vala Sat Jul 6 08:05:03 2019 (r505961) @@ -0,0 +1,117 @@ +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, "<a href=\"%s\" title=\"%s\" style=\"color:%s\">%s</a>".printf(link, link, color, text)); +- } else { +- result = result.replace(text, "<a href=\"%s\" title=\"%s\">%s</a>".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, "<a href=\"%s\" title=\"%s\" style=\"color:%s\">%s</a>".printf(link, link, color, text)); ++ } else { ++ result = result.replace(text, "<a href=\"%s\" title=\"%s\">%s</a>".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() Added: head/devel/gitg/files/patch-libgitg_gitg-diff-view.vala ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gitg/files/patch-libgitg_gitg-diff-view.vala Sat Jul 6 08:05:03 2019 (r505961) @@ -0,0 +1,75 @@ +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) Modified: head/devel/gitg/files/patch-libgitg_gitg-repository-list-box.vala ============================================================================== --- head/devel/gitg/files/patch-libgitg_gitg-repository-list-box.vala Sat Jul 6 07:59:54 2019 (r505960) +++ head/devel/gitg/files/patch-libgitg_gitg-repository-list-box.vala Sat Jul 6 08:05:03 2019 (r505961) @@ -1,7 +1,8 @@ -# gitg crash on exit if built with -fstack-protector-all -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234607 -# https://gitlab.gnome.org/GNOME/gitg/issues/171 ---- libgitg/gitg-repository-list-box.vala +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); Modified: head/devel/gitg/pkg-plist ============================================================================== --- head/devel/gitg/pkg-plist Sat Jul 6 07:59:54 2019 (r505960) +++ head/devel/gitg/pkg-plist Sat Jul 6 08:05:03 2019 (r505961) @@ -1,4 +1,6 @@ bin/gitg +include/libgitg-1.0/libgitg/libgitg.h +include/libgitg-ext-1.0/libgitg-ext/libgitg-ext.h lib/girepository-1.0/Gitg-1.0.typelib lib/girepository-1.0/GitgExt-1.0.typelib lib/gitg/plugins/diff.plugin @@ -16,16 +18,18 @@ lib/libgitg-ext-1.0.so.0.0.0 libdata/pkgconfig/libgitg-1.0.pc libdata/pkgconfig/libgitg-ext-1.0.pc man/man1/gitg.1.gz -share/applications/gitg.desktop +share/applications/org.gnome.gitg.desktop +share/gir-1.0/Gitg-1.0.gir +share/gir-1.0/GitgExt-1.0.gir %%DATADIR%%/icons/hicolor/scalable/actions/diff-symbolic.svg share/glade/catalogs/gitg-glade.xml -share/icons/hicolor/16x16/apps/gitg.png -share/icons/hicolor/22x22/apps/gitg.png -share/icons/hicolor/24x24/apps/gitg.png -share/icons/hicolor/256x256/apps/gitg.png -share/icons/hicolor/32x32/apps/gitg.png -share/icons/hicolor/48x48/apps/gitg.png -share/icons/hicolor/scalable/apps/gitg-symbolic.svg +share/icons/hicolor/16x16/apps/org.gnome.gitg.png +share/icons/hicolor/22x22/apps/org.gnome.gitg.png +share/icons/hicolor/24x24/apps/org.gnome.gitg.png +share/icons/hicolor/256x256/apps/org.gnome.gitg.png +share/icons/hicolor/32x32/apps/org.gnome.gitg.png +share/icons/hicolor/48x48/apps/org.gnome.gitg.png +share/icons/hicolor/scalable/apps/org.gnome.gitg-symbolic.svg share/locale/as/LC_MESSAGES/gitg.mo share/locale/bg/LC_MESSAGES/gitg.mo share/locale/bs/LC_MESSAGES/gitg.mo @@ -74,4 +78,6 @@ share/locale/vi/LC_MESSAGES/gitg.mo share/locale/zh_CN/LC_MESSAGES/gitg.mo share/locale/zh_HK/LC_MESSAGES/gitg.mo share/locale/zh_TW/LC_MESSAGES/gitg.mo -share/metainfo/gitg.appdata.xml +share/metainfo/org.gnome.gitg.appdata.xml +share/vala/vapi/libgitg-1.0.vapi +share/vala/vapi/libgitg-ext-1.0.vapi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907060805.x66853cm076777>