From 77b04e1053ebc0bed8f8cf8234cd0521a4ec8b5c Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 25 Oct 2022 00:23:07 +0200
Subject: [PATCH 1/6] xkeyboard-config: Convert to versionless bee file

---
 xkeyboard-config-2.11-0.bee => xkeyboard-config.be0 | 2 ++
 1 file changed, 2 insertions(+)
 rename xkeyboard-config-2.11-0.bee => xkeyboard-config.be0 (98%)

diff --git a/xkeyboard-config-2.11-0.bee b/xkeyboard-config.be0
similarity index 98%
rename from xkeyboard-config-2.11-0.bee
rename to xkeyboard-config.be0
index b8c970447..4cd0881b0 100755
--- a/xkeyboard-config-2.11-0.bee
+++ b/xkeyboard-config.be0
@@ -1,5 +1,7 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION xkeyboard-config-2.11-0
+
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
 

From 7210d4ecefb4a4dff1fe81a558fe20ca201abbd2 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 25 Oct 2022 00:23:43 +0200
Subject: [PATCH 2/6] xkeyboard-config: Update version from 2.11 to 2.37

1.  https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/blob/xkeyboard-config-2.37/NEWS
2.  Update suffix to xz.
---
 xkeyboard-config.be0 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xkeyboard-config.be0 b/xkeyboard-config.be0
index 4cd0881b0..839f3261c 100755
--- a/xkeyboard-config.be0
+++ b/xkeyboard-config.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION xkeyboard-config-2.11-0
+# BEE_VERSION xkeyboard-config-2.37-0
 
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
@@ -9,7 +9,7 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-${PKGVERSION}.tar.bz2"
+SRCURL[0]="http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-${PKGVERSION}.tar.xz"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.

From 0a5c0f5de04ee1ed4877d97d2f521013ba1966fb Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 25 Oct 2022 00:25:15 +0200
Subject: [PATCH 3/6] xkeyboard-config: Securely download source archive using
 HTTPS

---
 xkeyboard-config.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xkeyboard-config.be0 b/xkeyboard-config.be0
index 839f3261c..7f1cc4160 100755
--- a/xkeyboard-config.be0
+++ b/xkeyboard-config.be0
@@ -9,7 +9,7 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-${PKGVERSION}.tar.xz"
+SRCURL[0]="https://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-${PKGVERSION}.tar.xz"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.

From 7312ad82b32fc4c8234dadd0975e595412fe6292 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 25 Oct 2022 00:25:58 +0200
Subject: [PATCH 4/6] xkeyboard-config: Move to new URL to avoid redirect
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The HTTP URL redirects to https://www.x.org/….

    $ curl -I
    http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-2.37.tar.xz
    HTTP/1.1 301 Moved Permanently
    Date: Tue, 25 Oct 2022 10:42:45 GMT
    Server: Apache/2.4.38 (Debian)
    Location:
    https://www.x.org/archive/individual/data/xkeyboard-config/xkeyboard-config-2.37.tar.xz
    Content-Type: text/html; charset=iso-8859-1
---
 xkeyboard-config.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xkeyboard-config.be0 b/xkeyboard-config.be0
index 7f1cc4160..d04b22e9f 100755
--- a/xkeyboard-config.be0
+++ b/xkeyboard-config.be0
@@ -9,7 +9,7 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="https://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-${PKGVERSION}.tar.xz"
+SRCURL[0]="https://www.x.org/archive/individual/data/xkeyboard-config/xkeyboard-config-${PKGVERSION}.tar.xz"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.

From 0163a8ca3d4b1a083aec8f7ed14fb2e678dd7915 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 25 Oct 2022 00:27:56 +0200
Subject: [PATCH 5/6] xkeyboard-config: Convert from autotools to meson

Autotools are dropped in version 2.37.
---
 xkeyboard-config.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xkeyboard-config.be0 b/xkeyboard-config.be0
index d04b22e9f..4e7a1ccce 100755
--- a/xkeyboard-config.be0
+++ b/xkeyboard-config.be0
@@ -54,7 +54,7 @@ SRCURL[0]="https://www.x.org/archive/individual/data/xkeyboard-config/xkeyboard-
 #}
 
 mee_configure() {
-    bee_configure --with-xkb-rules-symlink=xorg
+    bee_configure -Dxorg-rules-symlinks=true
 }
 
 #mee_build() {

From 4bf39088f2cfc63f33804316f1fa89c68e265910 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 25 Oct 2022 00:33:39 +0200
Subject: [PATCH 6/6] xkeyboard-config: Download source archive from
 beehive.molgen.mpg.de

---
 xkeyboard-config.be0 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xkeyboard-config.be0 b/xkeyboard-config.be0
index 4e7a1ccce..16f17c033 100755
--- a/xkeyboard-config.be0
+++ b/xkeyboard-config.be0
@@ -9,7 +9,8 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="https://www.x.org/archive/individual/data/xkeyboard-config/xkeyboard-config-${PKGVERSION}.tar.xz"
+#SRCURL[0]="https://www.x.org/archive/individual/data/xkeyboard-config/xkeyboard-config-${PKGVERSION}.tar.xz"
+SRCURL[0]="https://beehive.molgen.mpg.de/eb133127bcf9da2df2dd4a0a9c92e387/xkeyboard-config-2.37.tar.xz"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.