| 1 |
commit: 6a901b89076b3f86dd9cebd8134267d02fc70cb3 |
| 2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 6 04:40:36 2018 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 6 06:49:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a901b89 |
| 7 |
|
| 8 |
dev-ruby/ruby-gio2: backport fix for failing test |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/645876 |
| 11 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 12 |
|
| 13 |
.../files/ruby-gio2-3.1.1-schema-path.patch | 28 ++++++++++++++++++++++ |
| 14 |
dev-ruby/ruby-gio2/ruby-gio2-3.1.1.ebuild | 4 +++- |
| 15 |
2 files changed, 31 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-ruby/ruby-gio2/files/ruby-gio2-3.1.1-schema-path.patch b/dev-ruby/ruby-gio2/files/ruby-gio2-3.1.1-schema-path.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..437a9b8513c |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-ruby/ruby-gio2/files/ruby-gio2-3.1.1-schema-path.patch |
| 22 |
@@ -0,0 +1,28 @@ |
| 23 |
+From f9bb159674c4eb25f99550fa8594fcbf97ed8cae Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Kouhei Sutou <kou@××××××××××.com> |
| 25 |
+Date: Mon, 30 Jan 2017 23:09:31 +0900 |
| 26 |
+Subject: [PATCH] gio2 test: fix path |
| 27 |
+ |
| 28 |
+GitHub: fix #990 |
| 29 |
+ |
| 30 |
+Reported by Mamoru TASAKA. Thanks!!! |
| 31 |
+--- |
| 32 |
+ gio2/test/test-settings.rb | 5 ++++- |
| 33 |
+ 1 file changed, 4 insertions(+), 1 deletion(-) |
| 34 |
+ |
| 35 |
+diff --git a/gio2/test/test-settings.rb b/gio2/test/test-settings.rb |
| 36 |
+index b16341c84..5a287f1e9 100644 |
| 37 |
+--- a/gio2/test/test-settings.rb |
| 38 |
++++ b/gio2/test/test-settings.rb |
| 39 |
+@@ -108,7 +108,10 @@ def need_keyfile_settings_backend |
| 40 |
+ need_keyfile_settings_backend |
| 41 |
+ keyfile = Tempfile.new(["settings", ".ini"]) |
| 42 |
+ backend = Gio::keyfile_settings_backend_new(keyfile.path, "/", "keyfile_settings") |
| 43 |
+- schema_source = Gio::SettingsSchemaSource.new(fixture_path("schema"), nil, true) |
| 44 |
++ schema_dir = fixture_path("schema", "default") |
| 45 |
++ schema_source = Gio::SettingsSchemaSource.new(schema_dir, |
| 46 |
++ nil, |
| 47 |
++ true) |
| 48 |
+ schema = schema_source.lookup("jp.ruby-gnome2.test.settings", true) |
| 49 |
+ settings = Gio::Settings.new(schema, |
| 50 |
+ backend, |
| 51 |
|
| 52 |
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.1.1.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.1.1.ebuild |
| 53 |
index c208c579977..346b4158f8e 100644 |
| 54 |
--- a/dev-ruby/ruby-gio2/ruby-gio2-3.1.1.ebuild |
| 55 |
+++ b/dev-ruby/ruby-gio2/ruby-gio2-3.1.1.ebuild |
| 56 |
@@ -2,7 +2,7 @@ |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
|
| 59 |
EAPI=5 |
| 60 |
-USE_RUBY="ruby21 ruby22 ruby23 ruby24" |
| 61 |
+USE_RUBY="ruby23 ruby24" |
| 62 |
|
| 63 |
inherit ruby-ng-gnome2 |
| 64 |
|
| 65 |
@@ -14,6 +14,8 @@ ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV} |
| 66 |
>=dev-ruby/ruby-gobject-introspection-${PV}" |
| 67 |
|
| 68 |
all_ruby_prepare() { |
| 69 |
+ epatch "${FILESDIR}/${P}-schema-path.patch" |
| 70 |
+ |
| 71 |
# Avoid unneeded dependency on test-unit-notify. |
| 72 |
sed -i -e '/notify/ s:^:#:' \ |
| 73 |
test/gio2-test-utils.rb || die |
Archives