Merge #2208

2208: Drop xterm for xfce terminal r=Saviq a=AlanGriffiths



Co-authored-by: Alan Griffiths <[email protected]>

Author: bors[bot]

snap-wrappers/bin/launch-multipass-gui

@@ -3,4 +3,14 @@
 . client-common.sh
 link_autostart
 
+if [ ! -e "${XDG_CONFIG_HOME}/xfce4/terminal/terminalrc" ]; then
+  mkdir -p "${XDG_CONFIG_HOME}/xfce4/terminal/"
+  cat <<EOT > "${XDG_CONFIG_HOME}/xfce4/terminal/terminalrc"
+[Configuration]
+Encoding=UTF-8
+MiscMenubarDefault=FALSE
+ShortcutsNoMenukey=TRUE
+EOT
+fi
+
 exec "$SNAP/bin/multipass.gui" "$@"

snap/hooks/install

@@ -0,0 +1,22 @@
+#!/bin/bash -e
+
+rm -f $SNAP_COMMON/snap_refresh
+
+# GDK pixbuf setup
+export LD_LIBRARY_PATH=/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void:${SNAP}/graphics/lib:${SNAP}/lib:${SNAP}/usr/lib:${SNAP}/lib/${ARCH_TRIPLET}:${SNAP}/usr/lib/${ARCH_TRIPLET}
+$SNAP/usr/lib/${ARCH_TRIPLET}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders > "$GDK_PIXBUF_MODULE_FILE"
+
+# GSettings schemas
+GS_SCHEMA_DIR=$SNAP_DATA/data/glib-2.0/schemas
+mkdir -p "$GS_SCHEMA_DIR"
+rm -f "$GS_SCHEMA_DIR"/*
+
+schema_dir="${SNAP}/usr/share/glib-2.0/schemas"
+if [ -n "$(ls -A $schema_dir/*.xml 2>/dev/null)" ]; then
+  ln -s $schema_dir/*.xml $GS_SCHEMA_DIR
+fi
+if [ -n "$(ls -A $schema_dir/*.override 2>/dev/null)" ]; then
+  ln -s $schema_dir/*.override $GS_SCHEMA_DIR
+fi
+
+$SNAP/usr/lib/${ARCH_TRIPLET}/glib-2.0/glib-compile-schemas "$GS_SCHEMA_DIR"

snap/hooks/post-refresh

@@ -0,0 +1 @@
+install

snap/hooks/post-refresh

@@ -16,6 +16,20 @@ base: core20
 layout:
   /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qemu:
     bind: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qemu
+  /usr/share/X11:
+    bind: $SNAP/usr/share/X11
+  /etc/fonts:
+    bind: $SNAP/etc/fonts
+  /usr/share/fonts:
+    bind: $SNAP/usr/share/fonts
+  /usr/share/icons:
+    bind: $SNAP/usr/share/icons
+
+environment:
+  # GDK pixbuf
+  GDK_PIXBUF_MODULEDIR: $SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders
+  GDK_PIXBUF_MODULE_FILE: $SNAP_COMMON/loaders.cache
+  ARCH_TRIPLET: ${SNAPCRAFT_ARCH_TRIPLET}
 
 plugs:
   all-home:
@@ -56,7 +70,7 @@ apps:
         PATH: *path
         QT_PLUGIN_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/plugins
         XDG_DATA_HOME: $SNAP_USER_DATA/data
-        XDG_DATA_DIRS: $SNAP/usr/share
+        XDG_DATA_DIRS: $SNAP/usr/share:$SNAP_DATA/data
         XDG_CACHE_HOME: $SNAP_USER_DATA/cache
         XDG_CONFIG_HOME: $SNAP_USER_DATA/config
       DAEMON_CONFIG_HOME: *daemon-config # temporary
@@ -154,17 +168,25 @@ parts:
     stage-packages:
     - try: [msr-tools]
 
-  xterm:
+  terminal:
     plugin: nil
-    override-pull: ""
     stage-packages:
-    - xterm
+      - xfce4-terminal
+      - dmz-cursor-theme
+      - libgdk-pixbuf2.0-bin # GDK pixbuf
+      - fonts-freefont-ttf
+      - libglib2.0-0
+    override-build: |
+      snapcraftctl build
+      update-mime-database $SNAPCRAFT_PART_INSTALL/usr/share/mime
+      rm -f $SNAPCRAFT_PART_INSTALL/usr/share/applications/exo-*
+      mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/default/
+      echo "[Icon Theme]" > $SNAPCRAFT_PART_INSTALL/usr/share/icons/default/index.theme
+      echo "Inherits=DMZ-White" >> $SNAPCRAFT_PART_INSTALL/usr/share/icons/default/index.theme
     stage:
-    - -usr/lib/*/libfreetype.so.6
-    - -usr/share/doc/libfreetype6/FTL.TXT.gz
-    - -usr/share/doc/libfreetype6/TODO
-    - -usr/share/doc/libfreetype6/changelog.Debian.gz
-    - -usr/share/doc/libfreetype6/pcf/README
+      - -usr/share/doc
+    organize:
+      usr/bin/xfce4-terminal.wrapper: bin/x-terminal-emulator
 
   glue:
     plugin: dump

snap/snapcraft.yaml

@@ -26,7 +26,8 @@ void mcp::open_multipass_shell(const QString& instance_name)
 {
     assert(!instance_name.isEmpty() && "Instance name cannot be empty");
     QProcess::startDetached(
-        "xterm", {"-title", instance_name, "-j", "-e", QString("multipass shell %1 || read").arg(instance_name)});
+        "x-terminal-emulator",
+        {"-title", instance_name, "-e", QString("bash -c 'multipass shell %1 || read'").arg(instance_name)});
 }
 
 QStringList mcp::gui_tray_notification_strings()