Version 2.12.0

3 files changed, 8 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62b51a473d32..607027798ab9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = birdfont
 	pkgdesc = A free font editor that lets you create vector graphics and export TTF, EOT & SVG fonts
-	pkgver = 2.11.7
+	pkgver = 2.12.0
 	pkgrel = 1
 	url = https://birdfont.org/
 	install = birdfont.install
@@ -15,14 +15,12 @@ pkgbase = birdfont
 	depends = libnotify
 	depends = libxmlbird
 	depends = ttf-roboto
-	source = https://birdfont.org/releases/birdfont-2.11.7.tar.xz
-	source = https://birdfont.org/releases/birdfont-2.11.7.tar.xz.sig
+	source = https://birdfont.org/releases/birdfont-2.12.0.tar.xz
+	source = https://birdfont.org/releases/birdfont-2.12.0.tar.xz.sig
 	source = http://www.unicode.org/Public/UNIDATA/NamesList.txt
-	source = fix_install.patch
-	sha512sums = d476497ef6fa8f336820f3c35deb53eed4cdd3db58522c707d689195dcd81962db45527f45ab034b2263b220e160ab5924e22bcf8d936da42c5695b28d4c3053
+	sha512sums = 65209b66df6c4c9980396c55b5862c9eee06a26302d4e0f3a3ce89ce3d7c4b6e1d2adda5315a553696336afab78732634a75fdd31ae01965934b37d6034e06d2
 	sha512sums = SKIP
 	sha512sums = 7f9fb0349f64e8c84d1d2fa3416d561b30744d6f1fcb7d01efe1bc93dca2fe7f58148918270bfeb92551a1e08c7fefba3208af259bf35d8653a1c7772b8da259
-	sha512sums = b8d286db7d56e89045b57f93e712487c9422560c744792326799f3c58fcca2b33bb1cf4c2fe95c693ba1a28b8cfb49f12eea5b59e63cb594e4e8a4f7b5a0e13c
 
 pkgname = birdfont
 
diff --git a/PKGBUILD b/PKGBUILD
index 6a7187592ca0..514445b091ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,34 +4,26 @@
 # Contributor: Matej Lach <matej.lach@gmail.com>
 
 pkgname=birdfont
-pkgver=2.11.7
+pkgver=2.12.0
 pkgrel=1
 pkgdesc='A free font editor that lets you create vector graphics and export TTF, EOT & SVG fonts'
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url='https://birdfont.org/'
 license=('GPL3')
 depends=('libgee' 'webkitgtk' 'libnotify' 'libxmlbird' 'ttf-roboto')
 makedepends=('vala' 'gettext' 'python')
 source=(
-	"https://birdfont.org/releases/${pkgname}-${pkgver}.tar.xz"
-	"https://birdfont.org/releases/${pkgname}-${pkgver}.tar.xz.sig"
+	https://birdfont.org/releases/${pkgname}-${pkgver}.tar.xz{,.sig}
 	'http://www.unicode.org/Public/UNIDATA/NamesList.txt'
-	'fix_install.patch'
 )
 sha512sums=(
-	'd476497ef6fa8f336820f3c35deb53eed4cdd3db58522c707d689195dcd81962db45527f45ab034b2263b220e160ab5924e22bcf8d936da42c5695b28d4c3053'
+	'65209b66df6c4c9980396c55b5862c9eee06a26302d4e0f3a3ce89ce3d7c4b6e1d2adda5315a553696336afab78732634a75fdd31ae01965934b37d6034e06d2'
 	'SKIP'
 	'7f9fb0349f64e8c84d1d2fa3416d561b30744d6f1fcb7d01efe1bc93dca2fe7f58148918270bfeb92551a1e08c7fefba3208af259bf35d8653a1c7772b8da259'
-	'b8d286db7d56e89045b57f93e712487c9422560c744792326799f3c58fcca2b33bb1cf4c2fe95c693ba1a28b8cfb49f12eea5b59e63cb594e4e8a4f7b5a0e13c'
 )
 validpgpkeys=('FB3BEFA59A6FF7F0E0682B68BCD31D4CCCEB9DD4') # Johan Mattsson <gmail: johan dot mattsson dot m>
 install="${pkgname}.install"
 
-prepare() {
-	cd "${srcdir}/$pkgname-$pkgver"
-	patch -p1 -i '../fix_install.patch'
-}
-
 build() {
 	cd "${srcdir}/$pkgname-$pkgver"
 	./configure -p /usr
diff --git a/fix_install.patch b/fix_install.patch
deleted file mode 100644
index 93e12bf46a81..000000000000
--- a/fix_install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/install.py b/install.py
-index 4ecbced..6dbc2a1 100755
---- a/install.py
-+++ b/install.py
-@@ -48,14 +48,14 @@ def install (file, dir, mode):
- 	f = getDest (file, dir)
- 	print ("install: " + f)
- 	run ('install -d ' + dest + prefix + dir)
--	run ('install -m ' + `mode` + ' '   + file + ' ' + dest + prefix + dir + '/')
-+	run ('install -m ' + str(mode) + ' ' + file + ' ' + dest + prefix + dir + '/')
- 	installed.write (f + "\n")
- 
- def install_root (file, dir, mode):
--        f = getDestRoot (file, dir)
--        print ("install: " + f)
--        run ('install -d ' + dest + dir)
--	run ('install -m ' + `mode` + ' '   + file + ' ' + dest + dir + '/')
-+	f = getDestRoot (file, dir)
-+	print ("install: " + f)
-+	run ('install -d ' + dest + dir)
-+	run ('install -m ' + str(mode) + ' ' + file + ' ' + dest + dir + '/')
- 
- def link (dir, file, linkname):
- 	f = getDest (linkname, dir)
-@@ -172,7 +172,7 @@ elif os.path.isfile ('build/bin/libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION +
-         link (libdir, 'libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib', ' libbirdgems.dylib.' + version.LIBBIRDGEMS_SO_VERSION_MAJOR)
-         link (libdir, 'libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib', ' libbirdgems.dylib')
- else:
--        print ("Can't find libbirdgems, version: " + version.LIBBIRDGEMS_SO_VERSION)
-+	print ("Can't find libbirdgems, version: " + version.LIBBIRDGEMS_SO_VERSION)
- 	exit (1)
- 
-