summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornate2018-11-22 09:33:18 -0600
committernate2018-11-22 09:33:18 -0600
commit57740ea79df866db4d2b7f9ceea72e72b9e4a32c (patch)
treec1c14077dceffbf44ac40e7b2a349608d44ca1d1
parentb3de453899909273ab236b914277c699de473f54 (diff)
downloadaur-57740ea79df866db4d2b7f9ceea72e72b9e4a32c.tar.gz
update build for meson
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD30
2 files changed, 23 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eba4ae24d479..ec46e1859404 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xed-git
pkgdesc = A small and lightweight text editor. X-Apps Project (git version).
- pkgver = 1.8.0.r0.g7951868
+ pkgver = master.lmde3.r0.g7220975
pkgrel = 1
url = https://github.com/linuxmint/xed
arch = i686
@@ -11,6 +11,7 @@ pkgbase = xed-git
makedepends = gnome-common
makedepends = iso-codes
makedepends = gobject-introspection
+ makedepends = meson
depends = gtksourceview3
depends = enchant
depends = desktop-file-utils
diff --git a/PKGBUILD b/PKGBUILD
index a4565dbd9821..1a60a79bed64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
pkgname=xed-git
_pkgbasename=xed
-pkgver=1.8.0.r0.g7951868
+pkgver=master.lmde3.r0.g7220975
pkgrel=1
pkgdesc="A small and lightweight text editor. X-Apps Project (git version)."
arch=('i686' 'x86_64' 'armv7h')
license=('GPL')
depends=('gtksourceview3' 'enchant' 'desktop-file-utils' 'libsm'
'libpeas' 'xapps' 'gspell')
-makedepends=('git' 'gnome-common' 'iso-codes' 'gobject-introspection')
+makedepends=('git' 'gnome-common' 'iso-codes' 'gobject-introspection' 'meson')
provides=($pkgname $_pkgbasename)
conflicts=(${_pkgbasename})
url='https://github.com/linuxmint/xed'
@@ -19,8 +19,6 @@ md5sums=('SKIP')
prepare() {
cd ${srcdir}/${pkgname}
- # https://www.archlinux.org/todo/enchant-221-rebuild/
- sed -i 's/, enchant/, enchant-2/' configure.ac
}
pkgver() {
@@ -30,14 +28,28 @@ pkgver() {
build() {
cd ${srcdir}/${pkgname}
- ./autogen.sh --with-gtk=3.0 --prefix="/usr" \
- --localstatedir="/var" \
- --libexecdir="/usr/lib/xed"
- make CFLAGS='-w -O2'
+
+ meson . build \
+ --prefix /usr \
+ --libdir /usr/lib \
+ --libexecdir /usr/lib \
+ --bindir /usr/bin \
+ --sbindir /usr/bin \
+ --includedir /usr/include \
+ --datadir /usr/share \
+ --mandir /usr/share/man \
+ --infodir /usr/share/info \
+ --localedir /usr/share/locale \
+ --sysconfdir /etc \
+ --localstatedir /var \
+ --sharedstatedir /var/lib
+
+ ninja -v -C build
}
package(){
cd ${srcdir}/${pkgname}
- make DESTDIR="$pkgdir/" install
+
+ DESTDIR="$pkgdir/" ninja install -v -C build
}