[arch-commits] Commit in etl/trunk (ETL-swap-type.patch PKGBUILD)

[Antonio Rojas]

    Date: Saturday, May 20, 2017 @ 09:10:55
  Author: arojas
Revision: 228758

Fix synfig build with GCC 7

Added:
  etl/trunk/ETL-swap-type.patch
Modified:
  etl/trunk/PKGBUILD

---------------------+
 ETL-swap-type.patch |   11 +++++++++++
 PKGBUILD            |   13 ++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

Added: ETL-swap-type.patch
===================================================================
--- ETL-swap-type.patch	                        (rev 0)
+++ ETL-swap-type.patch	2017-05-20 09:10:55 UTC (rev 228758)
@@ -0,0 +1,11 @@
+--- ETL/_surface.h~	2016-11-30 04:59:46.000000000 -0600
++++ ETL/_surface.h	2017-03-07 08:08:04.027014347 -0600
+@@ -190,7 +190,7 @@
+ 
+ 	value_prep_type cooker_;
+ 
+-	void swap(const surface &x)
++	void swap(surface &x)
+ 	{
+ 		std::swap(data_,x.data_);
+ 		std::swap(zero_pos_,x.zero_pos_);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-20 09:09:54 UTC (rev 228757)
+++ PKGBUILD	2017-05-20 09:10:55 UTC (rev 228758)
@@ -4,7 +4,7 @@
 
 pkgname=etl
 pkgver=0.04.22
-pkgrel=1
+pkgrel=2
 pkgdesc="VoriaETL: C++ STL complementory multiplatform template library"
 arch=(any)
 url="http://synfig.org"
@@ -12,9 +12,16 @@
 depends=()
 conflicts=('synfig-etl')
 replaces=('synfig-etl')
-source=(https://downloads.sourceforge.net/project/synfig/releases/1.2.0/source/ETL-${pkgver}.tar.gz)
-sha256sums=('ac5aeb9b8ec2c69dd455c6c72e104ff20c43e1e5dde6c0cd87f3f7d1b41d2746')
+source=(https://downloads.sourceforge.net/project/synfig/releases/1.2.0/source/ETL-${pkgver}.tar.gz ETL-swap-type.patch)
+sha256sums=('ac5aeb9b8ec2c69dd455c6c72e104ff20c43e1e5dde6c0cd87f3f7d1b41d2746'
+            '50ef24805f2e90d02fc2b94e2a578f78eaa266b56c57c198b3b947a65237e9c7')
 
+prepare() {
+  cd ETL-$pkgver
+  # fix synfig build with GCC 7 (Fedora)
+  patch -p0 -i ../ETL-swap-type.patch
+}
+
 build() {
   cd "$srcdir"/ETL-$pkgver
   ./configure --prefix=/usr