mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 22:55:11 +00:00
Code Issues Releases Wiki Activity

Fix appimage on ubuntu 16.04 (#30)

Browse Source 
* Fix appimage on ubuntu 16.04

* Add missed -j$(nproc)

* Fix python cache
This commit is contained in:
ilya-fedin
2020-04-23 02:18:46 +04:00
committed by GitHub
parent e559f63df7
commit 5e5b59a61a
5 changed files with 44 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.github/workflows/appimage-release.yml vendored
View File

@@ -22,6 +22,7 @@ jobs:
MANUAL_CACHING: "1" MANUAL_CACHING: "1"
DOC_PATH: "docs/building-cmake.md" DOC_PATH: "docs/building-cmake.md"
AUTO_CACHING: "1" AUTO_CACHING: "1"
CXX: "g++ -static-libstdc++"
steps: steps:
- name: Get repository name. - name: Get repository name.
@@ -124,7 +125,7 @@ jobs:
path: ${{ env.LibrariesPath }}/python-cache path: ${{ env.LibrariesPath }}/python-cache
key: ${{ runner.OS }}-python-${{ env.CACHE_KEY }} key: ${{ runner.OS }}-python-${{ env.CACHE_KEY }}
- name: Python 3.8 build. - name: Python 3.8 build.
if: steps.python-openssl.outputs.cache-hit != 'true' if: steps.cache-python.outputs.cache-hit != 'true'
run: | run: |
cd $LibrariesPath cd $LibrariesPath
@@ -160,7 +161,7 @@ jobs:
git clone -b v5.69.0 --depth=1 $GIT/KDE/extra-cmake-modules.git git clone -b v5.69.0 --depth=1 $GIT/KDE/extra-cmake-modules.git
cd extra-cmake-modules cd extra-cmake-modules
cmake . -DCMAKE_BUILD_TYPE=Release cmake . -DCMAKE_BUILD_TYPE=Release
cmake --build . cmake --build . -- -j$(nproc)
sudo cmake --install . sudo cmake --install .
cd .. cd ..
rm -rf extra-cmake-modules rm -rf extra-cmake-modules
@@ -210,7 +211,7 @@ jobs:
-DRANGE_V3_EXAMPLES=OFF \ -DRANGE_V3_EXAMPLES=OFF \
-DRANGE_V3_DOCS=OFF -DRANGE_V3_DOCS=OFF
cmake --build . cmake --build . -- -j$(nproc)
sudo cmake --install . sudo cmake --install .
cd .. cd ..
@@ -224,7 +225,7 @@ jobs:
cd zlib/contrib/minizip cd zlib/contrib/minizip
autoreconf -i autoreconf -i
./configure ./configure
make make -j$(nproc)
sudo make install sudo make install
cd ../../.. cd ../../..
rm -rf zlib rm -rf zlib
@@ -410,7 +411,7 @@ jobs:
-DALSOFT_UTILS=OFF \ -DALSOFT_UTILS=OFF \
-DALSOFT_CONFIG=OFF -DALSOFT_CONFIG=OFF
cmake --build . cmake --build . -- -j$(nproc)
sudo cmake --install . sudo cmake --install .
sudo ldconfig sudo ldconfig
@@ -424,8 +425,9 @@ jobs:
git clone -b v1.7.0 --depth=1 $GIT/hunspell/hunspell.git git clone -b v1.7.0 --depth=1 $GIT/hunspell/hunspell.git
cd hunspell cd hunspell
autoreconf -vfi autoreconf -vfi
./configure # unable to link libstdc++ statically, thanks to autoconf
make ./configure --disable-shared
make -j$(nproc)
sudo make install sudo make install
sudo ldconfig sudo ldconfig
cd .. cd ..
@@ -504,6 +506,8 @@ jobs:
-qt-xcb \ -qt-xcb \
-openssl-linked \ -openssl-linked \
OPENSSL_LIBS="-L/usr/local/lib -lssl -lcrypto" \ OPENSSL_LIBS="-L/usr/local/lib -lssl -lcrypto" \
QMAKE_CXX="$CXX" \
QMAKE_LINK="$CXX" \
-nomake examples \ -nomake examples \
-nomake tests -nomake tests
@@ -539,7 +543,7 @@ jobs:
cmake . \ cmake . \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DENABLE_LIBRARY=OFF -DENABLE_LIBRARY=OFF
cmake --build . cmake --build . -- -j$(nproc)
sudo install -D platforminputcontext/libfcitxplatforminputcontextplugin.so /usr/local/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so sudo install -D platforminputcontext/libfcitxplatforminputcontextplugin.so /usr/local/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so
cd .. cd ..
rm -rf fcitx-qt5 rm -rf fcitx-qt5
@@ -564,7 +568,7 @@ jobs:
--disable-appindicator \ --disable-appindicator \
--disable-lib64 \ --disable-lib64 \
--qt5-im-module-path=/usr/local/plugins/platforminputcontexts --qt5-im-module-path=/usr/local/plugins/platforminputcontexts
make make -j$(nproc)
sudo make install sudo make install
cd .. cd ..
rm -rf hime rm -rf hime
@@ -598,7 +602,7 @@ jobs:
cmake . \ cmake . \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DWITH_DOC=OFF -DWITH_DOC=OFF
cmake --build . cmake --build . -- -j$(nproc)
sudo cmake --install . sudo cmake --install .
sudo ldconfig sudo ldconfig
cd .. cd ..
@@ -625,7 +629,7 @@ jobs:
-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF
cd ../out/Release cd ../out/Release
cmake --build . cmake --build . -- -j$(nproc)
DESTDIR=../../AppDir cmake --install . DESTDIR=../../AppDir cmake --install .
- name: AppImageKit-checkrt build. - name: AppImageKit-checkrt build.
@@ -648,7 +652,6 @@ jobs:
# Workaround to increase compatibility with older systems; see https://github.com/darealshinji/AppImageKit-checkrt for details # Workaround to increase compatibility with older systems; see https://github.com/darealshinji/AppImageKit-checkrt for details
install -D $LibrariesPath/AppImageKit-checkrt/exec.so AppDir/usr/optional/exec.so install -D $LibrariesPath/AppImageKit-checkrt/exec.so AppDir/usr/optional/exec.so
install -D $LibrariesPath/AppImageKit-checkrt/AppRun_patched AppDir/AppRun install -D $LibrariesPath/AppImageKit-checkrt/AppRun_patched AppDir/AppRun
install -D /usr/lib/x86_64-linux-gnu/libstdc++.so.6 AppDir/usr/optional/libstdc++/libstdc++.so.6
../linuxdeployqt-continuous-x86_64.AppImage \ ../linuxdeployqt-continuous-x86_64.AppImage \
AppDir/usr/share/applications/*.desktop \ AppDir/usr/share/applications/*.desktop \

27
.github/workflows/appimage.yml vendored
View File

@@ -37,6 +37,7 @@ jobs:
MANUAL_CACHING: "1" MANUAL_CACHING: "1"
DOC_PATH: "docs/building-cmake.md" DOC_PATH: "docs/building-cmake.md"
AUTO_CACHING: "1" AUTO_CACHING: "1"
CXX: "g++ -static-libstdc++"
steps: steps:
- name: Get repository name. - name: Get repository name.
@@ -139,7 +140,7 @@ jobs:
path: ${{ env.LibrariesPath }}/python-cache path: ${{ env.LibrariesPath }}/python-cache
key: ${{ runner.OS }}-python-${{ env.CACHE_KEY }} key: ${{ runner.OS }}-python-${{ env.CACHE_KEY }}
- name: Python 3.8 build. - name: Python 3.8 build.
if: steps.python-openssl.outputs.cache-hit != 'true' if: steps.cache-python.outputs.cache-hit != 'true'
run: | run: |
cd $LibrariesPath cd $LibrariesPath
@@ -175,7 +176,7 @@ jobs:
git clone -b v5.69.0 --depth=1 $GIT/KDE/extra-cmake-modules.git git clone -b v5.69.0 --depth=1 $GIT/KDE/extra-cmake-modules.git
cd extra-cmake-modules cd extra-cmake-modules
cmake . -DCMAKE_BUILD_TYPE=Release cmake . -DCMAKE_BUILD_TYPE=Release
cmake --build . cmake --build . -- -j$(nproc)
sudo cmake --install . sudo cmake --install .
cd .. cd ..
rm -rf extra-cmake-modules rm -rf extra-cmake-modules
@@ -225,7 +226,7 @@ jobs:
-DRANGE_V3_EXAMPLES=OFF \ -DRANGE_V3_EXAMPLES=OFF \
-DRANGE_V3_DOCS=OFF -DRANGE_V3_DOCS=OFF
cmake --build . cmake --build . -- -j$(nproc)
sudo cmake --install . sudo cmake --install .
cd .. cd ..
@@ -239,7 +240,7 @@ jobs:
cd zlib/contrib/minizip cd zlib/contrib/minizip
autoreconf -i autoreconf -i
./configure ./configure
make make -j$(nproc)
sudo make install sudo make install
cd ../../.. cd ../../..
rm -rf zlib rm -rf zlib
@@ -425,7 +426,7 @@ jobs:
-DALSOFT_UTILS=OFF \ -DALSOFT_UTILS=OFF \
-DALSOFT_CONFIG=OFF -DALSOFT_CONFIG=OFF
cmake --build . cmake --build . -- -j$(nproc)
sudo cmake --install . sudo cmake --install .
sudo ldconfig sudo ldconfig
@@ -439,8 +440,9 @@ jobs:
git clone -b v1.7.0 --depth=1 $GIT/hunspell/hunspell.git git clone -b v1.7.0 --depth=1 $GIT/hunspell/hunspell.git
cd hunspell cd hunspell
autoreconf -vfi autoreconf -vfi
./configure # unable to link libstdc++ statically, thanks to autoconf
make ./configure --disable-shared
make -j$(nproc)
sudo make install sudo make install
sudo ldconfig sudo ldconfig
cd .. cd ..
@@ -519,6 +521,8 @@ jobs:
-qt-xcb \ -qt-xcb \
-openssl-linked \ -openssl-linked \
OPENSSL_LIBS="-L/usr/local/lib -lssl -lcrypto" \ OPENSSL_LIBS="-L/usr/local/lib -lssl -lcrypto" \
QMAKE_CXX="$CXX" \
QMAKE_LINK="$CXX" \
-nomake examples \ -nomake examples \
-nomake tests -nomake tests
@@ -554,7 +558,7 @@ jobs:
cmake . \ cmake . \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DENABLE_LIBRARY=OFF -DENABLE_LIBRARY=OFF
cmake --build . cmake --build . -- -j$(nproc)
sudo install -D platforminputcontext/libfcitxplatforminputcontextplugin.so /usr/local/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so sudo install -D platforminputcontext/libfcitxplatforminputcontextplugin.so /usr/local/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so
cd .. cd ..
rm -rf fcitx-qt5 rm -rf fcitx-qt5
@@ -579,7 +583,7 @@ jobs:
--disable-appindicator \ --disable-appindicator \
--disable-lib64 \ --disable-lib64 \
--qt5-im-module-path=/usr/local/plugins/platforminputcontexts --qt5-im-module-path=/usr/local/plugins/platforminputcontexts
make make -j$(nproc)
sudo make install sudo make install
cd .. cd ..
rm -rf hime rm -rf hime
@@ -613,7 +617,7 @@ jobs:
cmake . \ cmake . \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DWITH_DOC=OFF -DWITH_DOC=OFF
cmake --build . cmake --build . -- -j$(nproc)
sudo cmake --install . sudo cmake --install .
sudo ldconfig sudo ldconfig
cd .. cd ..
@@ -638,7 +642,7 @@ jobs:
-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF
cd ../out/Release cd ../out/Release
cmake --build . cmake --build . -- -j$(nproc)
DESTDIR=../../AppDir cmake --install . DESTDIR=../../AppDir cmake --install .
- name: AppImageKit-checkrt build. - name: AppImageKit-checkrt build.
@@ -661,7 +665,6 @@ jobs:
# Workaround to increase compatibility with older systems; see https://github.com/darealshinji/AppImageKit-checkrt for details # Workaround to increase compatibility with older systems; see https://github.com/darealshinji/AppImageKit-checkrt for details
install -D $LibrariesPath/AppImageKit-checkrt/exec.so AppDir/usr/optional/exec.so install -D $LibrariesPath/AppImageKit-checkrt/exec.so AppDir/usr/optional/exec.so
install -D $LibrariesPath/AppImageKit-checkrt/AppRun_patched AppDir/AppRun install -D $LibrariesPath/AppImageKit-checkrt/AppRun_patched AppDir/AppRun
install -D /usr/lib/x86_64-linux-gnu/libstdc++.so.6 AppDir/usr/optional/libstdc++/libstdc++.so.6
../linuxdeployqt-continuous-x86_64.AppImage \ ../linuxdeployqt-continuous-x86_64.AppImage \
AppDir/usr/share/applications/*.desktop \ AppDir/usr/share/applications/*.desktop \

13
Telegram/Patches/AppImageKit-checkrt.diff
View File

@@ -263,19 +263,6 @@ index cd8fe34..dab0cff 100644
+ wget -c "https://raw.githubusercontent.com/AppImage/AppImageKit/master/src/AppRun.c" + wget -c "https://raw.githubusercontent.com/AppImage/AppImageKit/master/src/AppRun.c"
.PHONY: checkrt test run_tests all clean .PHONY: checkrt test run_tests all clean
diff --git a/checkrt.c b/checkrt.c
index 7607d61..f5a187f 100644
--- a/checkrt.c
+++ b/checkrt.c
@@ -72,7 +72,7 @@ void checkrt(char *usr_in_appdir)
SCANLIB(stdcxx_sys_lib, stdcxx_sys_sym, "^GLIBCXX_3\\.4");
SCANLIB(stdcxx_bundle_lib, stdcxx_bundle_sym, "^GLIBCXX_3\\.4");
stdcxx_sys_ver = atoi(stdcxx_sys_sym+12);
- stdcxx_bundle_ver = atoi(stdcxx_bundle_sym+12);
+ stdcxx_bundle_ver = 21;
DEBUG("%s ==> %s (%d)\n", stdcxx_sys_lib, stdcxx_sys_sym, stdcxx_sys_ver);
DEBUG("%s ==> %s (%d)\n\n", stdcxx_bundle_lib, stdcxx_bundle_sym, stdcxx_bundle_ver);
}
diff --git a/env.c b/env.c diff --git a/env.c b/env.c
index 6776bff..9c1d476 100755 index 6776bff..9c1d476 100755
--- a/env.c --- a/env.c

41
Telegram/Patches/qtbase_5_12_8_appimage.diff
View File

@@ -12,32 +12,6 @@ index 266faca0ed..cf9dafb6d8 100644
void *poolFrame = nullptr; void *poolFrame = nullptr;
if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) { if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) {
void *frame; void *frame;
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 5014878bd2..0e05e0f5b9 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -50,6 +50,7 @@
#include <qpa/qplatformnativeinterface.h>
#include <qpa/qplatformtheme.h>
#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformservices.h>
#include <QtCore/QAbstractEventDispatcher>
#include <QtCore/QStandardPaths>
@@ -268,7 +269,12 @@ static void initThemeHints()
static bool checkNeedPortalSupport()
{
#if QT_CONFIG(dbus)
- return !QStandardPaths::locate(QStandardPaths::RuntimeLocation, QLatin1String("flatpak-info")).isEmpty() || qEnvironmentVariableIsSet("SNAP");
+ bool neededByDesktopEnvironment = false;
+ if (QGuiApplication::desktopSettingsAware()) {
+ const QByteArray desktopEnvironment = QGuiApplicationPrivate::platformIntegration()->services()->desktopEnvironment();
+ neededByDesktopEnvironment = (desktopEnvironment == "KDE");
+ }
+ return !QStandardPaths::locate(QStandardPaths::RuntimeLocation, QLatin1String("flatpak-info")).isEmpty() || qEnvironmentVariableIsSet("SNAP") || neededByDesktopEnvironment;
#else
return false;
#endif // QT_CONFIG(dbus)
diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp
index 48060a2c37..fff3271ec9 100644 index 48060a2c37..fff3271ec9 100644
--- a/src/gui/kernel/qstylehints.cpp --- a/src/gui/kernel/qstylehints.cpp
@@ -1018,7 +992,7 @@ index 077955eb4e..5c8a3dddf7 100644
case FontDialog: case FontDialog:
return new QGtk3FontDialogHelper; return new QGtk3FontDialogHelper;
diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
index fb65f6d909..f2e53ed851 100644 index fb65f6d909..66c3a54a07 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp --- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp +++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
@@ -57,9 +57,11 @@ public: @@ -57,9 +57,11 @@ public:
@@ -1033,14 +1007,19 @@ index fb65f6d909..f2e53ed851 100644
}; };
QXdgDesktopPortalTheme::QXdgDesktopPortalTheme() QXdgDesktopPortalTheme::QXdgDesktopPortalTheme()
@@ -90,6 +92,12 @@ QXdgDesktopPortalTheme::QXdgDesktopPortalTheme() @@ -85,11 +87,17 @@ QXdgDesktopPortalTheme::QXdgDesktopPortalTheme()
break;
}
// No error message; not having a theme plugin is allowed.
+
+ // Try to use gtk's open directory dialog if there are no fallback theme
+ d->gtkTheme = QPlatformThemeFactory::create(QLatin1String("gtk3"), nullptr);
}
// 3) Fall back on the built-in "null" platform theme. // 3) Fall back on the built-in "null" platform theme.
if (!d->baseTheme) if (!d->baseTheme)
d->baseTheme = new QPlatformTheme; d->baseTheme = new QPlatformTheme;
+ +
+ // Try to use gtk's open directory dialog if there are no fallback theme
+ d->gtkTheme = QPlatformThemeFactory::create(QLatin1String("gtk3"), nullptr);
+
+ if (!d->gtkTheme) + if (!d->gtkTheme)
+ d->gtkTheme = new QPlatformTheme; + d->gtkTheme = new QPlatformTheme;
} }

4
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View File

@@ -608,6 +608,10 @@ namespace Platform {
void start() { void start() {
LOG(("Launcher filename: %1").arg(GetLauncherFilename())); LOG(("Launcher filename: %1").arg(GetLauncherFilename()));
if (InAppImage()) {
qputenv("LIBGL_ALWAYS_INDIRECT", "1");
}
#ifdef TDESKTOP_USE_FONTCONFIG_FALLBACK #ifdef TDESKTOP_USE_FONTCONFIG_FALLBACK
FallbackFontConfig(); FallbackFontConfig();
#endif // TDESKTOP_USE_FONTCONFIG_FALLBACK #endif // TDESKTOP_USE_FONTCONFIG_FALLBACK