From: Uwe Hermann <redacted>
Date: Sun, 20 Aug 2017 14:11:41 +0000 (+0200)
Subject: sigrok-native-appimage: Drop some unneeded local files.
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=commitdiff_plain;h=fe8f66a93d7818d292cbd810fe79e5431a2a0aa6

sigrok-native-appimage: Drop some unneeded local files.

These files are now available in PulseView itself.
---

diff --git a/cross-compile/appimage/contrib/pulseview.desktop b/cross-compile/appimage/contrib/pulseview.desktop
deleted file mode 100644
index cbab083..0000000
--- a/cross-compile/appimage/contrib/pulseview.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=PulseView
-GenericName=Signal acquisition GUI for sigrok
-Categories=Electronics;
-Comment=Control your Logic Analyzer, Oscilloscope, or MSO
-Exec=pulseview
-Icon=sigrok-logo-notext
-Type=Application
-
diff --git a/cross-compile/appimage/contrib/sigrok-logo-notext.png b/cross-compile/appimage/contrib/sigrok-logo-notext.png
deleted file mode 100644
index 5b35dfe..0000000
Binary files a/cross-compile/appimage/contrib/sigrok-logo-notext.png and /dev/null differ
diff --git a/cross-compile/appimage/sigrok-native-appimage b/cross-compile/appimage/sigrok-native-appimage
index f9c6309..9a7cd06 100755
--- a/cross-compile/appimage/sigrok-native-appimage
+++ b/cross-compile/appimage/sigrok-native-appimage
@@ -45,6 +45,10 @@ chmod a+x usr/bin/*
 cp $PREFIX/lib/lib*.so* usr/lib/
 cp -r $PREFIX/share/libsigrokdecode usr/share/
 cp -r $PREFIX/share/sigrok-firmware usr/share/
+cp -r $PREFIX/share/applications usr/share/
+cp -r $PREFIX/share/icons usr/share/
+cp -r $PREFIX/share/metainfo usr/share/
+cp -r $PREFIX/share/mime usr/share/
 
 # Reduce binary size
 strip usr/bin/*
@@ -60,8 +64,8 @@ cp $APPIMAGEKIT_OUTDIR/AppRun .
 # Copy desktop and icon file to AppDir for AppRun to pick them up
 ########################################################################
 
-cp $STATIC_FILES/pulseview.desktop .
-cp $STATIC_FILES/sigrok-logo-notext.png .
+cp usr/share/applications/*.desktop .
+cp usr/share/icons/hicolor/48x48/apps/pulseview.png .
 
 ########################################################################
 # Copy in the dependencies that cannot be assumed to be available