From a71db1974130f2e7140e770a301916a5fcce1cfa Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 14 Jul 2022 06:48:31 +0200 Subject: [PATCH 1/4] xorgproto: Update version from 2018.4 to 2022.1 X.org X Server 22.1.4 requires newer protocol versions: checking for fixesproto >= 6.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 xtrans >= 1.3.5 bigreqsproto >= 1.1.0 xproto >= 7.0.31 randrproto >= 1.6.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3.99.1 kbproto >= 1.0.3 fontsproto >= 2.1.3 pixman-1 >= 0.27.2 libxcvt videoproto compositeproto >= 0.4 recordproto >= 1.13.99.1 scrnsaverproto >= 1.1 resourceproto >= 1.2.0 xf86driproto >= 2.1.0 glproto >= 1.4.17 dri >= 7.8.0 dri3proto presentproto >= 1.2 xineramaproto xkbfile pixman-1 >= 0.27.2 xfont2 >= 2.0.0 xau libsystemd >= 209 xshmfence >= 1.1 xdmcp... no configure: error: Package requirements (fixesproto >= 6.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 xtrans >= 1.3.5 bigreqsproto >= 1.1.0 xproto >= 7.0.31 randrproto >= 1.6.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3.99.1 kbproto >= 1.0.3 fontsproto >= 2.1.3 pixman-1 >= 0.27.2 libxcvt videoproto compositeproto >= 0.4 recordproto >= 1.13.99.1 scrnsaverproto >= 1.1 resourceproto >= 1.2.0 xf86driproto >= 2.1.0 glproto >= 1.4.17 dri >= 7.8.0 dri3proto presentproto >= 1.2 xineramaproto xkbfile pixman-1 >= 0.27.2 xfont2 >= 2.0.0 xau libsystemd >= 209 xshmfence >= 1.1 xdmcp) were not met: Requested 'fixesproto >= 6.0' but version of FixesProto is 5.0 Requested 'inputproto >= 2.3.99.1' but version of InputProto is 2.3.2 No package 'libxcvt' found --- xorgproto.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xorgproto.be0 b/xorgproto.be0 index 6514509e6..abbcc0c6c 100755 --- a/xorgproto.be0 +++ b/xorgproto.be0 @@ -1,9 +1,9 @@ #!/usr/bin/env beesh -# BEE_VERSION xorgproto-2018.4-1 +# BEE_VERSION xorgproto-2022.1-0 #SRCURL[0]="https://www.x.org/archive/individual/proto/xorgproto-${PKGVERSION}.tar.bz2" -SRCURL[0]="https://beehive.molgen.mpg.de/81557ca47ee66a4e54590fcdadd28114/xorgproto-2018.4.tar.bz2" +SRCURL[0]="https://beehive.molgen.mpg.de/3e84dbe18270e92d42a6eb5e6d0d9a8b/xorgproto-2022.1.tar.bz2" # PATCHURL+=() From 98b6f9240dd2505c07bea776468d4a88b7844bf5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 14 Jul 2022 07:06:41 +0200 Subject: [PATCH 2/4] libxcvt: Add version 0.1.1 [X.Org X Server 21.1.0 replaced its local implementation of the VESA CVT standard timing modelines generator with the one from libxcvt to avoid code duplication.][1] [1]: https://gitlab.freedesktop.org/xorg/xserver/-/commit/f788289bdcc4f04bd2fb62552df1c8c1ae0aea45 --- libxcvt.be0 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 libxcvt.be0 diff --git a/libxcvt.be0 b/libxcvt.be0 new file mode 100755 index 000000000..e8b74729f --- /dev/null +++ b/libxcvt.be0 @@ -0,0 +1,35 @@ +#!/usr/bin/env beesh + +# BEE_VERSION libxcvt-0.1.1-0 + +SRCURL[0]="https://www.x.org/pub/individual/lib/libxcvt-${PKGVERSION}.tar.xz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +#mee_install_post() { +# exit +#} From 691199b35fb897a185cee8b0d54c64de1e294bc6 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 14 Jul 2022 07:07:36 +0200 Subject: [PATCH 3/4] libxcvt: Download source archive from beehive.molgen.mpg.de --- libxcvt.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libxcvt.be0 b/libxcvt.be0 index e8b74729f..ae25456e1 100755 --- a/libxcvt.be0 +++ b/libxcvt.be0 @@ -2,7 +2,8 @@ # BEE_VERSION libxcvt-0.1.1-0 -SRCURL[0]="https://www.x.org/pub/individual/lib/libxcvt-${PKGVERSION}.tar.xz" +#SRCURL[0]="https://www.x.org/pub/individual/lib/libxcvt-${PKGVERSION}.tar.xz" +SRCURL[0]="https://beehive.molgen.mpg.de/9f30247e8b5a09fa1df9538252a192b5/libxcvt-0.1.1.tar.xz" # PATCHURL+=() From d09dd28e5d0d6a9a092a7b8b389fe0100e1a688e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 14 Jul 2022 06:33:22 +0200 Subject: [PATCH 4/4] xorg-server: Update version from 1.20.11 to 21.1.4 From the [announcement for 21.1.4][1]: > This release fixes 2 recently reported security vulnerabilities in xkb, several > regressions since 1.20.x and a number of miscellaneous bugs. More details are in the [merge request description][2]. [1]: https://lists.x.org/archives/xorg/2022-July/061036.html [2]: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/820 --- xorg-server.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xorg-server.be0 b/xorg-server.be0 index 9b2e170a1..a7e1a1090 100755 --- a/xorg-server.be0 +++ b/xorg-server.be0 @@ -1,9 +1,9 @@ #!/usr/bin/env beesh -# BEE_VERSION xorg-server-1.20.11-3 +# BEE_VERSION xorg-server-21.1.4-0 -# SRCURL[0]="https://ftp.x.org/archive/individual/xserver/xorg-server-${PKGVERSION}.tar.bz2" -SRCURL[0]="https://beehive.molgen.mpg.de/a22ccd74a5eee721cad6805e489c7144/xorg-server-1.20.11.tar.bz2" +#SRCURL[0]="https://ftp.x.org/archive/individual/xserver/xorg-server-${PKGVERSION}.tar.xz" +SRCURL[0]="https://beehive.molgen.mpg.de/1fee73752bc08a9d364d5e39f19f464f/xorg-server-21.1.4.tar.xz" # PATCHURL[0]="/src/mariux/download/xorg-xinerama.patch" PATCHURL+=("https://beehive.molgen.mpg.de/18072ac83e2b5c25ff8fc70d9bdd1975/xorg-server-no-chown-root.patch")