diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-ruby/ruby-glib2/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-ruby/ruby-glib2/files')
-rw-r--r-- | dev-ruby/ruby-glib2/files/ruby-glib2-2.2.3-glib-2.44.patch | 38 |
1 files changed, 38 insertions, 0 deletions
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 new file mode 100644 index 000000000000..1054bec43395 --- /dev/null +++ b/dev-ruby/ruby-glib2/files/ruby-glib2-2.2.3-glib-2.44.patch @@ -0,0 +1,38 @@ +From b2ebc03e04bfac0f60afd1a849958672cb8fe08b Mon Sep 17 00:00:00 2001 +From: Kouhei Sutou <kou@clear-code.com> +Date: Sat, 4 Apr 2015 15:00:14 +0900 +Subject: [PATCH] glib2: support GLib 2.44 + +gwin32.h includes an enum type that is available on Windows. + +GitHub: fix #361 + +Reported by Benjamin Maisano. Thanks!!! +--- + glib2/ext/glib2/extconf.rb | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/glib2/ext/glib2/extconf.rb b/glib2/ext/glib2/extconf.rb +index d88d971..1c5cd8d 100644 +--- a/glib2/ext/glib2/extconf.rb ++++ b/glib2/ext/glib2/extconf.rb +@@ -56,10 +56,18 @@ + + enum_types_prefix = "glib-enum-types" + include_paths = PKGConfig.cflags_only_I("glib-2.0") ++ignore_headers = [ ++ "giochannel.h", ++ "gmain.h", ++ "gscanner.h", ++] ++unless (/mingw|cygwin|mswin/ === RUBY_PLATFORM) ++ ignore_headers << "gwin32.h" ++end + headers = include_paths.split.inject([]) do |result, path| + result + Dir.glob(File.join(path.sub(/^-I/, ""), "glib", "*.h")) + end.reject do |file| +- /g(iochannel|main|scanner)\.h/ =~ file ++ ignore_headers.include?(File.basename(file)) + end + include_paths = PKGConfig.cflags_only_I("gobject-2.0") + headers = include_paths.split.inject(headers) do |result, path| |