rhodes 7.5.1 → 7.6.0

data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj

@@ -1134,7 +1134,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "LIB_NAME=\"rhorubylib\"\n\n#MY_BUILD_DIR = \"${BUILD_DIR}\"\nMY_BUILD_DIR=\"./build\"\n\nSIMULATOR_LIBRARY_PATH=\"${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator/lib${LIB_NAME}.a\"\n\nDEVICE_LIBRARY_PATH=\"${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos/lib${LIB_NAME}.a\"\n\nOUTPUT_DIR=\"./${LIB_NAME}-Aggregated\"\n\nrm -rf \"${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator\"\nrm -rf \"${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos\"\n\n\nARCHS=\"x86_64\"\n\nXcodebuild -project ${PROJECT_NAME}.Xcodeproj -scheme ${LIB_NAME} -sdk iphonesimulator -configuration ${CONFIGURATION} install CONFIGURATION_BUILD_DIR=${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator ARCHS=\"x86_64\" OTHER_CFLAGS=\"-fembed-bitcode\"\n\nARCHS=\"arm64 armv7\"\n\nXcodebuild -project ${PROJECT_NAME}.Xcodeproj -scheme ${LIB_NAME} -sdk iphoneos -configuration ${CONFIGURATION} install CONFIGURATION_BUILD_DIR=${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos ARCHS=\"arm64 armv7\" OTHER_CFLAGS=\"-fembed-bitcode\"\n\nrm -rf \"${OUTPUT_DIR}\"\n\nmkdir \"${OUTPUT_DIR}\"\n\nlipo \"${SIMULATOR_LIBRARY_PATH}\" \"${DEVICE_LIBRARY_PATH}\" -create -output \"${OUTPUT_DIR}/lib${LIB_NAME}.a\"\n\n";
+			shellScript = "LIB_NAME=\"rhorubylib\"\n\n#MY_BUILD_DIR = \"${BUILD_DIR}\"\nMY_BUILD_DIR=\"./build\"\n\nSIMULATOR_LIBRARY_PATH=\"${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator/lib${LIB_NAME}.a\"\n\nDEVICE_LIBRARY_PATH=\"${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos/lib${LIB_NAME}.a\"\n\nOUTPUT_DIR=\"./${LIB_NAME}-Aggregated\"\n\nrm -rf \"${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator\"\nrm -rf \"${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos\"\n\n\nARCHS=\"x86_64\"\n\nXcodebuild -project ${PROJECT_NAME}.Xcodeproj -scheme ${LIB_NAME} -sdk iphonesimulator -configuration ${CONFIGURATION} install CONFIGURATION_BUILD_DIR=${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator ARCHS=\"x86_64\" OTHER_CFLAGS=\"-fembed-bitcode\"\n\nARCHS=\"arm64\"\n\nXcodebuild -project ${PROJECT_NAME}.Xcodeproj -scheme ${LIB_NAME} -sdk iphoneos -configuration ${CONFIGURATION} install CONFIGURATION_BUILD_DIR=${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos ARCHS=\"arm64\" OTHER_CFLAGS=\"-fembed-bitcode\"\n\nrm -rf \"${OUTPUT_DIR}\"\n\nmkdir \"${OUTPUT_DIR}\"\n\nlipo \"${SIMULATOR_LIBRARY_PATH}\" \"${DEVICE_LIBRARY_PATH}\" -create -output \"${OUTPUT_DIR}/lib${LIB_NAME}.a\"\n\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj

@@ -357,7 +357,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "LIB_NAME=\"rhosynclib\"\n\n#MY_BUILD_DIR = \"${BUILD_DIR}\"\nMY_BUILD_DIR=\"./build\"\n\nSIMULATOR_LIBRARY_PATH=\"${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator/lib${LIB_NAME}.a\"\n\nDEVICE_LIBRARY_PATH=\"${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos/lib${LIB_NAME}.a\"\n\nOUTPUT_DIR=\"./${LIB_NAME}-Aggregated\"\n\nrm -rf \"${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator\"\nrm -rf \"${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos\"\n\n\nARCHS=\"x86_64\"\n\nXcodebuild -project ${PROJECT_NAME}.Xcodeproj -scheme ${LIB_NAME} -sdk iphonesimulator -configuration ${CONFIGURATION} install CONFIGURATION_BUILD_DIR=${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator ARCHS=\"x86_64\" OTHER_CFLAGS=\"-fembed-bitcode\"\n\nARCHS=\"arm64 armv7\"\n\nXcodebuild -project ${PROJECT_NAME}.Xcodeproj -scheme ${LIB_NAME} -sdk iphoneos -configuration ${CONFIGURATION} install CONFIGURATION_BUILD_DIR=${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos ARCHS=\"arm64 armv7\" OTHER_CFLAGS=\"-fembed-bitcode\"\n\nrm -rf \"${OUTPUT_DIR}\"\n\nmkdir \"${OUTPUT_DIR}\"\n\nlipo \"${SIMULATOR_LIBRARY_PATH}\" \"${DEVICE_LIBRARY_PATH}\" -create -output \"${OUTPUT_DIR}/lib${LIB_NAME}.a\"\n\n";
+			shellScript = "LIB_NAME=\"rhosynclib\"\n\n#MY_BUILD_DIR = \"${BUILD_DIR}\"\nMY_BUILD_DIR=\"./build\"\n\nSIMULATOR_LIBRARY_PATH=\"${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator/lib${LIB_NAME}.a\"\n\nDEVICE_LIBRARY_PATH=\"${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos/lib${LIB_NAME}.a\"\n\nOUTPUT_DIR=\"./${LIB_NAME}-Aggregated\"\n\nrm -rf \"${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator\"\nrm -rf \"${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos\"\n\n\nARCHS=\"x86_64\"\n\nXcodebuild -project ${PROJECT_NAME}.Xcodeproj -scheme ${LIB_NAME} -sdk iphonesimulator -configuration ${CONFIGURATION} install CONFIGURATION_BUILD_DIR=${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator ARCHS=\"x86_64\" OTHER_CFLAGS=\"-fembed-bitcode\"\n\nARCHS=\"arm64\"\n\nXcodebuild -project ${PROJECT_NAME}.Xcodeproj -scheme ${LIB_NAME} -sdk iphoneos -configuration ${CONFIGURATION} install CONFIGURATION_BUILD_DIR=${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos ARCHS=\"arm64\" OTHER_CFLAGS=\"-fembed-bitcode\"\n\nrm -rf \"${OUTPUT_DIR}\"\n\nmkdir \"${OUTPUT_DIR}\"\n\nlipo \"${SIMULATOR_LIBRARY_PATH}\" \"${DEVICE_LIBRARY_PATH}\" -create -output \"${OUTPUT_DIR}/lib${LIB_NAME}.a\"\n\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

data/platform/sailfish/build/{harbour-SailfishRhodes.pro.erb → SailfishRhodes.pro.erb}

@@ -1,32 +1,25 @@
-TARGET = <%= @nameApp %>
+TARGET = <%= @organization %>.<%= @nameApp %>
 QT += webkit core widgets network quick
-CONFIG += sailfishapp c++14 sailfishapp_i18n ordered
-CONFIG += <%= @buildMode %>
-CONFIG += force_debug_info
+CONFIG += auroraapp c++14 auroraapp_i18n ordered <%= @buildMode %> force_debug_info
 
 OTHER_FILES += $$PWD/data/*
 
-privileges.files = privileges/*
-privileges.path = /usr/share/mapplauncherd/privileges.d
-INSTALLS += privileges
-OTHER_FILES += privileges/*
-
 DEPLOYMENT_PATH = /usr/share/$${TARGET}
+
 data.files = data
 data.path = $${DEPLOYMENT_PATH}
 
 INSTALLS += data
 
-DISTFILES += rpm/harbour-SailfishRhodes.changes.in \
-    rpm/harbour-SailfishRhodes.changes.run.in \
-    rpm/harbour-SailfishRhodes.spec \
-    rpm/harbour-SailfishRhodes.yaml \
-    harbour-SailfishRhodes.desktop \
-    translations/*.ts \
-	privileges/<%= @nameApp %>
+DISTFILES += rpm/SailfishRhodes.changes.in \
+    rpm/SailfishRhodes.changes.run.in \
+    rpm/SailfishRhodes.spec \
+    rpm/SailfishRhodes.yaml \
+    SailfishRhodes.desktop \
+    translations/*.ts
 
 
-SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172
+AURORAAPP_ICONS = 86x86 108x108 128x128 172x172
 
 INCLUDEPATH += <%= @rhoRoot %>/platform/wm/rhodes
 INCLUDEPATH += <%= @rhoRoot %>/platform/shared/curl/include

data/platform/sailfish/build/rhodes.pro.erb

@@ -1,21 +1,12 @@
-QT += core gui network multimedia
+QT += core gui network multimedia webkit
 <%= @enableDBUS %>
 
-DEFINES += <%= @enableQWebEngine %>
-
-!contains(DEFINES, ENABLE_Q_WEB_ENGINE)  {
-    QT += webkit
-}
-contains(DEFINES, ENABLE_Q_WEB_ENGINE)  {
-    QT += webengine
-}
-
 message(Qt version: $$[QT_VERSION])
 
-CONFIG += sailfishapp c++14 sailfishapp_i18n
+CONFIG += auroraapp auroraapp_i18n c++14
 DEFINES += OS_SAILFISH OS_LINUX
 
-TARGET = <%= @nameApp %>
+TARGET = <%= @organization %>.<%= @nameApp %>
 TEMPLATE = app
 
 
@@ -112,11 +103,10 @@ HEADERS += <%= @rhoRoot %>/platform/shared/qt/sailfish/src/custommenuitem.h \
     <%= @rhoRoot %>/platform/shared/qt/sailfish/src/customtoolbaritem.h \
     <%= @rhoRoot %>/platform/shared/qt/sailfish/src/customwebviewtab.h
 
-#DISTFILES += $$PWD/../sailfish/qml/harbour-SailfishRhodes.qml \
-#    <%= @rhoRoot %>/platform/shared/qt/sailfish/qml/cover/harbour-CoverPage.qml \
-#    <%= @rhoRoot %>/platform/shared/qt/sailfish/qml/pages/harbour-FirstPageWK.qml \
-#    <%= @rhoRoot %>/platform/shared/qt/sailfish/qml/pages/harbour-FirstPageWE.qml \
-#    <%= @rhoRoot %>/platform/shared/qt/sailfish/qml/pages/harbour-MenuPage.qml
+#DISTFILES += $$PWD/../sailfish/qml/SailfishRhodes.qml \
+#    <%= @rhoRoot %>/platform/shared/qt/sailfish/qml/cover/CoverPage.qml \
+#    <%= @rhoRoot %>/platform/shared/qt/sailfish/qml/pages/FirstPageWK.qml \
+#    <%= @rhoRoot %>/platform/shared/qt/sailfish/qml/pages/MenuPage.qml
 
 
 #RESOURCES += resources/common.qrc

data/platform/sailfish/build/rpm/SailfishRhodes.desktop.erb

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+X-Nemo-Application-Type=silica-qt5
+Icon=<%= @organization %>.<%= @nameApp %>
+Name=<%= @desktopAppName %>
+Exec=/usr/bin/<%= @organization %>.<%= @nameApp %>
+
+[X-Application]
+Permissions=Sensors;SecureStorage;PushNotifications;DeviceInfo;Audio;Bluetooth;Camera;Internet;Location;MediaIndexing;Microphone;NFC;RemovableMedia;UserDirs;WebView
+OrganizationName=<%= @organization %>
+ApplicationName=<%= @nameApp %>
+ExecDBus=/usr/bin/<%= @organization %>.<%= @nameApp %>

data/platform/sailfish/build/rpm/SailfishRhodes.erb

@@ -0,0 +1,2 @@
+# Tells invoker to run sailfishrhodes as nemo:privileged
+/usr/bin/<%= @nameApp %>,

data/platform/sailfish/build/rpm/SailfishRhodes.spec.erb

@@ -0,0 +1,43 @@
+Name:       <%= @organization %>.<%= @nameApp %>
+
+Summary:    <%= @nameApp %>
+Version:    <%= @versionApp %>
+Release:    1
+Group:      Qt/Qt
+License:    BSD-3-Clause
+URL:        https://tau-platform.com/
+Source0:    %{name}-%{version}.tar.bz2
+
+Requires:   sailfishsilica-qt5 >= 0.10.9
+BuildRequires:  pkgconfig(auroraapp)
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Qml)
+BuildRequires:  pkgconfig(Qt5Quick)
+BuildRequires:  pkgconfig(Qt5WebKit)
+BuildRequires:  desktop-file-utils
+#BuildRequires:  pkgconfig(Qt5Bluetooth)
+#BuildRequires:  <%= ymlSpdscanner %>
+
+%description
+<%= @nameApp %>
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+%qmake5
+%make_build
+
+%install
+rm -rf %{buildroot}
+%qmake5_install
+
+desktop-file-install --delete-original         --dir %{buildroot}%{_datadir}/applications                %{buildroot}%{_datadir}/applications/*.desktop
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}
+%defattr(644,root,root,-)
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png

data/platform/sailfish/build/rubylib.pro.erb

@@ -9,9 +9,9 @@ CONFIG += staticlib warn_on
 CONFIG += <%= @buildMode %>
 
 
-INCLUDEPATH += <%= @rhoRoot %>/platform/shared/ruby/include\
-<%= @rhoRoot %>/platform/shared/ruby\
-<%= @rhoRoot %>/platform/shared/ruby/generated\
+INCLUDEPATH += <%= @rhoRoot %>/platform/shared/ruby/include \
+<%= @rhoRoot %>/platform/shared/ruby \
+<%= @rhoRoot %>/platform/shared/ruby/generated \
 <%= @rhoRoot %>/platform/shared
 
 DESTDIR = $$PWD/bin
@@ -19,18 +19,18 @@ OBJECTS_DIR = $$PWD/bin/tmp
 INCLUDEPATH += <%= @rhoRoot %>/platform/shared/ruby/sailfish
 HEADERS += <%= @rhoRoot %>/platform/shared/ruby/sailfish/ruby/config.h
 SOURCES += \
-<%= @rhoRoot %>/platform/shared/ruby/missing/acosh.c\
-<%= @rhoRoot %>/platform/shared/ruby/missing/cbrt.c\
-<%= @rhoRoot %>/platform/shared/ruby/missing/crypt.c\
-<%= @rhoRoot %>/platform/shared/ruby/missing/dup2.c\
-<%= @rhoRoot %>/platform/shared/ruby/missing/erf.c\
-<%= @rhoRoot %>/platform/shared/ruby/missing/hypot.c\
-<%= @rhoRoot %>/platform/shared/ruby/missing/stdlib.c\
-<%= @rhoRoot %>/platform/shared/ruby/missing/strlcat.c\
-<%= @rhoRoot %>/platform/shared/ruby/missing/strlcpy.c\
-<%= @rhoRoot %>/platform/shared/ruby/missing/tgamma.c\
-<%= @rhoRoot %>/platform/shared/ruby/newline.c\
-<%= @rhoRoot %>/platform/shared/ruby/missing/explicit_bzero.c\
+<%= @rhoRoot %>/platform/shared/ruby/missing/acosh.c \
+<%= @rhoRoot %>/platform/shared/ruby/missing/cbrt.c \
+<%= @rhoRoot %>/platform/shared/ruby/missing/crypt.c \
+<%= @rhoRoot %>/platform/shared/ruby/missing/dup2.c \
+<%= @rhoRoot %>/platform/shared/ruby/missing/erf.c \
+<%= @rhoRoot %>/platform/shared/ruby/missing/hypot.c \
+<%= @rhoRoot %>/platform/shared/ruby/missing/stdlib.c \
+<%= @rhoRoot %>/platform/shared/ruby/missing/strlcat.c \
+<%= @rhoRoot %>/platform/shared/ruby/missing/strlcpy.c \
+<%= @rhoRoot %>/platform/shared/ruby/missing/tgamma.c \
+<%= @rhoRoot %>/platform/shared/ruby/newline.c \
+<%= @rhoRoot %>/platform/shared/ruby/missing/explicit_bzero.c \
 <%= @rhoRoot %>/platform/shared/ruby/missing/setproctitle.c
 QMAKE_CFLAGS += -fvisibility=hidden
 QMAKE_CXXFLAGS += -fvisibility=hidden
@@ -43,20 +43,20 @@ QMAKE_CFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wn
   
 
 
-HEADERS += <%= @rhoRoot %>/platform/shared/ruby/ext/rho/rhoruby.h\
-<%= @rhoRoot %>/platform/shared/ruby/ext/calendar/event.h\
-<%= @rhoRoot %>/platform/shared/ruby/dln.h\
-<%= @rhoRoot %>/platform/shared/ruby/eval_intern.h\
-<%= @rhoRoot %>/platform/shared/ruby/gc.h\
-<%= @rhoRoot %>/platform/shared/ruby/id.h\
-<%= @rhoRoot %>/platform/shared/ruby/node.h\
-<%= @rhoRoot %>/platform/shared/ruby/regenc.h\
-<%= @rhoRoot %>/platform/shared/ruby/regint.h\
-<%= @rhoRoot %>/platform/shared/ruby/regparse.h\
-<%= @rhoRoot %>/platform/shared/ruby/revision.h\
-<%= @rhoRoot %>/platform/shared/ruby/transcode_data.h\
-<%= @rhoRoot %>/platform/shared/ruby/version.h\
-<%= @rhoRoot %>/platform/shared/ruby/vm_core.h\
+HEADERS += <%= @rhoRoot %>/platform/shared/ruby/ext/rho/rhoruby.h \
+<%= @rhoRoot %>/platform/shared/ruby/ext/calendar/event.h \
+<%= @rhoRoot %>/platform/shared/ruby/dln.h \
+<%= @rhoRoot %>/platform/shared/ruby/eval_intern.h \
+<%= @rhoRoot %>/platform/shared/ruby/gc.h \
+<%= @rhoRoot %>/platform/shared/ruby/id.h \
+<%= @rhoRoot %>/platform/shared/ruby/node.h \
+<%= @rhoRoot %>/platform/shared/ruby/regenc.h \
+<%= @rhoRoot %>/platform/shared/ruby/regint.h \
+<%= @rhoRoot %>/platform/shared/ruby/regparse.h \
+<%= @rhoRoot %>/platform/shared/ruby/revision.h \
+<%= @rhoRoot %>/platform/shared/ruby/transcode_data.h \
+<%= @rhoRoot %>/platform/shared/ruby/version.h \
+<%= @rhoRoot %>/platform/shared/ruby/vm_core.h \
 <%= @rhoRoot %>/platform/shared/ruby/vm_opts.h
 
 SOURCES += \