git: c463e4aa65de - main - print/xreader: unbreak build with Meson 1.2.0

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sat, 29 Jul 2023 00:49:50 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c463e4aa65deee21e3fcba2a573c72ee82b4e636

commit c463e4aa65deee21e3fcba2a573c72ee82b4e636
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-03-25 14:46:05 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-07-29 00:21:58 +0000

    print/xreader: unbreak build with Meson 1.2.0
    
    ld: error: undefined symbol: XLockDisplay
    >>> referenced by totem-scrsaver.c
    >>>               ../cut-n-paste/totem-screensaver/libtotemscrsaver.a.p/totem-scrsaver.c.o:(totem_scrsaver_disable) in archive shell/libshell.a
    >>> referenced by totem-scrsaver.c
    >>>               ../cut-n-paste/totem-screensaver/libtotemscrsaver.a.p/totem-scrsaver.c.o:(totem_scrsaver_enable) in archive shell/libshell.a
    
    ld: error: undefined symbol: XGetScreenSaver
    >>> referenced by totem-scrsaver.c
    >>>               ../cut-n-paste/totem-screensaver/libtotemscrsaver.a.p/totem-scrsaver.c.o:(totem_scrsaver_disable) in archive shell/libshell.a
    
    ld: error: undefined symbol: XSetScreenSaver
    >>> referenced by totem-scrsaver.c
    >>>               ../cut-n-paste/totem-screensaver/libtotemscrsaver.a.p/totem-scrsaver.c.o:(totem_scrsaver_disable) in archive shell/libshell.a
    >>> referenced by totem-scrsaver.c
    >>>               ../cut-n-paste/totem-screensaver/libtotemscrsaver.a.p/totem-scrsaver.c.o:(totem_scrsaver_enable) in archive shell/libshell.a
    
    ld: error: undefined symbol: XUnlockDisplay
    >>> referenced by totem-scrsaver.c
    >>>               ../cut-n-paste/totem-screensaver/libtotemscrsaver.a.p/totem-scrsaver.c.o:(totem_scrsaver_disable) in archive shell/libshell.a
    >>> referenced by totem-scrsaver.c
    >>>               ../cut-n-paste/totem-screensaver/libtotemscrsaver.a.p/totem-scrsaver.c.o:(totem_scrsaver_enable) in archive shell/libshell.a
    
    ld: error: undefined symbol: IceSetIOErrorHandler
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_startup) in archive shell/libshell.a
    
    ld: error: undefined symbol: IceSetErrorHandler
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_startup) in archive shell/libshell.a
    
    ld: error: undefined symbol: IceAddConnectionWatch
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_startup) in archive shell/libshell.a
    
    ld: error: undefined symbol: SmcSetErrorHandler
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_startup) in archive shell/libshell.a
    
    ld: error: undefined symbol: SmcOpenConnection
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_startup) in archive shell/libshell.a
    
    ld: error: undefined symbol: SmcInteractDone
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_will_quit) in archive shell/libshell.a
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(fix_broken_state) in archive shell/libshell.a
    
    ld: error: undefined symbol: SmcSaveYourselfDone
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_will_quit) in archive shell/libshell.a
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_end_session) in archive shell/libshell.a
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(xsmp_save_yourself) in archive shell/libshell.a
    >>> referenced 3 more times
    
    ld: error: undefined symbol: SmcVendor
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_end_session) in archive shell/libshell.a
    
    ld: error: undefined symbol: SmcRequestSaveYourself
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_end_session) in archive shell/libshell.a
    
    ld: error: undefined symbol: SmcGetIceConnection
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_end_session) in archive shell/libshell.a
    
    ld: error: undefined symbol: IceProcessMessages
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_end_session) in archive shell/libshell.a
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(ice_iochannel_watch) in archive shell/libshell.a
    
    ld: error: undefined symbol: IceGetConnectionContext
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_end_session) in archive shell/libshell.a
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(ice_iochannel_watch) in archive shell/libshell.a
    
    ld: error: undefined symbol: SmcCloseConnection
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(sm_client_xsmp_end_session) in archive shell/libshell.a
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(xsmp_die) in archive shell/libshell.a
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(ice_iochannel_watch) in archive shell/libshell.a
    
    ld: error: undefined symbol: IceConnectionNumber
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(ice_connection_watch) in archive shell/libshell.a
    
    ld: error: undefined symbol: SmcInteractRequest
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(do_save_yourself) in archive shell/libshell.a
    
    ld: error: undefined symbol: SmcSetProperties
    >>> referenced by eggsmclient-xsmp.c
    >>>               ../cut-n-paste/smclient/libsmclient.a.p/eggsmclient-xsmp.c.o:(set_properties) in archive shell/libshell.a
    
    ld: error: too many errors emitted, stopping now (use -error-limit=0 to see all errors)
    
    PR:             272276
    Reported by:    vishwin, antoine (via exp-run)
    Regressed by:   https://github.com/mesonbuild/meson/commit/a78af2368620
---
 print/xreader/files/patch-shell_meson.build | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/print/xreader/files/patch-shell_meson.build b/print/xreader/files/patch-shell_meson.build
new file mode 100644
index 000000000000..4bf924e924e6
--- /dev/null
+++ b/print/xreader/files/patch-shell_meson.build
@@ -0,0 +1,12 @@
+--- shell/meson.build.orig	2021-12-06 16:02:19 UTC
++++ shell/meson.build
+@@ -94,6 +94,9 @@ xreader_deps = [
+     gtk,
+     libsecret,
+     math,
++    ice,
++    sm,
++    X11,
+     xapp,
+ ]
+