drop split package, make fwupd optional & bump to working commit

2 files changed, 39 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9534a806678e..57c0aca3fe44 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,30 @@
 pkgbase = firmware-manager
 	pkgdesc = Generic framework and GTK UI for firmware updates from system76-firmware and fwupd
-	pkgver = 0.1.5
+	pkgver = 0.1.5+3+gf3ead34
 	pkgrel = 1
 	url = https://github.com/pop-os/firmware-manager
+	install = firmware-manager.install
 	arch = x86_64
 	arch = aarch64
 	license = GPL3
 	makedepends = cargo
 	makedepends = git
-	makedepends = gtk3
 	makedepends = setconf
 	depends = dbus
+	depends = gtk3
 	depends = libgudev
 	depends = openssl
+	depends = polkit
+	optdepends = fwupd: Generic firmware updates
+	optdepends = system76-firmware-daemon: System76 firmware updates
+	conflicts = libfirmware-manager
+	replaces = libfirmware-manager
 	options = !lto
-	source = firmware-manager-0.1.5.tar.gz::https://github.com/pop-os/firmware-manager/archive/0.1.5.tar.gz
+	source = git+https://github.com/pop-os/firmware-manager.git#commit=f3ead34e243025eb1ae39d19b5844f91e17f3c31
 	source = com.system76.FirmwareManager.policy
 	source = firmware-manager.sh
-	sha256sums = 997a85aa60c4cc46eb5f42b7e46cf2d60ba8b39a24d4574f604bf7d78da8fd96
+	sha256sums = SKIP
 	sha256sums = 310e872ec56f13764615795dbcc30e3ab8b0e4329c0d1fe34bd5aa73bc602535
 	sha256sums = fb8395e19bfd54f756dad1d073135c5b41caa2ad27ee0621350fba50b2e7363b
 
 pkgname = firmware-manager
-	pkgdesc = GTK application for managing system and device firmware.
-	install = firmware-manager.install
-	depends = gtk3
-	depends = libfirmware-manager
-	depends = polkit
-	provides = firmware-manager-virtual
-
-pkgname = libfirmware-manager
-	pkgdesc = Shared library for C which provides the firmware manager as a GTK widget.
-	depends = dbus
-	depends = libgudev
-	depends = openssl
-	depends = fwupd
-	optdepends = system76-firmware-daemon: For System76 firmware updates
-	provides = libfirmware_manager.so
diff --git a/PKGBUILD b/PKGBUILD
index e744e68822e2..4b5c43c1fc8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,57 @@
 # Maintainer: Mark Wagie <mark dot wagie at proton dot me>
 # Contributor: Corey Hinshaw <corey(at)electrickite(dot)org>
-pkgname=('firmware-manager' 'libfirmware-manager')
-pkgbase=firmware-manager
-pkgver=0.1.5
+pkgname=firmware-manager
+_app_id=com.system76.FirmwareManager
+pkgver=0.1.5+3+gf3ead34
 pkgrel=1
 pkgdesc="Generic framework and GTK UI for firmware updates from system76-firmware and fwupd"
 arch=('x86_64' 'aarch64')
 url="https://github.com/pop-os/firmware-manager"
 license=('GPL3')
-depends=('dbus' 'libgudev' 'openssl')
-makedepends=('cargo' 'git' 'gtk3' 'setconf')
+depends=('dbus' 'gtk3' 'libgudev' 'openssl' 'polkit')
+makedepends=('cargo' 'git' 'setconf')
+optdepends=('fwupd: Generic firmware updates'
+            'system76-firmware-daemon: System76 firmware updates')
+conflicts=('libfirmware-manager')
+replaces=('libfirmware-manager')
 options=('!lto')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
-        'com.system76.FirmwareManager.policy'
-        "$pkgbase.sh")
-sha256sums=('997a85aa60c4cc46eb5f42b7e46cf2d60ba8b39a24d4574f604bf7d78da8fd96'
+install="$pkgname.install"
+_commit=f3ead34e243025eb1ae39d19b5844f91e17f3c31  # branch/master
+source=("git+https://github.com/pop-os/firmware-manager.git#commit=${_commit}"
+        "${_app_id}.policy"
+        "$pkgname.sh")
+sha256sums=('SKIP'
             '310e872ec56f13764615795dbcc30e3ab8b0e4329c0d1fe34bd5aa73bc602535'
             'fb8395e19bfd54f756dad1d073135c5b41caa2ad27ee0621350fba50b2e7363b')
 
+pkgver() {
+  cd "$pkgname"
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd "$pkgbase-$pkgver"
+  cd "$pkgname"
   export CARGO_HOME="$srcdir/cargo-home"
   export RUSTUP_TOOLCHAIN=stable
-  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+  cargo fetch --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-  cd "$pkgbase-$pkgver"
+  cd "$pkgname"
   export CARGO_HOME="$srcdir/cargo-home"
   export RUSTUP_TOOLCHAIN=stable
   make prefix=/usr
 }
 
-package_firmware-manager() {
-  pkgdesc="GTK application for managing system and device firmware."
-  depends=('gtk3' 'libfirmware-manager' 'polkit')
-  provides=("$pkgname-virtual")
-  install="$pkgname.install"
-
-  cd "$pkgbase-$pkgver"
-  make prefix=/usr DESTDIR="$pkgdir/" install-{bin,notify,icons}
+package() {
+  cd "$pkgname"
+  make prefix=/usr DESTDIR="$pkgdir" install
 
-  install -Dm644 "$srcdir/com.system76.FirmwareManager.policy" -t \
-    "$pkgdir/usr/share/polkit-1/actions"
+  install -Dm644 "$srcdir/${_app_id}.policy" -t \
+    "$pkgdir/usr/share/polkit-1/actions/"
 
   install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
 
-  setconf "$pkgdir/usr/share/applications/com.system76.FirmwareManager.desktop" Exec "$pkgname"
+  setconf "$pkgdir/usr/share/applications/${_app_id}.desktop" Exec "$pkgname"
 }
 
-package_libfirmware-manager() {
-  pkgdesc="Shared library for C which provides the firmware manager as a GTK widget."
-  depends+=('fwupd')
-  optdepends=('system76-firmware-daemon: For System76 firmware updates')
-  provides=('libfirmware_manager.so')
-
-  cd "$pkgbase-$pkgver"
-  make prefix=/usr DESTDIR="$pkgdir/" install-ffi
-}