Merge branch 'master' into 'master'

initial port to core22

See merge request Remmina/Remmina!2539

1 files changed, 28 insertions, 44 deletions

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 265c532a5..85d2356b1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -6,7 +6,7 @@ architectures:
   - build-on: arm64
   - build-on: armhf
 
-base: core20
+base: core22
 grade: stable
 confinement: strict
 
@@ -26,7 +26,7 @@ environment:
 apps:
   remmina:
     command: usr/bin/remmina
-    extensions: [gnome-3-38]
+    extensions: [gnome]
     common-id: org.remmina.Remmina
     desktop: usr/share/applications/org.remmina.Remmina.desktop
     plugs:
@@ -71,7 +71,7 @@ apps:
   ssh-agent:
     command: usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
     daemon: simple
-    adapter: none
+    # adapter: none
     plugs:
       - home
       - network-bind
@@ -123,7 +123,6 @@ parts:
       - libusb-1.0-0-dev
       - libxkbfile-dev
       - libxv-dev
-      - libavresample-dev
     stage-packages:
       - libffi7
       - libusb-1.0-0
@@ -157,7 +156,7 @@ parts:
       # - -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 
       # XXX: This is an hack to have a kind of bind-mount with absolute prefix.
-      - -DCMAKE_INSTALL_PREFIX=/snap/$SNAPCRAFT_PROJECT_NAME/current/usr
+      - -DCMAKE_INSTALL_PREFIX=/snap/$CRAFT_PROJECT_NAME/current/usr
 
     organize:
       snap/remmina/current/usr: usr
@@ -203,12 +202,7 @@ parts:
       - pyhoca-cli
       - xdg-utils
     stage-packages:
-      - adwaita-icon-theme
-      - dmz-cursor-theme
-      - gnome-themes-standard
       - libdouble-conversion3
-      - libgpm2
-      - libgtk-3-dev
       - libgtk-vnc-2.0-0
       - libgvnc-1.0-0
       - libkf5configcore5
@@ -238,7 +232,7 @@ parts:
       - -DWITH_GVNC=ON
       - -DWITH_X2GO=ON
       - -DWITH_PYTHON=ON
-      - -DCMAKE_PREFIX_PATH=$SNAPCRAFT_STAGE/usr
+      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
       - -DSNAP_BUILD=on
 
       # XXX: This is an hack to have a kind of bind-mount with absolute prefix.
@@ -248,27 +242,28 @@ parts:
       snap/remmina/current/usr: usr
     stage:
       - -usr/share/fonts/**
+    prime:
+      - -usr/lib/pkgconfig
+      - -usr/include
 
     override-build: |
       set -eu
-      snapcraftctl build
+      craftctl default
 
-      cp -r $SNAPCRAFT_PART_INSTALL/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/metainfo $SNAPCRAFT_PART_INSTALL/usr/share/
-      sed --in-place '\|<id>org.remmina.Remmina</id>|a<icon type="stock">snap.remmina.org.remmina.Remmina</icon>' $SNAPCRAFT_PART_INSTALL/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/metainfo/org.remmina.Remmina.appdata.xml
-      update-mime-database ${SNAPCRAFT_PART_INSTALL}/usr/share/mime
+      cp -r $CRAFT_PART_INSTALL/snap/$CRAFT_PROJECT_NAME/current/usr/share/metainfo $CRAFT_PART_INSTALL/usr/share/
+      sed --in-place '\|<id>org.remmina.Remmina</id>|a<icon type="stock">snap.remmina.org.remmina.Remmina</icon>' $CRAFT_PART_INSTALL/snap/$CRAFT_PROJECT_NAME/current/usr/share/metainfo/org.remmina.Remmina.appdata.xml
+      update-mime-database ${CRAFT_PART_INSTALL}/usr/share/mime
 
     override-prime: |
       set -eu
-      snapcraftctl prime
+      craftctl default
       # Remove forbidden links (I'm sure the audio won't work anymore)
       rm -f etc/pulse/client.conf.d/01-enable-autospawn.conf lib/systemd/system/pulseaudio-enable-autospawn.service
 
   app:
     plugin: nil
     stage-packages:
-      - libappindicator3-1
       - libindicator3-7
-      - libgdbm6
       - libavahi-ui-gtk3-0
       - libxkbfile1
       - libvncclient1
@@ -277,51 +272,40 @@ parts:
       - libspice-client-glib-2.0-8
       - libspice-client-gtk-3.0-5
       - libavutil56
-      - libopus0
       - libswresample3
-      - libpulse-mainloop-glib0
       - libcacard0
-      - libva2
       - libzvbi0
       - libxvidcore4
       - libusbredirhost1
-      - libx265-179
+      - libx265-199
       - libusbredirparser1
-      - libx264-155
+      - libx264-163
       - libphodav-2.0-0
-      - libwebpmux3
-      - libnss3
-      - libwavpack1
-      - libnspr4
-      - libvpx6
-      - libtwolame0
-      - libtheora0
-      - libspeex1
       - libsnappy1v5
       - libshine3
-      - libopenjp2-7
-      - libmp3lame0
       - libgsm1
       - libvdpau1
-      - libva-x11-2
       - libsoxr0
-      - libva-drm2
       - libnuma1
-      - libgomp1
       - libsodium23
       - libusb-1.0-0
-      - python3
+    prime:
+      - -usr/share/doc
+      - -usr/share/doc-base
+      - -usr/share/pkgconfig
+      - -usr/lib/pkgconfig
+      - -usr/lib/*/pkgconfig
   cleanup:
-    after: [freerdp, remmina, app]  # Make this part run last; list all your other parts here
+    after: [freerdp, remmina, app]  
     plugin: nil
-    build-snaps: [core20, gnome-3-38-2004, gtk-common-themes]  # List all content-snaps you're using here
+    build-snaps: [core20, gnome-42-2204, gtk-common-themes]  # List all content-snaps you're using here
     override-prime: |
       set -eux
-      for snap in "core20" "gnome-3-38-2004" "gtk-common-themes"; do  # List all content-snaps you're using here
-        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
+      for snap in "core22" "gnome-42-2204" "gtk-common-themes"; do  # List all content-snaps you're using here
+        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$CRAFT_PRIME/{}" \;
       done
       for CRUFT in bug lintian man; do
-        rm -rf $SNAPCRAFT_PRIME/usr/share/$CRUFT
+        rm -rf $CRAFT_PRIME/usr/share/$CRUFT
       done
-      find $SNAPCRAFT_PRIME/usr/share/doc/ -type f -not -name 'copyright' -delete
-      find $SNAPCRAFT_PRIME/usr/share -type d -empty -delete
+      find $CRAFT_PRIME/usr/share/doc/ -type f -not -name 'copyright' -delete
+      find $CRAFT_PRIME/usr/share -type d -empty -delete