[arch-commits] Commit in cor/repos/community-x86_64 (PKGBUILD PKGBUILD cor-gcc7.patch)

[Antonio Rojas]

    Date: Monday, June 4, 2018 @ 19:19:34
  Author: arojas
Revision: 340440

archrelease: copy trunk to community-x86_64

Added:
  cor/repos/community-x86_64/PKGBUILD
    (from rev 340439, cor/trunk/PKGBUILD)
  cor/repos/community-x86_64/cor-gcc7.patch
    (from rev 340439, cor/trunk/cor-gcc7.patch)
Deleted:
  cor/repos/community-x86_64/PKGBUILD

----------------+
 PKGBUILD       |   76 ++++++++++++++++++++++++++++---------------------------
 cor-gcc7.patch |   10 +++++++
 2 files changed, 50 insertions(+), 36 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-04 19:19:14 UTC (rev 340439)
+++ PKGBUILD	2018-06-04 19:19:34 UTC (rev 340440)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=cor
-pkgver=0.1.17
-pkgrel=2
-pkgdesc="Just another C++/C library"
-arch=('i686' 'x86_64')
-url="https://git.merproject.org/mer-core/cor"
-license=('LGPL')
-depends=('systemd')
-makedepends=('git' 'cmake' 'tut')
-source=("git+https://git.merproject.org/mer-core/cor.git#tag=$pkgver")
-sha256sums=('SKIP')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-
-  cmake -DVERSION=$pkgver \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        ../cor
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR="${pkgdir}" install
-
-  # Remove tests
-  rm -r "$pkgdir/opt"
-}

Copied: cor/repos/community-x86_64/PKGBUILD (from rev 340439, cor/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-04 19:19:34 UTC (rev 340440)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=cor
+pkgver=0.1.17
+pkgrel=3
+pkgdesc="Just another C++/C library"
+arch=('x86_64')
+url="https://git.merproject.org/mer-core/cor"
+license=('LGPL')
+depends=('systemd')
+makedepends=('git' 'cmake' 'tut')
+source=("git+https://git.merproject.org/mer-core/cor.git#tag=$pkgver" cor-gcc7.patch)
+sha256sums=('SKIP'
+            '1aaaf4b404b57b0b93d63211d1fe5919efb1441a7958a208bf07115cec55a4e2')
+
+prepare() {
+  mkdir build
+
+  cd cor
+  patch -p1 -i ../cor-gcc7.patch # Fix build with GCC 7 
+}
+
+build() {
+  cd build
+
+  cmake -DVERSION=$pkgver \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        ../cor
+  make
+}
+
+package() {
+  cd build
+
+  make DESTDIR="${pkgdir}" install
+
+  # Remove tests
+  rm -r "$pkgdir/opt"
+}

Copied: cor/repos/community-x86_64/cor-gcc7.patch (from rev 340439, cor/trunk/cor-gcc7.patch)
===================================================================
--- cor-gcc7.patch	                        (rev 0)
+++ cor-gcc7.patch	2018-06-04 19:19:34 UTC (rev 340440)
@@ -0,0 +1,10 @@
+--- cor/include/cor/util.hpp.orig	2018-06-04 19:16:23.000259938 +0000
++++ cor/include/cor/util.hpp	2018-06-04 19:17:39.930258477 +0000
+@@ -11,6 +11,7 @@
+ #include <stack>
+ #include <sstream>
+ #include <memory>
++#include <functional>
+ 
+ #include <ctime>
+