Hello community, here is the log from the commit of package gitg for openSUSE:Factory checked in at 2019-06-20 18:55:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gitg (Old) and /work/SRC/openSUSE:Factory/.gitg.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gitg" Thu Jun 20 18:55:34 2019 rev:50 rq:710945 version:3.32.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gitg/gitg.changes 2019-05-28 09:42:23.229862519 +0200 +++ /work/SRC/openSUSE:Factory/.gitg.new.4811/gitg.changes 2019-06-20 18:55:58.720893359 +0200 @@ -1,0 +2,7 @@ +Tue Jun 18 21:10:05 UTC 2019 - Bjørn Lie <[email protected]> + +- Add gitg-port-to-gtksourceview4.patch: Port to gtksourceview4. + Following this patch, replace pkgconfig(gtksourceview-3.0) with + pkgconfig(gtksourceview-4) BuildRequires. + +------------------------------------------------------------------- New: ---- gitg-port-to-gtksourceview4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gitg.spec ++++++ --- /var/tmp/diff_new_pack.oITjdH/_old 2019-06-20 18:56:00.264895474 +0200 +++ /var/tmp/diff_new_pack.oITjdH/_new 2019-06-20 18:56:00.300895523 +0200 @@ -27,6 +27,8 @@ # PATCH-FIX-OPENSUSE gitg-typelib-dependencies.patch [email protected] -- Change the way we add library dependencies to .typelibs. openSUSE requires a full library name, incl. version Patch0: gitg-typelib-dependencies.patch +# PATCH-FIX-UPSTREAM gitg-port-to-gtksourceview4.patch -- Port to gtksourceview4 +Patch1: gitg-port-to-gtksourceview4.patch BuildRequires: fdupes BuildRequires: meson @@ -40,7 +42,7 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.10.1 BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gtk+-3.0) >= 3.20.0 -BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.10 +BuildRequires: pkgconfig(gtksourceview-4) >= 4.0.3 BuildRequires: pkgconfig(gtkspell3-3.0) >= 3.0.3 BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libdazzle-1.0) ++++++ gitg-port-to-gtksourceview4.patch ++++++ >From 4617a08deaa3b3e007c7e0b04c06cc7f43841a6a Mon Sep 17 00:00:00 2001 From: Martin Blanchard <[email protected]> Date: Sun, 19 May 2019 22:03:51 +0200 Subject: [PATCH] Port to GtkSourceView 4 GtkSourceView 3 isn't maintained any more. https://gitlab.gnome.org/GNOME/gitg/issues/131 --- libgitg/gitg-diff-view-file-selectable.vala | 6 +++--- meson.build | 2 +- org.gnome.gitgDevel.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libgitg/gitg-diff-view-file-selectable.vala b/libgitg/gitg-diff-view-file-selectable.vala index 369d7ae6..46673c6f 100644 --- a/libgitg/gitg-diff-view-file-selectable.vala +++ b/libgitg/gitg-diff-view-file-selectable.vala @@ -54,7 +54,7 @@ class Gitg.DiffViewFileSelectable : Object buffer.get_start_iter(out iter); - while (buffer.forward_iter_to_source_mark(ref iter, d_selection_category)) + while (buffer.forward_iter_to_source_mark(iter, d_selection_category)) { ret += iter.get_line(); } @@ -321,7 +321,7 @@ class Gitg.DiffViewFileSelectable : Object var buffer = source_view.buffer as Gtk.SourceBuffer; - if (!buffer.forward_iter_to_source_mark(ref iter, "header")) + if (!buffer.forward_iter_to_source_mark(iter, "header")) { iter.forward_to_end(); } @@ -493,7 +493,7 @@ class Gitg.DiffViewFileSelectable : Object } else { - something_selected = (buffer as Gtk.SourceBuffer).forward_iter_to_source_mark(ref iter, d_selection_category); + something_selected = (buffer as Gtk.SourceBuffer).forward_iter_to_source_mark(iter, d_selection_category); } if (something_selected != has_selection) diff --git a/meson.build b/meson.build index fada8986..7b27b8ec 100644 --- a/meson.build +++ b/meson.build @@ -132,7 +132,7 @@ gobject_introspection_dep = dependency('gobject-introspection-1.0', version: '>= gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas') gtk_dep = dependency('gtk+-3.0', version: '>= 3.20.0') gtkspell_dep = dependency('gtkspell3-3.0') -gtksourceview_dep = dependency('gtksourceview-3.0', version: '>= 3.10') +gtksourceview_dep = dependency('gtksourceview-4', version: '>= 4.0.3') libgit2_glib_dep = dependency('libgit2-glib-1.0', version: ['>= 0.27.8']) libpeas_dep = dependency('libpeas-1.0') libsecret_dep = dependency('libsecret-1') diff --git a/org.gnome.gitgDevel.json b/org.gnome.gitgDevel.json index 4349a709..08acddb2 100644 --- a/org.gnome.gitgDevel.json +++ b/org.gnome.gitgDevel.json @@ -140,7 +140,7 @@ { "type" : "git", "url" : "https://gitlab.gnome.org/GNOME/gtksourceview.git";, - "tag" : "gnome-3-24" + "tag" : "gtksourceview-4-2" } ] }, -- 2.21.0
