From 542a26467e521672bce786b15aa5cc3d27008f2c Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Tue, 7 Feb 2017 22:08:15 +0900
Subject: [PATCH] Move appimage-desktopintegration
---
.../appimage}/appimage-desktopintegration | 0
pkg/build.sh | 2 +-
xdgurl.pro | 12 ++++++------
3 files changed, 7 insertions(+), 7 deletions(-)
rename {src/desktop => pkg/appimage}/appimage-desktopintegration (100%)
diff --git a/src/desktop/appimage-desktopintegration b/pkg/appimage/appimage-desktopintegration
similarity index 100%
rename from src/desktop/appimage-desktopintegration
rename to pkg/appimage/appimage-desktopintegration
diff --git a/pkg/build.sh b/pkg/build.sh
index f848e26..ce4a22f 100644
--- a/pkg/build.sh
+++ b/pkg/build.sh
@@ -103,7 +103,7 @@ build_appimage() {
linuxdeployqt "${BUILDDIR}/${PKGNAME}.AppDir/xdgurl" -qmldir="${BUILDDIR}/${PKGNAME}/src/app/qml" -verbose=2 -bundle-non-qt-libs # https://github.com/probonopd/linuxdeployqt/issues/25
linuxdeployqt "${BUILDDIR}/${PKGNAME}.AppDir/xdgurl" -qmldir="${BUILDDIR}/${PKGNAME}/src/app/qml" -verbose=2 -bundle-non-qt-libs # twice because of #25
rm "${BUILDDIR}/${PKGNAME}.AppDir/AppRun"
- install -m 755 -p "${BUILDDIR}/${PKGNAME}/src/desktop/appimage-desktopintegration" "${BUILDDIR}/${PKGNAME}.AppDir/AppRun"
+ install -m 755 -p "${BUILDDIR}/${PKGNAME}/pkg/appimage/appimage-desktopintegration" "${BUILDDIR}/${PKGNAME}.AppDir/AppRun"
linuxdeployqt --appimage-extract
./squashfs-root/usr/bin/appimagetool "${BUILDDIR}/${PKGNAME}.AppDir"
}
diff --git a/xdgurl.pro b/xdgurl.pro
index b0e181a..a26d2d5 100644
--- a/xdgurl.pro
+++ b/xdgurl.pro
@@ -1,7 +1,3 @@
-include(src/lib/qtlib/qtlib.pri)
-
-include(src/app/app.pri)
-
TARGET = xdgurl
TEMPLATE = app
@@ -15,7 +11,6 @@ RESOURCES += src/desktop/desktop.qrc
DISTFILES += \
README.md \
src/desktop/xdgurl.desktop \
- src/desktop/appimage-desktopintegration \
pkg/build.sh \
pkg/ubuntu/debian/changelog \
pkg/ubuntu/debian/compat \
@@ -24,6 +19,11 @@ DISTFILES += \
pkg/ubuntu/debian/rules \
pkg/ubuntu/debian/xdgurl.install \
pkg/fedora/xdgurl.spec \
- pkg/arch/PKGBUILD
+ pkg/arch/PKGBUILD \
+ pkg/appimage/appimage-desktopintegration
include(deployment.pri)
+
+include(src/lib/qtlib/qtlib.pri)
+
+include(src/app/app.pri)
--
GitLab