diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-15 00:04:20 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-15 00:04:20 -0700 |
| commit | eebfa6ebe1522831767019e496b0c094b2e15a5c (patch) | |
| tree | 935fa3d9bddae6c8181a7025516e24875e35f9d2 /community/ruby-gtk3 | |
| parent | 3ff20dedff636571ad0faa4736af5b23e4623ffe (diff) | |
Fri Mar 15 00:04:19 PDT 2013
Diffstat (limited to 'community/ruby-gtk3')
| -rw-r--r-- | community/ruby-gtk3/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch | 40 | ||||
| -rw-r--r-- | community/ruby-gtk3/PKGBUILD | 17 |
2 files changed, 51 insertions, 6 deletions
diff --git a/community/ruby-gtk3/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch b/community/ruby-gtk3/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch new file mode 100644 index 000000000..d84107f0c --- /dev/null +++ b/community/ruby-gtk3/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch @@ -0,0 +1,40 @@ +From c0d6f9ad4ab23dc980746078a127905ea56c9bf1 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@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 + diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD index df5a1497e..955fb4412 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85910 2013-03-08 21:51:38Z arodseth $ +# $Id: PKGBUILD 86274 2013-03-14 15:41:22Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -8,17 +8,22 @@ pkgbase=ruby-gtk3 pkgname=('ruby-gtk3' 'ruby-gdk3') depends=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-glib2' 'ruby-pango') -pkgver=1.2.1 -pkgrel=3 +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") -sha256sums=('78c7dbfaebabefe0f5a3d96c779cc08ea949a354e3f7cd1ff797d850ded4168a') +source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz" + '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" LANG="en_US.UTF-8" ruby extconf.rb gtk3 gdk3 --vendor make } @@ -37,7 +42,7 @@ package_ruby-gdk3() { depends=('ruby' 'gtk3') cd "$srcdir/ruby-gtk3-$pkgver/gdk3" - [ $CARCH == 'i686' ] && mkdir -p /usr/lib/ruby/vendor_ruby/1.9.1/i686-linux + [ $CARCH == 'i686' ] && mkdir -p /usr/lib/ruby/vendor_ruby/2.0.0/i686-linux make DESTDIR="$pkgdir/" install } |