[arch-commits] Commit in ruby-gtk3/trunk (3 files)

[Alexander Rødseth]

    Date: Thursday, March 14, 2013 @ 16:41:10
  Author: arodseth
Revision: 86273

upgpkg: ruby-gtk3 1.2.2-1

Added:
  ruby-gtk3/trunk/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch
    (from rev 85992, ruby-gtk3/trunk/0001-backport-fix-for-syntax-error-https-github.com-ruby-.patch)
Modified:
  ruby-gtk3/trunk/PKGBUILD
Deleted:
  ruby-gtk3/trunk/0001-backport-fix-for-syntax-error-https-github.com-ruby-.patch

-----------------------------------------------------------------+
 0001-backport-fix-for-syntax-error-https-github.com-ruby-.patch |   40 ----------
 0001-backport-fix-for-syntax-error-https-github.com-ruby.patch  |   40 ++++++++++
 PKGBUILD                                                        |   12 +--
 3 files changed, 46 insertions(+), 46 deletions(-)

Deleted: 0001-backport-fix-for-syntax-error-https-github.com-ruby-.patch
===================================================================
--- 0001-backport-fix-for-syntax-error-https-github.com-ruby-.patch	2013-03-14 15:05:46 UTC (rev 86272)
+++ 0001-backport-fix-for-syntax-error-https-github.com-ruby-.patch	2013-03-14 15:41:10 UTC (rev 86273)
@@ -1,40 +0,0 @@
-From c0d6f9ad4ab23dc980746078a127905ea56c9bf1 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc at gmail.com>
-Date: Sun, 10 Mar 2013 09:39:45 -0700
-Subject: [PATCH] backport fix for syntax error
- https://github.com/ruby-gnome2/ruby-gnome2/commit/03be2d663730119036c9d70d4fc7b52523ae40df
-
----
- gdk3/ext/gdk3/rbgdkevent.c  | 2 +-
- gdk3/ext/gdk3/rbgdkscreen.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdk3/ext/gdk3/rbgdkevent.c b/gdk3/ext/gdk3/rbgdkevent.c
-index 62bb35d..a5478a6 100644
---- a/gdk3/ext/gdk3/rbgdkevent.c
-+++ b/gdk3/ext/gdk3/rbgdkevent.c
-@@ -370,7 +370,7 @@ gdkevent_s_setting_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
-     VALUE value;
- 
-     rb_scan_args(argc, argv, "11", &name, &type);
--    if NIL_P(type) 
-+    if (NIL_P(type)) 
-         gtype = G_TYPE_STRING;
-     else
-         gtype = CLASS2GTYPE(type);
-diff --git a/gdk3/ext/gdk3/rbgdkscreen.c b/gdk3/ext/gdk3/rbgdkscreen.c
-index 8f5bffb..7439ad1 100644
---- a/gdk3/ext/gdk3/rbgdkscreen.c
-+++ b/gdk3/ext/gdk3/rbgdkscreen.c
-@@ -214,7 +214,7 @@ rg_get_setting(int argc, VALUE *argv, VALUE self)
-     VALUE value;
- 
-     rb_scan_args(argc, argv, "11", &name, &type);
--    if NIL_P(type) 
-+    if (NIL_P(type)) 
-         gtype = G_TYPE_STRING;
-     else
-         gtype = CLASS2GTYPE(type);
--- 
-1.8.1.5
-

Copied: ruby-gtk3/trunk/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch (from rev 85992, ruby-gtk3/trunk/0001-backport-fix-for-syntax-error-https-github.com-ruby-.patch)
===================================================================
--- 0001-backport-fix-for-syntax-error-https-github.com-ruby.patch	                        (rev 0)
+++ 0001-backport-fix-for-syntax-error-https-github.com-ruby.patch	2013-03-14 15:41:10 UTC (rev 86273)
@@ -0,0 +1,40 @@
+From c0d6f9ad4ab23dc980746078a127905ea56c9bf1 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc at gmail.com>
+Date: Sun, 10 Mar 2013 09:39:45 -0700
+Subject: [PATCH] backport fix for syntax error
+ https://github.com/ruby-gnome2/ruby-gnome2/commit/03be2d663730119036c9d70d4fc7b52523ae40df
+
+---
+ gdk3/ext/gdk3/rbgdkevent.c  | 2 +-
+ gdk3/ext/gdk3/rbgdkscreen.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdk3/ext/gdk3/rbgdkevent.c b/gdk3/ext/gdk3/rbgdkevent.c
+index 62bb35d..a5478a6 100644
+--- a/gdk3/ext/gdk3/rbgdkevent.c
++++ b/gdk3/ext/gdk3/rbgdkevent.c
+@@ -370,7 +370,7 @@ gdkevent_s_setting_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+     VALUE value;
+ 
+     rb_scan_args(argc, argv, "11", &name, &type);
+-    if NIL_P(type) 
++    if (NIL_P(type)) 
+         gtype = G_TYPE_STRING;
+     else
+         gtype = CLASS2GTYPE(type);
+diff --git a/gdk3/ext/gdk3/rbgdkscreen.c b/gdk3/ext/gdk3/rbgdkscreen.c
+index 8f5bffb..7439ad1 100644
+--- a/gdk3/ext/gdk3/rbgdkscreen.c
++++ b/gdk3/ext/gdk3/rbgdkscreen.c
+@@ -214,7 +214,7 @@ rg_get_setting(int argc, VALUE *argv, VALUE self)
+     VALUE value;
+ 
+     rb_scan_args(argc, argv, "11", &name, &type);
+-    if NIL_P(type) 
++    if (NIL_P(type)) 
+         gtype = G_TYPE_STRING;
+     else
+         gtype = CLASS2GTYPE(type);
+-- 
+1.8.1.5
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-14 15:05:46 UTC (rev 86272)
+++ PKGBUILD	2013-03-14 15:41:10 UTC (rev 86273)
@@ -8,22 +8,22 @@
 pkgbase=ruby-gtk3
 pkgname=('ruby-gtk3' 'ruby-gdk3')
 depends=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-glib2' 'ruby-pango')
-pkgver=1.2.1
-pkgrel=4
+pkgver=1.2.2
+pkgrel=1
 arch=('x86_64' 'i686')
 url='http://ruby-gnome2.sourceforge.jp/'
 license=('LGPL')
 makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3')
 source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz"
-        '0001-backport-fix-for-syntax-error-https-github.com-ruby-.patch')
-sha256sums=('78c7dbfaebabefe0f5a3d96c779cc08ea949a354e3f7cd1ff797d850ded4168a'
+        '0001-backport-fix-for-syntax-error-https-github.com-ruby.patch')
+sha256sums=('1dd73c4aa184199f373edad589b715b68da8eb43ae6bdae360e0aa62189a681d'
             '0df3571688a18048fac9211df1bf21effd4120e568b34e523fe50a7a63e3e3d6')
 
 build() {
 	cd "$srcdir/ruby-gtk3-$pkgver"
 
-  patch -Np1 -i ${srcdir}/0001-backport-fix-for-syntax-error-https-github.com-ruby-.patch
-
+  #patch -Np1 -i \
+  #  "$srcdir/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch"
 	LANG="en_US.UTF-8" ruby extconf.rb gtk3 gdk3 --vendor
 	make
 }