diff --git a/qtquick/CMakeLists.txt b/qtquick/CMakeLists.txt index 67f7cee..05f8619 100644 --- a/qtquick/CMakeLists.txt +++ b/qtquick/CMakeLists.txt @@ -5,7 +5,7 @@ set(sailfin_SOURCES add_executable(sailfin ${sailfin_SOURCES}) target_link_libraries(sailfin PUBLIC Qt5::Gui Qt5::Qml Qt5::Quick jellyfin-qt) -install(TARGETS harbour-sailfin +install(TARGETS sailfin RUNTIME DESTINATION bin ) diff --git a/rpm/harbour-sailfin.changes.run b/rpm/harbour-sailfin.changes.run index 37ee1b6..eae611d 100644 --- a/rpm/harbour-sailfin.changes.run +++ b/rpm/harbour-sailfin.changes.run @@ -4,7 +4,7 @@ # generate changelog from well formatted Git commit messages and tag # annotations. -git-change-log +git-change-log --dense '/[0-9]+.[0-9]+$' # Here are some basic examples how to change from the default behavior. Run # git-change-log --help inside the Sailfish OS SDK chroot or build engine to diff --git a/rpm/harbour-sailfin.yaml b/rpm/harbour-sailfin.yaml index 9b71ade..41db878 100644 --- a/rpm/harbour-sailfin.yaml +++ b/rpm/harbour-sailfin.yaml @@ -44,11 +44,16 @@ Files: Macros: - '__provides_exclude_from; ^%{_datadir}/.*$' - '__requires_exclude; ^libjellyfin-qt.*$' + # Turn off facist build policy + - '_unpackaged_files_terminate_build; 0 ' ConfigOptions: - -DCMAKE_BUILD_TYPE=Release - -DSAILFISHOS=1 - -DSAILFIN_VERSION='%{version}-%{release}' + +# ExtraInstall: | + # mv /home/deploy/installroot/home/deploy/installroot/usr/share/harbour-sailfin/plugins /home/deploy/installroot/usr/share/harbour-sailfin/plugins # For more information about yaml and what's supported in Sailfish OS # build system, please see https://wiki.merproject.org/wiki/Spectacle diff --git a/sailfish/CMakeLists.txt b/sailfish/CMakeLists.txt index 847755e..54f306b 100644 --- a/sailfish/CMakeLists.txt +++ b/sailfish/CMakeLists.txt @@ -7,9 +7,10 @@ set(DEPLOY_ROOT /home/deploy/installroot/) ExternalProject_Add(BlurhashQt # PREFIX ${CMAKE_CURRENT_BINARY_DIR}/lib/blurhash-qt GIT_REPOSITORY https://github.com/HenkKalkwater/BlurhashQt.git - GIT_TAG 6a0d05919a798eedeacdbc30507470b774b90f8d + GIT_TAG 61ae7f0feca6ab67da1bfdbcb222bbd12e8f7e07 + + CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=ON -DENABLE_EXPORT=OFF -DQML_PLUGIN_PATH=${PROJECT_BINARY_DIR}/plugins/) - CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=ON -DENABLE_EXPORT=OFF -DCMAKE_INSTALL_LIBDIR=${DEPLOY_ROOT}usr/share/harbour-sailfin/plugins) find_package(Qt5 COMPONENTS Gui Qml Quick) find_package(SailfishApp 1.0 REQUIRED) @@ -66,6 +67,8 @@ target_link_libraries(harbour-sailfin PRIVATE Qt5::Gui Qt5::Qml Qt5::Quick Sailf install(TARGETS harbour-sailfin RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(DIRECTORY ${PROJECT_BINARY_DIR}/plugins/ + DESTINATION share/harbour-sailfin/) install(DIRECTORY qml DESTINATION share/harbour-sailfin ) diff --git a/sailfish/src/harbour-sailfin.cpp b/sailfish/src/harbour-sailfin.cpp index 9f96537..c1216f3 100644 --- a/sailfish/src/harbour-sailfin.cpp +++ b/sailfish/src/harbour-sailfin.cpp @@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include #endif +#include #include #include #include @@ -45,6 +46,7 @@ int main(int argc, char *argv[]) { QQuickView *view = SailfishApp::createView(); view->setSource(SailfishApp::pathToMainQml()); view->show(); + qDebug() << "QML import paths: " << view->engine()->importPathList(); return app->exec(); }