r46445 - in /packages/unstable/gnome-builder/debian/patches: ./ git_new-project-dialog-use-new-fetch-opt.patch git_pass-NULL-to-the-new-binary-callback.patch git_track-libgit-ABI-breakages.patch series
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Sun Oct 11 11:14:06 UTC 2015
Author: ah
Date: Sun Oct 11 11:14:06 2015
New Revision: 46445
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46445
Log:
Add patches from upstream git to build against new libgit2 API
Added:
packages/unstable/gnome-builder/debian/patches/
packages/unstable/gnome-builder/debian/patches/git_new-project-dialog-use-new-fetch-opt.patch
packages/unstable/gnome-builder/debian/patches/git_pass-NULL-to-the-new-binary-callback.patch
packages/unstable/gnome-builder/debian/patches/git_track-libgit-ABI-breakages.patch
packages/unstable/gnome-builder/debian/patches/series
Added: packages/unstable/gnome-builder/debian/patches/git_new-project-dialog-use-new-fetch-opt.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/git_new-project-dialog-use-new-fetch-opt.patch?rev=46445&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/git_new-project-dialog-use-new-fetch-opt.patch (added)
+++ packages/unstable/gnome-builder/debian/patches/git_new-project-dialog-use-new-fetch-opt.patch [utf-8] Sun Oct 11 11:14:06 2015
@@ -0,0 +1,51 @@
+From 31a64d94369d21bfe9dd890e0e8412361c49563d Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <icq at gnome.org>
+Date: Fri, 17 Jul 2015 12:04:50 +0200
+Subject: new-project-dialog: use the new fetch options to add the remote
+ callbacks
+
+---
+ src/dialogs/gb-new-project-dialog.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/src/dialogs/gb-new-project-dialog.c b/src/dialogs/gb-new-project-dialog.c
+index f011e34..dfa7e91 100644
+--- a/src/dialogs/gb-new-project-dialog.c
++++ b/src/dialogs/gb-new-project-dialog.c
+@@ -188,6 +188,7 @@ gb_new_project_dialog__clone_worker (GTask *task,
+ g_autoptr(GFile) workdir = NULL;
+ CloneRequest *req = task_data;
+ GgitCloneOptions *clone_options;
++ GgitFetchOptions *fetch_options;
+ GgitRemoteCallbacks *callbacks;
+ IdeProgress *progress;
+ GError *error = NULL;
+@@ -197,16 +198,20 @@ gb_new_project_dialog__clone_worker (GTask *task,
+ g_assert (req != NULL);
+ g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
+
+- clone_options = ggit_clone_options_new ();
+- ggit_clone_options_set_is_bare (clone_options, FALSE);
+- ggit_clone_options_set_checkout_branch (clone_options, "master");
+-
+ callbacks = g_object_new (IDE_TYPE_GIT_REMOTE_CALLBACKS, NULL);
+ progress = ide_git_remote_callbacks_get_progress (IDE_GIT_REMOTE_CALLBACKS (callbacks));
+ g_object_bind_property (progress, "fraction",
+ self->clone_progress, "fraction",
+ G_BINDING_SYNC_CREATE);
+- ggit_clone_options_set_remote_callbacks (clone_options, callbacks);
++
++ fetch_options = ggit_fetch_options_new ();
++ ggit_fetch_options_set_remote_callbacks (fetch_options, callbacks);
++
++ clone_options = ggit_clone_options_new ();
++ ggit_clone_options_set_is_bare (clone_options, FALSE);
++ ggit_clone_options_set_checkout_branch (clone_options, "master");
++ ggit_clone_options_set_fetch_options (clone_options, fetch_options);
++ ggit_fetch_options_free (fetch_options);
+
+ repository = ggit_repository_clone (req->uri, req->location, clone_options, &error);
+
+--
+cgit v0.11.2
+
Added: packages/unstable/gnome-builder/debian/patches/git_pass-NULL-to-the-new-binary-callback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/git_pass-NULL-to-the-new-binary-callback.patch?rev=46445&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/git_pass-NULL-to-the-new-binary-callback.patch (added)
+++ packages/unstable/gnome-builder/debian/patches/git_pass-NULL-to-the-new-binary-callback.patch [utf-8] Sun Oct 11 11:14:06 2015
@@ -0,0 +1,25 @@
+From f77c428772273db365bba4d21b6913196b7947ad Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <icq at gnome.org>
+Date: Fri, 17 Jul 2015 11:58:34 +0200
+Subject: git: pass NULL to the new binary callback
+
+---
+ libide/git/ide-git-buffer-change-monitor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libide/git/ide-git-buffer-change-monitor.c b/libide/git/ide-git-buffer-change-monitor.c
+index a6a306d..7763c76 100644
+--- a/libide/git/ide-git-buffer-change-monitor.c
++++ b/libide/git/ide-git-buffer-change-monitor.c
+@@ -618,7 +618,7 @@ ide_git_buffer_change_monitor_calculate_threaded (IdeGitBufferChangeMonitor *se
+ data = g_bytes_get_data (diff->content, &data_len);
+
+ ggit_diff_blob_to_buffer (diff->blob, relative_path, data, data_len, relative_path,
+- NULL, NULL, NULL, diff_line_cb, (gpointer)diff->state, error);
++ NULL, NULL, NULL, NULL, diff_line_cb, (gpointer)diff->state, error);
+
+ return ((*error) == NULL);
+ }
+--
+cgit v0.11.2
+
Added: packages/unstable/gnome-builder/debian/patches/git_track-libgit-ABI-breakages.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/git_track-libgit-ABI-breakages.patch?rev=46445&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/git_track-libgit-ABI-breakages.patch (added)
+++ packages/unstable/gnome-builder/debian/patches/git_track-libgit-ABI-breakages.patch [utf-8] Sun Oct 11 11:14:06 2015
@@ -0,0 +1,56 @@
+From 870b2d2c41328092447540d4aae52c12ac1e1fcc Mon Sep 17 00:00:00 2001
+From: Mohan R <mohan43u at gmail.com>
+Date: Sat, 8 Aug 2015 04:22:00 +0000
+Subject: git: track libgit2/libgit2-glib ABI breakages
+
+https://bugzilla.gnome.org/show_bug.cgi?id=753375
+---
+ configure.ac | 2 +-
+ src/dialogs/gb-new-project-dialog.c | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 54062c0..a81b5f3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,7 +145,7 @@ dnl ***********************************************************************
+ m4_define([gtk_required_version], [3.16.1])
+ m4_define([glib_required_version], [2.44.0])
+ m4_define([gtksourceview_required_version], [3.16.1])
+-m4_define([ggit_required_version], [0.22.6])
++m4_define([ggit_required_version], [0.23.4])
+ m4_define([gjs_required_version], [1.42.0])
+ m4_define([pygobject_required_version], [3.0.0])
+ m4_define([devhelp_required_version], [3.16.0])
+diff --git a/src/dialogs/gb-new-project-dialog.c b/src/dialogs/gb-new-project-dialog.c
+index dfa7e91..8f205a9 100644
+--- a/src/dialogs/gb-new-project-dialog.c
++++ b/src/dialogs/gb-new-project-dialog.c
+@@ -211,12 +211,12 @@ gb_new_project_dialog__clone_worker (GTask *task,
+ ggit_clone_options_set_is_bare (clone_options, FALSE);
+ ggit_clone_options_set_checkout_branch (clone_options, "master");
+ ggit_clone_options_set_fetch_options (clone_options, fetch_options);
+- ggit_fetch_options_free (fetch_options);
++ g_clear_pointer (&fetch_options, ggit_fetch_options_free);
+
+ repository = ggit_repository_clone (req->uri, req->location, clone_options, &error);
+
+- g_object_unref (callbacks);
+- ggit_clone_options_free (clone_options);
++ g_clear_object (&callbacks);
++ g_clear_object (&clone_options);
+
+ if (repository == NULL)
+ {
+@@ -227,7 +227,7 @@ gb_new_project_dialog__clone_worker (GTask *task,
+ workdir = ggit_repository_get_workdir (repository);
+ g_task_return_pointer (task, g_object_ref (workdir), g_object_unref);
+
+- g_object_unref (repository);
++ g_clear_object (&repository);
+ }
+
+ static void
+--
+cgit v0.11.2
+
Added: packages/unstable/gnome-builder/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/series?rev=46445&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/series (added)
+++ packages/unstable/gnome-builder/debian/patches/series [utf-8] Sun Oct 11 11:14:06 2015
@@ -0,0 +1,3 @@
+git_pass-NULL-to-the-new-binary-callback.patch
+git_new-project-dialog-use-new-fetch-opt.patch
+git_track-libgit-ABI-breakages.patch
More information about the pkg-gnome-commits
mailing list