upgpkg: regolith-de 1.6-4

Fix Rofi theming on Rofi 1.7.0 and patch Midnight Rofi Theme

4 files changed, 69 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5686c5840554..f59bd93a2d07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,11 +6,16 @@ pkgbase = regolith-de
 	groups = regolith-de
 	license = custom: multiple
 	makedepends = wget
+	makedepends = fakeroot
+	makedepends = binutils
+	makedepends = patch
 	makedepends = python
 	makedepends = meson
 	makedepends = ninja
 	makedepends = gtk3
 	makedepends = git
+	makedepends = gcc
+	makedepends = vala
 	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
@@ -76,6 +81,8 @@ pkgbase = regolith-de
 	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/d/dracula-gtk/dracula-gtk_1.0.1-1_amd64.deb
 	source = http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/p/pop-gtk-theme/pop-gtk-theme_4.1.4~1560290633~18.04~f75e86a_all.deb
 	source = git+https://github.com/regolith-linux/remontoire.git
+	source = rofitheme.patch
+	source = midnight-rofi.patch
 	sha256sums = 6e8c3d2dbe8c192c40593c85c9c5f2f6fb29ea376e72770461b41b867a2dd996
 	sha256sums = bc90c3f172fbff7b570a0bac516b9c76f7ed4cf3ca2a09003ff6c966fc03193d
 	sha256sums = afab55c89c58210ce24bc0416cb1cf474deb446010b209df623c29d1bdc481fb
@@ -141,6 +148,8 @@ pkgbase = regolith-de
 	sha256sums = 2f3d57a5445f46931b8184cdbea0aa52b5251b319f367ec188db00187c1c7e71
 	sha256sums = eb44cac833c369dc0f3afe71e334a7bccaaef45836030b3c9ab3d9dc70500370
 	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = regolith-i3
 	pkgdesc = Regolith's i3-gaps-based DE's underpinnings and gnome foundational dependencies
diff --git a/PKGBUILD b/PKGBUILD
index 60973eb64db0..4b9df62e1551 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -37,7 +37,7 @@ url4=http://archive.ubuntu.com/ubuntu/pool/main/g/gnome-session/
 url5=https://launchpad.net/~regolith-linux/+archive/ubuntu/stable/+files
 license=('custom: multiple')
 groups=('regolith-de')
-makedepends=('wget' 'python' 'meson' 'ninja' 'gtk3' 'git')
+makedepends=('wget' 'fakeroot' 'binutils' 'patch' 'python' 'meson' 'ninja' 'gtk3' 'git' 'gcc' 'vala')
 
 source=(http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/a/ayu-theme/ayu-theme_0.2.2-1_amd64.deb
         http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/c/cahuella/cahuella_1.0.3-1_amd64.deb
@@ -103,7 +103,9 @@ source=(http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/a/ayu-t
 	http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/g/gruvbox-gtk/gruvbox-gtk_1.0.1-1_amd64.deb
         http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/d/dracula-gtk/dracula-gtk_1.0.1-1_amd64.deb
 	http://ppa.launchpad.net/regolith-linux/release/ubuntu/pool/main/p/pop-gtk-theme/pop-gtk-theme_4.1.4\~1560290633\~18.04\~f75e86a_all.deb
-        git+https://github.com/regolith-linux/remontoire.git)
+        git+https://github.com/regolith-linux/remontoire.git
+	rofitheme.patch
+	midnight-rofi.patch)
 
 
 sha256sums=(6e8c3d2dbe8c192c40593c85c9c5f2f6fb29ea376e72770461b41b867a2dd996
@@ -170,6 +172,8 @@ sha256sums=(6e8c3d2dbe8c192c40593c85c9c5f2f6fb29ea376e72770461b41b867a2dd996
 	    6884a081345953c3e5aa2cf7c32253604eb9bf07b5ca4570cf41802d6ca762d6
 	    2f3d57a5445f46931b8184cdbea0aa52b5251b319f367ec188db00187c1c7e71
 	    eb44cac833c369dc0f3afe71e334a7bccaaef45836030b3c9ab3d9dc70500370
+	    SKIP
+	    SKIP
 	    SKIP)
 
 
@@ -540,6 +544,8 @@ package_regolith-styles () {
 
     move_copyright
 
+    cd "${pkgdir}"
+    patch -Np1 -i "${srcdir}"/midnight-rofi.patch
     cp "${pkgdir}"/etc/regolith/styles/ayu/typeface "${pkgdir}"/etc/regolith/styles/lascaille/typeface
     cp "${pkgdir}"/etc/regolith/styles/ayu/typeface "${pkgdir}"/etc/regolith/styles/cahuella/typeface
 }
@@ -573,6 +579,8 @@ package_regolith-desktop-config () {
 #    rm "${pkgdir}"/usr/share/applications/logout.desktop
 #    rm "${pkgdir}"/usr/share/applications/shutdown.desktop
     sed -i 's/x-terminal-emulator/st/g' "${pkgdir}"/etc/regolith/i3/config
+    cd "${pkgdir}"
+    patch -Np1 -i "${srcdir}"/rofitheme.patch
     cd "${srcdir}"/regolith-rofication
     python setup.py build
     python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/midnight-rofi.patch b/midnight-rofi.patch
new file mode 100644
index 000000000000..c67c27ad6ba8
--- /dev/null
+++ b/midnight-rofi.patch
@@ -0,0 +1,10 @@
+--- a/etc/regolith/styles/midnight/rofi.rasi	2021-10-28 15:45:24.631665969 -0400
++++ b/etc/regolith/styles/midnight/rofi.rasi	2021-10-28 15:46:59.161194831 -0400
+@@ -22,6 +22,7 @@
+    fga:  #CACACAFF;
+    fg:   #CACACAFF;
+    ac:   #181818FF;
++   background-color: #00000000;
+  }
+ 
+ window {
diff --git a/rofitheme.patch b/rofitheme.patch
new file mode 100644
index 000000000000..cc3bafe4b525
--- /dev/null
+++ b/rofitheme.patch
@@ -0,0 +1,40 @@
+--- /etc/regolith/i3/config	2021-10-22 17:36:51.692535888 -0400
++++ etc/regolith/i3/config	2021-10-22 17:38:12.274538822 -0400
+@@ -101,17 +101,19 @@
+ 
+ ## Launch // Application // <> Space ##
+ set_from_resource $i3-wm.binding.launcher.app i3-wm.binding.launcher.app space
+-set_from_resource $i3-wm.program.launcher.app i3-wm.program.launcher.app rofi -show drun -theme $rofiTheme
++set_from_resource $i3-wm.program.launcher.app i3-wm.program.launcher.app rofi -show drun -theme $(xrescat rofi.theme)
+ bindsym $mod+$i3-wm.binding.launcher.app exec $i3-wm.program.launcher.app
+ 
+ ## Launch // Command // <><Shift> Space ##
+ set_from_resource $i3-wm.binding.launcher.cmd i3-wm.binding.launcher.cmd Shift+space
+-set_from_resource $i3-wm.program.launcher.cmd i3-wm.program.launcher.cmd rofi -show run -theme $rofiTheme
++set_from_resource $i3-wm.program.launcher.cmd i3-wm.program.launcher.cmd rofi -show run -theme $(xrescat rofi.theme)
++
+ bindsym $mod+$i3-wm.binding.launcher.cmd exec $i3-wm.program.launcher.cmd
+ 
+ ## Navigate // Window by Name // <><Ctrl> Space ##
+ set_from_resource $i3-wm.binding.launcher.window i3-wm.binding.launcher.window Ctrl+space
+-set_from_resource $i3-wm.program.launcher.window i3-wm.program.launcher.window rofi -show window -theme $rofiTheme
++set_from_resource $i3-wm.program.launcher.window i3-wm.program.launcher.window rofi -show window -theme $(xrescat rofi.theme)
++
+ bindsym $mod+$i3-wm.binding.launcher.window exec $i3-wm.program.launcher.window
+ 
+ ## Launch // This Dialog // <><Shift> ? ##
+@@ -121,12 +123,12 @@
+ 
+ ## Launch // File Search // <><Alt> Space ##
+ set_from_resource $i3-wm.binding.file_search i3-wm.binding.file_search Mod1+space
+-set_from_resource $i3-wm.program.file_search i3-wm.program.file_search rofi -show find -modi find:/usr/share/rofi/modi/finder.sh
++set_from_resource $i3-wm.program.file_search i3-wm.program.file_search rofi -show find -modi find:/usr/share/rofi/modi/finder.sh -theme $(xrescat rofi.theme)
+ bindsym $mod+$i3-wm.binding.file_search exec $i3-wm.program.file_search
+ 
+ ## Launch // Look Selector // <><Alt> l ##
+ set_from_resource $i3-wm.binding.look_selector i3-wm.binding.look_selector Mod1+l
+-set_from_resource $i3-wm.program.look_selector i3-wm.program.look_selector rofi -show look -modi look:/usr/share/rofi/modi/look-selector.sh
++set_from_resource $i3-wm.program.look_selector i3-wm.program.look_selector rofi -show look -modi look:/usr/share/rofi/modi/look-selector.sh -theme $(xrescat rofi.theme)
+ bindsym $mod+$i3-wm.binding.look_selector exec $i3-wm.program.look_selector
+ 
+ ###############################################################################