From 444911497677f6780f7e9da7d4e47c2fcd74fdf7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 16:51:55 +0200 Subject: Adding debian version 3.38.2-1. Signed-off-by: Daniel Baumann --- debian/patches/debian/01_debianize_xrdb.patch | 58 ++++++++++++++++++++++ .../meson.build-Lower-polkit-requirement.patch | 24 +++++++++ debian/patches/series | 2 + 3 files changed, 84 insertions(+) create mode 100644 debian/patches/debian/01_debianize_xrdb.patch create mode 100644 debian/patches/debian/meson.build-Lower-polkit-requirement.patch create mode 100644 debian/patches/series (limited to 'debian/patches') diff --git a/debian/patches/debian/01_debianize_xrdb.patch b/debian/patches/debian/01_debianize_xrdb.patch new file mode 100644 index 0000000..1dced2c --- /dev/null +++ b/debian/patches/debian/01_debianize_xrdb.patch @@ -0,0 +1,58 @@ +From: Laurent Bigonville +Date: Thu, 12 Mar 2020 18:05:51 +0100 +Subject: Debianize the 00-xrdb script + +In Debian, /etc/X11/Xresources is a directory, processing of ~/.Xresources +is controlled by /etc/X11/Xsession.options, and xrdb is not a mandatory +dependency. + +Forwarded: not-needed, Debian-specific +--- + plugins/xsettings/00-xrdb | 36 +++++++++++++++++++++++++++++++----- + 1 file changed, 31 insertions(+), 5 deletions(-) + +diff --git a/plugins/xsettings/00-xrdb b/plugins/xsettings/00-xrdb +index a047e8b..7fc8492 100755 +--- a/plugins/xsettings/00-xrdb ++++ b/plugins/xsettings/00-xrdb +@@ -1,9 +1,35 @@ + #!/bin/sh + +-userresources=$HOME/.Xresources +-sysresources=/etc/X11/Xresources ++# This script mimic what /etc/X11/Xsession.d/30x11-common_xresources is doing ++# but for Xwayland + +-# merge in defaults +-[ -r "$sysresources" ] && xrdb -nocpp -merge "$sysresources" +-[ -r "$userresources" ] && xrdb -merge "$userresources" ++USRRESOURCES=$HOME/.Xresources ++SYSRESOURCES=/etc/X11/Xresources ++OPTIONFILE=/etc/X11/Xsession.options + ++# read OPTIONFILE ++OPTIONS=$(cat "$OPTIONFILE") || true ++ ++has_option() { ++ if [ "${OPTIONS#* ++$1}" != "$OPTIONS" ]; then ++ return 0 ++ else ++ return 1 ++ fi ++} ++ ++if [ -d "$SYSRESOURCES" ] && which xrdb >/dev/null 2>&1; then ++ RESOURCEFILES=$(run-parts --list $SYSRESOURCES) ++ if [ -n "$RESOURCEFILES" ]; then ++ for RESOURCEFILE in $RESOURCEFILES; do ++ xrdb -merge $RESOURCEFILE ++ done ++ fi ++fi ++ ++if has_option allow-user-resources && [ -f "$USRRESOURCES" ]; then ++ if which xrdb >/dev/null 2>&1; then ++ xrdb -merge $USRRESOURCES ++ fi ++fi diff --git a/debian/patches/debian/meson.build-Lower-polkit-requirement.patch b/debian/patches/debian/meson.build-Lower-polkit-requirement.patch new file mode 100644 index 0000000..f651b75 --- /dev/null +++ b/debian/patches/debian/meson.build-Lower-polkit-requirement.patch @@ -0,0 +1,24 @@ +From: Iain Lane +Date: Fri, 19 Jul 2019 16:40:38 +0100 +Subject: meson.build: Lower polkit requirement + +On Debian/Ubuntu, we've backported the ITS rules + +Forwarded: not-needed +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 80eabe5..7c8d04b 100644 +--- a/meson.build ++++ b/meson.build +@@ -104,7 +104,7 @@ libgeoclue_dep = dependency('libgeoclue-2.0', version: '>= 2.3.1') + libnotify_dep = dependency('libnotify', version: '>= 0.7.3') + libpulse_mainloop_glib_dep = dependency('libpulse-mainloop-glib', version: '>= 2.0') + pango_dep = dependency('pango', version: '>= 1.20.0') +-polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.114') ++polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.105') + upower_glib_dep = dependency('upower-glib', version: '>= 0.99.8') + x11_dep = dependency('x11') + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ae8f96e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +debian/01_debianize_xrdb.patch +debian/meson.build-Lower-polkit-requirement.patch -- cgit v1.2.3