From 8b7431be207b648f3708244a7523c6bead300347ebab5f69537d0ebf13d8d021 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 12 Oct 2023 13:06:35 +0000 Subject: [PATCH] Accepting request 1117090 from home:yfjiang:branches:GNOME:Factory - Add gnome-shell-add-linkoption-dl.patch on SLE and Leap: the -ldl option to build gnome-shell main programme is needed because an upstream fix. This option needs explicitly given on current SLE build environment. See: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65cde18786e2bea8ffe33317b86182207e419240 OBS-URL: https://build.opensuse.org/request/show/1117090 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=545 --- gnome-shell-add-linkoption-dl.patch | 12 ++++++++++++ gnome-shell.changes | 9 +++++++++ gnome-shell.spec | 3 +++ 3 files changed, 24 insertions(+) create mode 100644 gnome-shell-add-linkoption-dl.patch diff --git a/gnome-shell-add-linkoption-dl.patch b/gnome-shell-add-linkoption-dl.patch new file mode 100644 index 0000000..0eee69f --- /dev/null +++ b/gnome-shell-add-linkoption-dl.patch @@ -0,0 +1,12 @@ +Index: gnome-shell-45.0/src/meson.build +=================================================================== +--- gnome-shell-45.0.orig/src/meson.build ++++ gnome-shell-45.0/src/meson.build +@@ -250,6 +250,7 @@ executable('gnome-shell', 'main.c', + include_directories: [conf_inc, st_inc, include_directories('tray')], + build_rpath: mutter_typelibdir, + install_rpath: install_rpath, ++ link_args: ['-ldl'], + install: true + ) + diff --git a/gnome-shell.changes b/gnome-shell.changes index 10a4afa..2946ef7 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Oct 12 03:16:50 UTC 2023 - Yifan Jiang + +- Add gnome-shell-add-linkoption-dl.patch on SLE and Leap: the -ldl + option to build gnome-shell main programme is needed because an + upstream fix. This option needs explicitly given on current SLE + build environment. See: + https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65cde18786e2bea8ffe33317b86182207e419240 + ------------------------------------------------------------------- Sat Sep 16 22:16:51 UTC 2023 - Bjørn Lie diff --git a/gnome-shell.spec b/gnome-shell.spec index f637983..e9c0112 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -65,6 +65,8 @@ Patch1010: gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch Patch1011: gnome-shell-disable-offline-update-dialog.patch # PATCH-FEATURE-SLE gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch jsc#SLE-9267 qkzhu@suse.com -- Remove sessionList of endSessionDialog Patch1012: gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch +# PATCH-FIX-SLE gnome-shell-add-linkoption-dl.patch -- Need explicit -ldl build option with older gcc on SLE 15 +Patch1013: gnome-shell-add-linkoption-dl.patch # needed for directory ownership BuildRequires: asciidoc @@ -199,6 +201,7 @@ This package contains an optional extensions app for managing GNOME Shell extens %patch1011 -p1 %endif %patch1012 -p1 +%patch1013 -p1 %endif cp %{SOURCE2} data/theme/