upgpkg: regolith-de 1.6-7

1.6-7, refactor i3xrocks modules, fix rofication theming, other stuff

2 files changed, 20 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78e05bb14875..3839e230de64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = regolith-de
 	pkgver = 1.6
-	pkgrel = 6
+	pkgrel = 7
 	url = https://github.com/regolith-linux/regolith-desktop
 	arch = x86_64
 	groups = regolith-de
@@ -16,25 +16,13 @@ pkgbase = regolith-de
 	makedepends = git
 	makedepends = gcc
 	makedepends = vala
+	makedepends = xcb-util-xrm
+	makedepends = python-appdirs
 	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/a/ayu-theme/ayu-theme_0.2.2-1_amd64.deb
 	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/c/cahuella/cahuella_1.0.3-1_amd64.deb
 	source = https://launchpad.net/~regolith-linux/+archive/ubuntu/release/+files/i3-snapshot_1.0.1-2hirsute_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/i/i3xrocks/i3xrocks_1.3.5-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-battery_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-cpu-usage_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-focused-window-name_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-info_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-key-indicator_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-media-player_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-memory_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-net-traffic_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-nm-vpn_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-openvpn_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-temp_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-time_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-volume_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-weather_3.6.4-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/i3xrocks-wifi_3.6.4-1_amd64.deb
+	source = git+https://github.com/regolith-linux/i3xrocks.git
+	source = git+https://github.com/regolith-linux/regolith-i3xrocks-config
 	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/m/moka-icon-theme/moka-icon-theme_5.4.523-201905300105~daily~ubuntu19.04.1_all.deb
 	source = https://launchpad.net/~regolith-linux/+archive/ubuntu/release/+files/nordic_1.6.5-1ubuntu1ppa1_all.deb
 	source = https://launchpad.net/~regolith-linux/+archive/ubuntu/release/+files/paper-icon-theme_1.5.723-201905252133~daily~ubuntu19.04.1_all.deb
@@ -47,7 +35,6 @@ pkgbase = regolith-de
 	source = https://launchpad.net/~regolith-linux/+archive/ubuntu/release/+files/regolith-gdm3-theme_2.0.0-1ubuntu1~ppa1_amd64.deb
 	source = https://launchpad.net/~regolith-linux/+archive/ubuntu/release/+files/regolith-gnome-flashback_2.6.2-1_amd64.deb
 	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3-gaps-config/regolith-i3-gaps-config_2.8.6-1_amd64.deb
-	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-i3xrocks-config/regolith-i3xrocks-config_3.6.4-1_amd64.deb
 	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-lightdm-config/regolith-lightdm-config_1.1.1-1_amd64.deb
 	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-styles/regolith-look-ayu_2.9.7-1_amd64.deb
 	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/r/regolith-styles/regolith-look-ayu-dark_2.9.7-1_amd64.deb
@@ -71,7 +58,6 @@ pkgbase = regolith-de
 	source = git+https://github.com/regolith-linux/regolith-rofication.git
 	source = http://launchpad.net/~regolith-linux/+archive/ubuntu/release/+files/midnight-gtk-theme_1.1.0-1_all.deb
 	source = http://launchpad.net/~regolith-linux/+archive/ubuntu/release/+files/regolith-look-solarized-light_2.9.7-1_amd64.deb
-	source = http://launchpad.net/~regolith-linux/+archive/ubuntu/release/+files/i3xrocks-app-launcher_3.6.4-1_amd64.deb
 	source = https://launchpad.net/~regolith-linux/+archive/ubuntu/release/+files/regolith-look-midnight_2.9.7-1_amd64.deb
 	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/p/pop-icon-theme/pop-icon-theme_1.4.0~1565992228~18.04~2bac292_all.deb
 	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/p/pop-icon-theme/pop-icon-theme-extra_1.4.0~1565992228~18.04~2bac292_all.deb
@@ -83,25 +69,13 @@ pkgbase = regolith-de
 	source = git+https://github.com/regolith-linux/remontoire.git
 	source = rofitheme.patch
 	source = midnight-rofi.patch
+	source = rofication.patch
+	source = regolith-look.patch
 	sha256sums = 6e8c3d2dbe8c192c40593c85c9c5f2f6fb29ea376e72770461b41b867a2dd996
 	sha256sums = bc90c3f172fbff7b570a0bac516b9c76f7ed4cf3ca2a09003ff6c966fc03193d
 	sha256sums = afab55c89c58210ce24bc0416cb1cf474deb446010b209df623c29d1bdc481fb
-	sha256sums = ed7b5e923a706ff10f94944ce568a49d05c0917b1ffb841ff531ed656fc2c0e6
-	sha256sums = 362458ae72f749e8c42185b736500a7947f2580288a28ce8743230462c4e9e51
-	sha256sums = bcad5c52397bf04ad4320be5e62ccaad5b7e139f9fe86148a70d77dcf12c152f
-	sha256sums = 19c063c5f92bf07b7aadc28d814bbd2578c707df51071b70f73c8e4b5043a9e3
-	sha256sums = ef699b935b2d919f3f2b8dc6cd78da8fdcac80463f48a0af11029b8b282986ee
-	sha256sums = 4f32552584a21c01397c6ebe397b9903b31d2c26f7d7ac90489b84134f6bbb12
-	sha256sums = f7129b41e733a2572375b5b8a6675001c533de5d4170826ac894e03438db06e5
-	sha256sums = c6fbd5e44dabecb72ab297d697f7aa78ef547a85fc7ff43d40298fab1f7e61f6
-	sha256sums = 1ae8f4051cb6e8256d146dcd8f4140188e850a5ca6e76ba8ba36db168ee1eb9d
-	sha256sums = b5cbb54801fcb621a5481c4ecc48c1fb468908336ba8d1942f4e18ec123c923c
-	sha256sums = 35e10cf26fb83c2dec1c3394c8084f07617af20b594f1fb3ffc5fd40b5d3e689
-	sha256sums = 12a99b6d9e87710e8321ebf5fe1dfa0c9db21d82ba6e50574eb3137efbf7256d
-	sha256sums = 51de4f03eeac9de7c07391d53bb1f703eb57432352eb9971212bd79afeab8e93
-	sha256sums = dc605ad61d8657dd87c16b538ede4c011d00ceb9be53a96559aa181e2c302b68
-	sha256sums = 4bc7b0f3380d2dfc502d67c5a7083aa2c82d4d43a8c9efaebff847b533e66939
-	sha256sums = 32a5fcc332967f54e973a2ac8fcb17f7b2f91bffb0bf347694dc49560e3c2bc0
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = ff2fc4ccaf083eeeb4fccabf027f673fe1654631d4885bd7bf740683ce5e2667
 	sha256sums = 05c66c372d378d2992ec59be553bd7de1cf0574d61313d84274f1e64bfe23d3b
 	sha256sums = eea3b0004671455426336e21aa285dadb2d891d1d4917f2b3ebcbcc391fe6864
@@ -114,7 +88,6 @@ pkgbase = regolith-de
 	sha256sums = 82050c4f1a95faeb4fd34eada50028f855527ffeda4277a7563a050e81f5cd02
 	sha256sums = f8d8497b096f759797cb51c47adef958a6245e6608126db1e840097e2b3afdf5
 	sha256sums = 3a2c34cf6c4ccf9c205185286c45a61619a897fd7b5ad0dc6b48a16a66842231
-	sha256sums = 366710eca08bc30da80759b29be8fbc6762fbed1ff9eb14862e60143b45ae3f5
 	sha256sums = e9877b4c5c0013a1b2dfd0c4375fbe79461c01fb5246b19236b81ab6362d4f20
 	sha256sums = e8c503b6adc0d299146d51fee5978c354d7bd4707de3697ef58ffc37516d25a2
 	sha256sums = a4255f30cedd4223c256e84b09b613a4965ac7b6b8086c93e67b8a5c44077d13
@@ -138,7 +111,6 @@ pkgbase = regolith-de
 	sha256sums = SKIP
 	sha256sums = 528e231adb021eba916a2d9a82c5f4937f1103027d0588941d577112a1163161
 	sha256sums = 5c4752152bdfbf2936d0f5affd96b8be8a0e2ca341f2393737fa03f6261f7ead
-	sha256sums = 3aba80c709377e53c4beabc0e14cb274cc96e57e2fbf6e1e467e834f0033cf05
 	sha256sums = 4311b12f301b27bf24aaafa49528d251144c2a1071f999c1dae1341aa66b3c1a
 	sha256sums = 3309a0e7c851c063deeb696aab1f71d4233995cff1d44a432dbdd1f72581cb6a
 	sha256sums = fbe43d68d44e2dd18c87be59212a483dcdd305d44bafbb24c6ed7b4a7fa516ba
@@ -148,8 +120,10 @@ pkgbase = regolith-de
 	sha256sums = 2f3d57a5445f46931b8184cdbea0aa52b5251b319f367ec188db00187c1c7e71
 	sha256sums = eb44cac833c369dc0f3afe71e334a7bccaaef45836030b3c9ab3d9dc70500370
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	sha256sums = 734b6fdfbfc78cd9c41b1c32e59ef15671a0ef650719fdedfc47f50c5ec633ad
+	sha256sums = 705c95cdfd5847cd6c7fafe123cbdc6c3f404407118967797210189157c52e5c
+	sha256sums = 0e43a083e6c56aff8c188629fb6eb79150ef0c63fdb25157bc7731166d81eff5
+	sha256sums = 5f2b29ef8fb363a1121befa276d7e6251c8961b8819ac2d60a5ec2006f126c97
 
 pkgname = regolith-i3
 	pkgdesc = Regolith's i3-gaps-based DE's underpinnings and gnome foundational dependencies
@@ -209,6 +183,7 @@ pkgname = regolith-i3xrocks
 	depends = alsa-utils
 	depends = bc
 	depends = ttf-font-awesome
+	depends = xcb-util-xrm
 	provides = i3xrocks
 	conflicts = i3xrocks
 
@@ -424,6 +399,7 @@ pkgname = regolith-styles
 	depends = otf-fira-mono
 	depends = ttf-ubuntu-font-family
 	depends = arc-icon-theme
+	depends = python-appdirs
 	provides = paper-icon-theme
 	provides = regolith-styles
 	provides = regolith-look
diff --git a/PKGBUILD b/PKGBUILD
index 2e0ba5765d8e..cdafe9780f24 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -143,11 +143,11 @@ sha256sums=(6e8c3d2dbe8c192c40593c85c9c5f2f6fb29ea376e72770461b41b867a2dd996
 	    2f3d57a5445f46931b8184cdbea0aa52b5251b319f367ec188db00187c1c7e71
 	    eb44cac833c369dc0f3afe71e334a7bccaaef45836030b3c9ab3d9dc70500370
 	    SKIP
-	    SKIP
-	    SKIP
-	    SKIP
-	    SKIP)
-
+	    734b6fdfbfc78cd9c41b1c32e59ef15671a0ef650719fdedfc47f50c5ec633ad
+	    705c95cdfd5847cd6c7fafe123cbdc6c3f404407118967797210189157c52e5c
+	    0e43a083e6c56aff8c188629fb6eb79150ef0c63fdb25157bc7731166d81eff5
+	    5f2b29ef8fb363a1121befa276d7e6251c8961b8819ac2d60a5ec2006f126c97
+)