[arch-commits] Commit in ruby/repos (10 files)
Thomas Dziedzic
td123 at nymeria.archlinux.org
Sun Mar 2 06:12:57 UTC 2014
Date: Sunday, March 2, 2014 @ 07:12:56
Author: td123
Revision: 206585
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
ruby/repos/testing-i686/
ruby/repos/testing-i686/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch
(from rev 206584, ruby/trunk/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch)
ruby/repos/testing-i686/PKGBUILD
(from rev 206584, ruby/trunk/PKGBUILD)
ruby/repos/testing-i686/gemrc
(from rev 206584, ruby/trunk/gemrc)
ruby/repos/testing-i686/ruby.install
(from rev 206584, ruby/trunk/ruby.install)
ruby/repos/testing-x86_64/
ruby/repos/testing-x86_64/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch
(from rev 206584, ruby/trunk/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch)
ruby/repos/testing-x86_64/PKGBUILD
(from rev 206584, ruby/trunk/PKGBUILD)
ruby/repos/testing-x86_64/gemrc
(from rev 206584, ruby/trunk/gemrc)
ruby/repos/testing-x86_64/ruby.install
(from rev 206584, ruby/trunk/ruby.install)
--------------------------------------------------------------------------------+
testing-i686/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch | 26 +++
testing-i686/PKGBUILD | 75 ++++++++++
testing-i686/gemrc | 5
testing-i686/ruby.install | 22 ++
testing-x86_64/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch | 26 +++
testing-x86_64/PKGBUILD | 75 ++++++++++
testing-x86_64/gemrc | 5
testing-x86_64/ruby.install | 22 ++
8 files changed, 256 insertions(+)
Copied: ruby/repos/testing-i686/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch (from rev 206584, ruby/trunk/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch)
===================================================================
--- testing-i686/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch (rev 0)
+++ testing-i686/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch 2014-03-02 06:12:56 UTC (rev 206585)
@@ -0,0 +1,26 @@
+From 4c4da3fc650a3595ecc06f49072f1ffae07db706 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc at gmail.com>
+Date: Sat, 1 Mar 2014 21:41:28 -0800
+Subject: [PATCH] Fix undeclared identifier error by using the actual type of
+ rl_pre_input_hook
+
+---
+ ext/readline/readline.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/readline/readline.c b/ext/readline/readline.c
+index 659adb9..7bc0eed 100644
+--- a/ext/readline/readline.c
++++ b/ext/readline/readline.c
+@@ -1974,7 +1974,7 @@ Init_readline()
+
+ rl_attempted_completion_function = readline_attempted_completion_function;
+ #if defined(HAVE_RL_PRE_INPUT_HOOK)
+- rl_pre_input_hook = (Function *)readline_pre_input_hook;
++ rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
+ #endif
+ #ifdef HAVE_RL_CATCH_SIGNALS
+ rl_catch_signals = 0;
+--
+1.9.0
+
Copied: ruby/repos/testing-i686/PKGBUILD (from rev 206584, ruby/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-03-02 06:12:56 UTC (rev 206585)
@@ -0,0 +1,75 @@
+# Maintainer: Thomas Dziedzic <gostrc at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+# Contributor: Jeramy Rutley <jrutley at gmail.com>
+
+pkgname=('ruby' 'ruby-docs')
+pkgver=2.1.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.ruby-lang.org/en/'
+license=('BSD' 'custom')
+# disable ruby tk since 1.9.3 it has caused a segfault on require 'tk'
+# https://bugs.ruby-lang.org/issues/8000
+# wait for upstream to start supporting tk 8.6
+makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml') # 'tk'
+options=('!emptydirs' '!makeflags' 'staticlibs')
+source=("http://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.bz2"
+ 'gemrc'
+ '0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch')
+md5sums=('53edc33b2f590ecdd9f6a344b9d92d0d'
+ '6fb8e7a09955e0f64be3158fb4a27e7a'
+ '0496e962e0ce11507b7577a8eb93af58')
+
+build() {
+ cd ruby-${pkgver}
+
+ # readline 6.3 doesn't define Function anymore
+ # https://bugs.ruby-lang.org/issues/9578
+ patch -Np1 -i ${srcdir}/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch
+
+ PKG_CONFIG=/usr/bin/pkg-config ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-shared \
+ --disable-rpath \
+ --with-dbm-type=gdbm_compat
+
+ make
+}
+
+check() {
+ cd ruby-${pkgver}
+
+ make test
+}
+
+package_ruby() {
+ pkgdesc='An object-oriented language for quick and easy programming'
+ depends=('gdbm' 'openssl' 'libffi' 'libyaml')
+ optdepends=('ruby-docs: Ruby documentation') # 'tk: for Ruby/TK'
+ provides=('rubygems' 'rake')
+ conflicts=('rake')
+ backup=('etc/gemrc')
+ install='ruby.install'
+
+ cd ruby-${pkgver}
+
+ make DESTDIR="${pkgdir}" install-nodoc
+
+ install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc"
+
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
+ install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
+}
+
+package_ruby-docs() {
+ pkgdesc='Documentation files for ruby'
+
+ cd ruby-${pkgver}
+
+ make DESTDIR="${pkgdir}" install-doc install-capi
+
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
+ install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
+}
Copied: ruby/repos/testing-i686/gemrc (from rev 206584, ruby/trunk/gemrc)
===================================================================
--- testing-i686/gemrc (rev 0)
+++ testing-i686/gemrc 2014-03-02 06:12:56 UTC (rev 206585)
@@ -0,0 +1,5 @@
+# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
+
+# --user-install is used to install to $HOME/.gem/ by default since we want to separate
+# pacman installed gems and gem installed gems
+gem: --user-install
Copied: ruby/repos/testing-i686/ruby.install (from rev 206584, ruby/trunk/ruby.install)
===================================================================
--- testing-i686/ruby.install (rev 0)
+++ testing-i686/ruby.install 2014-03-02 06:12:56 UTC (rev 206585)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+print_gem_default_target() {
+ echo 'The default location of gem installs is $HOME/.gem/ruby'
+ echo 'Add the following line to your PATH if you plan to install using gem'
+ echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
+ echo 'If you want to install to the system wide location, you must either:'
+ echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
+}
+
+# arg 1: the new package version
+post_install() {
+ print_gem_default_target
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then
+ print_gem_default_target
+ fi
+}
Copied: ruby/repos/testing-x86_64/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch (from rev 206584, ruby/trunk/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch)
===================================================================
--- testing-x86_64/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch (rev 0)
+++ testing-x86_64/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch 2014-03-02 06:12:56 UTC (rev 206585)
@@ -0,0 +1,26 @@
+From 4c4da3fc650a3595ecc06f49072f1ffae07db706 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc at gmail.com>
+Date: Sat, 1 Mar 2014 21:41:28 -0800
+Subject: [PATCH] Fix undeclared identifier error by using the actual type of
+ rl_pre_input_hook
+
+---
+ ext/readline/readline.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/readline/readline.c b/ext/readline/readline.c
+index 659adb9..7bc0eed 100644
+--- a/ext/readline/readline.c
++++ b/ext/readline/readline.c
+@@ -1974,7 +1974,7 @@ Init_readline()
+
+ rl_attempted_completion_function = readline_attempted_completion_function;
+ #if defined(HAVE_RL_PRE_INPUT_HOOK)
+- rl_pre_input_hook = (Function *)readline_pre_input_hook;
++ rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
+ #endif
+ #ifdef HAVE_RL_CATCH_SIGNALS
+ rl_catch_signals = 0;
+--
+1.9.0
+
Copied: ruby/repos/testing-x86_64/PKGBUILD (from rev 206584, ruby/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-03-02 06:12:56 UTC (rev 206585)
@@ -0,0 +1,75 @@
+# Maintainer: Thomas Dziedzic <gostrc at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+# Contributor: Jeramy Rutley <jrutley at gmail.com>
+
+pkgname=('ruby' 'ruby-docs')
+pkgver=2.1.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.ruby-lang.org/en/'
+license=('BSD' 'custom')
+# disable ruby tk since 1.9.3 it has caused a segfault on require 'tk'
+# https://bugs.ruby-lang.org/issues/8000
+# wait for upstream to start supporting tk 8.6
+makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml') # 'tk'
+options=('!emptydirs' '!makeflags' 'staticlibs')
+source=("http://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.bz2"
+ 'gemrc'
+ '0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch')
+md5sums=('53edc33b2f590ecdd9f6a344b9d92d0d'
+ '6fb8e7a09955e0f64be3158fb4a27e7a'
+ '0496e962e0ce11507b7577a8eb93af58')
+
+build() {
+ cd ruby-${pkgver}
+
+ # readline 6.3 doesn't define Function anymore
+ # https://bugs.ruby-lang.org/issues/9578
+ patch -Np1 -i ${srcdir}/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch
+
+ PKG_CONFIG=/usr/bin/pkg-config ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-shared \
+ --disable-rpath \
+ --with-dbm-type=gdbm_compat
+
+ make
+}
+
+check() {
+ cd ruby-${pkgver}
+
+ make test
+}
+
+package_ruby() {
+ pkgdesc='An object-oriented language for quick and easy programming'
+ depends=('gdbm' 'openssl' 'libffi' 'libyaml')
+ optdepends=('ruby-docs: Ruby documentation') # 'tk: for Ruby/TK'
+ provides=('rubygems' 'rake')
+ conflicts=('rake')
+ backup=('etc/gemrc')
+ install='ruby.install'
+
+ cd ruby-${pkgver}
+
+ make DESTDIR="${pkgdir}" install-nodoc
+
+ install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc"
+
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
+ install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
+}
+
+package_ruby-docs() {
+ pkgdesc='Documentation files for ruby'
+
+ cd ruby-${pkgver}
+
+ make DESTDIR="${pkgdir}" install-doc install-capi
+
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
+ install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
+}
Copied: ruby/repos/testing-x86_64/gemrc (from rev 206584, ruby/trunk/gemrc)
===================================================================
--- testing-x86_64/gemrc (rev 0)
+++ testing-x86_64/gemrc 2014-03-02 06:12:56 UTC (rev 206585)
@@ -0,0 +1,5 @@
+# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
+
+# --user-install is used to install to $HOME/.gem/ by default since we want to separate
+# pacman installed gems and gem installed gems
+gem: --user-install
Copied: ruby/repos/testing-x86_64/ruby.install (from rev 206584, ruby/trunk/ruby.install)
===================================================================
--- testing-x86_64/ruby.install (rev 0)
+++ testing-x86_64/ruby.install 2014-03-02 06:12:56 UTC (rev 206585)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+print_gem_default_target() {
+ echo 'The default location of gem installs is $HOME/.gem/ruby'
+ echo 'Add the following line to your PATH if you plan to install using gem'
+ echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
+ echo 'If you want to install to the system wide location, you must either:'
+ echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
+}
+
+# arg 1: the new package version
+post_install() {
+ print_gem_default_target
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then
+ print_gem_default_target
+ fi
+}
More information about the arch-commits
mailing list