[arch-commits] Commit in rubinius/trunk (2 files)

[Jan Steffens]

    Date: Saturday, June 13, 2015 @ 16:47:46
  Author: heftig
Revision: 135261

2.5.6

Modified:
  rubinius/trunk/PKGBUILD
Deleted:
  rubinius/trunk/0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch

----------------------------------------------------+
 0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch |   25 -------------------
 PKGBUILD                                           |   12 +++------
 2 files changed, 4 insertions(+), 33 deletions(-)

Deleted: 0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch
===================================================================
--- 0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch	2015-06-13 12:38:30 UTC (rev 135260)
+++ 0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch	2015-06-13 14:47:46 UTC (rev 135261)
@@ -1,25 +0,0 @@
-From e2659914cad36f73c4944e018498af30ee71591b Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Mon, 25 May 2015 02:21:07 +0200
-Subject: [PATCH] Fix a __GNUC__ check to work with GCC 5
-
----
- vm/object_utils.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vm/object_utils.hpp b/vm/object_utils.hpp
-index 551b3f5..66c3203 100644
---- a/vm/object_utils.hpp
-+++ b/vm/object_utils.hpp
-@@ -13,7 +13,7 @@
- 
- // A stupid work around for g++ changing it's behavior on 4.3
- 
--#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3)
-+#if __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
-   #define SPECIALIZATION_STORAGE
- #else
-   #define SPECIALIZATION_STORAGE static inline
--- 
-2.4.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-13 12:38:30 UTC (rev 135260)
+++ PKGBUILD	2015-06-13 14:47:46 UTC (rev 135261)
@@ -3,7 +3,7 @@
 
 pkgbase=rubinius
 pkgname=(rubinius rubinius-ruby)
-pkgver=2.5.5
+pkgver=2.5.6
 pkgrel=1
 pkgdesc="Ruby runtime written in Ruby, designed for concurrency"
 arch=(i686 x86_64)
@@ -13,12 +13,10 @@
 makedepends=(llvm35 rubinius-ruby)
 options=(!emptydirs)
 source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2
-        gemrc dirs.patch
-        0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch)
-sha256sums=('217659849ca2c67322d24ce7167e760dc835f32a701ca6e558703914ca82d02f'
+        gemrc dirs.patch)
+sha256sums=('a81f57c6a9d38122a974df1debd5dd7900cb9d4a5cd621b2105de716990f807a'
             '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614'
-            'a9922b199730c059c26781af45adc46401811ff2e6840c4aeb49da4fa41acdd9'
-            '0660c552b9bbff3537901983b6fb8d8e2af9558bb95302e970696698d0ae9a25')
+            'a9922b199730c059c26781af45adc46401811ff2e6840c4aeb49da4fa41acdd9')
 
 _common() {
   export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8"
@@ -28,8 +26,6 @@
 prepare() {
   _common
 
-  patch -Np1 -i ../0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch
-
   patch -Np1 -i ../dirs.patch
 
   mkdir -p "$GEM_HOME"