Version 1.0.7

3 files changed, 94 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f094e8a6690d..2ae849d393e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = libxmlbird
 	pkgdesc = XML parsing library written in Vala
-	pkgver = 1.0.6
+	pkgver = 1.0.7
 	pkgrel = 1
 	url = https://birdfont.org/xmlbird.php
 	arch = i686
 	arch = x86_64
 	license = LGPL3
 	makedepends = vala
-	makedepends = python2
+	makedepends = python
 	depends = glib2
-	source = https://birdfont.org/xmlbird-releases/libxmlbird-1.0.6.tar.xz
-	source = https://birdfont.org/xmlbird-releases/libxmlbird-1.0.6.tar.xz.sig
-	sha512sums = 7d58216bfb6a880948ff6e76062cfcc6e7a41406bf50f5981df44e925d8a77ee2bea3b5aa58d4ca28ddd32c5ab1125dff0af3012a032446230b99454a47a420e
+	source = https://birdfont.org/xmlbird-releases/libxmlbird-1.0.7.tar.xz
+	source = https://birdfont.org/xmlbird-releases/libxmlbird-1.0.7.tar.xz.sig
+	source = fix_install.patch
+	sha512sums = ee407da8a63152e5427456d57724aa19ca54f2af88b5b08d26b0494160920c9d76220c5f5eb199758569b3452419de3523eacdc1fa173ac9d31968d0ffcbee39
 	sha512sums = SKIP
+	sha512sums = 71ff8563ade1e07818a10f6296e8d12bcbbba3e5901fc849b76004be1a0e0ce01336b3193367d0a9f384b40053b9d95afdbfc198c66800f3d123d3165242887e
 
 pkgname = libxmlbird
 
diff --git a/PKGBUILD b/PKGBUILD
index c07d8e15492e..9e12859b50d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,33 @@
 # Contributor: fstirlitz <felix.von.s@posteo.de>
 
 pkgname=libxmlbird
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=1
 pkgdesc='XML parsing library written in Vala'
 arch=('i686' 'x86_64')
 url='https://birdfont.org/xmlbird.php'
 license=('LGPL3')
 depends=('glib2')
-makedepends=('vala' 'python2')
-source=(https://birdfont.org/xmlbird-releases/${pkgname}-${pkgver}.tar.xz{,.sig})
-sha512sums=('7d58216bfb6a880948ff6e76062cfcc6e7a41406bf50f5981df44e925d8a77ee2bea3b5aa58d4ca28ddd32c5ab1125dff0af3012a032446230b99454a47a420e'
-            'SKIP')
+makedepends=('vala' 'python')
+source=(https://birdfont.org/xmlbird-releases/${pkgname}-${pkgver}.tar.xz{,.sig}
+        'fix_install.patch')
+sha512sums=('ee407da8a63152e5427456d57724aa19ca54f2af88b5b08d26b0494160920c9d76220c5f5eb199758569b3452419de3523eacdc1fa173ac9d31968d0ffcbee39'
+            'SKIP'
+            '71ff8563ade1e07818a10f6296e8d12bcbbba3e5901fc849b76004be1a0e0ce01336b3193367d0a9f384b40053b9d95afdbfc198c66800f3d123d3165242887e')
 validpgpkeys=('FB3BEFA59A6FF7F0E0682B68BCD31D4CCCEB9DD4') # Johan Mattsson <gmail: johan dot mattsson dot m>
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i '../fix_install.patch'
+}
+
 build() {
-	cd "${srcdir}/$pkgname-$pkgver"
-	python2 ./configure -p /usr
-	python2 ./scripts/build_linux.py -p /usr
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure -p /usr
+	./build.py
 }
 
 package() {
-	cd "${srcdir}/$pkgname-$pkgver"
-	python2 ./install.py -d "${pkgdir}" -l /lib
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./install.py -d "${pkgdir}" -l /lib
 }
diff --git a/fix_install.patch b/fix_install.patch
new file mode 100644
index 000000000000..75f391ce0ed4
--- /dev/null
+++ b/fix_install.patch
@@ -0,0 +1,70 @@
+diff --git a/install.py b/install.py
+index c1f7f06..9e6f0c6 100755
+--- a/install.py
++++ b/install.py
+@@ -43,24 +43,24 @@ def getDestRoot (file, dir):
+ 	else:
+ 		f += file
+ 	return f
+-	
++
+ 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 + '/')
+ 
+ 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)
+ 	print ("install link: " + f)
+ 	run ('cd ' + dest + prefix + dir + ' && ln -sf ' + file + ' ' + linkname)
+-	
++
+ parser = OptionParser()
+ parser.add_option ("-l", "--libdir", dest="libdir", help="path to directory for shared libraries (lib or lib64).")
+ parser.add_option ("-d", "--dest", dest="dest", help="install to this directory", metavar="DEST")
+@@ -91,22 +91,21 @@ else:
+ 
+ 
+ if os.path.isfile ('build/bin/libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION):
+-   install ('build/bin/libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, libdir, 644)
+-   link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION_MAJOR)
+-   link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so')
++	install ('build/bin/libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, libdir, 644)
++	link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION_MAJOR)
++	link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so')
+ elif os.path.isfile ('build/libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION):
+-   install ('build/libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, libdir, 644)
+-   link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION_MAJOR)
+-   link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so')
++	install ('build/libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, libdir, 644)
++	link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION_MAJOR)
++	link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so')
+ elif os.path.isfile ('build/bin/libxmlbird.' + version.LIBXMLBIRD_SO_VERSION + '.dylib'):
+-   install ('build/bin/libxmlbird-' + version.LIBXMLBIRD_SO_VERSION + '.dylib', libdir, 644)
+-   link (libdir, 'libxmlbird-' + version.LIBXMLBIRD_SO_VERSION + '.dylib', ' libxmlbird.dylib.' + version.LIBXMLBIRD_SO_VERSION_MAJOR)
+-   link (libdir, 'libxmlbird-' + version.LIBXMLBIRD_SO_VERSION + '.dylib', ' libxmlbird.dylib')
++	install ('build/bin/libxmlbird-' + version.LIBXMLBIRD_SO_VERSION + '.dylib', libdir, 644)
++	link (libdir, 'libxmlbird-' + version.LIBXMLBIRD_SO_VERSION + '.dylib', ' libxmlbird.dylib.' + version.LIBXMLBIRD_SO_VERSION_MAJOR)
++	link (libdir, 'libxmlbird-' + version.LIBXMLBIRD_SO_VERSION + '.dylib', ' libxmlbird.dylib')
+ else:
+-   print ("Can't find libxmlbird.")
+-   exit (1)
++	print ("Can't find libxmlbird.")
++	exit (1)
+ 
+ install ('build/xmlbird/xmlbird.h', '/include', 644)
+ install ('build/xmlbird.vapi', '/share/vala/vapi', 644)
+ install ('build/xmlbird.pc', libdir + '/pkgconfig', 644)
+-