Upgrade to version 1.2.2

3 files changed, 12 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4508100dffb7..814020e542d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = synfigstudio
 	pkgdesc = Professional vector animation program (GUI)
-	pkgver = 1.2.1
-	pkgrel = 4
+	pkgver = 1.2.2
+	pkgrel = 1
 	url = https://synfig.org
 	arch = x86_64
 	license = GPL2
@@ -16,12 +16,10 @@ pkgbase = synfigstudio
 	depends = gtkmm3
 	depends = synfig
 	depends = sdl_image
-	source = https://github.com/synfig/synfig/releases/download/v1.2.1/ETL-1.2.1.tar.gz
-	source = https://github.com/synfig/synfig/releases/download/v1.2.1/synfigstudio-1.2.1.tar.gz
-	source = ETL-1.2.1.patch
-	sha256sums = 754d88c5ddfdef54f27d1e17f62a902eb9f09fbe7ef9aebded34541b4c1700e6
-	sha256sums = 1a97875e0039895604085649bcd30cf0d6165f4c865299ca13d45d2dfbfab05d
-	sha256sums = 35e218317050430ebae667d26269903ad1c377407b9a75feb48a9138af131cb0
+	source = https://github.com/synfig/synfig/releases/download/v1.2.2/source-ETL-1.2.2.tar.gz
+	source = https://github.com/synfig/synfig/releases/download/v1.2.2/source-synfigstudio-1.2.2.tar.gz
+	sha256sums = 0dc19c5a6c9e964054ca3af6dacd6ab0c198d78071cfab2aebac178afe454d8b
+	sha256sums = 76fa37998af634cf694f9b5bdfcb90220bc88f8527df117d9282a39fe01489e2
 
 pkgname = synfigstudio
 
diff --git a/ETL-1.2.1.patch b/ETL-1.2.1.patch
deleted file mode 100644
index bcf70e00880c..000000000000
--- a/ETL-1.2.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/ETL/_pen.h	2017-09-08 05:51:26.000000000 -0400
-+++ b/ETL/_pen.h	2018-07-27 12:56:43.833337339 -0400
-@@ -136,7 +136,8 @@
- 		typedef int value_type;
- 		value_type x,y;
- 		difference_type(value_type x, value_type y):x(x),y(y) { }
--		value_type &operator[](int i)const { return i?y:x; }
-+		const value_type &operator[](int i) const { return i?y:x; }
-+		value_type &operator[](int i) { return i?y:x; }
- 	};
- 
- protected:
diff --git a/PKGBUILD b/PKGBUILD
index db483a8670fa..0468a34b4442 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfigstudio
-pkgver=1.2.1
-pkgrel=4
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="Professional vector animation program (GUI)"
 arch=(x86_64)
 url="https://synfig.org"
@@ -13,21 +13,11 @@ depends=('gtkmm3' 'synfig' 'sdl_image')
 makedepends=('openexr' 'libmagick6' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi'
              'xorg-fonts-misc' 'xorg-fonts-type1' 'intltool' 'imagemagick')
 source=(
-    "https://github.com/synfig/synfig/releases/download/v$pkgver/ETL-$pkgver.tar.gz"
-    "https://github.com/synfig/synfig/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
-    'ETL-1.2.1.patch')
+    "https://github.com/synfig/synfig/releases/download/v$pkgver/source-ETL-$pkgver.tar.gz"
+    "https://github.com/synfig/synfig/releases/download/v$pkgver/source-$pkgname-$pkgver.tar.gz")
 sha256sums=(
-    '754d88c5ddfdef54f27d1e17f62a902eb9f09fbe7ef9aebded34541b4c1700e6'
-    '1a97875e0039895604085649bcd30cf0d6165f4c865299ca13d45d2dfbfab05d'
-    '35e218317050430ebae667d26269903ad1c377407b9a75feb48a9138af131cb0')
-
-prepare() {
-    # Fix const-invalid method in ETL 1.2.1 using the patch which is included
-    # in ETL ≥ 1.3.9. This makes building with GCC possible.
-    # (see <https://github.com/synfig/synfig/commit/cb05b072>)
-    cd "$srcdir"/ETL-$pkgver
-    patch -p1 -i "$srcdir"/ETL-1.2.1.patch
-}
+    '0dc19c5a6c9e964054ca3af6dacd6ab0c198d78071cfab2aebac178afe454d8b'
+    '76fa37998af634cf694f9b5bdfcb90220bc88f8527df117d9282a39fe01489e2')
 
 build() {
     # Build a local ETL version