0.3.15

4 files changed, 48 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9692b17bebc..3f58a7a0d8a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,25 @@
 pkgbase = usb-creator
 	pkgdesc = Create bootable USB from a LiveCD or disc image of Ubuntu
-	pkgver = 0.3.10
-	pkgrel = 3
-	url = https://launchpad.net/usb-creator
-	install = usb-creator.install
+	pkgver = 0.3.15
+	pkgrel = 1
+	url = https://git.launchpad.net/~usb-creator-hackers/usb-creator/+git/main
 	arch = any
 	license = GPL3
 	makedepends = python-distutils-extra
-	depends = udisks2
-	depends = syslinux
-	depends = parted
+	makedepends = python-setuptools
+	depends = cdrkit
 	depends = dosfstools
+	depends = gtk3
+	depends = kde-dev-scripts
 	depends = mtools
-	depends = cdrkit
+	depends = parted
+	depends = python
 	depends = python-dbus
 	depends = python-gobject
-	optdepends = python-pyqt5: for KDE/QT5 frontend
-	optdepends = gtk3: for GTK frontend
-	source = https://launchpad.net/ubuntu/+archive/primary/+files/usb-creator_0.3.10.tar.xz
-	source = usb-creator-fix-unity-check.patch
-	sha256sums = 583de0edd663cb93ccff679535e4fd868004da4cbef0b84087429a836bb31a4b
-	sha256sums = 93e8892ae7f20589185c65c2b21fbe22b8a945ce388a76c6e93f5a7975350cf8
+	depends = python-pyqt5
+	depends = syslinux
+	depends = udisks2
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/usb-creator_0.3.15.tar.xz
+	b2sums = f028fba9b57413ef01573deec88e89d1756a5f4f4434b27fcf63a03d87f6b454cc332514d2001c71acb2ed49a7c08cea0b87c7170cfbd88c6acefa2816d15ef1
 
 pkgname = usb-creator
-
diff --git a/PKGBUILD b/PKGBUILD
index f6455e9f52f0..1fb410247547 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,46 @@
-# Maintainer: Barfin
-# Previous Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
+# Maintainer: Marco Rubin <marco.rubin@protonmail.com>
+# Contributor: Barfin
+# Contributor: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 # Contributors: Jekyll Wu, Jacco Koning, qwak, twa022
 
 pkgname=usb-creator
-pkgver=0.3.10
-pkgrel=3
+pkgver=0.3.15
+pkgrel=1
 pkgdesc="Create bootable USB from a LiveCD or disc image of Ubuntu"
 arch=('any')
-url="https://launchpad.net/usb-creator"
+url="https://git.launchpad.net/~usb-creator-hackers/usb-creator/+git/main"
 license=('GPL3')
-depends=('udisks2' 'syslinux' 'parted' 'dosfstools' 'mtools' 'cdrkit' 'python-dbus'
-         'python-gobject')
-makedepends=('python-distutils-extra')
-optdepends=('python-pyqt5: for KDE/QT5 frontend'
-            'gtk3: for GTK frontend')
-install=usb-creator.install
-source=("https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_${pkgver}.tar.xz"
-        "$pkgname-fix-unity-check.patch")
-sha256sums=('583de0edd663cb93ccff679535e4fd868004da4cbef0b84087429a836bb31a4b'
-            '93e8892ae7f20589185c65c2b21fbe22b8a945ce388a76c6e93f5a7975350cf8')
+depends=('cdrkit'
+         'dosfstools'
+         'gtk3'
+         'kde-dev-scripts'
+         'mtools'
+         'parted'
+         'python'
+         'python-dbus'
+         'python-gobject'
+         'python-pyqt5'
+         'syslinux'
+         'udisks2')
+makedepends=('python-distutils-extra'
+             'python-setuptools')
+source=("https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_$pkgver.tar.xz")
+b2sums=('f028fba9b57413ef01573deec88e89d1756a5f4f4434b27fcf63a03d87f6b454cc332514d2001c71acb2ed49a7c08cea0b87c7170cfbd88c6acefa2816d15ef1')
 
-#prepare() {
-#  patch -Np0 < $pkgname-fix-unity-check.patch
-#}
+prepare() {
+    cd trunk
+    sed -i 's/except ImportError/except (ImportError, ValueError)/g' usbcreator/frontends/gtk/unitysupport.py
+}
+
+build() {
+    cd trunk
+    python setup.py build
+}
 
 package() {
-  cd ${srcdir}/trunk
+    cd trunk
 
-  python3 setup.py install --root="$pkgdir/" --optimize=1
+    python3 setup.py install --root="$pkgdir/" --optimize=1
 
-  # FIXME: install manual pages
-  install -d "$pkgdir"/usr/share/man/man8
-  install -Dm0644 man/$pkgname-{gtk,kde}.8 "$pkgdir"/usr/share/man/man8
+    install -Dm644 -t "$pkgdir"/usr/share/man/man8 man/$pkgname-{gtk,kde}.8
 }
diff --git a/usb-creator-fix-unity-check.patch b/usb-creator-fix-unity-check.patch
deleted file mode 100644
index 738725776cf8..000000000000
--- a/usb-creator-fix-unity-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -Naur usb-creator-0.3.5.orig/usbcreator/frontends/gtk/unitysupport.py usb-creator-0.3.5/usbcreator/frontends/gtk/unitysupport.py
---- usb-creator-0.3.5.orig/usbcreator/frontends/gtk/unitysupport.py	2016-07-26 15:16:32.000000000 +0200
-+++ usb-creator-0.3.5/usbcreator/frontends/gtk/unitysupport.py	2018-10-08 11:57:03.886676447 +0200
-@@ -28,7 +28,7 @@
-     gi.require_version('Unity', '7.0')
-     from gi.repository import Unity
-     HAVE_UNITY_SUPPORT=True
--except ImportError as e:
-+except (ImportError, ValueError) as e:
-     logging.warn("can not import unity GI %s" % e)
- 
- class IUnitySupport(object):
diff --git a/usb-creator.install b/usb-creator.install
deleted file mode 100644
index 34e78366d15b..000000000000
--- a/usb-creator.install
+++ /dev/null
@@ -1,10 +0,0 @@
-
-post_install() {
-  echo " => This package provides two frontends:"
-  echo "    'usb-creator-gtk' for GTK3 and 'usb-creator-kde' for KDE4"
-  echo " => Choose your preferred frontend and install the needed runtime dependency."
-}
-
-post_upgrade() {
-  post_install
-}