Updated package

4 files changed, 39 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 990acc177d69..0326ff58c6c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,23 @@
 pkgbase = wxformbuilder
 	pkgdesc = RAD tool for wxWidgets GUI design
 	pkgver = 3.9.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/wxFormBuilder/wxFormBuilder
 	arch = i686
 	arch = x86_64
-	license = GPL
+	license = GPL2
 	makedepends = git
 	makedepends = ninja
 	makedepends = meson
-	depends = wxgtk2
+	depends = wxgtk3
 	provides = wxformbuilder
 	conflicts = wxformbuilder
 	conflicts = wxformbuilder-svn
 	conflicts = wxformbuilder-git
 	source = git://github.com/wxFormBuilder/wxFormBuilder.git#tag=v3.9.0
-	md5sums = SKIP
+	source = nativefile.ini
+	sha512sums = SKIP
+	sha512sums = c44a263897bc22e46bbe8d106cb0e4ee4c331fec0d271b4140055c59a891360c251fa7f33ce7b83fa8a3515c954c6cbf9b06eddaff2e3b671709d652fd603836
 
 pkgname = wxformbuilder
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..ca29db2e47b2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/pkg
+/src
+/wxFormBuilder
+*.pkg.tar*
diff --git a/PKGBUILD b/PKGBUILD
index 42f75526e989..f8b920e72df9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,42 @@
+# Maintainer: redtide <redtid3 at gmail dot com>
 # Maintainer: Antonio O. <antonio.mx.9605 at gmail dot com>
 
+# TODO: replace git checkout with a tarball when available, see
+# https://github.com/wxFormBuilder/wxFormBuilder/issues/676
+
+_gitname=wxFormBuilder
 pkgname=wxformbuilder
-gitname=wxFormBuilder
 pkgver=3.9.0
-pkgrel=1
-pkgdesc='RAD tool for wxWidgets GUI design'
+pkgrel=2
+pkgdesc="RAD tool for wxWidgets GUI design"
 arch=('i686' 'x86_64')
-url=https://github.com/wxFormBuilder/wxFormBuilder
-license=('GPL')
+url="https://github.com/wxFormBuilder/wxFormBuilder"
+license=('GPL2')
 provides=('wxformbuilder')
 conflicts=('wxformbuilder' 'wxformbuilder-svn' 'wxformbuilder-git')
-depends=('wxgtk2')
+depends=('wxgtk3')
 makedepends=('git' 'ninja' 'meson')
-source=('git://github.com/wxFormBuilder/wxFormBuilder.git#tag=v3.9.0')
-md5sums=('SKIP')
-
+source=(
+  "git://github.com/wxFormBuilder/wxFormBuilder.git#tag=v3.9.0"
+  "nativefile.ini"
+)
+sha512sums=(
+  "SKIP"
+  "c44a263897bc22e46bbe8d106cb0e4ee4c331fec0d271b4140055c59a891360c251fa7f33ce7b83fa8a3515c954c6cbf9b06eddaff2e3b671709d652fd603836"
+)
 prepare() {
-  cd $srcdir/${gitname}
+  cd "${srcdir}/${_gitname}"
   git submodule update --init
 }
-
 build() {
-  cd $srcdir/${gitname}
-  meson _build --prefix $srcdir/${gitname}/_install
-  ninja -j$(nproc) -C _build install 
+  cd "${srcdir}/${_gitname}"
+  meson _build --native-file "${srcdir}/nativefile.ini" --prefix /usr
+  ninja -C _build
 }
-
 package() {
-  cd $srcdir/${gitname}
-  install -Dm 755 -d $pkgdir/usr
-  cp -a _install/* $pkgdir/usr
-  gendesk -f -n --pkgname $pkgname --pkgdesc "$pkgdesc" --name wxFormBuilder
-  install -Dm 644 $srcdir/${gitname}/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
-  install -Dm 644 $pkgdir/usr/share/wxformbuilder/resources/icons/logo.png $pkgdir/usr/share/pixmaps/$pkgname.png
+  cd "${srcdir}/${_gitname}"
+  DESTDIR="${pkgdir}" ninja -C _build install
+  mkdir -p "${pkgdir}/usr/share/mime/packages/"
+  cp -r "install/linux/data/gnome/usr/share" "${pkgdir}/usr"
+  install -m644 "install/linux/debian/wxformbuilder.sharedmimeinfo" "${pkgdir}/usr/share/mime/packages/wxformbuilder.xml"
 }
diff --git a/nativefile.ini b/nativefile.ini
new file mode 100644
index 000000000000..471c6dd6b163
--- /dev/null
+++ b/nativefile.ini
@@ -0,0 +1,2 @@
+[binaries]
+wx-config = 'wx-config-gtk3'