[arch-commits] Commit in ruby-glib2/trunk (2 files)

[Anatol Pomozov]

    Date: Wednesday, April 15, 2015 @ 21:48:27
  Author: anatolik
Revision: 131439

upgpkg: ruby-glib2 2.2.4-4

FS#44599 Add ruby-pkgconfig as runtime dependency

Added:
  ruby-glib2/trunk/0001-glib2-support-GLib-2.44.patch
Modified:
  ruby-glib2/trunk/PKGBUILD

------------------------------------+
 0001-glib2-support-GLib-2.44.patch |   38 +++++++++++++++++++++++++++++++++++
 PKGBUILD                           |   20 +++++++++++++-----
 2 files changed, 53 insertions(+), 5 deletions(-)

Added: 0001-glib2-support-GLib-2.44.patch
===================================================================
--- 0001-glib2-support-GLib-2.44.patch	                        (rev 0)
+++ 0001-glib2-support-GLib-2.44.patch	2015-04-15 19:48:27 UTC (rev 131439)
@@ -0,0 +1,38 @@
+From c5cdb741a9eb72351739e48a38946b87c292c293 Mon Sep 17 00:00:00 2001
+From: Kouhei Sutou <kou at 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!!!
+
+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 @@ create_pkg_config_file("Ruby/GLib2", package_id)
+ 
+ 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|
+-- 
+2.3.5
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-15 18:51:09 UTC (rev 131438)
+++ PKGBUILD	2015-04-15 19:48:27 UTC (rev 131439)
@@ -4,18 +4,28 @@
 _gemname=glib2
 pkgname=ruby-$_gemname
 pkgver=2.2.4
-pkgrel=3
+pkgrel=4
 pkgdesc='Ruby/GLib2 is a Ruby binding of GLib-2.x.'
 arch=(i686 x86_64)
 url='http://ruby-gnome2.sourceforge.jp/'
 license=(LGPL2.1)
-depends=(ruby glib2)
-makedepends=(ruby-pkgconfig)
+depends=(ruby glib2 ruby-pkgconfig)
 options=(!emptydirs)
-source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
+source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem
+        0001-glib2-support-GLib-2.44.patch)
 noextract=($_gemname-$pkgver.gem)
-sha1sums=('2387c5a151a7bb324de604234960cf4a6e2aa232')
+sha1sums=('2387c5a151a7bb324de604234960cf4a6e2aa232'
+          '54e83b3de30cfcf1f79232a98dc5ec1a1f1c116b')
 
+prepare() {
+  gem unpack $_gemname-$pkgver.gem
+  gem spec $_gemname-$pkgver.gem --ruby > $_gemname.gemspec
+  cd $_gemname-$pkgver
+  patch -p2 < ../0001-glib2-support-GLib-2.44.patch
+  gem build ../$_gemname.gemspec
+  mv $_gemname-$pkgver.gem ..
+}
+
 package() {
   local _gemdir="$(ruby -e'puts Gem.default_dir')"
   gem install --ignore-dependencies --no-user-install -i "$pkgdir/$_gemdir" -n "$pkgdir/usr/bin" $_gemname-$pkgver.gem