commit 05c3c8d04ec3d351ddcffbf613f8a6a54cb58fd4 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Thu Sep 26 19:17:48 2024 +0200
- updated to 47.0 gdm-defaults.patch | 51 ++++++++++++++++++++++++--------------------------- gdm.spec | 9 ++++----- 2 files changed, 28 insertions(+), 32 deletions(-) --- diff --git a/gdm.spec b/gdm.spec index 2ad4585..b0d0e47 100644 --- a/gdm.spec +++ b/gdm.spec @@ -16,13 +16,13 @@ Summary(pt_BR.UTF-8): Gerenciador de Entrada do GNOME Summary(ru.UTF-8): Дисплейный менеджер GNOME Summary(uk.UTF-8): Дисплейний менеджер GNOME Name: gdm -Version: 46.2 +Version: 47.0 Release: 1 Epoch: 2 License: GPL v2+ Group: X11/Applications -Source0: https://download.gnome.org/sources/gdm/46/%{name}-%{version}.tar.xz -# Source0-md5: 1d92ec4dd0643907fa135056aee18066 +Source0: https://download.gnome.org/sources/gdm/47/%{name}-%{version}.tar.xz +# Source0-md5: 0312497290b26525e14fbc153f1a87f2 Source1: %{name}.pamd Source2: %{name}.init Source3: %{name}-pld-logo.png @@ -40,7 +40,7 @@ URL: https://wiki.gnome.org/Projects/GDM BuildRequires: accountsservice-devel >= 0.6.35 BuildRequires: audit-libs-devel BuildRequires: check-devel >= 0.9.4 -BuildRequires: dconf +BuildRequires: dconf-devel BuildRequires: gettext-tools >= 0.19.8 BuildRequires: glib2-devel >= %{glib2_ver} BuildRequires: gobject-introspection-devel >= 0.9.12 @@ -316,7 +316,6 @@ fi %doc AUTHORS MAINTAINERS NEWS README.md %attr(755,root,root) %{_sbindir}/gdm %attr(755,root,root) %{_bindir}/gdm-config -%attr(755,root,root) %{_bindir}/gdm-screenshot %attr(755,root,root) %{_bindir}/gdmflexiserver %attr(755,root,root) %{_libexecdir}/gdm-host-chooser %attr(755,root,root) %{_libexecdir}/gdm-runtime-config diff --git a/gdm-defaults.patch b/gdm-defaults.patch index cc0101b..b220660 100644 --- a/gdm-defaults.patch +++ b/gdm-defaults.patch @@ -1,28 +1,25 @@ ---- gdm-41.3/meson.build.orig 2022-01-12 21:07:22.248332481 +0100 -+++ gdm-41.3/meson.build 2022-01-12 21:14:05.232427434 +0100 -@@ -72,23 +72,10 @@ x_deps = declare_dependency( - # Xserver 1.17 & later default to -nolisten and require -listen for remote access - xserver_deps = dependency('xorg-server', version : '>=1.17', required : false) - xserver_has_listen = xserver_deps.found() --find_x_server_script = find_program('build-aux/find-x-server.sh', native: true) --find_x_server_out = run_command(find_x_server_script).stdout().strip() --if find_x_server_out != '' -- x_bin = find_x_server_out -- x_bin_path_split = x_bin.split('/') -- i = 0 -- x_path = '/' -- foreach dir : x_bin_path_split -- if i < x_bin_path_split.length() - 1 -- x_path = x_path / dir -- endif -- i = i + 1 -- endforeach --else -+if true - # what to do, what to do, this is wrong, but this just sets the - # defaults, perhaps this user is cross compiling or some such -- x_path = '/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin' +--- gdm-47.0/meson.build.orig 2024-09-26 18:51:02.857969320 +0200 ++++ gdm-47.0/meson.build 2024-09-26 18:54:27.126862700 +0200 +@@ -95,20 +95,8 @@ if have_x11_support + # Xserver 1.17 & later default to -nolisten and require -listen for remote access + xserver_deps = dependency('xorg-server', version : '>=1.17', required : false) + xserver_has_listen = xserver_deps.found() +- find_x_server_script = find_program('build-aux/find-x-server.sh', native: true) +- find_x_server_out = run_command(find_x_server_script).stdout().strip() +- if find_x_server_out != '' +- x_bin = find_x_server_out +- x_bin_path_split = x_bin.split('/') +- i = 0 +- x_path = '/' +- foreach dir : x_bin_path_split +- if i < x_bin_path_split.length() - 1 +- x_path = x_path / dir +- endif +- i = i + 1 +- endforeach +- endif ++ x_bin = '/usr/bin/X' + x_path = '/usr/bin' - x_bin = '/usr/bin/X' - endif - xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp')) + + xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp')) + have_xdmcp = xdmcp_dep.found() ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gdm.git/commitdiff/05c3c8d04ec3d351ddcffbf613f8a6a54cb58fd4 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit