Backport fixes for API changes in libgit2-glib, #537232

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 160 insertions, 13 deletions

diff --git a/dev-vcs/gitg/ChangeLog b/dev-vcs/gitg/ChangeLog
index 9ce5f7efc90a..2795953c6ab7 100644
--- a/dev-vcs/gitg/ChangeLog
+++ b/dev-vcs/gitg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/gitg
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/ChangeLog,v 1.33 2014/12/24 00:26:48 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/ChangeLog,v 1.34 2015/02/12 10:33:55 jlec Exp $
+
+  12 Feb 2015; Justin Lecher <jlec@gentoo.org>
+  +files/gitg-3.14.1-libgit2-glib-0.22.0.patch, gitg-3.14.1.ebuild:
+  Backport fixes for API changes in libgit2-glib, #537232
 
 *gitg-3.14.1 (24 Dec 2014)
 
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index 6cb0f796779c..7a0204f2f823 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gitg-0.1.2-fix-disable-debug.patch 1335 SHA256 4d5d51fbf0dbf9a162d1b97ed761cea9e7c5315f7eb152f1af3809dab22a7f6c SHA512 0629fff2555a768ee1cd402c506c1c378ae90577735693be0f2319d6cdc795117c58aa9be8ab4e9b70cc11f2e9b7df815fc69a9bc87d01c1558e2db7673a2f4b WHIRLPOOL 35d946c8135e23b6f43939253dbaaa5d68feac5b81ce4712f653ff4f5b0aa375fb2fb917246730ec8b6cd548fb0f54b37aa96b64687f04d194d5dea276c2da94
 AUX gitg-0.2.6-fix-libreoffice.patch 11432 SHA256 4168a7b0f87a887019f41958001f026f35600e097f61cab8aac5d2df5d04aa7d SHA512 38fa8a2da67aa6efb0592720324baf05a9fdec5ac4fe533103983f92c3858d4ea1f8e7e2a41cd4a0bc0f919a744248e545be1df1bc30801a6dc0750bcfdab4ff WHIRLPOOL 6c9ac770272221fe18ee80a6f3520c47fc777b07c17a71c842fd26923816cf55b415a17a62c995857e20fcd60cd8da9fe6e56b23a3f570adfb63d1936eb675f7
+AUX gitg-3.14.1-libgit2-glib-0.22.0.patch 4194 SHA256 471c06c3a9c1ca1f366ba47b40df6377bb22ba84536ee8f8f844888c47b5338e SHA512 94429b266deab25bfbc05e45ee6cb6ce53f587e361d90d76926e65222881cd3de50b5b33d7c55e5de32f57e7a61f150abcc3d4e635bb043f420f03f5970a6d4a WHIRLPOOL 74a5883e7e870b7952e708e3a516ebc333fc7fae3179e7e55d298ccf30c05c0ab3241b75e01f09736ddff8996a43342cf2f3cc804e314811bc781dac3af47103
 DIST gitg-0.2.7.tar.xz 528904 SHA256 c07fc4fc6cef31a06f0b9daa2ed23a5d0f6cb0a10a728324970675fc7001d095 SHA512 8d07e3410691a9ea4772e8db546d3da87f4517ac35111156c6cba3b9317e02fc7dd63a79c05aa0700ce59d2739d0c680d33825e3a8c8c7c242db7ac8ae6962c4 WHIRLPOOL 743a07f6478b0d2526aa1b1f2197353029caacd32d9fbfe75d32a287d4e55caf9441de69b5dfbf40c11597101016bdc843c2f1f0fe893370ee24ba2a06e43b9f
 DIST gitg-0.3.2.tar.xz 1080536 SHA256 77a30eb46ccd1882dca5a2bc4b43850c1066b1c406de86e335628c1c5a2a6c0f SHA512 cd8a24a5dfa833b4380e0b8da647bb6bfe97a28e9ba57fc26c9806939b06416f7728006fe247cf07264931d420416f25ac307051b672184b06809d750d3ed928 WHIRLPOOL 24230a3926f98c9f115cb1367091558aa68dc773c8b1c5c64992ef605d5b89862cbd1d9c898ebc9a4ab7c1ce837ccda7a7a08c8c680a9da3bf9dfad668a01869
 DIST gitg-3.14.0.tar.xz 1194904 SHA256 8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b SHA512 cf52ae6e892dcca40894a921810ab7cc1df4923c00f040d658db88e4ccbba2605181addbd64aa61eb35bc8a6e44172a35601371664d87b5b35439f3547877c30 WHIRLPOOL 658829d4bf999b86f8ead87a69579c72f02ed5373d5aaeda973ce31b93ace67596c13b8450f6b2aa76e98dfe0e7047d41864b008042040913b5a44e8f2b8ee21
@@ -10,13 +11,25 @@ DIST gitg-3.14.1.tar.xz 1197524 SHA256 8e485b35d918fddc255c3bf5d5c139d0a8b684bd9
 EBUILD gitg-0.2.7.ebuild 1293 SHA256 cbbe84a8a3ffd3df991fe7c64ebafffae1e70f6e97a4663fc12e887a93105d9c SHA512 e72afccca3ca4528d0dcd58c8729871f8d27f633da7f633669a01292f13690a8b459221a286cc9d5e7bcb9f50c41e9013d4646a42b5bedc6d779ef97acb54012 WHIRLPOOL f5af24106946439984f3dfe041d51bce3c9ea9307a38ee2ad23729ee363a0553e908ccd2b095fff9b1cad6a6896b0791c4b3a94993fd54fbadf77eb05ec0acdc
 EBUILD gitg-0.3.2.ebuild 1963 SHA256 18eaac9add9ba75225bf3a4571f333c254d0c1dbf9693e841685be83c1f3ba2d SHA512 e911c68419dbaa4678e47261ba9a7a9d732840fb48c62a328eb43f5a9f535d745e3f842288d34637c1bd9950bba5794f92c17ffa56e380997d3d640361a051d2 WHIRLPOOL 7cd54e87c4e0f2dfe5553afeac7250101edbf4224c851c1254eabd24c40031ff4b1130598163f06a708fc1ecca7c37c687b6b798004adcc0446b626bec0f51b3
 EBUILD gitg-3.14.0.ebuild 2048 SHA256 c0351aa264647948ada78e43deb3f9a4ef4d0d91991ec133bc5339b9ab65828b SHA512 2ccf5c1e6250693e9303ae957503225d668d8c796cb44e5b14434a9745678eb870a48f8d02721243faad744db508a7bc6b8fac6d5681b1b0708a9c6b1bdf627d WHIRLPOOL c0b4e510205f3bbeb327cde9c6789ae383c42988eea3a01410c45dcdb7a45af92ff1e72c550bc62d1016401a62cd572d2efc65be88a23635f145b7dbd990ba8b
-EBUILD gitg-3.14.1.ebuild 1977 SHA256 394f140941188463d34ad0c4aa8bfd8de23b8c5c0d3b29c75694cbf3bba7ce27 SHA512 be834072a43f46cdb6689b980351505065d085dfdbb634176b70379600ed1cca204dd1c7026f9dad6c1d92f73faffc5eb1bf791b2e1baa5a9c4515d3dc2aa2be WHIRLPOOL 192bad62b6d1421707eff16a6856f5a84f9e871bbbca4b518cd695d912d47378a11dd9568989226cbb5e681d4169e95e1ad90c0a3d39e70fb4717c7a5a6e1e48
-MISC ChangeLog 6825 SHA256 b259d5beecbc6616d451cc8ee5c3141ab18caa79114bf79e7401ce8c12be6c02 SHA512 33bbc95c63fa743697fac91fdb260c5580a6f417ecea32ab2a3772596037b7761ad09d2b26e9cbedd660a162958be98712b6b84fc2b0d933869d10b2a2234c7f WHIRLPOOL c074e13253a45c3bf9b7ab40c34b4d96bc0243b6a0dd701b9a96e818af60cea394aa72788ac37a18784cfeb8d73a92592043d8e1707a61e5f48ab00d8f43c259
+EBUILD gitg-3.14.1.ebuild 2072 SHA256 71fcae120a1965c35818d6c8892976e09a38b28d6779e9a197b939e89436b03f SHA512 36be2cdc4e9b7d6d2059ad519ee235a4c7e48b40f770d5a2f6263286be2ba537852b0cdaa6dbfd723a45139878fbb6bfa4205f37296e3f11d07d93b90ab7138a WHIRLPOOL a459cad475ecde93b3b2de12c3dd09d29123f58e95dbcae1b04fdfabc0d4eaf6f3c360b7761a7cf0e0d3a4fb404110e73ef8102fe4daf1e4a3fe7e8ff4279286
+MISC ChangeLog 7000 SHA256 c1a72d33544764d8dfaaac18673626f7cd3f9ffa5966ed7d8251997eb4a36741 SHA512 3ae47b6528c2bb62b92d6957aa78c9597eba45a24d1371dbd4c875ad084024693ad42e35444c5b947c3eef17053ce2dda94b5285a3b79a87ba99d92ec39e5cdd WHIRLPOOL 1b05037bf835ba25ae386e8babdb9cd3cb1d4de15bce76f169b9ced4944339292bc4cb64d1aba578903b1433719f308fde17435ef6233a9fd2207506216b42fa
 MISC metadata.xml 477 SHA256 3ac7963107238be17b779f613409daaaa9dff0224081c3ee9daff4bfef15fef8 SHA512 299f86ab1726b9e89bd5be17406ed6c4fbd32d9d1036ac74fe20f10056ed439308212f47ae9ca62135738255939a29bc30e71a60c377620b69583ba59f18dff5 WHIRLPOOL 8d8ffc0519d8e22f3442c0ab2c9b6ccf025ea7bb50d11d93351944ad8059af192ce94e9c4f0e9fce7e32895efdd71fed7ac331cc5a04f4e7d860c2da001556fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSaCEkACgkQ1fmVwcYIWAYI0gCfYPBaMCWyNsUgPpDNRNCQUpN7
-IV8AoINX//zSh54Y9cUTGpiqzchnFNpg
-=KdE9
+iQJ8BAEBCgBmBQJU3IKHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirtYEP/02yBC+3jU+W5JvbMXA+kWRR
++6os4p+1AzVEItP+3+Ah3kpWHKjAmnYJN8r/rNLd+CKKtvnsPUFGupx0TLOdSrPO
+rni3s39XhgvD5C1ZYH6BZ6n6VH1DLnDlIJT4eul5KbWC0fyK70du0bry2N5gr4p4
+BRRuEZ0mTWHNTI4LcQ+UpATrwrG2JqLsfaFxuu5Fj7nMxouDYoZognDeA0RogVHo
+LF692fuVRcUqi7fv2cC7nVvMvBaQ96YGNnyYEiarWGdopS0edHhZTj/B9TvfukRH
+JNB6BSK4M/DN6hUWEfblDxg/Bo1OBFMLbDWDWIM2hCzOKRjxW2XWODdgyOgjmhDA
+WkBAPWKXv/8OsfMX5T8WLiPRYzWfREiim960A/L89Npf9cRvVML42cZqREFikehB
+OKV2Fc+VgCKTSpIArKR6g4phqTZmyx2CbYwFpb8gHZ9v1n360YfCP+m9zBvAZFRc
+NkqMbNp2mRezHtZuXs6gF1QCJ20m+gIsGA/r5GRfJbk6dW0HzCGWe6oWBnPiv6vD
+586sglTHa+LaCgTy4lkCAn9KO0UXBvX7TgFopzHHhJ+X14KdmEsiKwrPlt0uYbP1
+4Fm86wpR4aZ/ZikymMMm/AyVktDmuQsFV/1B46QuynqQ1eWFBEdQABGmlwDHZZbJ
+F769YqJb2/Xwemjn6XzW
+=zDIg
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/gitg/files/gitg-3.14.1-libgit2-glib-0.22.0.patch b/dev-vcs/gitg/files/gitg-3.14.1-libgit2-glib-0.22.0.patch
new file mode 100644
index 000000000000..d8a8b0bd9007
--- /dev/null
+++ b/dev-vcs/gitg/files/gitg-3.14.1-libgit2-glib-0.22.0.patch
@@ -0,0 +1,123 @@
+ gitg/gitg-author-details-dialog.vala | 1 -
+ gitg/gitg-clone-dialog.vala          | 5 +----
+ libgitg/gitg-commit.vala             | 4 ++--
+ libgitg/gitg-lanes.vala              | 4 ++--
+ tests/libgitg/test-commit.vala       | 2 +-
+ 5 files changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/gitg/gitg-author-details-dialog.vala b/gitg/gitg-author-details-dialog.vala
+index 64cdb65..59f66dd 100644
+--- a/gitg/gitg-author-details-dialog.vala
++++ b/gitg/gitg-author-details-dialog.vala
+@@ -81,7 +81,6 @@ namespace Gitg
+ 
+ 			try
+ 			{
+-				d_config.refresh();
+ 				author_name = d_config.get_string("user.name");
+ 			}
+ 			catch {}
+diff --git a/gitg/gitg-clone-dialog.vala b/gitg/gitg-clone-dialog.vala
+index 94eb610..60390f9 100644
+--- a/gitg/gitg-clone-dialog.vala
++++ b/gitg/gitg-clone-dialog.vala
+@@ -80,9 +80,8 @@ public class CloneDialog : Gtk.Dialog
+ 		d_entry_url.changed.connect((e) => {
+ 			string ?tooltip_text = null;
+ 			string ?icon_name = null;
+-			bool url_supported = Ggit.Remote.is_supported_url(d_entry_url.get_text());
+ 
+-			if (!url_supported && (d_entry_url.text != ""))
++			if (d_entry_url.text != "")
+ 			{
+ 				icon_name = "dialog-warning-symbolic";
+ 				tooltip_text = _("The URL introduced is not supported");
+@@ -90,8 +89,6 @@ public class CloneDialog : Gtk.Dialog
+ 
+ 			d_entry_url.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, icon_name);
+ 			d_entry_url.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, tooltip_text);
+-
+-			set_response_sensitive(Gtk.ResponseType.OK, url_supported);
+ 		});
+ 	}
+ }
+diff --git a/libgitg/gitg-commit.vala b/libgitg/gitg-commit.vala
+index 2aba60d..2ec5a4c 100644
+--- a/libgitg/gitg-commit.vala
++++ b/libgitg/gitg-commit.vala
+@@ -122,7 +122,7 @@ public class Commit : Ggit.Commit
+ 			var parents = get_parents();
+ 
+ 			// Create a new diff from the parents to the commit tree
+-			if (parents.size() == 0)
++			if (parents.size == 0)
+ 			{
+ 				diff = new Ggit.Diff.tree_to_tree(repo,
+ 				                                  null,
+@@ -131,7 +131,7 @@ public class Commit : Ggit.Commit
+ 			}
+ 			else
+ 			{
+-				for (var i = 0; i < parents.size(); ++i)
++				for (var i = 0; i < parents.size; ++i)
+ 				{
+ 					var parent = parents.get(0);
+ 
+diff --git a/libgitg/gitg-lanes.vala b/libgitg/gitg-lanes.vala
+index 06886dc..f2d99f5 100644
+--- a/libgitg/gitg-lanes.vala
++++ b/libgitg/gitg-lanes.vala
+@@ -158,7 +158,7 @@ public class Lanes : Object
+ 		init_next_layer();
+ 		var mylane = d_lanes[pos];
+ 
+-		for (uint i = 0; i < parents.size(); ++i)
++		for (uint i = 0; i < parents.size; ++i)
+ 		{
+ 			int lnpos;
+ 			var poid = parents.get_id(i);
+@@ -439,7 +439,7 @@ public class Lanes : Object
+ 
+ 		var parents = commit.get_parents();
+ 
+-		for (uint i = 0; i < parents.size(); ++i)
++		for (uint i = 0; i < parents.size; ++i)
+ 		{
+ 			expand_lane_from_oid(parents.get_id(i));
+ 		}
+diff --git a/tests/libgitg/test-commit.vala b/tests/libgitg/test-commit.vala
+index fd0c137..65c0473 100644
+--- a/tests/libgitg/test-commit.vala
++++ b/tests/libgitg/test-commit.vala
+@@ -252,7 +252,7 @@ class Gitg.Test.Commit : Gitg.Test.Repository
+ 			assert_streq(d_repository.get_head().get_target().to_string(),
+ 			             oid.to_string());
+ 
+-			assert_uinteq(commit.get_parents().size(), 0);
++			assert_uinteq(commit.get_parents().size, 0);
+ 
+ 			var reflog = d_repository.lookup_reference("HEAD").get_log();
+ 			var entry = reflog.get_entry_from_index(0);
+ libgitg/gitg-repository-list-box.vala | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libgitg/gitg-repository-list-box.vala b/libgitg/gitg-repository-list-box.vala
+index 8dd5b33..393b29e 100644
+--- a/libgitg/gitg-repository-list-box.vala
++++ b/libgitg/gitg-repository-list-box.vala
+@@ -494,14 +494,13 @@ namespace Gitg
+ 				d_row = row;
+ 			}
+ 
+-			protected override bool transfer_progress(Ggit.TransferProgress stats) throws Error
++			protected override void transfer_progress(Ggit.TransferProgress stats)
+ 			{
+ 				var recvobj = stats.get_received_objects();
+ 				var indxobj = stats.get_indexed_objects();
+ 				var totaobj = stats.get_total_objects();
+ 
+ 				d_row.fraction = (recvobj + indxobj) / (double)(2 * totaobj);
+-				return true;
+ 			}
+ 		}
+ 
diff --git a/dev-vcs/gitg/gitg-3.14.1.ebuild b/dev-vcs/gitg/gitg-3.14.1.ebuild
index 2c4bfee7daa4..458ab4d71300 100644
--- a/dev-vcs/gitg/gitg-3.14.1.ebuild
+++ b/dev-vcs/gitg/gitg-3.14.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/gitg-3.14.1.ebuild,v 1.1 2014/12/24 00:26:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/gitg-3.14.1.ebuild,v 1.2 2015/02/12 10:33:55 jlec Exp $
 
 EAPI=5
 
@@ -28,7 +28,7 @@ RDEPEND="
 	>=dev-libs/glib-2.38:2
 	>=dev-libs/gobject-introspection-0.10.1
 	dev-libs/libgit2[threads]
-	>=dev-libs/libgit2-glib-0.0.20
+	>=dev-libs/libgit2-glib-0.22.0
 	>=dev-libs/libpeas-1.5.0[gtk]
 	>=gnome-base/gsettings-desktop-schemas-0.1.1
 	>=net-libs/webkit-gtk-2.2:4[introspection]
@@ -43,7 +43,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	dev-libs/libgit2-glib[vala]
+	>=dev-libs/libgit2-glib-0.22.0[vala]
 	gnome-base/gnome-common
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
@@ -52,6 +52,10 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libgit2-glib-0.22.0.patch
+)
+
 pkg_setup() {
 	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
 }
@@ -61,6 +65,9 @@ src_prepare() {
 		-e '/CFLAGS/s:-g::g' \
 		-e '/CFLAGS/s:-O0::g' \
 		-i configure.ac || die
+
+	epatch "${PATCHES[@]}"
+
 	eautoreconf
 	gnome2_src_prepare
 	vala_src_prepare