Date: Thursday, March 20, 2014 @ 15:07:42 Author: anatolik Revision: 208309
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 208308, ruby/trunk/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch) ruby/repos/testing-i686/PKGBUILD (from rev 208308, ruby/trunk/PKGBUILD) ruby/repos/testing-i686/disable_sse2_on_i686.patch (from rev 208308, ruby/trunk/disable_sse2_on_i686.patch) ruby/repos/testing-i686/gemrc (from rev 208308, ruby/trunk/gemrc) ruby/repos/testing-i686/ruby.install (from rev 208308, 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 208308, ruby/trunk/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch) ruby/repos/testing-x86_64/PKGBUILD (from rev 208308, ruby/trunk/PKGBUILD) ruby/repos/testing-x86_64/disable_sse2_on_i686.patch (from rev 208308, ruby/trunk/disable_sse2_on_i686.patch) ruby/repos/testing-x86_64/gemrc (from rev 208308, ruby/trunk/gemrc) ruby/repos/testing-x86_64/ruby.install (from rev 208308, ruby/trunk/ruby.install) --------------------------------------------------------------------------------+ testing-i686/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch | 26 +++ testing-i686/PKGBUILD | 85 ++++++++++ testing-i686/disable_sse2_on_i686.patch | 27 +++ 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 | 85 ++++++++++ testing-x86_64/disable_sse2_on_i686.patch | 27 +++ testing-x86_64/gemrc | 5 testing-x86_64/ruby.install | 22 ++ 10 files changed, 330 insertions(+) Copied: ruby/repos/testing-i686/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch (from rev 208308, 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-20 14:07:42 UTC (rev 208309) @@ -0,0 +1,26 @@ +From 4c4da3fc650a3595ecc06f49072f1ffae07db706 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gos...@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 208308, ruby/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2014-03-20 14:07:42 UTC (rev 208309) @@ -0,0 +1,85 @@ +# Maintainer: Thomas Dziedzic <gos...@gmail.com> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: John Proctor <jproc...@prium.net> +# Contributor: Jeramy Rutley <jrut...@gmail.com> + +pkgname=('ruby' 'ruby-docs') +pkgver=2.1.1 +pkgrel=2 +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' + 'disable_sse2_on_i686.patch' + '0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch') +sha1sums=('a7fd539f64864bc00fc64444d2d814df6c19fd4a' + 'de4b760b7e2cd9af88ca67536ce37b950f1ee514' + '92592bca7e4bbe760202b1bc356a8e3a1a9446b5' + '52e10cb0577c1281c664e0f34b51053ef7644f33') + + +prepare() { + 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 + + # FS#39470 + patch -Np1 -i ${srcdir}/disable_sse2_on_i686.patch +} + +build() { + cd ruby-${pkgver} + + 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' 'gmp' 'zlib') + 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/disable_sse2_on_i686.patch (from rev 208308, ruby/trunk/disable_sse2_on_i686.patch) =================================================================== --- testing-i686/disable_sse2_on_i686.patch (rev 0) +++ testing-i686/disable_sse2_on_i686.patch 2014-03-20 14:07:42 UTC (rev 208309) @@ -0,0 +1,27 @@ +diff --git a/configure.in b/configure.in +index e952cc7..e5f86cc 100644 +--- a/configure.in ++++ b/configure.in +@@ -868,22 +868,6 @@ if test "$GCC" = yes; then + for oflag in -fno-fast-math; do + RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)]) + done +- AS_CASE(["$target"], +- [*-darwin*], [ +- # doesn't seem necessary on Mac OS X +- ], +- [[i[4-6]86*]], [ +- RUBY_TRY_CFLAGS(-msse2 -mfpmath=sse, [ +- RUBY_APPEND_OPTION(XCFLAGS, -msse2 -mfpmath=sse) +- ]) +- AS_CASE(["$XCFLAGS"], +- [[*-msse2*]], [ +- RUBY_TRY_CFLAGS(-mstackrealign, [ +- RUBY_APPEND_OPTION(XCFLAGS, -mstackrealign) +- ]) +- ]) +- ] +- ) + fi + + AC_ARG_WITH(opt-dir, Copied: ruby/repos/testing-i686/gemrc (from rev 208308, ruby/trunk/gemrc) =================================================================== --- testing-i686/gemrc (rev 0) +++ testing-i686/gemrc 2014-03-20 14:07:42 UTC (rev 208309) @@ -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 208308, ruby/trunk/ruby.install) =================================================================== --- testing-i686/ruby.install (rev 0) +++ testing-i686/ruby.install 2014-03-20 14:07:42 UTC (rev 208309) @@ -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 208308, 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-20 14:07:42 UTC (rev 208309) @@ -0,0 +1,26 @@ +From 4c4da3fc650a3595ecc06f49072f1ffae07db706 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gos...@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 208308, ruby/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2014-03-20 14:07:42 UTC (rev 208309) @@ -0,0 +1,85 @@ +# Maintainer: Thomas Dziedzic <gos...@gmail.com> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: John Proctor <jproc...@prium.net> +# Contributor: Jeramy Rutley <jrut...@gmail.com> + +pkgname=('ruby' 'ruby-docs') +pkgver=2.1.1 +pkgrel=2 +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' + 'disable_sse2_on_i686.patch' + '0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch') +sha1sums=('a7fd539f64864bc00fc64444d2d814df6c19fd4a' + 'de4b760b7e2cd9af88ca67536ce37b950f1ee514' + '92592bca7e4bbe760202b1bc356a8e3a1a9446b5' + '52e10cb0577c1281c664e0f34b51053ef7644f33') + + +prepare() { + 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 + + # FS#39470 + patch -Np1 -i ${srcdir}/disable_sse2_on_i686.patch +} + +build() { + cd ruby-${pkgver} + + 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' 'gmp' 'zlib') + 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/disable_sse2_on_i686.patch (from rev 208308, ruby/trunk/disable_sse2_on_i686.patch) =================================================================== --- testing-x86_64/disable_sse2_on_i686.patch (rev 0) +++ testing-x86_64/disable_sse2_on_i686.patch 2014-03-20 14:07:42 UTC (rev 208309) @@ -0,0 +1,27 @@ +diff --git a/configure.in b/configure.in +index e952cc7..e5f86cc 100644 +--- a/configure.in ++++ b/configure.in +@@ -868,22 +868,6 @@ if test "$GCC" = yes; then + for oflag in -fno-fast-math; do + RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)]) + done +- AS_CASE(["$target"], +- [*-darwin*], [ +- # doesn't seem necessary on Mac OS X +- ], +- [[i[4-6]86*]], [ +- RUBY_TRY_CFLAGS(-msse2 -mfpmath=sse, [ +- RUBY_APPEND_OPTION(XCFLAGS, -msse2 -mfpmath=sse) +- ]) +- AS_CASE(["$XCFLAGS"], +- [[*-msse2*]], [ +- RUBY_TRY_CFLAGS(-mstackrealign, [ +- RUBY_APPEND_OPTION(XCFLAGS, -mstackrealign) +- ]) +- ]) +- ] +- ) + fi + + AC_ARG_WITH(opt-dir, Copied: ruby/repos/testing-x86_64/gemrc (from rev 208308, ruby/trunk/gemrc) =================================================================== --- testing-x86_64/gemrc (rev 0) +++ testing-x86_64/gemrc 2014-03-20 14:07:42 UTC (rev 208309) @@ -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 208308, ruby/trunk/ruby.install) =================================================================== --- testing-x86_64/ruby.install (rev 0) +++ testing-x86_64/ruby.install 2014-03-20 14:07:42 UTC (rev 208309) @@ -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 +}