Hello community, here is the log from the commit of package libgit2-glib for openSUSE:Factory checked in at 2018-11-18 23:26:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgit2-glib (Old) and /work/SRC/openSUSE:Factory/.libgit2-glib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgit2-glib" Sun Nov 18 23:26:02 2018 rev:31 rq:649253 version:0.27.7 Changes: -------- --- /work/SRC/openSUSE:Factory/libgit2-glib/libgit2-glib.changes 2018-04-30 22:50:06.379797392 +0200 +++ /work/SRC/openSUSE:Factory/.libgit2-glib.new/libgit2-glib.changes 2018-11-18 23:26:07.145921646 +0100 @@ -1,0 +2,9 @@ +Wed Nov 14 08:06:04 UTC 2018 - [email protected] + +- Update to version 0.27.7 + + pkg-config pc file generation fixed + + Fix cached hunks +- Remove libgit2-glib-libgit2-0.27.0.patch: Version 0.27.7 added + support for libgit2 0.27.0 + +------------------------------------------------------------------- Old: ---- libgit2-glib-0.26.4.tar.xz libgit2-glib-libgit2-0.27.0.patch New: ---- libgit2-glib-0.27.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgit2-glib.spec ++++++ --- /var/tmp/diff_new_pack.wvyZxn/_old 2018-11-18 23:26:07.689920985 +0100 +++ /var/tmp/diff_new_pack.wvyZxn/_new 2018-11-18 23:26:07.689920985 +0100 @@ -18,15 +18,13 @@ Name: libgit2-glib -Version: 0.26.4 +Version: 0.27.7 Release: 0 Summary: GLib wrapper library around libgit2 License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ URL: https://wiki.gnome.org/Projects/Libgit2-glib -Source0: https://download.gnome.org/sources/libgit2-glib/0.26/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM libgit2-glib-libgit2-0.27.0.patch bgo#794890 [email protected] -- Fix build with libgit2 0.27.0 -Patch0: libgit2-glib-libgit2-0.27.0.patch +Source0: https://download.gnome.org/sources/libgit2-glib/0.27/%{name}-%{version}.tar.xz BuildRequires: gtk-doc BuildRequires: meson BuildRequires: pkgconfig @@ -67,9 +65,6 @@ %prep %setup -q -if pkg-config --atleast-version=0.27.0 libgit2; then -%patch0 -p1 -fi %build %meson \ ++++++ libgit2-glib-0.26.4.tar.xz -> libgit2-glib-0.27.7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgit2-glib-0.26.4/.gitignore new/libgit2-glib-0.27.7/.gitignore --- old/libgit2-glib-0.26.4/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/libgit2-glib-0.27.7/.gitignore 2018-11-04 02:51:54.000000000 +0100 @@ -0,0 +1,70 @@ +*.bak +*.lo +*.la +*.o +*.gir +*.typelib +*~ +*.stamp +.*.sw[nop] +*.gcov +.deps +.libs +Makefile +Makefile.in +/ABOUT-NLS +/aclocal.m4 +/autom4te.cache +/config.cache +/config.guess +/config.h +/config.h.in +/config.log +/config.lt +/config.rpath +/config.status +/config.status.lineno +/config.sub +/configure +/configure.lineno +/depcomp +/examples/general +/examples/walk +/gnome-doc-utils.make +/gtk-doc.make +/INSTALL +/install-sh +/intltool-extract +/intltool-extract.in +/intltool-merge +/intltool-merge.in +/intltool-update +/intltool-update.in +/libgit2-glib-1.0.pc +/libgit2-glib-*.tar.bz2 +/libgit2-glib/ggit-enum-types.c +/libgit2-glib/ggit-enum-types.h +/libtool +/ltmain.sh +/m4 +/missing +/mkinstalldirs +/omf.make +/po/*.header +/po/*.gmo +/po/*.mo +/po/*.sed +/po/*.sin +/po/.intltool-merge-cache +/po/Makefile +/po/Makefile.in +/po/Makefile.in.in +/po/Makevars.template +/po/POTFILES +/po/Rules-quot +/po/stamp-it +/py-compile +/so_locations +/stamp-h1 +/tests/repository +/xmldocs.make diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgit2-glib-0.26.4/NEWS new/libgit2-glib-0.27.7/NEWS --- old/libgit2-glib-0.26.4/NEWS 2018-03-02 10:51:47.000000000 +0100 +++ new/libgit2-glib-0.27.7/NEWS 2018-11-04 02:51:54.000000000 +0100 @@ -1,3 +1,9 @@ +News in 0.27.7 +-------------- +* pkg-config pc file generation fixed +* Compatibility with libgit2 0.27 +* Fix cached hunks + News in 0.26.4 -------------- * Make meson the official build system diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgit2-glib-0.26.4/README new/libgit2-glib-0.27.7/README --- old/libgit2-glib-0.26.4/README 2018-03-02 10:51:47.000000000 +0100 +++ new/libgit2-glib-0.27.7/README 2018-11-04 02:51:54.000000000 +0100 @@ -15,16 +15,16 @@ Installation ============ -libgit2-glib requires libgit2-0.26.x, glib 2.44.x, gio 2.26.x and +libgit2-glib requires libgit2-0.27.x, glib 2.44.x, gio 2.26.x and gobject-introspection 0.9.x. Simple install procedure: - % tar Jxf libgit2-glib-0.26.4.tar.xz # unpack the sources - % cd libgit2-glib-0.26.4 # change to the toplevel directory - % meson builddir # run meson - % ninja -C builddir # build libgit2-glib - [ Become root if necessary ] - % ninja -C builddir install # install libgit2-glib + % tar Jxf libgit2-glib-0.27.7.tar.xz # unpack the sources + % cd libgit2-glib-0.27.7 # change to the toplevel directory + % meson builddir # run meson + % ninja -C builddir # build libgit2-glib + # [ Become root if necessary ] + % ninja -C builddir install # install libgit2-glib See the file 'INSTALL' for more detailed information. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgit2-glib-0.26.4/libgit2-glib/ggit-config.c new/libgit2-glib-0.27.7/libgit2-glib/ggit-config.c --- old/libgit2-glib-0.26.4/libgit2-glib/ggit-config.c 2018-03-02 10:51:47.000000000 +0100 +++ new/libgit2-glib-0.27.7/libgit2-glib/ggit-config.c 2018-11-04 02:51:54.000000000 +0100 @@ -295,6 +295,9 @@ ret = git_config_add_file_ondisk (_ggit_native_get (config), path, (git_config_level_t)level, +#if LIBGIT2_SOVERSION >= 27 + NULL, +#endif force); g_free (path); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgit2-glib-0.26.4/libgit2-glib/ggit-diff.c new/libgit2-glib-0.27.7/libgit2-glib/ggit-diff.c --- old/libgit2-glib-0.26.4/libgit2-glib/ggit-diff.c 2018-03-02 10:51:47.000000000 +0100 +++ new/libgit2-glib-0.27.7/libgit2-glib/ggit-diff.c 2018-11-04 02:51:54.000000000 +0100 @@ -71,23 +71,60 @@ PROP_REPOSITORY }; +static void +wrapper_data_init (CallbackWrapperData *data) +{ + if (data != NULL) + { + data->cached_deltas = + g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, + (GDestroyNotify) ggit_diff_delta_unref); + + data->cached_hunks = + g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, + (GDestroyNotify) ggit_diff_hunk_unref); + } +} + static GgitDiffDelta * wrap_diff_delta_cached (CallbackWrapperData *data, const git_diff_delta *delta) { GgitDiffDelta *gdelta; + gchar *key; if (!delta) { return NULL; } - gdelta = g_hash_table_lookup (data->cached_deltas, delta); + if (delta->old_file.path != NULL) + { + key = g_strdup_printf ("%s%s", + delta->old_file.path, + git_oid_tostr_s (&delta->old_file.id)); + } + else + { + key = g_strdup_printf ("%s%s", + delta->new_file.path, + git_oid_tostr_s (&delta->new_file.id)); + } + + gdelta = g_hash_table_lookup (data->cached_deltas, key); if (!gdelta) { gdelta = _ggit_diff_delta_wrap (delta); - g_hash_table_insert (data->cached_deltas, (gpointer) delta, gdelta); + g_hash_table_insert (data->cached_deltas, key, gdelta); + } + else + { + g_free (key); } return gdelta; @@ -95,21 +132,42 @@ static GgitDiffHunk * wrap_diff_hunk_cached (CallbackWrapperData *data, + const git_diff_delta *delta, const git_diff_hunk *hunk) { GgitDiffHunk *ghunk; + gchar *key; - if (!hunk) + if (!delta || !hunk) { return NULL; } - ghunk = g_hash_table_lookup (data->cached_hunks, hunk); + if (delta->old_file.path != NULL) + { + key = g_strdup_printf ("%s%s%s", + delta->old_file.path, + git_oid_tostr_s (&delta->old_file.id), + hunk->header); + } + else + { + key = g_strdup_printf ("%s%s%s", + delta->new_file.path, + git_oid_tostr_s (&delta->new_file.id), + hunk->header); + } + + ghunk = g_hash_table_lookup (data->cached_hunks, key); if (!ghunk) { ghunk = _ggit_diff_hunk_wrap (hunk); - g_hash_table_insert (data->cached_hunks, (gpointer) hunk, ghunk); + g_hash_table_insert (data->cached_hunks, g_strdup (key), ghunk); + } + else + { + g_free (key); } return ghunk; @@ -195,7 +253,7 @@ gint ret; gdelta = wrap_diff_delta_cached (data, delta); - ghunk = wrap_diff_hunk_cached (data, hunk); + ghunk = wrap_diff_hunk_cached (data, delta, hunk); ret = data->hunk_cb (gdelta, ghunk, data->user_data); @@ -228,7 +286,7 @@ } gdelta = wrap_diff_delta_cached (data, delta); - ghunk = wrap_diff_hunk_cached (data, hunk); + ghunk = wrap_diff_hunk_cached (data, delta, hunk); gline = line == NULL ? NULL : _ggit_diff_line_wrap (line, encoding); @@ -610,11 +668,11 @@ g_return_if_fail (file_cb != NULL && binary_cb != NULL && hunk_cb != NULL && line_cb != NULL); g_return_if_fail (error == NULL || *error == NULL); + wrapper_data_init (&wrapper_data); + wrapper_data.user_data = user_data; wrapper_data.diff = diff; - wrapper_data.cached_deltas = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) ggit_diff_delta_unref); - wrapper_data.cached_hunks = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) ggit_diff_hunk_unref); if (file_cb != NULL) { @@ -678,14 +736,13 @@ g_return_if_fail (print_cb != NULL); g_return_if_fail (error == NULL || *error == NULL); + wrapper_data_init (&wrapper_data); + wrapper_data.user_data = user_data; wrapper_data.diff = diff; wrapper_data.line_cb = print_cb; - wrapper_data.cached_deltas = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) ggit_diff_delta_unref); - wrapper_data.cached_hunks = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) ggit_diff_hunk_unref); - ret = git_diff_print (_ggit_native_get (diff), (git_diff_format_t)type, ggit_diff_line_callback_wrapper, &wrapper_data); @@ -831,6 +888,8 @@ gdiff_options = _ggit_diff_options_get_diff_options (diff_options); + wrapper_data_init (&wrapper_data); + wrapper_data.user_data = user_data; if (file_cb != NULL) @@ -857,9 +916,6 @@ wrapper_data.line_cb = line_cb; } - wrapper_data.cached_deltas = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) ggit_diff_delta_unref); - wrapper_data.cached_hunks = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) ggit_diff_hunk_unref); - ret = git_diff_blobs (old_blob ? _ggit_native_get (old_blob) : NULL, old_as_path, new_blob ? _ggit_native_get (new_blob) : NULL, @@ -925,6 +981,8 @@ gdiff_options = _ggit_diff_options_get_diff_options (diff_options); + wrapper_data_init (&wrapper_data); + wrapper_data.user_data = user_data; if (buffer_len == -1) @@ -956,9 +1014,6 @@ wrapper_data.line_cb = line_cb; } - wrapper_data.cached_deltas = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) ggit_diff_delta_unref); - wrapper_data.cached_hunks = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) ggit_diff_hunk_unref); - ret = git_diff_blob_to_buffer (old_blob ? _ggit_native_get (old_blob) : NULL, old_as_path, (const gchar *) buffer, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgit2-glib-0.26.4/libgit2-glib/meson.build new/libgit2-glib-0.27.7/libgit2-glib/meson.build --- old/libgit2-glib-0.26.4/libgit2-glib/meson.build 2018-03-02 10:51:47.000000000 +0100 +++ new/libgit2-glib-0.27.7/libgit2-glib/meson.build 2018-11-04 02:51:54.000000000 +0100 @@ -220,7 +220,7 @@ description: 'libgit2-glib, a a glib wrapper library around the libgit2 git access library.', filebase: libgit2_glib_api_name, subdirs: libgit2_glib_api_name, - requires: 'libgit2 >= @0@, glib-2.0 >= @1@, gobject-2.0 >= @1@, gio-2.0 >= @1@'.format(git2_req, glib_req), + requires: ['libgit2 >= ' + git2_req, 'glib-2.0 >= ' + glib_req, 'gobject-2.0 >= ' + glib_req, 'gio-2.0 >= ' + glib_req], variables: 'exec_prefix=${prefix}', extra_cflags: extra_args ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgit2-glib-0.26.4/libgit2-glib.doap new/libgit2-glib-0.27.7/libgit2-glib.doap --- old/libgit2-glib-0.26.4/libgit2-glib.doap 2018-03-02 10:51:47.000000000 +0100 +++ new/libgit2-glib-0.27.7/libgit2-glib.doap 2018-11-04 02:51:54.000000000 +0100 @@ -11,10 +11,17 @@ GObject oriented application.</description> <download-page rdf:resource="http://download.gnome.org/sources/libgit2-glib/"; /> - <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gitg"; /> + <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/libgit2-glib/issues"; /> <maintainer> <foaf:Person> + <foaf:name>Alberto Fanjul Alonso</foaf:name> + <foaf:mbox rdf:resource="mailto:[email protected]"; /> + <gnome:userid>icq</gnome:userid> + </foaf:Person> + </maintainer> + <maintainer> + <foaf:Person> <foaf:name>Ignacio Casal Quinteiro</foaf:name> <foaf:mbox rdf:resource="mailto:[email protected]"; /> <gnome:userid>icq</gnome:userid> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgit2-glib-0.26.4/meson.build new/libgit2-glib-0.27.7/meson.build --- old/libgit2-glib-0.26.4/meson.build 2018-03-02 10:51:47.000000000 +0100 +++ new/libgit2-glib-0.27.7/meson.build 2018-11-04 02:51:54.000000000 +0100 @@ -1,5 +1,5 @@ project('libgit2-glib', 'c', - version: '0.26.4', + version: '0.27.7', default_options: [ 'buildtype=debugoptimized' ],
