From 09454f7dee236cc946c9bda02df21f4060496fb4 Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 29 Jan 2021 21:40:00 +0300 Subject: [PATCH] xfce4-session rebuild --- ...t-XDG_CONFIG_HOME-and-XDG_CACHE_HOME.patch | 32 +++++++ .../files/mageia/xfce4-lightdm.conf | 2 + ...2-add-more-screen-lockers-to-xflock4.patch | 19 ++++ .../mageia/xfce4-session-4.13.2-xinitrc.patch | 28 ++++++ .../base/xfce4-session/files/mageia/xfce4.pam | 7 ++ ...olkit-gnome-authentication-agent-1.desktop | 87 +++++++++++++++++++ ...sion-4.10.1-alock_support_to_xflock4.patch | 15 ++++ desktop/xfce/base/xfce4-session/pspec.xml | 17 +++- 8 files changed, 205 insertions(+), 2 deletions(-) create mode 100644 desktop/xfce/base/xfce4-session/files/mageia/0001-Export-XDG_CONFIG_HOME-and-XDG_CACHE_HOME.patch create mode 100644 desktop/xfce/base/xfce4-session/files/mageia/xfce4-lightdm.conf create mode 100644 desktop/xfce/base/xfce4-session/files/mageia/xfce4-session-4.13.2-add-more-screen-lockers-to-xflock4.patch create mode 100644 desktop/xfce/base/xfce4-session/files/mageia/xfce4-session-4.13.2-xinitrc.patch create mode 100644 desktop/xfce/base/xfce4-session/files/mageia/xfce4.pam create mode 100644 desktop/xfce/base/xfce4-session/files/xfce-polkit-gnome-authentication-agent-1.desktop create mode 100644 desktop/xfce/base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch diff --git a/desktop/xfce/base/xfce4-session/files/mageia/0001-Export-XDG_CONFIG_HOME-and-XDG_CACHE_HOME.patch b/desktop/xfce/base/xfce4-session/files/mageia/0001-Export-XDG_CONFIG_HOME-and-XDG_CACHE_HOME.patch new file mode 100644 index 0000000000..6cf54c6b4b --- /dev/null +++ b/desktop/xfce/base/xfce4-session/files/mageia/0001-Export-XDG_CONFIG_HOME-and-XDG_CACHE_HOME.patch @@ -0,0 +1,32 @@ +From 464659dbdd982cad0d2b315b12d3bfc5c5bc1f16 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jani=20V=C3=A4limaa?= +Date: Fri, 25 Dec 2020 13:16:46 +0200 +Subject: [PATCH] Export XDG_CONFIG_HOME and XDG_CACHE_HOME + +--- + scripts/xinitrc.in.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in +index ff044ed..9bd6fc3 100644 +--- a/scripts/xinitrc.in.in ++++ b/scripts/xinitrc.in.in +@@ -33,6 +33,7 @@ fi + # or empty, a default equal to $HOME/.config should be used. + if test "x$XDG_CONFIG_HOME" = "x" ; then + XDG_CONFIG_HOME=$HOME/.config ++ export XDG_CONFIG_HOME + fi + [ -d "$XDG_CONFIG_HOME" ] || mkdir "$XDG_CONFIG_HOME" + +@@ -41,6 +42,7 @@ fi + # set or empty, a default equal to $HOME/.cache should be used. + if test "x$XDG_CACHE_HOME" = "x" ; then + XDG_CACHE_HOME=$HOME/.cache ++ export XDG_CACHE_HOME + fi + [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" + +-- +2.29.2 + diff --git a/desktop/xfce/base/xfce4-session/files/mageia/xfce4-lightdm.conf b/desktop/xfce/base/xfce4-session/files/mageia/xfce4-lightdm.conf new file mode 100644 index 0000000000..d5ceab539a --- /dev/null +++ b/desktop/xfce/base/xfce4-session/files/mageia/xfce4-lightdm.conf @@ -0,0 +1,2 @@ +[Seat:*] +user-session=xfce diff --git a/desktop/xfce/base/xfce4-session/files/mageia/xfce4-session-4.13.2-add-more-screen-lockers-to-xflock4.patch b/desktop/xfce/base/xfce4-session/files/mageia/xfce4-session-4.13.2-add-more-screen-lockers-to-xflock4.patch new file mode 100644 index 0000000000..2ca6429ae0 --- /dev/null +++ b/desktop/xfce/base/xfce4-session/files/mageia/xfce4-session-4.13.2-add-more-screen-lockers-to-xflock4.patch @@ -0,0 +1,19 @@ +diff -up ./scripts/xflock4.orig ./scripts/xflock4 +--- ./scripts/xflock4.orig 2015-09-27 13:19:24.784098605 +0300 ++++ ./scripts/xflock4 2015-09-27 13:21:49.630546600 +0300 +@@ -30,9 +30,11 @@ LOCK_CMD=$(xfconf-query -c xfce4-session + # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running + for lock_cmd in \ + "$LOCK_CMD" \ +- "xfce4-screensaver-command --lock" \ +- "xscreensaver-command -lock" \ +- "gnome-screensaver-command --lock" ++ "xfce4-screensaver-command --lock" \ ++ "light-locker-command --lock" \ ++ "mate-screensaver-command --lock" \ ++ "gnome-screensaver-command --lock" \ ++ "xscreensaver-command -lock" + do + if [ ! -z "$lock_cmd" ]; then + $lock_cmd >/dev/null 2>&1 && exit + diff --git a/desktop/xfce/base/xfce4-session/files/mageia/xfce4-session-4.13.2-xinitrc.patch b/desktop/xfce/base/xfce4-session/files/mageia/xfce4-session-4.13.2-xinitrc.patch new file mode 100644 index 0000000000..0bfa98aa13 --- /dev/null +++ b/desktop/xfce/base/xfce4-session/files/mageia/xfce4-session-4.13.2-xinitrc.patch @@ -0,0 +1,28 @@ +diff -p -up ./scripts/xinitrc.in.in.0000 ./scripts/xinitrc.in.in +--- ./scripts/xinitrc.in.in.0000 2012-03-30 18:48:01.000000000 +0000 ++++ ./scripts/xinitrc.in.in 2012-04-01 19:14:14.875368141 +0000 +@@ -44,6 +44,24 @@ if which xdg-user-dirs-update >/dev/null + xdg-user-dirs-update + fi + ++# Create user preferences if they are missing ++# - Thunar ++for i in Thunar; do ++ if [ ! -d $XDG_CONFIG_HOME/$i ]; then ++ mkdir -p $XDG_CONFIG_HOME/$i ++ cp -a /etc/xdg/$i $XDG_CONFIG_HOME ++ fi ; ++done ++ ++ ++# Create panel and xfconf user preferences if they are missing ++for i in panel xfconf terminal; do ++ if [ ! -d $XDG_CONFIG_HOME/xfce4/$i ]; then ++ mkdir -p $XDG_CONFIG_HOME/xfce4/$i ++ cp -a /etc/xdg/xfce4/$i $XDG_CONFIG_HOME/xfce4 ++ fi ; ++done ++ + # For now, start with an empty list + XRESOURCES="" + diff --git a/desktop/xfce/base/xfce4-session/files/mageia/xfce4.pam b/desktop/xfce/base/xfce4-session/files/mageia/xfce4.pam new file mode 100644 index 0000000000..954c54f65f --- /dev/null +++ b/desktop/xfce/base/xfce4-session/files/mageia/xfce4.pam @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth include system-auth +auth required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session optional pam_console.so diff --git a/desktop/xfce/base/xfce4-session/files/xfce-polkit-gnome-authentication-agent-1.desktop b/desktop/xfce/base/xfce4-session/files/xfce-polkit-gnome-authentication-agent-1.desktop new file mode 100644 index 0000000000..fec61e7fc4 --- /dev/null +++ b/desktop/xfce/base/xfce4-session/files/xfce-polkit-gnome-authentication-agent-1.desktop @@ -0,0 +1,87 @@ +[Desktop Entry] +Name=PolicyKit Authentication Agent +Name[ar]=مدير الاستيثاق PolicyKit +Name[be]=PolicyKit - аґент аўтэнтыфікацыі +Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট +Name[ca]=Agent d'autenticació del PolicyKit +Name[cs]=Ověřovací agent PolicyKit +Name[da]=Godkendelsesprogrammet PolicyKit +Name[de]=Legitimationsdienst von PolicyKit +Name[el]=Πράκτορας πιστοποίησης PolicyKit +Name[en_GB]=PolicyKit Authentication Agent +Name[es]=Agente de autenticación de PolicyKit +Name[eu]=PolicyKit autentifikatzeko agentea +Name[fi]=PolicytKit-tunnistautumisohjelma +Name[fr]=Agent d'authentification de PolicyKit +Name[gl]=Axente de autenticación PolicyKit +Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ +Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि +Name[hu]=PolicyKit hitelesítési ügynök +Name[it]=Agente di autenticazione per PolicyKit +Name[ja]=PolicyKit 認証エージェント +Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ +Name[lt]=PolicyKit tapatybės nustatymo agentas +Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ് +Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट +Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ +Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ +Name[pl]=Agent uwierzytelniania PolicyKit +Name[pt]=Agente de Autenticação PolicyKit +Name[pt_BR]=Agente de autenticação PolicyKit +Name[ro]=Agent de autentificare PolicyKit +Name[sk]=Agent PolicyKit na overovanie totožnosti +Name[sl]=PolicyKit program overjanja +Name[sv]=Autentiseringsagent för PolicyKit +Name[ta]=PolicyKit அங்கீகார முகவர் +Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి +Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit +Name[uk]=Агент автентифікації PolicyKit +Name[zh_CN]=PolicyKit 认证代理 +Name[zh_HK]=PolicyKit 驗證代理程式 +Name[zh_TW]=PolicyKit 驗證代理程式 +Comment=PolicyKit Authentication Agent +Comment[ar]=مدير الاستيثاق PolicyKit +Comment[be]=PolicyKit - аґент аўтэнтыфікацыі +Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট +Comment[ca]=Agent d'autenticació del PolicyKit +Comment[cs]=Ověřovací agent PolicyKit +Comment[da]=Godkendelsesprogrammet PolicyKit +Comment[de]=Legitimationsdienst von PolicyKit +Comment[el]=Πράκτορας πιστοποίησης PolicyKit +Comment[en_GB]=PolicyKit Authentication Agent +Comment[es]=Agente de autenticación de PolicyKit +Comment[eu]=PolicyKit autentifikatzeko agentea +Comment[fi]=PolicytKit-tunnistautumisohjelma +Comment[fr]=Agent d'authentification de PolicyKit +Comment[gl]=Axente de autenticación PolicyKit +Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ +Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि +Comment[hu]=PolicyKit hitelesítési ügynök +Comment[it]=Agente di autenticazione per PolicyKit +Comment[ja]=PolicyKit 認証エージェント +Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ +Comment[lt]=PolicyKit tapatybės nustatymo agentas +Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ് +Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट +Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ +Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ +Comment[pl]=Agent uwierzytelniania PolicyKit +Comment[pt]=Agente de Autenticação PolicyKit +Comment[pt_BR]=Agente de autenticação PolicyKit +Comment[ro]=Agent de autentificare PolicyKit +Comment[sk]=Agent PolicyKit na overovanie totožnosti +Comment[sl]=PolicyKit program overjanja +Comment[sv]=Autentiseringsagent för PolicyKit +Comment[ta]=PolicyKit அங்கீகார முகவர் +Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి +Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit +Comment[uk]=Агент автентифікації PolicyKit +Comment[zh_CN]=PolicyKit 认证代理 +Comment[zh_HK]=PolicyKit 驗證代理程式 +Comment[zh_TW]=PolicyKit 驗證代理程式 +Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +Terminal=false +Type=Application +Categories= +NoDisplay=true +OnlyShowIn=XFCE; diff --git a/desktop/xfce/base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch b/desktop/xfce/base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch new file mode 100644 index 0000000000..0582ecd020 --- /dev/null +++ b/desktop/xfce/base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/501370 +http://bugzilla.xfce.org/show_bug.cgi?id=10679 + +--- a/scripts/xflock4 ++++ b/scripts/xflock4 +@@ -35,7 +35,8 @@ + # else run another access locking utility, if installed + for lock_cmd in \ + "xlock -mode blank" \ +- "slock" ++ "slock" \ ++ "alock -bg blank -auth pam" + do + set -- $lock_cmd + if command -v -- $1 >/dev/null 2>&1; then diff --git a/desktop/xfce/base/xfce4-session/pspec.xml b/desktop/xfce/base/xfce4-session/pspec.xml index 7c3b5c79c0..04d46637c4 100644 --- a/desktop/xfce/base/xfce4-session/pspec.xml +++ b/desktop/xfce/base/xfce4-session/pspec.xml @@ -40,8 +40,9 @@ libxfce4util-devel - - + mageia/0001-Export-XDG_CONFIG_HOME-and-XDG_CACHE_HOME.patch + mageia/xfce4-session-4.13.2-add-more-screen-lockers-to-xflock4.patch + mageia/xfce4-session-4.13.2-xinitrc.patch @@ -73,9 +74,21 @@ /usr/share/doc /usr/share/man + + mageia/xfce4-lightdm.conf + mageia/xfce4.pam + xfce-polkit-gnome-authentication-agent-1.desktop + + + 2021-01-29 + 4.16.0 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2020-12-24 4.16.0