port build to meson

2 files changed, 37 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1a58aafd3f1e..1bbd29dc0416 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pix-git
 	pkgdesc = Image viewer and browser based on gthumb. X-Apps Project (git version).
-	pkgver = 2.8.4.r1.g4c49677
+	pkgver = 3.0.0.r0.g2d78023
 	pkgrel = 1
 	url = https://github.com/linuxmint/pix
 	arch = i686
@@ -8,11 +8,10 @@ pkgbase = pix-git
 	arch = armv7h
 	license = GPL
 	makedepends = git
-	makedepends = gnome-common
+	makedepends = meson
 	makedepends = intltool
 	makedepends = itstool
 	makedepends = liboauth
-	makedepends = libchamplain
 	makedepends = exiv2
 	depends = desktop-file-utils
 	depends = librsvg
@@ -21,6 +20,7 @@ pkgbase = pix-git
 	depends = gsettings-desktop-schemas
 	depends = libwebp
 	depends = webkit2gtk
+	depends = xapp
 	optdepends = gstreamer: Video support
 	optdepends = exiv2: Embedded metadata support
 	optdepends = libjpeg-turbo: Jpeg writing support
@@ -29,6 +29,7 @@ pkgbase = pix-git
 	optdepends = brasero: Burn discs
 	optdepends = liboauth: Web albums
 	optdepends = libchamplain: Map Viewer
+	optdepends = libheif: heif/heic/avif file support
 	provides = pix-git
 	provides = pix
 	conflicts = pix
diff --git a/PKGBUILD b/PKGBUILD
index 3d0188ffc4f2..4f0811f1be97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,40 @@
 
 pkgname=pix-git
 _pkgbasename=pix
-pkgver=2.8.4.r1.g4c49677
+pkgver=3.0.0.r0.g2d78023
 pkgrel=1
 pkgdesc="Image viewer and browser based on gthumb. X-Apps Project (git version)."
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
-depends=('desktop-file-utils' 'librsvg' 'clutter-gtk'
-         'gst-plugins-base-libs' 'gsettings-desktop-schemas' 'libwebp' 'webkit2gtk')
-makedepends=('git' 'gnome-common' 'intltool' 'itstool'
-             'liboauth' 'libchamplain' 'exiv2' )
-optdepends=('gstreamer: Video support'
+depends=(
+    'desktop-file-utils'
+    'librsvg'
+    'clutter-gtk'
+    'gst-plugins-base-libs'
+    'gsettings-desktop-schemas'
+    'libwebp'
+    'webkit2gtk'
+    'xapp'
+)
+makedepends=(
+    'git'
+    'meson'
+    'intltool'
+    'itstool'
+    'liboauth'
+    'exiv2'
+)
+optdepends=(
+    'gstreamer: Video support'
     'exiv2: Embedded metadata support'
     'libjpeg-turbo: Jpeg writing support'
     'libtiff: Tiff writing support'
     'dcraw: Support for RAW photos'
     'brasero: Burn discs'
     'liboauth: Web albums'
-    'libchamplain: Map Viewer')
+    'libchamplain: Map Viewer'
+    'libheif: heif/heic/avif file support'
+)
 provides=($pkgname $_pkgbasename)
 conflicts=(${_pkgbasename})
 url='https://github.com/linuxmint/pix'
@@ -32,27 +49,18 @@ pkgver() {
 }
 
 build() {
-    cd ${srcdir}/${pkgname}
-    gnome-autogen.sh --prefix="/usr" \
-        --localstatedir="/var" \
-        --libexecdir="/usr/lib/pix" \
-        -disable-static
+    mkdir -p "${srcdir}"/${pkgname}/build
+    cd "${srcdir}"/${pkgname}/build
 
-    # Copy some files that ended up in the wrong directory.
-    # This doesn't happen on mint. See this github issue:
-    # https://github.com/linuxmint/pix/issues/7
-    if [ -d 'tests/$(top_srcdir)/' ]
-    then
-        cp 'tests/$(top_srcdir)/pix/.deps/dom_test-dom.Po' "pix/.deps/"
-        cp 'tests/$(top_srcdir)/pix/.deps/glib_utils_test-glib-utils.Po' "pix/.deps/"
-        cp 'tests/$(top_srcdir)/pix/.deps/gsignature_test-gsignature.Po' "pix/.deps/"
-        cp 'tests/$(top_srcdir)/pix/.deps/oauth_test-gsignature.Po' "pix/.deps/"
-    fi
+    meson --prefix=/usr \
+          --libexecdir=lib/${pkgname} \
+          --buildtype=plain \
+          ..
 
-    make
+    ninja
 }
 
 package(){
-    cd ${srcdir}/${pkgname}
-    make DESTDIR="$pkgdir/" install
+    cd ${srcdir}/${pkgname}/build
+    DESTDIR="$pkgdir/" ninja install
 }