pool/libcaca
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 290405 from home:dimstar:Factory

Browse Source 
- Update libcaca-ruby_vendor_install.patch: Use RbConfig::CONFIG
  instead of Config::Config to be compatible with ruby 2.2.

OBS-URL: https://build.opensuse.org/request/show/290405
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcaca?expand=0&rev=35
This commit is contained in:
Ismail Dönmez 2015-03-13 06:57:03 +00:00 committed by Git OBS Bridge
parent 70601463f4
commit f12e54da3b
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcaca-ruby_vendor_install.patch
View File

@ -9,13 +9,13 @@ Index: configure.ac
- RUBY_CFLAGS="$(ruby -r mkmf -e 'conf = RbConfig::CONFIG.merge("hdrdir" => $hdrdir, "arch_hdrdir" => $arch_hdrdir); print RbConfig::expand("#$INCFLAGS", conf)')"
+ RUBY_CFLAGS=$(pkg-config --cflags ruby-1.9)
+ if test -z "$RUBY_CFLAGS"; then
+ RUBY_CFLAGS="-I$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"archdir"@:>@')"
+ RUBY_CFLAGS="-I$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"archdir"@:>@')"
+ fi
RUBY_LIBS="-L$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"RUBY_SO_NAME"@:>@')"
- RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitearchdir"@:>@'`
- RUBY_SITELIBDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitelibdir"@:>@'`
+ RUBY_VENDORARCHDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"vendorarchdir"@:>@'`
+ RUBY_VENDORLIBDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"vendorlibdir"@:>@'`
+ RUBY_VENDORARCHDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"vendorarchdir"@:>@'`
+ RUBY_VENDORLIBDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"vendorlibdir"@:>@'`
AC_SUBST(RUBY_CFLAGS)
AC_SUBST(RUBY_LIBS)
- AC_SUBST(RUBY_SITEARCHDIR)
@ -42,4 +42,4 @@ Index: ruby/Makefile.am
+rubyvendor_DATA = lib/caca.rb
TESTS = test
endif

6
libcaca.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 12 09:52:22 UTC 2015 - dimstar@opensuse.org
- Update libcaca-ruby_vendor_install.patch: Use RbConfig::CONFIG
instead of Config::Config to be compatible with ruby 2.2.
-------------------------------------------------------------------
Tue Feb 17 03:37:09 UTC 2015 - p.drouand@gmail.com

2
libcaca.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libcaca
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed