bug#70456: Request for merging "core-updates" branch

[tumashu]

emacs has a script gitmerge.el, it can skip some commit when merge with 
different merge rule (ours), maybe can make life easier:


https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/gitmerge.el


https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/notes/git-workflow











--
发自我的网易邮箱手机智能版

bug#70194: SDDM fails to start, black screen on 188d18fc47

[tumashu]

remove this line



(display-server "wayland")



after update to sddm 0.20, sddm add it support, but sddm-service-type do not 
support at the moment,


 recent days i try to fix, but face vt problem, no progress






--
发自我的网易邮箱手机智能版

bug#68939: sddm does not start after update to 0.20.0

[tumashu]

(display-server "wayland")

remove this line, at the moment, sddm-service-type do not support this feature, 
for waston is not configure properly






--
发自我的网易邮箱手机智能版



- Original Message -
From: "Jonathan Brielmaier" 
To: bug-guix@gnu.org
Cc: tuma...@163.com
Sent: Mon, 5 Feb 2024 23:37:52 +0100
Subject: sddm does not start after update to 0.20.0

Today I rebooted my workstation running Guix System and somehow sddm
didn't started anymore.

I quickly found a suspicious commit:
05fad99a431c6708ec18c7d0db67178bd8d36597
gnu: sddm: Update to 0.20.0.

Then I pulled and reconfigured to this commit (Generation 14) and to one
commit before (Generation 13). And indeed the sddm update to 0.20.0
breaks my system.

```
Generation 13 Feb 05 2024 23:00:35
   file name: /var/guix/profiles/system-13-link
   canonical file name: /gnu/store/hq4bd4vzlyvnwblc5w2jpll4xn7nmzrd-system
   label: GNU with Linux 6.6.8
   bootloader: grub-efi
   root device: /dev/mapper/cryptroot
   kernel: /gnu/store/nn8dir9d1d025r123ib11jfsxxc714fl-linux-6.6.8/bzImage
   channels:
 guix:
   repository URL: https://git.savannah.gnu.org/git/guix.git
   commit: f96590fb3662300058022f0aaee594e766f8941f
   configuration file:
/gnu/store/4n81nr9bi0jn5vqfpa3s4y4wzci1zxkf-configuration.scm

Generation 14 Feb 05 2024 23:07:31
   file name: /var/guix/profiles/system-14-link
   canonical file name: /gnu/store/ks1f2wg4gb4sn2gv1ag0f3spp5xjv5gq-system
[ part is identical to Gen 13 ]
   channels:
 guix:
   repository URL: https://git.savannah.gnu.org/git/guix.git
   commit: 05fad99a431c6708ec18c7d0db67178bd8d36597
   configuration file:
/gnu/store/4n81nr9bi0jn5vqfpa3s4y4wzci1zxkf-configuration.scm
```

The relevant part of my configuration.scm:
```
(service sddm-service-type
   (sddm-configuration
 (display-server "wayland")))
```

There is an upstream bug report which is maybe relevant:
https://github.com/sddm/sddm/issues/1456

@Feng Shu: I CC'ed you for this bug as you updated the sddm package.
Maybe you are not affected by this issue or have a workaround :)

~Jonathan

bug#54525: [PATCH 1/5] gnu: Add thunar-archive-plugin.

[tumashu]

From: Feng Shu 

* gnu/packages/xfce.scm (thunar-archive-plugin): New variable.
---
 gnu/packages/xfce.scm | 21 +
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index b58a517257..9de3db3cc4 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -792,6 +792,27 @@ (define-public thunar-volman
 and import the new pictures from your camera.")
 (license gpl2+)))
 
+(define-public thunar-archive-plugin
+  (package
+(name "thunar-archive-plugin")
+(version "0.4.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "https://archive.xfce.org/src/thunar-plugins/;
+   name "/" (version-major+minor version)
+   "/" name "-" version ".tar.bz2"))
+   (sha256
+(base32 "059ikda4hig1iqk0g5kqc4p95chj0z1ljhl5qjrlw4l8lf3gm0mz"
+(build-system gnu-build-system)
+(native-inputs (list pkg-config intltool))
+(inputs (list exo thunar gtk+))
+(home-page "https://www.xfce.org/;)
+(synopsis "Archive plugin for Thunar file manager")
+(description "The Thunar Archive Plugin allows you to create and extract
+archive files using the file context menus in the Thunar file manager.")
+(license gpl2+)))
+
 (define-public xfwm4
   (package
 (name "xfwm4")
-- 
2.34.0

bug#54525: [PATCH 3/5] gnu: Add thunar-media-tags-plugin.

[tumashu]

From: Feng Shu 

* gnu/packages/xfce.scm (thunar-media-tags-plugin): New variable.
---
 gnu/packages/xfce.scm | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index ba4e51a2f3..083e890cc7 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -52,6 +52,7 @@ (define-module (gnu packages xfce)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages mate)
+  #:use-module (gnu packages mp3)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages photo)
@@ -835,6 +836,28 @@ (define-public thunar-shares-plugin
 Samba from Thunar (the Xfce file manager) without requiring root access.")
 (license gpl2+)))
 
+(define-public thunar-media-tags-plugin
+  (package
+(name "thunar-media-tags-plugin")
+(version "0.3.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "https://archive.xfce.org/src/thunar-plugins/;
+   name "/" (version-major+minor version)
+   "/" name "-" version ".tar.bz2"))
+   (sha256
+(base32 "06sr7b4p9f585gian8vpx7j0pkzg0vvwcrjmrhvh7i5sb90w8rg2"
+(build-system gnu-build-system)
+(native-inputs (list pkg-config intltool))
+(inputs (list exo gtk+ thunar taglib))
+(home-page "https://www.xfce.org/;)
+(synopsis "Media tags plugin for Thunar file manager")
+(description
+ "Media tags plugin allows tags editing from Thunar file manager and
+tags-based file renaming from inside Thunar Bulk Renamer.")
+(license gpl2+)))
+
 (define-public xfwm4
   (package
 (name "xfwm4")
-- 
2.34.0

bug#54525: [PATCH 5/5] gnu: thunar: Add search path for "THUNARX_DIRS".

[tumashu]

From: Feng Shu 

* gnu/packages/xfce.scm (thunar)[native-search-paths]: new field.
[source]: Add thunar-search-paths.patch.
---
 .../patches/thunar-search-paths.patch | 211 ++
 gnu/packages/xfce.scm |  12 +-
 2 files changed, 222 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/thunar-search-paths.patch

diff --git a/gnu/packages/patches/thunar-search-paths.patch 
b/gnu/packages/patches/thunar-search-paths.patch
new file mode 100644
index 00..fcf55ba14f
--- /dev/null
+++ b/gnu/packages/patches/thunar-search-paths.patch
@@ -0,0 +1,211 @@
+From 848f1dfb2d2f404efa5371817285236d33b32a5c Mon Sep 17 00:00:00 2001
+From: tumashu 
+Date: Tue, 22 Mar 2022 20:16:19 +
+Subject: [PATCH] Look for thunar plugins at $THUNARX_DIRS (Issue #748)
+
+THUNARX_DIRS is a list of directories where thunar plugins are looked
+for. It is needed for distributions like NixOS/GuixOS that do not
+install all plugins in the same directory. In NixOS/GuixOS each
+package is installed in a self contained directory.
+
+MR !197
+---
+ thunarx/thunarx-provider-factory.c | 86 +-
+ thunarx/thunarx-provider-module.c  | 68 ++-
+ 2 files changed, 91 insertions(+), 63 deletions(-)
+
+diff --git a/thunarx/thunarx-provider-factory.c 
b/thunarx/thunarx-provider-factory.c
+index 94b11545..386c3417 100644
+--- a/thunarx/thunarx-provider-factory.c
 b/thunarx/thunarx-provider-factory.c
+@@ -154,54 +154,66 @@ thunarx_provider_factory_load_modules 
(ThunarxProviderFactory *factory)
+   GList *modules = NULL;
+   GList *lp;
+   GDir  *dp;
++  gchar *dirs_string;
++  gchar**dirs;
+ 
+-  dp = g_dir_open (THUNARX_DIRECTORY, 0, NULL);
+-  if (G_LIKELY (dp != NULL))
++  dirs_string = (gchar *) g_getenv ("THUNARX_DIRS");
++  if (!dirs_string)
++dirs_string = THUNARX_DIRECTORY;
++  dirs = g_strsplit (dirs_string, G_SEARCHPATH_SEPARATOR_S, 0);
++
++  for (int i = 0; dirs[i] != NULL; i++)
+ {
+-  /* determine the types for all existing plugins */
+-  for (;;)
+-{
+-  /* read the next entry from the directory */
+-  name = g_dir_read_name (dp);
+-  if (G_UNLIKELY (name == NULL))
+-break;
+ 
+-  /* check if this is a valid plugin file */
+-  if (g_str_has_suffix (name, "." G_MODULE_SUFFIX))
+-{
+-  /* check if we already have that module */
+-  for (lp = thunarx_provider_modules; lp != NULL; lp = lp->next)
+-if (g_str_equal (G_TYPE_MODULE (lp->data)->name, name))
+-  break;
++  dp = g_dir_open (dirs[i], 0, NULL);
+ 
+-  /* use or allocate a new module for the file */
+-  if (G_UNLIKELY (lp != NULL))
+-{
+-  /* just use the existing module */
+-  module = THUNARX_PROVIDER_MODULE (lp->data);
+-}
+-  else
+-{
+-  /* allocate the new module and add it to our list */
+-  module = thunarx_provider_module_new (name);
+-  thunarx_provider_modules = g_list_prepend 
(thunarx_provider_modules, module);
+-}
++  if (G_LIKELY (dp != NULL))
++{
++  /* determine the types for all existing plugins */
++  for (;;)
++{
++  /* read the next entry from the directory */
++  name = g_dir_read_name (dp);
++  if (G_UNLIKELY (name == NULL))
++break;
+ 
+-  /* try to load the module */
+-  if (g_type_module_use (G_TYPE_MODULE (module)))
++  /* check if this is a valid plugin file */
++  if (g_str_has_suffix (name, "." G_MODULE_SUFFIX))
+ {
+-  /* add the types provided by the module */
+-  thunarx_provider_factory_add (factory, module);
+-
+-  /* add the module to our list */
+-  modules = g_list_prepend (modules, module);
++  /* check if we already have that module */
++  for (lp = thunarx_provider_modules; lp != NULL; lp = 
lp->next)
++if (g_str_equal (G_TYPE_MODULE (lp->data)->name, name))
++  break;
++
++  /* use or allocate a new module for the file */
++  if (G_UNLIKELY (lp != NULL))
++{
++  continue;
++}
++  else
++{
++  /* allocate the new module and add it to our list */
++  module = thunarx_provider_module_new (name);
++  thunarx_provider_modules = g_list_prepend 
(thunarx_provider_modules, module);
++   

bug#54525: [PATCH 4/5] gnu: Add thunar-vcs-plugin.

[tumashu]

From: Feng Shu 

* gnu/packages/xfce.scm (thunar-vcs-plugin): New variable.
---
 gnu/packages/xfce.scm | 37 +
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 083e890cc7..d3a414ec15 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -35,6 +35,7 @@
 (define-module (gnu packages xfce)
   #:use-module (gnu artwork)
   #:use-module (gnu packages)
+  #:use-module (gnu packages apr)
   #:use-module (gnu packages base)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages cdrom)
@@ -63,6 +64,8 @@ (define-module (gnu packages xfce)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages search)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages web)
   #:use-module (gnu packages wm)
   #:use-module (gnu packages xml)
@@ -858,6 +861,40 @@ (define-public thunar-media-tags-plugin
 tags-based file renaming from inside Thunar Bulk Renamer.")
 (license gpl2+)))
 
+(define-public thunar-vcs-plugin
+  (package
+(name "thunar-vcs-plugin")
+(version "0.2.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "https://archive.xfce.org/src/thunar-plugins/;
+   name "/" (version-major+minor version)
+   "/" name "-" version ".tar.bz2"))
+   (sha256
+(base32 "1f2d1dwfyi6xv3qkd8l8xh0vhz8wh0601cyigjzn426lqga1d29n"
+(build-system gnu-build-system)
+(arguments
+ (list #:configure-flags
+   #~(list (string-append "CPPFLAGS=-I" #$apr-util "/include/apr-1"
+(native-inputs (list pkg-config intltool utf8proc))
+(inputs
+ (list exo
+   gtk+
+   thunar
+   libxfce4util
+   apr
+   apr-util
+   subversion
+   git))
+(home-page "https://www.xfce.org/;)
+(synopsis "VCS plugin for Thunar file manager")
+(description
+ "Thunar VCS Plugin (formerly known as Thunar SVN Plugin) gives SVN and
+GIT integration to Thunar, it adds Subversion and GIT actions to the context
+menu.")
+(license gpl2+)))
+
 (define-public xfwm4
   (package
 (name "xfwm4")
-- 
2.34.0

bug#54525: [PATCH 2/5] gnu: Add thunar-shares-plugin.

[tumashu]

From: Feng Shu 

* gnu/packages/xfce.scm (thunar-shares-plugin): New variable.
---
 gnu/packages/xfce.scm | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 9de3db3cc4..ba4e51a2f3 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -813,6 +813,28 @@ (define-public thunar-archive-plugin
 archive files using the file context menus in the Thunar file manager.")
 (license gpl2+)))
 
+(define-public thunar-shares-plugin
+  (package
+(name "thunar-shares-plugin")
+(version "0.3.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "https://archive.xfce.org/src/thunar-plugins/;
+   name "/" (version-major+minor version)
+   "/" name "-" version ".tar.bz2"))
+   (sha256
+(base32 "182j8jl91735004hbl0i2xxga4r6fk03srfl6g87czkjm9y8q7fw"
+(build-system gnu-build-system)
+(native-inputs (list pkg-config intltool))
+(inputs (list thunar gtk+))
+(home-page "https://www.xfce.org/;)
+(synopsis "Folder share plugin for Thunar file manager")
+(description
+ "The Thunar Shares Plugin allows you to quickly share a folder using
+Samba from Thunar (the Xfce file manager) without requiring root access.")
+(license gpl2+)))
+
 (define-public xfwm4
   (package
 (name "xfwm4")
-- 
2.34.0