[neon/snap-packaging/kf6-snap-runtime] /: Switch to neon user. Use upstream snapcraft now that extension is

[Scarlett Moore]

Git commit 376fd6da2746f684e5202c875cce8e5da71229db by Scarlett Moore.
Committed on 12/04/2024 at 08:53.
Pushed by scarlettmoore into branch 'master'.

Switch to neon user. Use upstream snapcraft now that extension is
merged. Cleanup duplicate libs.

M  +6    -3    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf6-snap-runtime/-/commit/376fd6da2746f684e5202c875cce8e5da71229db

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 621bbe8..2ed6316 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -32,7 +32,7 @@ package-repositories:
     suites:
     - jammy
     key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
-    url: http://origin.archive.neon.kde.org/unstable
+    url: http://origin.archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
 parts:
     mesa:
@@ -79,6 +79,9 @@ parts:
         stage-snaps:
         - kf6-core22-sdk/latest/stable
         - kde-qt6-core22-sdk/latest/stable
+        stage:
+        - -usr/lib/*/libdrm*
+        - usr/share/doc/libdrm*
         plugin: nil
         override-prime: |
             set -eux
@@ -86,9 +89,9 @@ parts:
             cd $CRAFT_PRIME
             find . -type f,l -name "*.h" -exec bash -c "rm -f {}*" \;
     command-chain:
-        source: https://github.com/ScarlettGatelyMoore/snapcraft.git
+        source: https://github.com/canonical/snapcraft.git
         source-type: git
-        source-branch: sgmoore/kde-neon-6
+        source-branch: main
         source-subdir: extensions/desktop/kde-neon-6
         plugin: make
         make-parameters: