patch 9.1.1726: Patch v9.1.1725 causes problems

Problem:  Patch v9.1.1725 causes problems
Solution: Revert the patch for now

fixes: #18187

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2025-09-02 19:06:06 +02:00
parent 0ed08788a1
commit 8429a44a9e
29 changed files with 2688 additions and 2613 deletions

View File

@ -2464,25 +2464,11 @@ AC_ARG_WITH(wayland,
AC_MSG_RESULT([yes])]))
if test "$with_wayland" = yes; then
cppflags_save=$CPPFLAGS
cflags_save=$CFLAGS
cppflags_save=$CPPFLAGS
cflags_save=$CFLAGS
AC_MSG_CHECKING(for wayland)
if "$PKG_CONFIG" --exists 'wayland-client'; then
AC_MSG_RESULT([yes])
AC_MSG_CHECKING(--enable-wayland-focus-steal argument)
AC_ARG_ENABLE(wayland-focus-steal,
[AS_HELP_STRING([--enable-wayland-focus-steal],
[Include focus stealing support for Wayland clipboard.])],
[enable_wayland_fs=$enableval],
enable_wayland_fs="yes")
AS_IF([test "$enable_wayland_fs" = "yes"],
[AC_MSG_RESULT([yes])
AC_DEFINE(FEAT_WAYLAND_CLIPBOARD_FS)],
[AC_MSG_RESULT([no])])
AC_DEFINE(HAVE_WAYLAND)
WAYLAND_CPPFLAGS=`$PKG_CONFIG --cflags-only-I wayland-client`
WAYLAND_CFLAGS=`$PKG_CONFIG --cflags-only-other wayland-client`
@ -2492,20 +2478,15 @@ if test "$with_wayland" = yes; then
WAYLAND_SRC=" \
auto/wayland/wlr-data-control-unstable-v1.c \
auto/wayland/ext-data-control-v1.c \
auto/wayland/xdg-shell.c \
auto/wayland/primary-selection-unstable-v1.c \
wayland.c"
WAYLAND_OBJ=" \
objects/wlr-data-control-unstable-v1.o \
objects/ext-data-control-v1.o \
objects/xdg-shell.o \
objects/primary-selection-unstable-v1.o \
objects/wayland.o"
AS_IF([test "$enable_wayland_fs" = "yes"],
[WAYLAND_SRC+=" \
auto/wayland/xdg-shell.c \
auto/wayland/primary-selection-unstable-v1.c"
WAYLAND_OBJ+=" \
objects/xdg-shell.o \
objects/primary-selection-unstable-v1.o"])
AC_SUBST(WAYLAND_CPPFLAGS)
AC_SUBST(WAYLAND_CFLAGS)
AC_SUBST(WAYLAND_LIBS)