From deeb288fc38e09fba325741afb2c66f693438f9b Mon Sep 17 00:00:00 2001 From: vanntile Date: Thu, 24 Jan 2019 08:24:03 +0200 Subject: Rename Linux metadata Issue fix --- packaging/appimage/generate.sh | 6 +++--- packaging/autopackage/default.apspec.in | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'packaging') diff --git a/packaging/appimage/generate.sh b/packaging/appimage/generate.sh index 71b1f0afc..1d05d9e2f 100644 --- a/packaging/appimage/generate.sh +++ b/packaging/appimage/generate.sh @@ -25,7 +25,7 @@ cp ../packaging/appimage/AppRun appdir/AppRun ; chmod +x appdir/AppRun ( cd appdir/usr/lib/ ; ln -s ../* . ) # FIXME: Why is this needed? ( cd appdir/ ; ln -s usr/* . ) # FIXME: Why is this needed? cp ./appdir/usr/share/icons/hicolor/256x256/apps/inkscape.png ./appdir/ -sed -i -e 's|^Icon=.*|Icon=inkscape|g' ./appdir/usr/share/applications/inkscape.desktop # FIXME +sed -i -e 's|^Icon=.*|Icon=org.inkscape.Inkscape|g' ./appdir/usr/share/applications/org.inkscape.Inkscape.desktop # FIXME cd appdir/ ######################################################################## @@ -73,7 +73,7 @@ cd - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" chmod a+x linuxdeployqt-continuous-x86_64.AppImage -./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract-and-run appdir/usr/share/applications/inkscape.desktop \ +./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract-and-run appdir/usr/share/applications/org.inkscape.Inkscape.desktop \ -appimage -unsupported-bundle-everything -executable=appdir/usr/bin/inkview \ -executable=appdir/usr/lib/inkscape/libinkscape_base.so \ -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-xpm.so) \ @@ -93,4 +93,4 @@ chmod a+x linuxdeployqt-continuous-x86_64.AppImage -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gtk-*/*/engines/libadwaita.so) \ -executable=appdir/usr/bin/python2.7 -mv Inkscape*.AppImage* ../ \ No newline at end of file +mv Inkscape*.AppImage* ../ diff --git a/packaging/autopackage/default.apspec.in b/packaging/autopackage/default.apspec.in index e477ea982..1a6ffa90f 100644 --- a/packaging/autopackage/default.apspec.in +++ b/packaging/autopackage/default.apspec.in @@ -10,7 +10,7 @@ Maintainer: The Inkscape team Packager: Aaron Spike AutopackageTarget: 1.2 PackageFileName: inkscape-$SOFTWAREVERSION.x86.package -PackageDesktop: share/applications/inkscape.desktop +PackageDesktop: share/applications/org.inkscape.Inkscape.desktop [BuildPrepare] if [ ! -x configure ]; then @@ -23,7 +23,7 @@ PATH=/usr/local/src/inkscape/extra/static/bin:$PATH PKG_CONFIG_PATH=/usr/local/src/inkscape/extra/static/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig CPPFLAGS="-fno-stack-protector -I/usr/local/src/inkscape/extra/static/include" LDFLAGS="-L/usr/local/src/inkscape/extra/static/lib" -CXX="ccache apg++" +CXX="ccache apg++" export PATH PKG_CONFIG_PATH CPPFLAGS LDFLAGS CXX prepareBuild --enable-binreloc --enable-lcms @@ -52,7 +52,7 @@ removeOwningPackage $PREFIX/bin/inkscape installExe bin/inkscape bin/inkview installMan 1 man/man1/* installIcon share/pixmaps/inkscape.png -installMenuItem "Graphics" share/applications/inkscape.desktop +installMenuItem "Graphics" share/applications/org.inkscape.Inkscape.desktop copyFiles --nobackup share/locale $PREFIX/share copyFiles share/inkscape $PREFIX/share @@ -60,4 +60,3 @@ copyFiles share/inkscape $PREFIX/share [Uninstall] uninstallFromLog - -- cgit v1.2.3