setxkb.sh was renamed to setkb.sh, supressed benign warning. It comes up in bright colours and is scary!

3 files changed, 36 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e43d2cab4265..bafe541a0a0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = xkeyboard-config-dreymar-git
 	pkgdesc = DreymaR's Extensive Yet Modular ARSenal (for X KeyBoarding)
-	pkgver = r3.9d3de38
+	pkgver = r60.51e0778
 	pkgrel = 1
 	url = https://forum.colemak.com/topic/1438-dreymars-big-bag-of-keyboard-tricks-linuxxkb-files-included
 	arch = any
 	license = unknown
-	makedepends = git
-	provides = xkbdata
-	provides = xkeyboard-config
-	conflicts = xkbdata
-	conflicts = xkeyboard-config
+	makedepends = xorg-setxkbmap
+	provides = bigbagkbdtrixxkb-git
+	conflicts = bigbagkbdtrixxkb-git
 	source = bbkt::git+https://github.com/DreymaR/BigBagKbdTrix_XKB.git
-	md5sums = SKIP
+	source = ignore-benign-warning.patch
+	sha256sums = SKIP
+	sha256sums = 99abcadb49c5e3c194c5e7fbfb9d7c62e0c9dc2dec84ecffdfd98ad1232cd36f
 
 pkgname = xkeyboard-config-dreymar-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 859a93c30bc5..455cf48a61ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,35 @@
 
 pkgname=xkeyboard-config-dreymar-git
 _pkgname=bbkt
-pkgver=r3.9d3de38
+pkgver=r60.51e0778
 pkgrel=1
 pkgdesc="DreymaR's Extensive Yet Modular ARSenal (for X KeyBoarding)"
 arch=(any)
 url="https://forum.colemak.com/topic/1438-dreymars-big-bag-of-keyboard-tricks-linuxxkb-files-included"
 license=('unknown')
-provides=('xkbdata' 'xkeyboard-config')
-conflicts=('xkbdata' 'xkeyboard-config')
-makedepends=('git')
-source=("bbkt::git+https://github.com/DreymaR/BigBagKbdTrix_XKB.git")
-md5sums=('SKIP')
+makedepends=('xorg-setxkbmap')
+source=("bbkt::git+https://github.com/DreymaR/BigBagKbdTrix_XKB.git"
+        "ignore-benign-warning.patch")
+sha256sums=("SKIP"
+            "99abcadb49c5e3c194c5e7fbfb9d7c62e0c9dc2dec84ecffdfd98ad1232cd36f")
+provides=('bigbagkbdtrixxkb-git')
+conflicts=('bigbagkbdtrixxkb-git')
 
 pkgver() {
   cd "$_pkgname"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "$_pkgname"
+  patch --forward --strip=1 --input="${srcdir}/ignore-benign-warning.patch"
+}
+
 package() {
   cd "$_pkgname"
   bash ./install-dreymar-xmod.sh -i "$pkgdir/usr/share/X11" -n
-  mv "$pkgdir/usr/share/X11/"{d,}xkb
   install -dm755 "$pkgdir/usr/bin"
-  mv "$pkgdir/usr/share/X11/setxkb.sh" "$pkgdir/usr/bin/setxkb.sh"
-  chmod 755 "$pkgdir/usr/bin/setxkb.sh"
+  mv "$pkgdir/usr/share/X11/setkb.sh" "$pkgdir/usr/bin/setkb.sh"
+  chmod 755 "$pkgdir/usr/bin/setkb.sh"
 }
+
diff --git a/ignore-benign-warning.patch b/ignore-benign-warning.patch
new file mode 100644
index 000000000000..2097dd722c47
--- /dev/null
+++ b/ignore-benign-warning.patch
@@ -0,0 +1,13 @@
+diff --git a/install-dreymar-xmod.sh b/install-dreymar-xmod.sh
+index c57766e..4606ae1 100755
+--- a/install-dreymar-xmod.sh
++++ b/install-dreymar-xmod.sh
+@@ -240,7 +240,7 @@ for That in ${SubDirs}; do
+ 		MyDir="${InstDir%/}/${DModFix}${That}"
+ 		#~ MyDir="$(dirname "${MyDir}")/${DModFix}$(basename "${MyDir}")"	# Insert prefix in path/name
+ 		MyPoint "Installing mod files in '${MyDir}'"
+-		MyWarning "It seems that setxkbmap w/ local dir isn't working now?!"
++		#MyWarning "It seems that setxkbmap w/ local dir isn't working now?!"
+ 		${DoSudo} mkdir -p "${MyDir}" || MyError "Can't make '${MyDir}'!"
+ 		${DoSudo} cp -a "${X11DIR}/${That}/"* "${MyDir}" 2>/dev/null || MyError "Local files copy error!"
+ 		${DoSudo} cp -a "${DModDir}/${That}/"* "${MyDir}" 2>/dev/null \