d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #812 from Nheko-Reborn/jdenticon-packaging

Browse source 
Jdenticon packaging
This commit is contained in:
DeepBlueV7.X 2021-11-15 14:29:06 +01:00 committed by GitHub
commit be53fd9b00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -69,6 +69,7 @@ build-macos:
-DUSE_BUNDLED_BOOST=ON -DUSE_BUNDLED_BOOST=ON
-DCI_BUILD=ON -DCI_BUILD=ON
- cmake --build build - cmake --build build
- (cd build && git clone https://github.com/Nheko-Reborn/qt-jdenticon.git && cd qt-jdenticon && qmake && make -j 4 && cp libqtjdenticon.dylib ../nheko.app/Contents/MacOS)
after_script: after_script:
- mv ../.hunter .hunter - mv ../.hunter .hunter
artifacts: artifacts:

7
appveyor.yml
View file

@ -54,12 +54,19 @@ build_script:
- cmake --build build --config Release - cmake --build build --config Release
- git clone https://github.com/Nheko-Reborn/qt-jdenticon.git
- cd qt-jdenticon
- qmake
- nmake
- cd ..
after_build: after_build:
# Variables # Variables
- set BUILD=%APPVEYOR_BUILD_FOLDER% - set BUILD=%APPVEYOR_BUILD_FOLDER%
- echo %BUILD% - echo %BUILD%
- mkdir NhekoRelease - mkdir NhekoRelease
- copy build\Release\nheko.exe NhekoRelease\nheko.exe - copy build\Release\nheko.exe NhekoRelease\nheko.exe
- copy qt-jdenticon\release\qtjdenticon0.dll NhekoRelease\qtjdenticon0.dll
- copy build\_deps\cmark-build\src\Release\cmark.dll NhekoRelease\cmark.dll - copy build\_deps\cmark-build\src\Release\cmark.dll NhekoRelease\cmark.dll
- windeployqt --qmldir resources\qml\ NhekoRelease\nheko.exe - windeployqt --qmldir resources\qml\ NhekoRelease\nheko.exe

10
io.github.NhekoReborn.Nheko.yaml
View file

@ -147,6 +147,16 @@ modules:
tag: 1.18.3 tag: 1.18.3
type: git type: git
url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git
- buildsystem: qmake
name: qt-jdenticon
no-make-install: true
build-commands:
- mkdir -p /app/bin/
- cp libqtjdenticon.so /app/bin/
sources:
- commit: 77eb0d62441e03bbbfc2b1d2057c4045ac87fb85
type: git
url: https://github.com/Nheko-Reborn/qt-jdenticon.git
- buildsystem: meson - buildsystem: meson
config-opts: config-opts:
- -Ddefault_library=static - -Ddefault_library=static

10
src/JdenticonProvider.cpp
View file

@ -88,20 +88,16 @@ getJdenticonInterface()
if (interface == nullptr && interfaceExists) { if (interface == nullptr && interfaceExists) {
QDir pluginsDir(qApp->applicationDirPath()); QDir pluginsDir(qApp->applicationDirPath());
bool plugins = pluginsDir.cd("plugins"); QPluginLoader pluginLoader("qtjdenticon");
if (plugins) {
for (const QString &fileName : pluginsDir.entryList(QDir::Files)) {
QPluginLoader pluginLoader(pluginsDir.absoluteFilePath(fileName));
QObject *plugin = pluginLoader.instance(); QObject *plugin = pluginLoader.instance();
if (plugin) { if (plugin) {
interface = qobject_cast<JdenticonInterface *>(plugin); interface = qobject_cast<JdenticonInterface *>(plugin);
if (interface) { if (interface) {
nhlog::ui()->info("Loaded jdenticon plugin."); nhlog::ui()->info("Loaded jdenticon plugin.");
break;
} }
} }
}
} else { if (!interface) {
nhlog::ui()->info("jdenticon plugin not found."); nhlog::ui()->info("jdenticon plugin not found.");
interfaceExists = false; interfaceExists = false;
} }