Hello community, here is the log from the commit of package gitg for openSUSE:Factory checked in at 2019-01-24 14:13:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gitg (Old) and /work/SRC/openSUSE:Factory/.gitg.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gitg" Thu Jan 24 14:13:45 2019 rev:47 rq:667820 version:3.30.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gitg/gitg.changes 2018-03-22 12:12:36.481563785 +0100 +++ /work/SRC/openSUSE:Factory/.gitg.new.28833/gitg.changes 2019-01-24 14:13:49.387334196 +0100 @@ -1,0 +2,35 @@ +Tue Jan 22 14:34:33 UTC 2019 - Dominique Leuenberger <dims...@opensuse.org> + +- 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 - bjorn....@gmail.com + +- 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.30.1.tar.xz gitg-Bump-libgit2-glib-dependency.patch gitg-Various-meson-build-fixes.patch gitg-typelib-dependencies.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gitg.spec ++++++ --- /var/tmp/diff_new_pack.dkbpWG/_old 2019-01-24 14:13:49.819333698 +0100 +++ /var/tmp/diff_new_pack.dkbpWG/_new 2019-01-24 14:13:49.823333693 +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,27 @@ # 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.30.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.30/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gitg-Bump-libgit2-glib-dependency.patch -- Fix build with new libgit2-glib +Patch0: gitg-Bump-libgit2-glib-dependency.patch +# PATCH-FIX-UPSTREAM gitg-Various-meson-build-fixes.patch -- Various meson build fixes needed, all taken from upstream +Patch1: gitg-Various-meson-build-fixes.patch +# PATCH-FIX-OPENSUSE gitg-typelib-dependencies.patch dims...@opensuse.org -- Change the way we add library dependencies to .typelibs. openSUSE requires a full library name, incl. version +Patch2: gitg-typelib-dependencies.patch BuildRequires: fdupes BuildRequires: intltool +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -39,14 +46,13 @@ BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.10 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(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); @@ -54,7 +60,6 @@ # ./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,18 +143,20 @@ %lang_package %prep -%setup -q +%autosetup -p1 translation-update-upstream %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 +%meson_install %suse_update_desktop_file -G "Git repository viewer" %{name} RevisionControl %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_datadir} @@ -158,18 +165,12 @@ %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 %{_bindir}/gitg -%dir %{_datadir}/appdata -%{_datadir}/appdata/gitg.appdata.xml +%{_datadir}/metainfo/gitg.appdata.xml %{_datadir}/gitg/ %{_datadir}/applications/gitg.desktop %{_datadir}/glib-2.0/schemas/org.gnome.gitg.gschema.xml @@ -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.30.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/gitg/gitg-3.26.0.tar.xz /work/SRC/openSUSE:Factory/.gitg.new.28833/gitg-3.30.1.tar.xz differ: char 8, line 1 ++++++ gitg-Bump-libgit2-glib-dependency.patch ++++++ >From 42bceea265f53fe7fd4a41037b936deed975fc6c Mon Sep 17 00:00:00 2001 From: Alberto Fanjul <albertofan...@gmail.com> Date: Sun, 4 Nov 2018 03:33:21 +0100 Subject: [PATCH] meson: Bump libgit2-glib dependency --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 44a6e40f..33b82fa8 100644 --- a/meson.build +++ b/meson.build @@ -130,7 +130,7 @@ 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') -libgit2_glib_dep = dependency('libgit2-glib-1.0', version: ['>= 0.25.0', '< 0.27.0']) +libgit2_glib_dep = dependency('libgit2-glib-1.0', version: ['>= 0.27.7']) libpeas_dep = dependency('libpeas-1.0') libsecret_dep = dependency('libsecret-1') libsoup_dep = dependency('libsoup-2.4') -- 2.18.1 ++++++ gitg-Various-meson-build-fixes.patch ++++++ >From 046945a021c056dc64aebfcba9721c4395bf8d39 Mon Sep 17 00:00:00 2001 From: Alberto Fanjul <albertofan...@gmail.com> Date: Sun, 28 Oct 2018 00:05:56 +0200 Subject: [PATCH] meson: install generated files --- libgitg-ext/meson.build | 8 +++++++- libgitg/meson.build | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libgitg-ext/meson.build b/libgitg-ext/meson.build index 2750c6cd..784f36d3 100644 --- a/libgitg-ext/meson.build +++ b/libgitg-ext/meson.build @@ -49,7 +49,13 @@ libgitg_ext = shared_library( vala_gir: libgitg_ext_gir_name, link_args: common_ldflags, link_depends: symbol_map, - install: true + install: true, + install_dir: [ + true, + true, + true, + true + ] ) deps = [ diff --git a/libgitg/meson.build b/libgitg/meson.build index 8837199c..1214f3fb 100644 --- a/libgitg/meson.build +++ b/libgitg/meson.build @@ -136,7 +136,13 @@ libgitg = shared_library( vala_gir: libgitg_gir_name, link_args: ldflags, link_depends: symbol_map, - install: true + install: true, + install_dir: [ + true, + true, + true, + true + ] ) libgitg_dep = declare_dependency( -- 2.18.1 >From 849f95c33658e9a5d7d97c55e56ba9625a86a00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomarti...@gmail.com> Date: Sat, 27 Oct 2018 15:32:23 +0200 Subject: [PATCH] build: Fix shared library paths in typelib files The GObject Introspection metadata generation by meson uses a custom target command[0]. This command also needs to specify the shared library where the symbols in the typelib file can be found. However, the values used are wrong because the path to the built shared libraries are specified instead of the name of the shared libraries themselves. This has been fixed by specifying the name of the shared libraries. Fixes #157 [0] http://mesonbuild.com/Vala.html#gobject-introspection --- libgitg-ext/meson.build | 2 +- libgitg/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libgitg-ext/meson.build b/libgitg-ext/meson.build index 784f36d3..5e347e01 100644 --- a/libgitg-ext/meson.build +++ b/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.full_path(), '--includedir', libgitg_build_dir, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), libgitg_ext_gir_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)], depends: [ libgitg, libgitg_ext, diff --git a/libgitg/meson.build b/libgitg/meson.build index 1214f3fb..a3a78a0b 100644 --- a/libgitg/meson.build +++ b/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.full_path(), '--output', '@OUTPUT@', join_paths(libgitg_build_dir, libgitg_gir_name)], + command: [g_ir_compiler, '--shared-library', libgitg_api_name, '--output', '@OUTPUT@', join_paths(libgitg_build_dir, libgitg_gir_name)], depends: libgitg, install: true, install_dir: gitg_girepositorydir, -- 2.18.1 >From f0cd2c8cfacdf6906dfb1d2a42e77163cd776e3b Mon Sep 17 00:00:00 2001 From: Alberto Fanjul <albertofan...@gmail.com> Date: Sun, 4 Nov 2018 03:15:30 +0100 Subject: [PATCH] meson: Install vala header into correct location --- libgitg-ext/meson.build | 2 +- libgitg/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libgitg-ext/meson.build b/libgitg-ext/meson.build index 5e347e01..f116ba01 100644 --- a/libgitg-ext/meson.build +++ b/libgitg-ext/meson.build @@ -52,7 +52,7 @@ libgitg_ext = shared_library( install: true, install_dir: [ true, - true, + join_paths(gitg_includedir, libgitg_ext_api_name, 'libgitg-ext'), true, true ] diff --git a/libgitg/meson.build b/libgitg/meson.build index a3a78a0b..b3ff67a6 100644 --- a/libgitg/meson.build +++ b/libgitg/meson.build @@ -139,7 +139,7 @@ libgitg = shared_library( install: true, install_dir: [ true, - true, + join_paths(gitg_includedir, libgitg_api_name, 'libgitg'), true, true ] -- 2.18.1 >From c83122140a998b3026a56cb2688f5675d5180b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomarti...@gmail.com> Date: Mon, 24 Dec 2018 10:30:58 +0100 Subject: [PATCH] meson: Add libdir on gitg's rpath If `libdir` is set in a custom directory, `gitg` will not be able to find `libgitg` and `libgitg-ext`. `libdir` has been set as the `rpath` in `gitg` so when a custom `libdir` directory is used `libgitg` and `libgitg-ext` will be found. Fixes #174 --- gitg/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/gitg/meson.build b/gitg/meson.build index 53b1fa72..930f8013 100644 --- a/gitg/meson.build +++ b/gitg/meson.build @@ -134,4 +134,5 @@ executable( c_args: cflags, vala_args: vala_flags, install: true, + install_rpath: gitg_libdir, ) -- 2.18.1 ++++++ 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', '@0@.so.@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', '@0@.so.@1@'.format(libgitg_api_name, soversion), '--output', '@OUTPUT@', join_paths(libgitg_build_dir, libgitg_gir_name)], depends: libgitg, install: true, install_dir: gitg_girepositorydir,
