Date: Sunday, June 8, 2014 @ 15:09:00 Author: heftig Revision: 214381
Update 3.11 PKGBUILD Modified: meld/trunk/PKGBUILD-3.11 ---------------+ PKGBUILD-3.11 | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) Modified: PKGBUILD-3.11 =================================================================== --- PKGBUILD-3.11 2014-06-08 10:57:06 UTC (rev 214380) +++ PKGBUILD-3.11 2014-06-08 13:09:00 UTC (rev 214381) @@ -4,7 +4,7 @@ # Contributor: Douglas Soares de Andrade <doug...@archlinux.org> pkgname=meld -pkgver=3.11.0 +pkgver=3.11.1 pkgrel=1 pkgdesc='Visual diff and merge tool' url='http://meldmerge.org/' @@ -11,11 +11,13 @@ license=('GPL') arch=('any') makedepends=('intltool' 'itstool') -depends=('python2-gobject' 'gtk3' 'gtksourceview3' 'hicolor-icon-theme' 'desktop-file-utils') +depends=('python2-gobject' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils') +optdepends=('gtksourceview3: syntax highlighting' + 'python2-dbus: open a new tab in an already running instance') source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz";) -sha1sums=('3a23ef1b813bdcb3f8fd0308d46ba83f8536c90b') +sha1sums=('d7a641bcb67dbae5087708bfe256a8385f015e13') -# Don't forget to add the glib-compile-schemas call to install before using this PKGBUILD +# Don't forget to add the glib-compile-schemas call to install when using this PKGBUILD install=install build() { @@ -25,10 +27,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build - - # Missing files; required - install -d "${pkgdir}"/usr/share/{glib-2.0/schemas,icons} - cp -r data/icons/hicolor data/icons/HighContrast "${pkgdir}/usr/share/icons" - cp data/org.gnome.meld.gschema.xml "${pkgdir}/usr/share/glib-2.0/schemas" + # using --skip-build breaks install + python2 setup.py --no-update-icon-cache --no-compile-schemas \ + install --prefix=/usr --root="${pkgdir}" --optimize=1 }
