Hello community, here is the log from the commit of package gitg for openSUSE:Leap:15.2 checked in at 2020-02-21 10:52:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/gitg (Old) and /work/SRC/openSUSE:Leap:15.2/.gitg.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gitg" Fri Feb 21 10:52:08 2020 rev:22 rq:777436 version:3.32.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/gitg/gitg.changes 2020-01-15 15:03:17.081837004 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.gitg.new.26092/gitg.changes 2020-02-21 10:52:08.963264513 +0100 @@ -1,0 +2,96 @@ +Sat Jan 25 14:08:29 UTC 2020 - Dominique Leuenberger <[email protected]> + +- No longer recommend -lang: supplements are in use + +------------------------------------------------------------------- +Thu Jul 25 12:29:25 UTC 2019 - Bjørn Lie <[email protected]> + +- Update to version 3.32.1: + + Support repository being null. + + Allow copying file names. +- Drop gitg-repository-being-null.patch: fixed upstream. + +------------------------------------------------------------------- +Wed Jun 26 01:27:17 UTC 2019 - Dead Mozay <[email protected]> + +- Add gitg-repository-being-null.patch: Support repository being + null (boo#1137583, gl#GNOME/gitg#213). + +------------------------------------------------------------------- +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. + +------------------------------------------------------------------- +Fri May 24 13:26:30 UTC 2019 - Bjørn Lie <[email protected]> + +- Update to version 3.32.0: + + Detect links in commit messages. + + Push action with http/ssh support. + + Fix time sort mode. + + Add push support. + + Add typeahead find feature. + + Respect system fonts. + + Update submodules at clone. + + Add body to patch. + + Shorcut to open preferences. + + Honor GIT_DIR env. + + Update menus for AppMenu removal. + + Bump libgit2 to 0.27. + + Use Unicode typography in user-visible strings. + + Fix shared library paths in typelib files. + + Migrate from Intltool to Gettext. + + Meson polish. + + Removed autotools. + + Fixes in documentation. + + Fixed several deprecations. + + Misc fixes. +- Drop upstream fixed patches: + + gitg-Bump-libgit2-glib-dependency.patch. + + gitg-Various-meson-build-fixes.patch. +- Add pkgconfig(libdazzle-1.0) BuildRequires: New dependency. +- Drop intltool BuildRequires: No longer needed, nor used. + +------------------------------------------------------------------- +Sun Feb 10 14:18:48 UTC 2019 - [email protected] + +- Fix build with new translations-update-upstream. + +------------------------------------------------------------------- +Tue Jan 22 14:34:33 UTC 2019 - Dominique Leuenberger <[email protected]> + +- Add gitg-typelib-dependencies.patch: Change the way we add + library dependencies to .typelibs. openSUSE requires a full + library name, incl. version. + +------------------------------------------------------------------- +Fri Jan 4 23:26:56 UTC 2019 - [email protected] + +- Update to version 3.30.1: + + Meson improvements. + + Fix parsing title and body for message commit. + + Search repositories ignoring case. + + Added standalone mode. + + Allow to config patience algorithm. + + GUI improvements. + + Removed autotools buildsystem. + + Fixed mac compilation. + + Misc fixes. +- Changes from version 3.30.0: + + Detect dark theme from its background color. + + Buildsystem meson added. + + Added flatpak deployments. + + Updated translations. + + Misc fixes. +- Switch to meson buildsystem, add meson BuildRequires and macros. +- Add gitg-Bump-libgit2-glib-dependency.patch: Fix build with new + libgit2-glib, following this drop pkgconfig(libgit2-glib-1.0) + BuildConflicts: No longer needed nor valid. +- Add gitg-Various-meson-build-fixes.patch: Various meson build + fixes needed, all taken from upstream. +- Drop post(un) handling of glib2_gsettings_schema_post(un) and + glib2_gsettings_schema_requires, no longer needed. + +------------------------------------------------------------------- Old: ---- gitg-3.26.0.tar.xz New: ---- gitg-3.32.1.tar.xz gitg-port-to-gtksourceview4.patch gitg-typelib-dependencies.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gitg.spec ++++++ --- /var/tmp/diff_new_pack.q5yVr3/_old 2020-02-21 10:52:09.435265477 +0100 +++ /var/tmp/diff_new_pack.q5yVr3/_new 2020-02-21 10:52:09.439265486 +0100 @@ -1,7 +1,7 @@ # # spec file for package gitg # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,20 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: gitg -Version: 3.26.0 +Version: 3.32.1 Release: 0 Summary: Git repository viewer License: GPL-2.0-or-later Group: Development/Tools/Version Control -URL: http://trac.novowork.com/gitg/ -Source0: https://download.gnome.org/sources/gitg/3.26/%{name}-%{version}.tar.xz +URL: https://wiki.gnome.org/Apps/Gitg +Source0: https://download.gnome.org/sources/gitg/3.32/%{name}-%{version}.tar.xz + +# 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: intltool +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -36,25 +42,23 @@ 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(libgit2-glib-1.0) >= 0.26.0 +BuildRequires: pkgconfig(libdazzle-1.0) +BuildRequires: pkgconfig(libgit2-glib-1.0) >= 0.27.7 BuildRequires: pkgconfig(libpeas-1.0) >= 1.5.0 BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 1.5.0 BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libxml-2.0) >= 2.9.0 BuildRequires: pkgconfig(pygobject-3.0) >= 3.0.0 -BuildConflicts: pkgconfig(libgit2-glib-1.0) >= 0.27.0 #BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.2 # Those dependencies cannot (yet) be auto-detected, as they are actually compiled inside a binary... # ./gitg-3.16.1/gitg/gitg-plugins-engine.vala: repo.require("Peas", "1.0", 0); Requires: typelib-1_0-Peas-1_0 # ./gitg-3.16.1/gitg/gitg-plugins-engine.vala: repo.require("PeasGtk", "1.0", 0); Requires: typelib-1_0-PeasGtk-1_0 -Recommends: %{name}-lang -%glib2_gsettings_schema_requires %description gitg is a GitX clone for GNOME/gtk+. It aims at being a small, fast and @@ -138,19 +142,22 @@ %lang_package %prep -%setup -q -translation-update-upstream +%autosetup -p1 +sed -i 's/\[.*\]//g' po/POTFILES.in +translation-update-upstream po gitg %build -%configure --disable-static \ - --enable-glade-catalog \ - --disable-maintainer-mode -make %{?_smp_mflags} +%meson \ + -Dglade_catalog=true \ + -Dpython=true \ + -Ddeprecations=false \ + -Ddocs=false \ + %{nil} +%meson_build %install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print -%suse_update_desktop_file -G "Git repository viewer" %{name} RevisionControl +%meson_install +%suse_update_desktop_file -G "Git repository viewer" org.gnome.gitg RevisionControl %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_datadir} @@ -158,20 +165,14 @@ %postun -n libgitg-1_0-0 -p /sbin/ldconfig %post -n libgitg-ext-1_0-0 -p /sbin/ldconfig %postun -n libgitg-ext-1_0-0 -p /sbin/ldconfig -%post -%glib2_gsettings_schema_post - -%postun -%glib2_gsettings_schema_postun %files %license COPYING -%doc AUTHORS README NEWS +%doc AUTHORS README.md NEWS %{_bindir}/gitg -%dir %{_datadir}/appdata -%{_datadir}/appdata/gitg.appdata.xml +%{_datadir}/metainfo/org.gnome.gitg.appdata.xml %{_datadir}/gitg/ -%{_datadir}/applications/gitg.desktop +%{_datadir}/applications/org.gnome.gitg.desktop %{_datadir}/glib-2.0/schemas/org.gnome.gitg.gschema.xml %{_datadir}/icons/hicolor/ %{_libdir}/gitg/ @@ -205,7 +206,7 @@ %{_libdir}/pkgconfig/libgitg-ext-1.0.pc %files -n python3-GitgExt -%{python3_sitearch}/gi/overrides/ +%{python3_sitelib}/gi/ %files lang -f %{name}.lang ++++++ gitg-3.26.0.tar.xz -> gitg-3.32.1.tar.xz ++++++ /work/SRC/openSUSE:Leap:15.2/gitg/gitg-3.26.0.tar.xz /work/SRC/openSUSE:Leap:15.2/.gitg.new.26092/gitg-3.32.1.tar.xz differ: char 25, line 1 ++++++ 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 ++++++ gitg-typelib-dependencies.patch ++++++ Index: gitg-3.30.1/libgitg-ext/meson.build =================================================================== --- gitg-3.30.1.orig/libgitg-ext/meson.build +++ gitg-3.30.1/libgitg-ext/meson.build @@ -114,7 +114,7 @@ endif custom_target( libgitg_ext_typelib_name, output: libgitg_ext_typelib_name, - command: [g_ir_compiler, '--shared-library', libgitg_ext_api_name, '--includedir', libgitg_build_dir, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), libgitg_ext_gir_name)], + command: [g_ir_compiler, '--shared-library', '@[email protected].@1@'.format(libgitg_ext_api_name, soversion), '--includedir', libgitg_build_dir, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), libgitg_ext_gir_name)], depends: [ libgitg, libgitg_ext, Index: gitg-3.30.1/libgitg/meson.build =================================================================== --- gitg-3.30.1.orig/libgitg/meson.build +++ gitg-3.30.1/libgitg/meson.build @@ -167,7 +167,7 @@ pkg.generate( custom_target( libgitg_typelib_name, output: libgitg_typelib_name, - command: [g_ir_compiler, '--shared-library', libgitg_api_name, '--output', '@OUTPUT@', join_paths(libgitg_build_dir, libgitg_gir_name)], + command: [g_ir_compiler, '--shared-library', '@[email protected].@1@'.format(libgitg_api_name, soversion), '--output', '@OUTPUT@', join_paths(libgitg_build_dir, libgitg_gir_name)], depends: libgitg, install: true, install_dir: gitg_girepositorydir,
