diff --git a/mingw-w64-mypaint-brushes/001-fix-pkgdir-location.patch b/mingw-w64-mypaint-brushes/001-fix-pkgdir-location.patch deleted file mode 100644 index 9f78d02005..0000000000 --- a/mingw-w64-mypaint-brushes/001-fix-pkgdir-location.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- mypaint-brushes-1.3.0/Makefile.am.orig 2018-04-18 13:24:37.659949900 +0300 -+++ mypaint-brushes-1.3.0/Makefile.am 2018-04-18 13:24:43.572360300 +0300 -@@ -1,4 +1,4 @@ - SUBDIRS = brushes - --pkgconfigdir = $(datadir)/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = mypaint-brushes-@MYPAINT_DATA_VERSION@.pc diff --git a/mingw-w64-mypaint-brushes/PKGBUILD b/mingw-w64-mypaint-brushes/PKGBUILD index 6922b70a02..ab5784668e 100644 --- a/mingw-w64-mypaint-brushes/PKGBUILD +++ b/mingw-w64-mypaint-brushes/PKGBUILD @@ -1,30 +1,27 @@ # Maintainer: Alexey Pavlov _realname=mypaint-brushes -_realver=1.3.0 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=${_realver/-/} -pkgrel=1 -pkgdesc="Brush engine used by MyPaint (mingw-w64)" +pkgver=1.3.0 +pkgrel=2 +pkgdesc="Brushes for MyPaint (mingw-w64)" arch=('any') url="https://github.com/Jehan/mypaint-brushes" license=("ISC") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") depends=("${MINGW_PACKAGE_PREFIX}-libmypaint") options=('strip' '!debug') -source=(${_realname}-${pkgver}.tar.gz::https://github.com/Jehan/mypaint-brushes/archive/v${pkgver}.tar.gz - 001-fix-pkgdir-location.patch) -sha256sums=('704bb6420e65085acfd7a61d6050e96b0395c5eab078433f11406c355f16b214' - '45894c60fe9e9dcd0bcf8ad3b5f6acf90651a6196058ad80c1052533b2d23b12') +source=(${_realname}-${pkgver}.tar.gz::https://github.com/Jehan/mypaint-brushes/archive/v${pkgver}.tar.gz) +sha256sums=('704bb6420e65085acfd7a61d6050e96b0395c5eab078433f11406c355f16b214') noextract=(${_realname}-${pkgver}.tar.gz) prepare() { [[ -d ${srcdir}/${_realname}-${pkgver} ]] && rm -rf ${srcdir}/${_realname}-${pkgver} - tar -xzf ${srcdir}/${_realname}-${pkgver}.tar.gz -C ${srcdir} || true - cd ${_realname}-${_realver} - patch -p1 -i ${srcdir}/001-fix-pkgdir-location.patch + tar --exclude=README -xzf ${_realname}-${pkgver}.tar.gz + + cd ${_realname}-${pkgver} ./autogen.sh } @@ -32,8 +29,7 @@ build() { [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST} mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST} - PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/share/pkgconfig" \ - ../${_realname}-${_realver}/configure \ + "${srcdir}/${_realname}-${pkgver}"/configure \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ @@ -45,5 +41,5 @@ build() { package() { cd "${srcdir}"/build-${MINGW_CHOST} make -j1 DESTDIR="${pkgdir}" install - install -Dm644 ${srcdir}/${_realname}-${_realver}/Licenses.md "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/Licenses.md + install -Dm644 ${srcdir}/${_realname}-${pkgver}/Licenses.md "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/Licenses.md }