Commit f7c45ea8 authored by Eric Vidal's avatar Eric Vidal 💬
Browse files

upgpkg: 1.20.9.r21.g5c400cae1-3

parent 8aa5c7b5
Pipeline #364832 failed with stages
in 1 minute and 31 seconds
......@@ -8,82 +8,82 @@
pkgbase=xorg-server
pkgname=(
'xorg-server-rootless'
'xorg-server-xephyr-rootless'
'xorg-server-xvfb-rootless'
'xorg-server-xnest-rootless'
'xorg-server-xwayland-rootless'
'xorg-server-common-rootless'
'xorg-server-devel-rootless')
pkgver=1.20.9
'xorg-server-rootless'
'xorg-server-xephyr-rootless'
'xorg-server-xvfb-rootless'
'xorg-server-xnest-rootless'
'xorg-server-xwayland-rootless'
'xorg-server-common-rootless'
'xorg-server-devel-rootless')
pkgver=1.20.9.r21.g5c400cae1
pkgrel=3
track=
target="${pkgbase}-${pkgver}.tar.bz2"
url="http://xorg.freedesktop.org"
url="https://xorg.freedesktop.org/releases/individual/xserver"
source=(https://xorg.freedesktop.org/releases/individual/xserver/${target}
xserver-autobind-hotplug.patch
xvfb-run # with updates from FC master
xvfb-run.1
0001-v2-FS-58644.patch
0002-fix-libshadow-2.patch
'0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch')
track=commit
target=5c400cae1f9817045378966effa6bca91e45aead # server-1.20-branch 2020-11-09
source=("git+https://gitlab.freedesktop.org/xorg/xserver#${track}=${target}"
'xserver-autobind-hotplug.patch'
'0001-v2-FS-58644.patch'
'0002-fix-libshadow-2.patch'
'xvfb-run' ## with updates from FC master
'xvfb-run.1'
'Xwrapper.config')
#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
makedepends=(
'xorgproto'
'pixman'
'libx11'
'mesa'
'mesa-libgl'
'xtrans'
'libxkbfile'
'libxfont2'
'libpciaccess'
'libxv'
'libxmu'
'libxrender'
'libxi'
'libxaw'
'libxtst'
'libxres'
'xorg-xkbcomp'
'xorg-util-macros'
'xorg-font-util'
'libepoxy'
'xcb-util'
'xcb-util-image'
'xcb-util-renderutil'
'xcb-util-wm'
'xcb-util-keysyms'
'libxshmfence'
'libunwind'
'wayland-protocols'
'egl-wayland'
'meson')
'xorgproto'
'pixman'
'libx11'
'mesa'
'mesa-libgl'
'xtrans'
'libxkbfile'
'libxfont2'
'libpciaccess'
'libxv'
'libxmu'
'libxrender'
'libxi'
'libxaw'
'libxtst'
'libxres'
'xorg-xkbcomp'
'xorg-util-macros'
'xorg-font-util'
'libepoxy'
'xcb-util'
'xcb-util-image'
'xcb-util-renderutil'
'xcb-util-wm'
'xcb-util-keysyms'
'libxshmfence'
'libunwind'
'wayland-protocols'
'egl-wayland'
'meson'
'git')
#--------------------------------------| BUILD PREPARATION |------------------------------------
pkgver() {
cd xserver
git describe --tags | sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
#cd xserver
cd "${pkgbase}-${pkgver}"
# patch from Fedora, not yet merged
patch -Np1 -i ../xserver-autobind-hotplug.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=106588
patch -Np1 -i ../0001-v2-FS-58644.patch
# Fix libshadow.so: libfb.so => not found - FS#58731
# https://bugs.freedesktop.org/show_bug.cgi?id=106656
patch -Np1 -i ../0002-fix-libshadow-2.patch
# Fix FS#67774 - merged upstream
patch -Np1 -i ../0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
#cd "${pkgbase}-${pkgver}"
cd xerver
## patch from Fedora, not yet merged
patch -Np1 -i ../xserver-autobind-hotplug.patch
## https://bugs.freedesktop.org/show_bug.cgi?id=106588
patch -Np1 -i ../0001-v2-FS-58644.patch
## Fix libshadow.so: libfb.so => not found - FS#58731
patch -Np1 -i ../0002-fix-libshadow-2.patch
}
......@@ -98,7 +98,8 @@ build() {
export LDFLAGS=${LDFLAGS/,-z,now}
arch-meson ${pkgbase}-$pkgver build \
#arch-meson ${pkgbase}-$pkgver build
arch-meson xserver build \
-D os_vendor="Obarun" \
-D ipv6=true \
-D xvfb=true \
......@@ -113,13 +114,13 @@ build() {
-D suid_wrapper=false \
-D xkb_dir=/usr/share/X11/xkb \
-D xkb_output_dir=/var/lib/xkb \
-D systemd_logind=false
-D systemd_logind=false
# Print config
meson configure build
ninja -C build
# fake installation to be seperated into packages
DESTDIR="${srcdir}/fakeinstall" ninja -C build install
}
......@@ -143,19 +144,21 @@ package_xorg-server-common-rootless() {
depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap)
conflicts=('xorg-server-common')
provides=('xorg-server-common')
_install fakeinstall/usr/lib/xorg/protocol.txt
_install fakeinstall/usr/share/man/man1/Xserver.1
install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
#install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
install -m644 -Dt "${pkgdir}/var/lib/xkb/" xserver/xkb/README.compiled
# license
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
}
package_xorg-server-rootless() {
pkgdesc="Xorg X server"
depends=(libepoxy libxfont2 pixman xorg-server-common-rootless libunwind
depends=(libepoxy libxfont2 pixman xorg-server-common-rootless libunwind
dbus libgl xf86-input-libinput nettle
libpciaccess libdrm libxshmfence) # FS#52949
......@@ -166,7 +169,7 @@ package_xorg-server-rootless() {
replaces=('glamor-egl' 'xf86-video-modesetting')
install=xorg-server-rootless.install
_install fakeinstall/usr/bin/{Xorg,cvt,gtf}
ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
#_install fakeinstall/usr/lib/Xorg{,.wrap}
......@@ -180,7 +183,8 @@ package_xorg-server-rootless() {
install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
# license
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
}
package_xorg-server-xephyr-rootless() {
......@@ -190,12 +194,13 @@ package_xorg-server-xephyr-rootless() {
nettle libtirpc)
conflicts=('xorg-server-xephyr')
provides=('xorg-server-xephyr')
_install fakeinstall/usr/bin/Xephyr
_install fakeinstall/usr/share/man/man1/Xephyr.1
# license
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
}
package_xorg-server-xvfb-rootless() {
......@@ -203,7 +208,7 @@ package_xorg-server-xvfb-rootless() {
depends=(libxfont2 libunwind pixman xorg-server-common-rootless xorg-xauth libgl nettle libtirpc)
conflicts=('xorg-server-xvfb')
provides=('xorg-server-xvfb')
_install fakeinstall/usr/bin/Xvfb
_install fakeinstall/usr/share/man/man1/Xvfb.1
......@@ -211,7 +216,8 @@ package_xorg-server-xvfb-rootless() {
install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
# license
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
}
package_xorg-server-xnest-rootless() {
......@@ -219,12 +225,13 @@ package_xorg-server-xnest-rootless() {
depends=(libxfont2 libxext pixman xorg-server-common-rootless nettle libtirpc)
conflicts=('xorg-server-xnest')
provides=('xorg-server-xnest')
_install fakeinstall/usr/bin/Xnest
_install fakeinstall/usr/share/man/man1/Xnest.1
# license
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
}
package_xorg-server-xwayland-rootless() {
......@@ -233,11 +240,12 @@ package_xorg-server-xwayland-rootless() {
nettle libtirpc)
conflicts=('xorg-server-xwayland')
provides=('xorg-server-xwayland')
_install fakeinstall/usr/bin/Xwayland
# license
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
}
package_xorg-server-devel-rootless() {
......@@ -247,13 +255,14 @@ package_xorg-server-devel-rootless() {
'xorg-util-macros')
conflicts=('xorg-server-devel')
provides=('xorg-server-devel')
_install fakeinstall/usr/include/xorg/*
_install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
_install fakeinstall/usr/share/aclocal/xorg-server.m4
# license
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
# make sure there are no files left to install
find fakeinstall -depth -print0 | xargs -0 rmdir
......
#!/bin/sh
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# T2 SDE: package/.../xorg-server/xvfb-run.sh
# Copyright (C) 2005 The T2 SDE Project
# Copyright (C) XXXX - 2005 Debian
#
#
# More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
......@@ -178,7 +178,7 @@ EOF
# Start the command and save its exit status.
set +e
DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
RETVAL=$?
set -e
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment