commit 5c894c9a99e24117a98c99d536950cc6e94fb66a Author: Danny Rawlins <contact@romster.me> Date: Mon Sep 19 23:54:53 2022 +1000 [notify] xorg-libx11: disable a new option that makes X11 threadsafe as this breaks a ton of things, move a legacy header (XKBgeom.h)out of xorg-xorgproto to xorg-libx11 diff --git a/xorg-libx11/.footprint b/xorg-libx11/.footprint index d53efac5..9e52fc6b 100644 --- a/xorg-libx11/.footprint +++ b/xorg-libx11/.footprint @@ -14,6 +14,7 @@ drwxr-xr-x root/root usr/include/X11/ -rw-r--r-- root/root usr/include/X11/Xutil.h -rw-r--r-- root/root usr/include/X11/cursorfont.h drwxr-xr-x root/root usr/include/X11/extensions/ +-rw-r--r-- root/root usr/include/X11/extensions/XKBgeom.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libX11-xcb.a -rwxr-xr-x root/root usr/lib/libX11-xcb.la diff --git a/xorg-libx11/.signature b/xorg-libx11/.signature index 68cb1637..fd49903a 100644 --- a/xorg-libx11/.signature +++ b/xorg-libx11/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndDlXO640r+ZA9H+GQrOuSLVJ0TpvUK9uRZ4RB0EBGDAOy6zh8bUGguZLSmMLc3jX7fW7Ga/LaGNNUc4oCB4kMAM= -SHA256 (Pkgfile) = 4f64a327dccb91092a3b30ad2444506087750c8fcdf69eab91c37928f5ef323d -SHA256 (.footprint) = 63ced358e03505394f076a68be0e08a228628a70fac192e3a162ee09be4bbab0 +RWTSGWF5Q7TndFTpJz/jgHK44uYVWNW8osDx0IW6+T59MWLYp3Zgdiso98PuIqjeRyUxujdAoFdFOGvD9L5w6CaKNuULfbhV2Q0= +SHA256 (Pkgfile) = a3f6eea4bd6b4bbfade9ff11778f4ddc13615f0542be430e65963c55b0efb9d0 +SHA256 (.footprint) = 4c27b51e09695066f98ad89cfc3f1e4becc59ccaa39387c56ee010bb8700295f SHA256 (libX11-1.8.1.tar.xz) = 1bc41aa1bbe01401f330d76dfa19f386b79c51881c7bbfee9eb4e27f22f2d9f7 diff --git a/xorg-libx11/Pkgfile b/xorg-libx11/Pkgfile index 03b2e880..a97cbf92 100644 --- a/xorg-libx11/Pkgfile +++ b/xorg-libx11/Pkgfile @@ -5,19 +5,24 @@ name=xorg-libx11 version=1.8.1 -release=1 +release=2 source=(https://www.x.org/releases/individual/lib/libX11-$version.tar.xz) build() { cd libX11-$version - ./configure --prefix=/usr + # https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/157 + # https://bugs.gentoo.org/862115 + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1016363 + # https://www.mail-archive.com/tech@openbsd.org/msg71386.html + # https://gitlab.freedesktop.org/mesa/demos/-/issues/27 + # --disable-thread-safety-constructor as per LFS Debian Alpine OpenBSD - make - make DESTDIR=$PKG install - - # Conflict with xorg-xorgproto - rm $PKG/usr/include/X11/extensions/XKBgeom.h + ./configure \ + --prefix=/usr \ + --disable-specs \ + --disable-thread-safety-constructor - rm -r $PKG/usr/share/doc + make + make DESTDIR="$PKG" install }