Change source to upstream to prevent E.G.O checksum breakage && build from source

3 files changed, 26 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index adbe29a2b4b6..f76d9ad2689c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
 pkgbase = gnome-shell-extension-color-picker
-	pkgdesc = Simple color picker for gnome shell
+	pkgdesc = Simple color picker for Gnome Shell
 	pkgver = 27
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/tuberry/color-picker
 	arch = any
 	license = GPL3
 	depends = dconf
-	depends = gnome-shell>=41
-	source = https://extensions.gnome.org/extension-data/color-pickertuberry.v27.shell-extension.zip
-	source = https://raw.githubusercontent.com/tuberry/color-picker/master/color-picker%40tuberry/schemas/org.gnome.shell.extensions.color-picker.gschema.xml
-	sha256sums = c8b7e269f214ce97b81930cdd9ca34b28d8d7f8736b69d5ea76d6f3f9dd73de9
-	sha256sums = 0adb1688bd9e0cb9721995eb9b004e622997afcefaf12d33c307a85bf39d5540
+	depends = gnome-shell>=1:41
+	source = tuberry-color-picker-27.tar.gz::https://github.com/tuberry/color-picker/tarball/b84de1f
+	sha256sums = 5a9c8844fe05b12d21f1b8c9659cbc1f638334c97f8320d7a407acd36495f699
 
 pkgname = gnome-shell-extension-color-picker
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 8bb7b7a8756e..5442d65fe0aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,26 @@
-# Maintainer: skrewball <skrewball at joickle dot com>
+# Maintainer: skrewball <jason at joickle dot com>
 
 pkgname=gnome-shell-extension-color-picker
+_pkgbase=tuberry-color-picker
 pkgver=27
-pkgrel=3
-pkgdesc='Simple color picker for gnome shell'
+_commit=b84de1f
+pkgrel=4
+pkgdesc='Simple color picker for Gnome Shell'
 arch=(any)
 url='https://github.com/tuberry/color-picker'
 license=('GPL3')
-depends=('dconf' 'gnome-shell>=41')
-source=("https://extensions.gnome.org/extension-data/color-pickertuberry.v${pkgver}.shell-extension.zip"
-	"https://raw.githubusercontent.com/tuberry/color-picker/master/color-picker%40tuberry/schemas/org.gnome.shell.extensions.color-picker.gschema.xml")
-sha256sums=('c8b7e269f214ce97b81930cdd9ca34b28d8d7f8736b69d5ea76d6f3f9dd73de9'
-            '0adb1688bd9e0cb9721995eb9b004e622997afcefaf12d33c307a85bf39d5540')
+depends=('dconf' 'gnome-shell>=1:41')
+source=("${_pkgbase}-${pkgver}.tar.gz::${url}/tarball/${_commit}")
+sha256sums=('5a9c8844fe05b12d21f1b8c9659cbc1f638334c97f8320d7a407acd36495f699')
+
+build() {
+  cd "${_pkgbase}-${_commit}"
+  # The envvar LANG is used to localize pot file.
+  make LANG=${LANG} mergepo \
+    && make VERSION="${pkgver}"
+}
 
 package() {
-    local _uuid="color-picker@tuberry"
-    local _destdir="${pkgdir}/usr/share/gnome-shell/extensions/${_uuid}"
-    
-    install -Dm644 -t "${_destdir}" metadata.json *.js *.css
-    install -Dm644 -t "${_destdir}/icons" icons/*.svg
-    install -Dm644 -t "${pkgdir}/usr/share/glib-2.0/schemas/" org.gnome.shell.extensions.color-picker.gschema.xml
-    
-    cd locale
-    for locale in */
-      do
-        install -Dm644 -t "${pkgdir}/usr/share/locale/${locale}/LC_MESSAGES" "${locale}/LC_MESSAGES"/*.mo
-      done
+  cd "${_pkgbase}-${_commit}"
+  make DESTDIR="${pkgdir}" install
 }