update to verion 1.0.1

5 files changed, 66 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0406e1a1daac..cc6e5fad8209 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
 pkgbase = wxglade
-	pkgdesc = GUI designer for wxWidgets that can generate Python, C++, Perl, Lisp and XRC code
-	pkgver = 0.9.5
+	pkgdesc = wxGlade is a GUI builder written in Python for the GUI toolkit wxWidgets / wxPython
+	pkgver = 1.0.1
 	pkgrel = 1
 	url = http://wxglade.sourceforge.net/
-	install = wxglade.install
 	arch = any
 	license = MIT
+	makedepends = icoutils
 	makedepends = gendesk
-	makedepends = imagemagick
-	depends = python2
-	depends = wxpython
+	depends = python
+	depends = python-wxpython
 	depends = desktop-file-utils
-	source = https://github.com/wxGlade/wxGlade/archive/v0.9.5.tar.gz
-	source = wxglade.sh
-	sha256sums = 46a644c7960cb718ccb7267d7a21311231f99d37f817770e958704ef12d64275
-	sha256sums = 4549c2034453475f06265fa1c845db3b4c006ab9b17d0386aecd2a276577a6e0
+	depends = hicolor-icon-theme
+	depends = shared-mime-info
+	source = https://github.com/wxGlade/wxGlade/archive/v1.0.1.tar.gz
+	source = application-x-wxg.xml
+	sha256sums = a92585df4254eae88db457b0505cd58374385898e94206bf190111a041a20cd4
+	sha256sums = f651ff097678077eac865c64a655107c9a4aa4fd0bf65e233713a5ed916608c0
 
 pkgname = wxglade
 
diff --git a/PKGBUILD b/PKGBUILD
index 75b3fea5487a..557d68bc17e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Christoph Robbert <chrobbert@gmail.com>
+# Maintainer:  FirstAirBender <noblechuk5[at]web[dot]de>
+# Contributor: Christoph Robbert <chrobbert@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: jrutila
@@ -6,45 +7,49 @@
 # Contributor: jht <stefano@inventati.org>
 
 pkgname=wxglade
-pkgver=0.9.5
+pkgver=1.0.1
 pkgrel=1
-pkgdesc='GUI designer for wxWidgets that can generate Python, C++, Perl, Lisp and XRC code'
+pkgdesc='wxGlade is a GUI builder written in Python for the GUI toolkit wxWidgets / wxPython'
 arch=('any')
 license=('MIT')
 url='http://wxglade.sourceforge.net/'
-depends=('python2' 'wxpython' 'desktop-file-utils')
-makedepends=('gendesk' 'imagemagick')
-install="$pkgname.install"
+depends=('python' 'python-wxpython' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info')
+makedepends=(icoutils gendesk)
 source=("https://github.com/wxGlade/wxGlade/archive/v$pkgver.tar.gz"
-        'wxglade.sh')
-sha256sums=('46a644c7960cb718ccb7267d7a21311231f99d37f817770e958704ef12d64275'
-            '4549c2034453475f06265fa1c845db3b4c006ab9b17d0386aecd2a276577a6e0')
+        application-x-wxg.xml)
+sha256sums=('a92585df4254eae88db457b0505cd58374385898e94206bf190111a041a20cd4'
+            'f651ff097678077eac865c64a655107c9a4aa4fd0bf65e233713a5ed916608c0')
 
 prepare() {
-  gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --exec 'wxglade %F' \
-    --name 'wxGlade' --mimetypes 'application/x-wxg'
-  convert "wxGlade-$pkgver/icons/icon.xpm" "$pkgname.png"
+  gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --exec "$pkgname %F" \
+    --name 'WxGlade' --mimetypes 'application/x-wxg'
+
+  rm -rf "$pkgname-$pkgver" && mv -Tfv {wxGlade,$pkgname}-$pkgver
 }
 
-package() {
-  mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/doc/wxGlade"
-
-  # TODO: Update man pages upstream
-  #install -Dm644 "wxGlade-$pkgver/docs/man/$pkgname.1" \
-  #  "$pkgdir/usr/share/man/man1/$pkgname.1"
-  rm -rf "wxGlade-$pkgver/docs/man"
-  mv "wxGlade-$pkgver/docs/"* "$pkgdir/usr/share/doc/wxGlade/"
-  cp -R "wxGlade-$pkgver/" "$pkgdir/usr/share/wxGlade/"
-
-  python2 -m compileall "$pkgdir/usr/share/wxGlade/"
-
-  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 "wxGlade-$pkgver/LICENSE.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
-  install -Dm644 "$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 "$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
+build() {
+  cd "$pkgname-$pkgver"
+  python setup.py build
+
+  icotool --extract --output=$srcdir icons/wxglade*.ico
 }
 
-# vim:set ts=2 sw=2 et:
+package() {
+  cd "$pkgname-$pkgver"
+
+  python setup.py install --root="$pkgdir" --optimize=1
+
+  datadir="$pkgdir/usr/share/"
+
+  install -Dm644 "$srcdir/application-x-wxg.xml" "$datadir/mime/packages/$pkgname.xml"
+
+  find "$srcdir" -maxdepth 1 -name "$pkgname*128*.png" \
+    -execdir install -Dm644 {} "$datadir/icons/hicolor/128x128/apps/$pkgname.png" \; \
+    -execdir install -Dm644 {} "$datadir/icons/hicolor/128x128/mimetypes/application-x-wxg.png" \;
+
+  find "$srcdir" -maxdepth 1 -name "$pkgname*32*.png" \
+    -execdir install -Dm644 {} "$datadir/icons/hicolor/32x32/apps/$pkgname.png" \; \
+    -execdir install -Dm644 {} "$datadir/icons/hicolor/32x32/mimetypes/application-x-wxg.png" \;
+
+  install -Dm644 "$srcdir/$pkgname.desktop" "$datadir/applications/$pkgname.desktop"
+}
diff --git a/application-x-wxg.xml b/application-x-wxg.xml
new file mode 100644
index 000000000000..1f1a6bbf5f5e
--- /dev/null
+++ b/application-x-wxg.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+    <mime-type type="application/x-wxg">
+        <comment>wxGlade design file</comment>
+        <sub-class-of type="application/xml"/>
+        <!-- workaround for Nautilus/Nemo
+        See: https://gitlab.gnome.org/GNOME/nautilus/-/issues/1816 -->
+        <generic-icon name="application-x-wxg"/>
+        <!-- end workaround -->
+        <magic priority="60">
+        	<match type="string" offset="0" value="&lt;?xml version=&quot;1.0&quot;?&gt;">
+        		<match type="string" offset="0:256" value="&lt;!-- generated by wxGlade"/>
+        	</match>
+        </magic>
+        <glob pattern="*.wxg"/>
+    </mime-type>
+</mime-info>
diff --git a/wxglade.install b/wxglade.install
index 88620003c2bc..e69de29bb2d1 100644
--- a/wxglade.install
+++ b/wxglade.install
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/wxglade.sh b/wxglade.sh
deleted file mode 100644
index 812fae31bb6a..000000000000
--- a/wxglade.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-python2 /usr/share/wxGlade/wxglade.py "$@"