Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/ruby-glib2/files/
Date: Fri, 11 Aug 2017 05:40:37
Message-Id: 1502429946.ce1c5b9d341e84caed36c340d58a3aeea9eaffe2.graaff@gentoo
1 commit: ce1c5b9d341e84caed36c340d58a3aeea9eaffe2
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 11 05:39:06 2017 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 11 05:39:06 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce1c5b9d
7
8 dev-ruby/ruby-glib2: remove unused files
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 .../files/ruby-glib2-2.2.3-glib-2.44.patch | 38 ----------------------
13 1 file changed, 38 deletions(-)
14
15 diff --git a/dev-ruby/ruby-glib2/files/ruby-glib2-2.2.3-glib-2.44.patch b/dev-ruby/ruby-glib2/files/ruby-glib2-2.2.3-glib-2.44.patch
16 deleted file mode 100644
17 index 1054bec4339..00000000000
18 --- a/dev-ruby/ruby-glib2/files/ruby-glib2-2.2.3-glib-2.44.patch
19 +++ /dev/null
20 @@ -1,38 +0,0 @@
21 -From b2ebc03e04bfac0f60afd1a849958672cb8fe08b Mon Sep 17 00:00:00 2001
22 -From: Kouhei Sutou <kou@××××××××××.com>
23 -Date: Sat, 4 Apr 2015 15:00:14 +0900
24 -Subject: [PATCH] glib2: support GLib 2.44
25 -
26 -gwin32.h includes an enum type that is available on Windows.
27 -
28 -GitHub: fix #361
29 -
30 -Reported by Benjamin Maisano. Thanks!!!
31 ----
32 - glib2/ext/glib2/extconf.rb | 10 +++++++++-
33 - 1 file changed, 9 insertions(+), 1 deletion(-)
34 -
35 -diff --git a/glib2/ext/glib2/extconf.rb b/glib2/ext/glib2/extconf.rb
36 -index d88d971..1c5cd8d 100644
37 ---- a/glib2/ext/glib2/extconf.rb
38 -+++ b/glib2/ext/glib2/extconf.rb
39 -@@ -56,10 +56,18 @@
40 -
41 - enum_types_prefix = "glib-enum-types"
42 - include_paths = PKGConfig.cflags_only_I("glib-2.0")
43 -+ignore_headers = [
44 -+ "giochannel.h",
45 -+ "gmain.h",
46 -+ "gscanner.h",
47 -+]
48 -+unless (/mingw|cygwin|mswin/ === RUBY_PLATFORM)
49 -+ ignore_headers << "gwin32.h"
50 -+end
51 - headers = include_paths.split.inject([]) do |result, path|
52 - result + Dir.glob(File.join(path.sub(/^-I/, ""), "glib", "*.h"))
53 - end.reject do |file|
54 -- /g(iochannel|main|scanner)\.h/ =~ file
55 -+ ignore_headers.include?(File.basename(file))
56 - end
57 - include_paths = PKGConfig.cflags_only_I("gobject-2.0")
58 - headers = include_paths.split.inject(headers) do |result, path|