diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-25 10:08:30 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-25 10:08:30 +0100 |
| commit | 3ffe7613c97fecff8c5710dfbd44a984eaae9adc (patch) | |
| tree | 35a12d280fa79d40862ced37a5908a566e1bdc39 /community/ruby-gtk3 | |
| parent | 0a91993304168ce808fbb7eca986e03262ccb692 (diff) | |
| parent | 32793d9a5b60ef0591c71c12ad75121d9b155adf (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/newsbeuter/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/ruby-ncurses/PKGBUILD
community/subtle/PKGBUILD
extra/gegl/PKGBUILD
extra/libebml/PKGBUILD
extra/libmatroska/PKGBUILD
extra/ncmpc/PKGBUILD
extra/nx/PKGBUILD
extra/qtwebkit/PKGBUILD
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 | 12 |
2 files changed, 4 insertions, 48 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 deleted file mode 100644 index d84107f0c..000000000 --- a/community/ruby-gtk3/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 955fb4412..608698d8d 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86274 2013-03-14 15:41:22Z arodseth $ +# $Id: PKGBUILD 86881 2013-03-23 23:10:44Z td123 $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -9,21 +9,17 @@ pkgbase=ruby-gtk3 pkgname=('ruby-gtk3' 'ruby-gdk3') depends=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-glib2' 'ruby-pango') pkgver=1.2.2 -pkgrel=1 +pkgrel=2 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=('1dd73c4aa184199f373edad589b715b68da8eb43ae6bdae360e0aa62189a681d' - '0df3571688a18048fac9211df1bf21effd4120e568b34e523fe50a7a63e3e3d6') +source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz") +sha256sums=('1dd73c4aa184199f373edad589b715b68da8eb43ae6bdae360e0aa62189a681d') 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 } |