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

[Sergej Pupykin]

    Date: Friday, October 6, 2017 @ 11:19:31
  Author: spupykin
Revision: 261879

upgpkg: etl 1.2.1-1

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

---------------------+
 ETL-swap-type.patch |   11 -----------
 PKGBUILD            |   15 ++++-----------
 2 files changed, 4 insertions(+), 22 deletions(-)

Deleted: ETL-swap-type.patch
===================================================================
--- ETL-swap-type.patch	2017-10-06 11:19:28 UTC (rev 261878)
+++ ETL-swap-type.patch	2017-10-06 11:19:31 UTC (rev 261879)
@@ -1,11 +0,0 @@
---- 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-10-06 11:19:28 UTC (rev 261878)
+++ PKGBUILD	2017-10-06 11:19:31 UTC (rev 261879)
@@ -3,8 +3,8 @@
 # Contributor: Franco Iacomella <yaco at gnu.org>
 
 pkgname=etl
-pkgver=0.04.22
-pkgrel=2
+pkgver=1.2.1
+pkgrel=1
 pkgdesc="VoriaETL: C++ STL complementory multiplatform template library"
 arch=(any)
 url="http://synfig.org"
@@ -12,16 +12,9 @@
 depends=()
 conflicts=('synfig-etl')
 replaces=('synfig-etl')
-source=(https://downloads.sourceforge.net/project/synfig/releases/1.2.0/source/ETL-${pkgver}.tar.gz ETL-swap-type.patch)
-sha256sums=('ac5aeb9b8ec2c69dd455c6c72e104ff20c43e1e5dde6c0cd87f3f7d1b41d2746'
-            '50ef24805f2e90d02fc2b94e2a578f78eaa266b56c57c198b3b947a65237e9c7')
+source=(https://downloads.sourceforge.net/project/synfig/releases/$pkgver/source/ETL-${pkgver}.tar.gz)
+sha256sums=('754d88c5ddfdef54f27d1e17f62a902eb9f09fbe7ef9aebded34541b4c1700e6')
 
-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