From 35fb45c28055aed0894c4a452e37340858e4976f Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Sat, 26 Sep 2020 22:54:51 +0200 Subject: [PATCH] Flatpak refresh 0001-build-Fix-the-installation-paths.patch --- ...001-build-Fix-the-installation-paths.patch | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch b/build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch index fb1b335df..480736be5 100644 --- a/build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch +++ b/build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch @@ -1,6 +1,6 @@ -From 579ee22f1d2bef560ec90d324a0e476b81faf495 Mon Sep 17 00:00:00 2001 -From: Mathieu Bridon -Date: Tue, 7 Jan 2020 14:39:08 +0100 +From 2a390b5188fe070295090b1bd37273d12963b371 Mon Sep 17 00:00:00 2001 +From: Laurent Trinques +Date: Sat, 26 Sep 2020 22:52:52 +0200 Subject: [PATCH] build: Fix the installation paths --- @@ -8,37 +8,37 @@ Subject: [PATCH] build: Fix the installation paths 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/qelectrotech.pro b/qelectrotech.pro -index 07e51fb..2a86b91 100644 +index 2901a30d5..1019a9870 100644 --- a/qelectrotech.pro +++ b/qelectrotech.pro @@ -5,20 +5,20 @@ # Chemins utilises pour la compilation et l'installation de QET unix { - # Chemins UNIX -- COMPIL_PREFIX = '/usr/local/' -- INSTALL_PREFIX = '/usr/local/' -+ COMPIL_PREFIX = '/app/' -+ INSTALL_PREFIX = '/app/' - QET_BINARY_PATH = 'bin/' - QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/' - QET_COMMON_TBT_PATH = 'share/qelectrotech/titleblocks/' - QET_LANG_PATH = 'share/qelectrotech/lang/' - QET_EXAMPLES_PATH = 'share/qelectrotech/examples/' -- QET_LICENSE_PATH = 'doc/qelectrotech/' -- QET_MIME_XML_PATH = '../share/mime/application/' -- QET_MIME_DESKTOP_PATH = '../share/mimelnk/application/' -- QET_MIME_PACKAGE_PATH = '../share/mime/packages/' -+ QET_LICENSE_PATH = 'share/doc/qelectrotech/' -+ QET_MIME_XML_PATH = 'share/mime/application/' -+ QET_MIME_DESKTOP_PATH = 'share/mimelnk/application/' -+ QET_MIME_PACKAGE_PATH = 'share/mime/packages/' - QET_DESKTOP_PATH = 'share/applications/' - QET_ICONS_PATH = 'share/icons/hicolor/' -- QET_MAN_PATH = 'man/' -+ QET_MAN_PATH = 'share/man/' - QET_APPDATA_PATH = 'share/appdata' + # Chemins UNIX +- COMPIL_PREFIX = '/usr/local/' +- INSTALL_PREFIX = '/usr/local/' ++ COMPIL_PREFIX = '/app/' ++ INSTALL_PREFIX = '/app/' + QET_BINARY_PATH = 'bin/' + QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/' + QET_COMMON_TBT_PATH = 'share/qelectrotech/titleblocks/' + QET_LANG_PATH = 'share/qelectrotech/lang/' + QET_EXAMPLES_PATH = 'share/qelectrotech/examples/' +- QET_LICENSE_PATH = 'doc/qelectrotech/' +- QET_MIME_XML_PATH = '../share/mime/application/' +- QET_MIME_DESKTOP_PATH = '../share/mimelnk/application/' +- QET_MIME_PACKAGE_PATH = '../share/mime/packages/' ++ QET_LICENSE_PATH = 'share/doc/qelectrotech/' ++ QET_MIME_XML_PATH = 'share/mime/application/' ++ QET_MIME_DESKTOP_PATH = 'share/mimelnk/application/' ++ QET_MIME_PACKAGE_PATH = 'share/mime/packages/' + QET_DESKTOP_PATH = 'share/applications/' + QET_ICONS_PATH = 'share/icons/hicolor/' +- QET_MAN_PATH = 'man/' ++ QET_MAN_PATH = 'share/man/' + QET_APPDATA_PATH = 'share/appdata' } win32 { -- -2.24.1 +2.28.0