From b8f6a0926e2926e41daffbc8b84d6f5aaad49370 Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Wed, 20 Jun 2018 11:01:05 +0200 Subject: [PATCH 01/11] appimage: use linuxdeployqt build type2 appimage with linuxdeployqt, add support for relative paths, set with cmake flag add log for relative appimage paths --- .travis.yml | 40 ++++++++++++++++++++++++++-------------- scribus/scpaths.cpp | 28 +++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5627d4bc65..b0a00caf74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,10 +64,23 @@ script: else export NPROC=1; fi; - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US; - make -j"$NPROC"; - make install; - bash -ex ./AppImage-package/bundle.sh; + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US; + make -j"$NPROC"; + make DESTDIR=appdir -j"$NPROC" install ; find appdir/; + cp /usr/lib/python2.7/lib-dynload/_tkinter.so appdir/usr/; + cp -r /usr/lib/tcltk appdir/usr/lib/; + cp -r /usr/share/tcltk appdir/usr/share/; + wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"; + chmod a+x linuxdeployqt-continuous-x86_64.AppImage; + unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH; + export VERSION=$(git rev-parse --short HEAD); + ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -bundle-non-qt-libs; + ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract; + mv appdir/usr/_tkinter.so appdir/usr/lib/; + ( cd appdir/usr/ ; ln -s ./lib/_tkinter.so . ); + ./squashfs-root/usr/bin/linuxdeployqt -bundle-non-qt-libs appdir/usr/lib/_tkinter.so; + ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage; + curl --upload-file "${TRAVIS_BUILD_DIR}/Scribus-${VERSION}-x86_64.AppImage" https://transfer.sh/"Scribus-${VERSION}-x86_64.AppImage"; fi - if [ $TRAVIS_OS_NAME = osx -a $CC = clang ]; then @@ -76,13 +89,12 @@ script: make install; fi -notifications: - irc: - channels: - - "chat.freenode.net#scribus" - - "chat.freenode.net#scribus-dev" - template: - - "%{repository}/%{branch} (%{author}): %{build_url}: %{message}" - on_success: always - on_failure: always - +#notifications: +# irc: +# channels: +# - "chat.freenode.net#scribus" +# - "chat.freenode.net#scribus-dev" +# template: +# - "%{repository}/%{branch} (%{author}): %{build_url}: %{message}" +# on_success: always +# on_failure: always diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp index f4bac4d4dd..6bf99770ca 100644 --- a/scribus/scpaths.cpp +++ b/scribus/scpaths.cpp @@ -6,6 +6,7 @@ for which a new license (GPL+exception) is in place. */ #include "scpaths.h" #include +#include #include #include #include @@ -66,9 +67,34 @@ ScPaths::ScPaths() : m_shareDir(SHAREDIR), m_templateDir(TEMPLATEDIR) { + +#ifdef Q_OS_LINUX + QString pathPtr = QCoreApplication::applicationDirPath() + QString("/.."); + m_shareDir = QString("%1/share/scribus/").arg(pathPtr); + m_docDir = QString("%1/share/doc/scribus/").arg(pathPtr); + //m_fontDir = QString("%1/share/scribus/fonts/").arg(pathPtr); + m_iconDir = QString("%1/share/scribus/icons/").arg(pathPtr); + m_sampleScriptDir = QString("%1/share/scribus/samples/").arg(pathPtr); + m_scriptDir = QString("%1/share/scribus/scripts/").arg(pathPtr); + m_templateDir = QString("%1/share/scribus/templates/").arg(pathPtr); + m_libDir = QString("%1/lib/").arg(pathPtr); + m_pluginDir = QString("%1/lib/scribus/plugins/").arg(pathPtr); + m_qmlDir = QString("%1/share/scribus/qml/").arg(pathPtr); + + qDebug() << QString("scpaths: doc dir=%1").arg(m_docDir); + qDebug() << QString("scpaths: icon dir=%1").arg(m_iconDir); + //qDebug() << QString("scpaths: font dir=%1").arg(m_fontDir); + qDebug() << QString("scpaths: sample dir=%1").arg(m_sampleScriptDir); + qDebug() << QString("scpaths: script dir=%1").arg(m_scriptDir); + qDebug() << QString("scpaths: template dir=%1").arg(m_templateDir); + qDebug() << QString("scpaths: lib dir=%1").arg(m_libDir); + qDebug() << QString("scpaths: plugins dir=%1").arg(m_pluginDir); + qDebug() << QString("scpaths: qml dir=%1").arg(m_qmlDir); + + // On MacOS/X, override the compile-time settings with a location // obtained from the system. -#ifdef Q_OS_MAC +#elif Q_OS_MAC QString pathPtr(bundleDir()); qDebug() << QString("scpaths: bundle at %1").arg(pathPtr); m_shareDir = QString("%1/Contents/share/scribus/").arg(pathPtr); From 0f7b3dcc935d53c38c0ebab103978a5f6a91dfa6 Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Sun, 24 Jun 2018 14:06:13 +0200 Subject: [PATCH 02/11] Update to qt5.9 --- .travis.yml | 2 +- scribus/scpaths.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0a00caf74..5a832bb553 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ script: else export NPROC=1; fi; - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US; + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US -DBUILD_APPIMAGE_BUNDLE=1; make -j"$NPROC"; make DESTDIR=appdir -j"$NPROC" install ; find appdir/; cp /usr/lib/python2.7/lib-dynload/_tkinter.so appdir/usr/; diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp index 6bf99770ca..46e93b493a 100644 --- a/scribus/scpaths.cpp +++ b/scribus/scpaths.cpp @@ -68,6 +68,8 @@ ScPaths::ScPaths() : m_templateDir(TEMPLATEDIR) { +// Build an appimage and redirect the paths to +// ones inside the bundle, relative to the executable. #ifdef Q_OS_LINUX QString pathPtr = QCoreApplication::applicationDirPath() + QString("/.."); m_shareDir = QString("%1/share/scribus/").arg(pathPtr); @@ -77,7 +79,7 @@ ScPaths::ScPaths() : m_sampleScriptDir = QString("%1/share/scribus/samples/").arg(pathPtr); m_scriptDir = QString("%1/share/scribus/scripts/").arg(pathPtr); m_templateDir = QString("%1/share/scribus/templates/").arg(pathPtr); - m_libDir = QString("%1/lib/").arg(pathPtr); + m_libDir = QString("%1/lib/scribus/").arg(pathPtr); m_pluginDir = QString("%1/lib/scribus/plugins/").arg(pathPtr); m_qmlDir = QString("%1/share/scribus/qml/").arg(pathPtr); From 2ac485e6c812991129f0d0a0a659c5ce4ac5cffb Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Sun, 24 Jun 2018 17:10:41 +0200 Subject: [PATCH 03/11] Add plugins to linuxdeployqt --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5a832bb553..ac9c9803e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,7 @@ script: chmod a+x linuxdeployqt-continuous-x86_64.AppImage; unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH; export VERSION=$(git rev-parse --short HEAD); - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -bundle-non-qt-libs; + ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -executable=$(ls appdir/usr/lib/scribus/plugins/*.so | sed ':a;N;$!ba;s/\n/ -executable=/g'); ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract; mv appdir/usr/_tkinter.so appdir/usr/lib/; ( cd appdir/usr/ ; ln -s ./lib/_tkinter.so . ); From edb5a2bd42be6b5c85ed61d6e1f6a3fce31d0e29 Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Sun, 24 Jun 2018 18:15:39 +0200 Subject: [PATCH 04/11] Enable all builds --- .travis.yml | 18 +++++++++--------- scribus/scpaths.cpp | 7 ++++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac9c9803e8..f32b35f0a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,12 +89,12 @@ script: make install; fi -#notifications: -# irc: -# channels: -# - "chat.freenode.net#scribus" -# - "chat.freenode.net#scribus-dev" -# template: -# - "%{repository}/%{branch} (%{author}): %{build_url}: %{message}" -# on_success: always -# on_failure: always +notifications: + irc: + channels: + - "chat.freenode.net#scribus" + - "chat.freenode.net#scribus-dev" + template: + - "%{repository}/%{branch} (%{author}): %{build_url}: %{message}" + on_success: always + on_failure: always diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp index 46e93b493a..ed65263519 100644 --- a/scribus/scpaths.cpp +++ b/scribus/scpaths.cpp @@ -92,11 +92,11 @@ ScPaths::ScPaths() : qDebug() << QString("scpaths: lib dir=%1").arg(m_libDir); qDebug() << QString("scpaths: plugins dir=%1").arg(m_pluginDir); qDebug() << QString("scpaths: qml dir=%1").arg(m_qmlDir); - +#endif // On MacOS/X, override the compile-time settings with a location // obtained from the system. -#elif Q_OS_MAC +#ifdef Q_OS_MAC QString pathPtr(bundleDir()); qDebug() << QString("scpaths: bundle at %1").arg(pathPtr); m_shareDir = QString("%1/Contents/share/scribus/").arg(pathPtr); @@ -122,8 +122,9 @@ ScPaths::ScPaths() : qDebug() << QString("scpaths: plugin dir=%1").arg(m_pluginDir); qDebug() << QString("scpaths: QML dir=%1").arg(m_qmlDir); qDebug() << QString("scpaths: qtplugins=%1").arg(QApplication::libraryPaths().join(":")); +#endif -#elif defined(_WIN32) +#ifdef defined(_WIN32) QFileInfo appInfo(qApp->applicationDirPath()); QString appPath = qApp->applicationDirPath(); QString cleanAppPath = appInfo.canonicalFilePath(); From 60b02610a3ba99094cf25f8815b4f8bde54bf18f Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Sat, 30 Jun 2018 13:43:36 +0200 Subject: [PATCH 05/11] Add explicit appname on linux. --- scribus/scpaths.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp index ed65263519..1ff5b9081f 100644 --- a/scribus/scpaths.cpp +++ b/scribus/scpaths.cpp @@ -68,10 +68,12 @@ ScPaths::ScPaths() : m_templateDir(TEMPLATEDIR) { -// Build an appimage and redirect the paths to +// Build an appimage and redirect the paths to // ones inside the bundle, relative to the executable. #ifdef Q_OS_LINUX - QString pathPtr = QCoreApplication::applicationDirPath() + QString("/.."); + // Set the application name expliticly. + QCoreApplication::setApplicationName("scribus"); + QString pathPtr = QCoreApplication::applicationDirPath() + QString("/.."); m_shareDir = QString("%1/share/scribus/").arg(pathPtr); m_docDir = QString("%1/share/doc/scribus/").arg(pathPtr); //m_fontDir = QString("%1/share/scribus/fonts/").arg(pathPtr); @@ -451,10 +453,17 @@ QStringList ScPaths::systemProfilesDirs() winSysDir = winSysDir.replace('\\','/'); if (osVersion.dwPlatformId == VER_PLATFORM_WIN32_NT) // Windows NT/2k/XP { +<<<<<<< HEAD if (osVersion.dwMajorVersion >= 5) // for 2k and XP dwMajorVersion == 5 iccProfDirs.append(winSysDir + "/Spool/Drivers/Color/"); } else if (osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) // Windows 9x/Me +======= + if( osVersion.dwMajorVersion >= 5 ) // for 2k and XP dwMajorVersion == 5 + iccProfDirs.append( winSysDir + "/Spool/Drivers/Color/"); + } + else if( osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) // Windows 9x/Me +>>>>>>> Add explicit appname on linux. { if (osVersion.dwMajorVersion >= 4 && osVersion.dwMinorVersion >= 10) // Win98 or WinMe iccProfDirs.append(winSysDir + "/Color/"); From 9a50fddbad3ac9d71bb4aa4d12a1a6b986265a6d Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Sat, 19 Jan 2019 15:44:41 +0100 Subject: [PATCH 06/11] Add appimage cmake option --- CMakeLists.txt | 5 +++++ scribus/scpaths.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 305e11b067..fe02d63435 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1112,6 +1112,11 @@ if(APPLEBUNDLE) ) endif() +# Appimage +if (BUILD_APPIMAGE_BUNDLE) + set(DBUILD_APPIMAGE_BUNDLE TRUE) +endif() + ############################################################################################################## ########## Install/CPack Setup ########## diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp index 1ff5b9081f..96153f3384 100644 --- a/scribus/scpaths.cpp +++ b/scribus/scpaths.cpp @@ -70,7 +70,7 @@ ScPaths::ScPaths() : // Build an appimage and redirect the paths to // ones inside the bundle, relative to the executable. -#ifdef Q_OS_LINUX +#ifdef BUILD_APPIMAGE_BUNDLE // Set the application name expliticly. QCoreApplication::setApplicationName("scribus"); QString pathPtr = QCoreApplication::applicationDirPath() + QString("/.."); From 68b544201ae9422b9043a38059ed19a68239f1db Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Sun, 20 Jan 2019 18:57:42 +0100 Subject: [PATCH 07/11] Add recent poppler build --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index f32b35f0a3..f3b60e2f39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,14 @@ before_install: libopenscenegraph-dev libpoppler-dev libpoppler-cpp-dev libcairo2-dev libwpg-dev libmspub-dev libcdr-dev libvisio-dev libharfbuzz-dev libharfbuzz-icu0 coreutils binutils python-tk; + wget http://poppler.freedesktop.org/poppler-0.73.0.tar.xz + unxz poppler-0.73.0.tar.xz + tar xfv poppler-0.73.0.tar + cd poppler-0.73.0 + ./configure && make && make install + cp ../../poppler-qt5.pc /tmp + export PKG_CONFIG_PATH=/tmp + cd .. fi # OSX # - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config && brew list; fi From 2398c83787310808e2b913ac61998991f8b99da8 Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Sun, 20 Jan 2019 18:59:50 +0100 Subject: [PATCH 08/11] Add recent poppler build --- .travis.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3b60e2f39..cdd0951cac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ matrix: sudo: required compiler: - gcc + services: + - docker - os: linux dist: xenial sudo: required @@ -36,14 +38,11 @@ before_install: libopenscenegraph-dev libpoppler-dev libpoppler-cpp-dev libcairo2-dev libwpg-dev libmspub-dev libcdr-dev libvisio-dev libharfbuzz-dev libharfbuzz-icu0 coreutils binutils python-tk; - wget http://poppler.freedesktop.org/poppler-0.73.0.tar.xz - unxz poppler-0.73.0.tar.xz - tar xfv poppler-0.73.0.tar - cd poppler-0.73.0 - ./configure && make && make install - cp ../../poppler-qt5.pc /tmp - export PKG_CONFIG_PATH=/tmp - cd .. + wget http://poppler.freedesktop.org/poppler-0.73.0.tar.xz; + unxz poppler-0.73.0.tar.xz; + tar xfv poppler-0.73.0.tar; + cd poppler-0.73.0; + mkdir build; cd build; cmake ..; make; make install; fi # OSX # - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config && brew list; fi From b715142f5b74d1baece8de39d84c68990c44bef9 Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Sun, 20 Jan 2019 19:32:45 +0100 Subject: [PATCH 09/11] Move comment --- .travis.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86a331d12f..3346d58b93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,15 +5,11 @@ matrix: - os: linux dist: xenial sudo: required - compiler: - - gcc - services: - - docker + compiler: gcc - os: linux dist: xenial sudo: required - compiler: - - clang + compiler: clang - os: osx compiler: clang exclude: @@ -39,6 +35,7 @@ before_install: install: # Linux +# Build a more recent poppler than Ubuntu Xenial's poppler 0.41.0 - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get install --force-yes cmake libboost-python-dev libcups2-dev libhunspell-dev libhyphen-dev liblcms2-dev libpodofo-dev libtiff-dev libxml2-dev @@ -47,7 +44,6 @@ install: libopenscenegraph-dev libpoppler-dev libpoppler-cpp-dev libcairo2-dev libwpg-dev libmspub-dev libcdr-dev libvisio-dev libharfbuzz-dev libharfbuzz-icu0 coreutils binutils python-tk; -# Build a more recent poppler than Ubuntu Xenial's poppler 0.41.0 mkdir deps && pushd deps; sudo apt-get install --force-yes libopenjpeg-dev; wget https://poppler.freedesktop.org/poppler-data-0.4.9.tar.gz && tar -xf poppler-data-0.4.9.tar.gz; @@ -99,7 +95,6 @@ script: ./squashfs-root/usr/bin/linuxdeployqt -bundle-non-qt-libs appdir/usr/lib/_tkinter.so; ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage; curl --upload-file "${TRAVIS_BUILD_DIR}/Scribus-${VERSION}-x86_64.AppImage" https://transfer.sh/"Scribus-${VERSION}-x86_64.AppImage"; - fi - if [ $TRAVIS_OS_NAME = osx -a $CC = clang ]; then From e12e51de1667357f0d045d6f2a4257ebd62a1e1f Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Sun, 20 Jan 2019 19:36:40 +0100 Subject: [PATCH 10/11] remove older ppa --- .travis.yml | 1 - scribus/scpaths.cpp | 7 ------- 2 files changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3346d58b93..462a6a38c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,6 @@ before_install: # Linux - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-add-repository ppa:beineri/opt-qt595-xenial -y; - sudo apt-add-repository ppa:as-bahanta/raqm -y; sudo apt-add-repository ppa:ricotz/testing -y; sudo apt-get update -qq; fi diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp index 96153f3384..dc62f1475b 100644 --- a/scribus/scpaths.cpp +++ b/scribus/scpaths.cpp @@ -453,17 +453,10 @@ QStringList ScPaths::systemProfilesDirs() winSysDir = winSysDir.replace('\\','/'); if (osVersion.dwPlatformId == VER_PLATFORM_WIN32_NT) // Windows NT/2k/XP { -<<<<<<< HEAD if (osVersion.dwMajorVersion >= 5) // for 2k and XP dwMajorVersion == 5 iccProfDirs.append(winSysDir + "/Spool/Drivers/Color/"); } else if (osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) // Windows 9x/Me -======= - if( osVersion.dwMajorVersion >= 5 ) // for 2k and XP dwMajorVersion == 5 - iccProfDirs.append( winSysDir + "/Spool/Drivers/Color/"); - } - else if( osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) // Windows 9x/Me ->>>>>>> Add explicit appname on linux. { if (osVersion.dwMajorVersion >= 4 && osVersion.dwMinorVersion >= 10) // Win98 or WinMe iccProfDirs.append(winSysDir + "/Color/"); From e51649adf1c0d72e912b87b0cc44ececd580281d Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Sun, 20 Jan 2019 20:55:48 +0100 Subject: [PATCH 11/11] Revert to Q_OS_LINUX --- .travis.yml | 2 +- scribus/scpaths.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 462a6a38c1..5798f15f84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,7 +77,7 @@ script: else export NPROC=1; fi; - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US -DBUILD_APPIMAGE_BUNDLE=1; + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US; make -j"$NPROC"; make DESTDIR=appdir -j"$NPROC" install ; find appdir/; cp /usr/lib/python2.7/lib-dynload/_tkinter.so appdir/usr/; diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp index dc62f1475b..168ef4090a 100644 --- a/scribus/scpaths.cpp +++ b/scribus/scpaths.cpp @@ -70,7 +70,7 @@ ScPaths::ScPaths() : // Build an appimage and redirect the paths to // ones inside the bundle, relative to the executable. -#ifdef BUILD_APPIMAGE_BUNDLE +#ifdef Q_OS_LINUX // Set the application name expliticly. QCoreApplication::setApplicationName("scribus"); QString pathPtr = QCoreApplication::applicationDirPath() + QString("/..");