Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/xorg]: xsrc/external/mit/xorg-server/dist initial import of xorg-server...
details: https://anonhg.NetBSD.org/xsrc/rev/7e445e063d50
branches: xorg
changeset: 7107:7e445e063d50
user: mrg <mrg%NetBSD.org@localhost>
date: Fri Jul 15 09:08:51 2022 +0000
description:
initial import of xorg-server-21.1.4
diffstat:
external/mit/xorg-server/dist/ChangeLog | 505 ++++
external/mit/xorg-server/dist/Makefile.in | 16 +-
external/mit/xorg-server/dist/Xext/Makefile.in | 4 +-
external/mit/xorg-server/dist/Xi/Makefile.in | 4 +-
external/mit/xorg-server/dist/Xi/exevents.c | 2 +-
external/mit/xorg-server/dist/aclocal.m4 | 59 +-
external/mit/xorg-server/dist/compile | 6 +-
external/mit/xorg-server/dist/composite/Makefile.in | 4 +-
external/mit/xorg-server/dist/config/Makefile.in | 4 +-
external/mit/xorg-server/dist/configure | 43 +-
external/mit/xorg-server/dist/configure.ac | 4 +-
external/mit/xorg-server/dist/damageext/Makefile.in | 4 +-
external/mit/xorg-server/dist/dbe/Makefile.in | 4 +-
external/mit/xorg-server/dist/depcomp | 2 +-
external/mit/xorg-server/dist/dix/Makefile.in | 4 +-
external/mit/xorg-server/dist/dix/events.c | 35 +-
external/mit/xorg-server/dist/doc/Makefile.in | 4 +-
external/mit/xorg-server/dist/doc/dtrace/Makefile.in | 4 +-
external/mit/xorg-server/dist/dri3/Makefile.in | 4 +-
external/mit/xorg-server/dist/exa/Makefile.in | 4 +-
external/mit/xorg-server/dist/fb/Makefile.in | 4 +-
external/mit/xorg-server/dist/glamor/Makefile.in | 4 +-
external/mit/xorg-server/dist/glx/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/kdrive/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/kdrive/ephyr/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/kdrive/ephyr/man/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/kdrive/src/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/vfb/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/vfb/man/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/Makefile.in | 9 +-
external/mit/xorg-server/dist/hw/xfree86/common/Makefile.in | 9 +-
external/mit/xorg-server/dist/hw/xfree86/ddc/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/ddc/print_edid.c | 2 +-
external/mit/xorg-server/dist/hw/xfree86/dixmods/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/doc/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/dri/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/dri2/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/dri2/pci_ids/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/inputtest/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/inputtest/xf86-input-inputtest.c | 45 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/exa/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/exa/man/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/fbdevhw/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/fbdevhw/man/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/glamor_egl/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/i2c/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/int10/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/loader/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/man/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/meson.build | 2 +-
external/mit/xorg-server/dist/hw/xfree86/modes/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/hurd/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/linux/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/misc/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/solaris/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/stub/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/parser/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/ramdac/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/shadowfb/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/utils/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/utils/gtf/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/utils/man/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/vgahw/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/x86emu/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xfree86/xkb/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xnest/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xnest/man/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xquartz/GL/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xquartz/Makefile.am | 3 +
external/mit/xorg-server/dist/hw/xquartz/Makefile.in | 31 +-
external/mit/xorg-server/dist/hw/xquartz/NSUserDefaults+XQuartzDefaults.h | 49 +
external/mit/xorg-server/dist/hw/xquartz/NSUserDefaults+XQuartzDefaults.m | 149 +
external/mit/xorg-server/dist/hw/xquartz/X11Application.h | 48 -
external/mit/xorg-server/dist/hw/xquartz/X11Application.m | 489 +----
external/mit/xorg-server/dist/hw/xquartz/X11Controller.m | 231 +-
external/mit/xorg-server/dist/hw/xquartz/bundle/Info.plist.cpp | 33 +-
external/mit/xorg-server/dist/hw/xquartz/bundle/Makefile.am | 6 +-
external/mit/xorg-server/dist/hw/xquartz/bundle/Makefile.in | 75 +-
external/mit/xorg-server/dist/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects-110000.nib | Bin
external/mit/xorg-server/dist/hw/xquartz/bundle/chown-bundle.sh | 7 +
external/mit/xorg-server/dist/hw/xquartz/bundle/meson.build | 6 +-
external/mit/xorg-server/dist/hw/xquartz/mach-startup/Makefile.in | 9 +-
external/mit/xorg-server/dist/hw/xquartz/mach-startup/meson.build | 11 +
external/mit/xorg-server/dist/hw/xquartz/man/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xquartz/meson.build | 28 +-
external/mit/xorg-server/dist/hw/xquartz/pbproxy/Makefile.am | 4 +-
external/mit/xorg-server/dist/hw/xquartz/pbproxy/Makefile.in | 39 +-
external/mit/xorg-server/dist/hw/xquartz/pbproxy/app-main.m | 40 -
external/mit/xorg-server/dist/hw/xquartz/pbproxy/meson.build | 4 +-
external/mit/xorg-server/dist/hw/xquartz/pbproxy/x-selection.m | 45 +-
external/mit/xorg-server/dist/hw/xquartz/quartz.c | 12 +-
external/mit/xorg-server/dist/hw/xquartz/xpr/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xwin/Makefile.in | 9 +-
external/mit/xorg-server/dist/hw/xwin/dri/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xwin/glx/Makefile.in | 9 +-
external/mit/xorg-server/dist/hw/xwin/man/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xwin/winclipboard/Makefile.in | 4 +-
external/mit/xorg-server/dist/hw/xwin/winprefsyacc.c | 1018 ++++-----
external/mit/xorg-server/dist/hw/xwin/winprefsyacc.h | 82 +-
external/mit/xorg-server/dist/include/Makefile.in | 13 +-
external/mit/xorg-server/dist/include/input.h | 1 +
external/mit/xorg-server/dist/install-sh | 157 +-
external/mit/xorg-server/dist/ltmain.sh | 4 +-
external/mit/xorg-server/dist/m4/libtool.m4 | 4 +-
external/mit/xorg-server/dist/man/Makefile.in | 4 +-
external/mit/xorg-server/dist/meson.build | 10 +-
external/mit/xorg-server/dist/meson_options.txt | 6 +
external/mit/xorg-server/dist/mi/Makefile.in | 4 +-
external/mit/xorg-server/dist/miext/Makefile.in | 4 +-
external/mit/xorg-server/dist/miext/damage/Makefile.in | 4 +-
external/mit/xorg-server/dist/miext/rootless/Makefile.in | 4 +-
external/mit/xorg-server/dist/miext/rootless/rootlessScreen.c | 5 -
external/mit/xorg-server/dist/miext/shadow/Makefile.in | 4 +-
external/mit/xorg-server/dist/miext/sync/Makefile.in | 4 +-
external/mit/xorg-server/dist/missing | 2 +-
external/mit/xorg-server/dist/os/Makefile.in | 4 +-
external/mit/xorg-server/dist/os/connection.c | 31 +-
external/mit/xorg-server/dist/os/utils.c | 1 -
external/mit/xorg-server/dist/present/Makefile.in | 4 +-
external/mit/xorg-server/dist/present/present_scmd.c | 6 +
external/mit/xorg-server/dist/pseudoramiX/Makefile.in | 4 +-
external/mit/xorg-server/dist/randr/Makefile.in | 4 +-
external/mit/xorg-server/dist/record/Makefile.in | 4 +-
external/mit/xorg-server/dist/render/Makefile.in | 4 +-
external/mit/xorg-server/dist/render/picture.c | 8 +-
external/mit/xorg-server/dist/test-driver | 10 +-
external/mit/xorg-server/dist/test/Makefile.in | 12 +-
external/mit/xorg-server/dist/test/meson.build | 2 +
external/mit/xorg-server/dist/xfixes/Makefile.in | 4 +-
external/mit/xorg-server/dist/xkb/Makefile.in | 4 +-
external/mit/xorg-server/dist/xkb/xkb.c | 120 +-
external/mit/xorg-server/dist/ylwrap | 2 +-
138 files changed, 2056 insertions(+), 1834 deletions(-)
diffs (truncated from 7108 to 300 lines):
diff -r 6e3b3bbfd639 -r 7e445e063d50 external/mit/xorg-server/dist/ChangeLog
--- a/external/mit/xorg-server/dist/ChangeLog Fri Jul 15 02:12:39 2022 +0000
+++ b/external/mit/xorg-server/dist/ChangeLog Fri Jul 15 09:08:51 2022 +0000
@@ -1,3 +1,508 @@
+commit 6bf62381d0a1fb54226a10f9d0e6b03aff12f3aa
+Author: Povilas Kanapickas <povilas%radix.lt@localhost>
+Date: Tue Jul 12 16:09:23 2022 +0300
+
+ xserver 21.1.4
+
+commit 06b23cccb1166fcccc2f5fe7259b3ef9e1d0f32e
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date: Tue Jul 5 11:11:06 2022 +1000
+
+ xkb: add request length validation for XkbSetGeometry
+
+ No validation of the various fields on that report were done, so a
+ malicious client could send a short request that claims it had N
+ sections, or rows, or keys, and the server would process the request for
+ N sections, running out of bounds of the actual request data.
+
+ Fix this by adding size checks to ensure our data is valid.
+
+ ZDI-CAN 16062, CVE-2022-2319.
+
+ This vulnerability was discovered by:
+ Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
+
+ Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+ (cherry picked from commit 6907b6ea2b4ce949cb07271f5b678d5966d9df42)
+
+commit e3a530540f2f13739b0233ec51d7a3985a7ec4be
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date: Tue Jul 5 09:50:41 2022 +1000
+
+ xkb: swap XkbSetDeviceInfo and XkbSetDeviceInfoCheck
+
+ XKB often uses a FooCheck and Foo function pair, the former is supposed
+ to check all values in the request and error out on BadLength,
+ BadValue, etc. The latter is then called once we're confident the values
+ are good (they may still fail on an individual device, but that's a
+ different topic).
+
+ In the case of XkbSetDeviceInfo, those functions were incorrectly
+ named, with XkbSetDeviceInfo ending up as the checker function and
+ XkbSetDeviceInfoCheck as the setter function. As a result, the setter
+ function was called before the checker function, accessing request
+ data and modifying device state before we ensured that the data is
+ valid.
+
+ In particular, the setter function relied on values being already
+ byte-swapped. This in turn could lead to potential OOB memory access.
+
+ Fix this by correctly naming the functions and moving the length checks
+ over to the checker function. These were added in 87c64fc5b0 to the
+ wrong function, probably due to the incorrect naming.
+
+ Fixes ZDI-CAN 16070, CVE-2022-2320.
+
+ This vulnerability was discovered by:
+ Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
+
+ Introduced in c06e27b2f6fd9f7b9f827623a48876a225264132
+
+ Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+ (cherry picked from commit dd8caf39e9e15d8f302e54045dd08d8ebf1025dc)
+
+commit e75840565775dc95b848b366aeed44066a9d8a28
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date: Tue Jul 5 12:40:47 2022 +1000
+
+ xkb: switch to array index loops to moving pointers
+
+ Most similar loops here use a pointer that advances with each loop
+ iteration, let's do the same here for consistency.
+
+ No functional changes.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+ Reviewed-by: Olivier Fourdan <ofourdan%redhat.com@localhost>
+ (cherry picked from commit f1070c01d616c5f21f939d5ebc533738779451ac)
+
+commit f3d9c6ff12b5a8a1a9f316b096d5573060747ff9
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date: Mon Jul 4 14:16:43 2022 -0700
+
+ xquartz: Add missing files to distribution tarball
+
+ Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1346
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+
+commit 147c17fc786c268ec51dc0f0655e69f6493f7ef2
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date: Sat Jul 2 14:15:50 2022 -0700
+
+ XQuartz: Improve type safety for X11Controller's application menu editor
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+ (cherry picked from commit 4cfdc5af31ae8282903d0f65cff858330b9f9d1a)
+
+commit 9e2fc7e2484be7c577ee5baf3765734beef9adc2
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date: Sat Jul 2 14:17:18 2022 -0700
+
+ xquartz: Fix a possible crash when editing the Application menu due to mutaing immutable arrays
+
+ Crashing on exception: -[__NSCFArray replaceObjectAtIndex:withObject:]: mutating method sent to immutable object
+
+ Application Specific Backtrace 0:
+ 0 CoreFoundation 0x00007ff80d2c5e9b __exceptionPreprocess + 242
+ 1 libobjc.A.dylib 0x00007ff80d027e48 objc_exception_throw + 48
+ 2 CoreFoundation 0x00007ff80d38167b _CFThrowFormattedException + 194
+ 3 CoreFoundation 0x00007ff80d382a25 -[__NSCFArray removeObjectAtIndex:].cold.1 + 0
+ 4 CoreFoundation 0x00007ff80d2e6c0b -[__NSCFArray replaceObjectAtIndex:withObject:] + 119
+ 5 X11.bin 0x00000001003180f9 -[X11Controller tableView:setObjectValue:forTableColumn:row:] + 169
+
+ Fixes: https://github.com/XQuartz/XQuartz/issues/267
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+ (cherry picked from commit dfd057996b26420309c324ec844a5ba6dd07eda3)
+
+commit 86ace20398a6c559e89213622538134b72e448b1
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date: Fri Jul 1 14:26:06 2022 -0700
+
+ xquartz: Use correct defines when building to support Sparkle updates
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+ (cherry picked from commit aa636b97c66343b25e508b9c73d8505e8c11b1d9)
+
+commit 855b96a85bc0711460a2542573a9a3959d1bfefa
+Author: Povilas Kanapickas <povilas%radix.lt@localhost>
+Date: Sun Dec 19 16:51:39 2021 +0200
+
+ xfree86: Fix event data alignment in inputtest driver
+
+ This fixes address sanitizer errors when running unit tests. The
+ additional copying may reduce performance by a small amount, but we
+ don't care about that because this driver is used for testing only.
+
+ Signed-off-by: Povilas Kanapickas <povilas%radix.lt@localhost>
+ (cherry picked from commit 7d2014e7d523e10623203582b9f573303750f087)
+
+commit 9d05ee10c231edacc69b342677ae8c3cc32f97e5
+Author: Povilas Kanapickas <povilas%radix.lt@localhost>
+Date: Sun Jan 16 10:42:15 2022 +0200
+
+ dix: Don't send touch end to clients that do async grab without touches
+
+ GTK3 menu widget creates a selection for touch and other events and
+ after receiving touch events creates an async grab that excludes touch
+ events. Unfortunately it relies on X server not sending the touch end
+ event in order to function properly. Sending touch end event will cause
+ it to think that the initiating touch ended and when it actually ends,
+ the ButtonRelease event will make it think that the menu should be
+ closed. As a result, the menu will be open only for the duration of the
+ touch making it useless.
+
+ This commit reverts f682e0563f736ed2c2c612ed575e05b6e3db945e.
+
+ Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1255
+
+ Signed-off-by: Povilas Kanapickas <povilas%radix.lt@localhost>
+ (cherry picked from commit 43e934a19f644cddedae73602e86429c9dc5074a)
+
+commit b713e717c34d539486f661c03a0f1b35b3208d21
+Author: Povilas Kanapickas <povilas%radix.lt@localhost>
+Date: Sun Jan 23 22:18:52 2022 +0200
+
+ dix: Correctly save replayed event into GrabInfoRec
+
+ When processing events we operate on InternalEvent pointers. They may
+ actually refer to a an instance of DeviceEvent, GestureEvent or any
+ other event that comprises the InternalEvent union. This works well in
+ practice because we always look into event type before doing anything,
+ except in the case of copying the event.
+
+ *dst_event = *src_event would copy whole InternalEvent event and would
+ cause out of bounds read in case the pointed to event was not
+ InternalEvent but e.g. DeviceEvent.
+
+ This regression has been introduced in
+ 23a8b62d34344575f9df9d057fb74bfefa94a77b.
+
+ Fixes https://gitlab.freedesktop.org/xorg/xserver/-/issues/1261
+
+ Signed-off-by: Povilas Kanapickas <povilas%radix.lt@localhost>
+ (cherry picked from commit 6ef5c05728f8b18170fbc8415d7502495a08670b)
+
+commit cd3d21d8c44a35c22b7eca61a58bb5620b116102
+Author: Samuel Thibault <samuel.thibault%ens-lyon.org@localhost>
+Date: Wed Jan 26 00:05:55 2022 +0100
+
+ xkb: fix XkbSetMap when changing a keysym without changing a keytype
+
+ As the comment says:
+
+ "symsPerKey/mapWidths must be filled regardless of client-side flags"
+
+ so we always have to call CheckKeyTypes which will notably fill mapWidths
+ and nTypes. That is needed for CheckKeySyms to work since it checks the
+ width. Without it, any request with XkbKeySymsMask but not
+ XkbKeyTypesMask will fail because of the missing width information, for
+ instance this:
+
+ XkbDescPtr xkb;
+ if (!(xkb = XkbGetMap (dpy, XkbKeyTypesMask|XkbKeySymsMask, XkbUseCoreKbd))) {
+ fprintf (stderr, "ERROR getting map\n");
+ exit(1);
+ }
+ XFlush (dpy);
+ XSync (dpy, False);
+
+ XkbMapChangesRec changes = { .changed = 0 };
+ int oneGroupType[XkbNumKbdGroups] = { XkbOneLevelIndex };
+
+ if (XkbChangeTypesOfKey(xkb, keycode, 1, XkbGroup1Mask, oneGroupType, &changes)) {
+ fprintf(stderr, "ERROR changing type of key\n");
+ exit(1);
+ }
+ XkbKeySymEntry(xkb,keycode,0,0) = keysym;
+
+ if (!XkbChangeMap(dpy,xkb,&changes)) {
+ fprintf(stderr, "ERROR changing map\n");
+ exit(1);
+ }
+
+ XkbFreeKeyboard (xkb, 0, TRUE);
+ XFlush (dpy);
+ XSync (dpy, False);
+
+ This had being going under the radar since about ever until commit
+ de940e06f8733d87bbb857aef85d830053442cfe ("xkb: fix key type index check
+ in _XkbSetMapChecks") fixed checking the values of kt_index, which was
+ previously erroneously ignoring errors and ignoring all other checks, just
+ because nTypes was not set, precisely because CheckKeyTypes was not called.
+
+ Note: yes, CheckKeyTypes is meant to be callable without XkbKeyTypesMask, it
+ does properly check for that and just fills nTypes and mapWidths in that
+ case.
+
+ Signed-off-by: Samuel Thibault <samuel.thibault%ens-lyon.org@localhost>
+ (cherry picked from commit 0217cc6e0cf5013366105a90f5f91ccc4bab5425)
+
+commit f575524314e9f20a1ff639f6bd65386cdbd083f4
+Author: Povilas Kanapickas <povilas%radix.lt@localhost>
+Date: Thu Feb 3 20:04:52 2022 +0200
+
+ Revert "os: Try to discover the current seat with the XDG_SEAT var first"
+
+ This reverts commit b27eaa72837eebe80adfe6c257a71a6b9eaf66ee.
+
+commit 419fbf639d8f53d39449c157a9554bd5482ed64f
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date: Sun Jun 26 10:31:54 2022 -0700
+
+ XQuartz: Add TCC reason keys to Info.plist
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+ (cherry picked from commit 9ce7264889e36fddbdf6bac332225ad6f628ad5d)
+
+commit 66ac50090dd191f1b16daf338ca3b46d9147fbbd
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date: Sun Jun 26 02:40:20 2022 -0700
+
+ XQuartz: Build the bundle trampoline when using meson
+
+ This brings the change for e1fdc856aedfcb4788011415930a0c6861df5123 into meson based builds
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+ (cherry picked from commit b00cf4aef881e00533f995c141c3586749cd7ca1)
+
+commit 033d93a021e86dd5ce9b2b3a1554a72c7031a7f2
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date: Mon Jun 20 17:08:53 2022 -0700
+
+ meson: Support building Xnest and Xorg on darwin
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+ (cherry picked from commit ef8101560eefd6160df6d4b57ddb65ea2328c441)
+
+commit 433f53a1a08390a038176b7c1207512cf1dd3f44
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date: Mon Jun 20 20:19:06 2022 -0700
+
+ tests: Fix build failure from missing micmap.c
+
+ FAILED: test/tests
+ clang -o test/tests test/tests.p/.._mi_miinitext.c.o test/tests.p/fixes.c.o test/tests.p/input.c.o test/tests.p/list.c.o test/tests.p/misc.c.o test/tests.p/signal-logging.c.o
test/tests.p/string.c.o test/tests.p/test_xkb.c.o test/tests.p/tests-common.c.o test/tests.p/tests.c.o test/tests.p/touch.c.o test/tests.p/xfree86.c.o test/tests.p/xtest.c.o
test/tests.p/hashtabletest.c.o -Wl,-dead_strip_dylibs -Wl,-headerpad_max_install_names -Wl,-undefined,error -fvisibility=hidden -O0 -g3 -gdwarf-2 -mmacosx-version-min=10.9
-Werror=unguarded-availability-new -Werror=format -Werror=objc-method-access -Werror=incompatible-pointer-types -F/Applications/Utilities/XQuartz.app/Contents/Frameworks -isysroot
/Library/Developer/CommandLineTools/SDKs/MacOSX10.13.sdk -arch x86_64 -O0 -g3 -gdwarf-2 -mmacosx-version-min=10.9 -Werror=unguarded-availability-new -Werror=format -Werror=objc-method-access
-Werror=incompatible-pointer-types -F/Applications/Utilities/XQuartz.app/Contents/Frameworks -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.13.sdk -arch x86_64 -Wl,-rpath,/opt/X11/lib
mi/liblibxserver_mi.a dix/liblibxserver_dix.a composite/liblibxserver_composite.a damageext/liblibxserver_damageext.a dbe/liblibxserver_dbe.a randr/liblibxserver_randr.a
miext/damage/liblibxserver_miext_damage.a render/liblibxserver_render.a present/liblibxserver_present.a Xext/liblibxserver_xext.a miext/sync/liblibxserver_miext_sync.a xfixes/liblibxserver_xfixes.a
Xi/liblibxserver_xi.a xkb/liblibxserver_xkb.a record/liblibxserver_record.a os/liblibxserver_os.a os/liblibxlibc.a glx/liblibglxvnd.a hw/xfree86/common/libxorg_common.a
hw/xfree86/loader/libxorg_loader.a hw/xfree86/ddc/libxorg_ddc.a hw/xfree86/xkb/libxorg_xkb.a hw/xfree86/i2c/libxorg_i2c.a hw/xfree86/modes/libxorg_modes.a hw/xfree86/os-support/libxorg_os_support.a
hw/xfree86/parser/libxorg_parser.a hw/xfree86/ramdac/libxorg_ramdac.a fb/liblibxserver_fb.a Xext/liblibxserver_xext_vidmode.a dix/liblibxserver_main.a config/liblibxserver_config.a
/opt/X11/lib/libpixman-1.dylib /opt/X11/lib/libxcvt.dylib /opt/X11/lib/libxkbfile.dylib /opt/X11/lib/libXfont2.dylib /opt/X11/lib/libXdmcp.dylib -lm /opt/X11/lib/libxshmfence.dylib -ldl -lpthread
/opt/X11/lib/libXau.dylib /opt/X11/lib/libGL.dylib
+ Undefined symbols for architecture x86_64:
+ "_micmapScrPrivateKeyRec", referenced from:
+ _DGAInstallCmap in libxorg_common.a(xf86DGA.c.o)
+ _xf86HandleColormaps in libxorg_common.a(xf86cmap.c.o)
+ _CMapInstallColormap in libxorg_common.a(xf86cmap.c.o)
+ _CMapEnterVT in libxorg_common.a(xf86cmap.c.o)
+ _CMapSwitchMode in libxorg_common.a(xf86cmap.c.o)
+ _CMapSetDGAMode in libxorg_common.a(xf86cmap.c.o)
+ _CMapChangeGamma in libxorg_common.a(xf86cmap.c.o)
+ ...
+ ld: symbol(s) not found for architecture x86_64
+
Home |
Main Index |
Thread Index |
Old Index