Changes - SailfishOS Open Build Service

Changes of Revision 7

[-] [+]	Changed	_service:tar_git:maplibre-gl-native.spec
@@ -1,14 +1,14 @@ Summary: Maplibre GL Native Qt version Name: qmaplibregl -Version: 2.0.1.0 +Version: 2.1.0+git.23.12.28.0 Release: 1%{?dist} License: BSD-2-Clause Group: Libraries/Geosciences URL: https://github.com/maplibre/maplibre-gl-native Source: %{name}-%{version}.tar.gz -Patch1: 0001-Switch-to-CURL-for-downloads.patch -Patch2: 0002-Add-long-int-to-toString.patch +Patch1: 0001-Use-CURL-for-downloads.patch +Patch2: 0002-Fixes-for-compilation-on-SFOS.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -42,7 +42,7 @@ - Maps - Science Icon: https://raw.githubusercontent.com/maplibre/maplibre.github.io/main/img/maplibre-logo-dark.svg - + %package devel Summary: Development files for %{name} License: Open Source @@ -52,12 +52,12 @@ This package contains the development headers for %{name}. %prep -%setup -q -n %{name}-%{version}/maplibre-gl-native +%setup -q -n %{name}-%{version}/maplibre-native-qt %patch1 -p1 %patch2 -p1 %build -%cmake -DMBGL_WITH_QT=ON -DMBGL_WITH_WERROR=OFF -DCMAKE_INSTALL_PREFIX:PATH=/usr -DMBGL_QT_WITH_HEADLESS=OFF -DMBGL_QT_LIBRARY_ONLY=ON -DMBGL_QT_STATIC=OFF -DMBGL_QT_WITH_INTERNAL_ICU=ON . +%cmake -DMLN_QT_WITH_WIDGETS=OFF -DMLN_QT_WITH_LOCATION=OFF -DCMAKE_INSTALL_PREFIX:PATH=/usr -DMLN_QT_WITH_INTERNAL_ICU=ON . %{__make} %{?_smp_mflags} %install @@ -74,14 +74,14 @@ %files %defattr(-, root, root, 0755) -%{_libdir}/libQMapLibreGL.so.* +%{_libdir}/libQMapLibre.so.* %files devel %{_includedir}/mbgl -%{_includedir}/QMapLibreGL -#%{_libdir}/libQMapboxGL.a -%{_libdir}/libQMapLibreGL.so -%{_libdir}/cmake/QMapLibreGL +%{_includedir}/QMapLibre +#{_libdir}/libQMapbox.a +%{_libdir}/libQMapLibre.so +%{_libdir}/cmake/QMapLibre %changelog * Sun Dec 5 2021 rinigus <rinigus.git@gmail.com> - 2.0.0-1
[-] [+]	Deleted	_service:tar_git:0001-Switch-to-CURL-for-downloads.patch ^
@@ -1,37 +0,0 @@ -From 3e6635c85b1ee83474d2514baf40e1b4079522b4 Mon Sep 17 00:00:00 2001 -From: Rinigus <rinigus.git@gmail.com> -Date: Sun, 5 Dec 2021 14:54:48 +0200 -Subject: [PATCH] Switch to CURL for downloads - -As Qt 5.6 does not allow to download tiles offline from localhost, -replace qt http with curl implementation ---- - platform/qt/qt.cmake \| 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake -index 6303ae758..d2f7abe72 100644 ---- a/platform/qt/qt.cmake -+++ b/platform/qt/qt.cmake -@@ -98,10 +98,6 @@ target_sources( - ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/async_task.cpp - ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/async_task_impl.hpp - ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/gl_functions.cpp -- $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_file_source.cpp> -- $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_file_source.hpp> -- $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_request.cpp> -- $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_request.hpp> - ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/image.cpp - ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/number_format.cpp - ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/local_glyph_rasterizer.cpp -@@ -114,6 +110,7 @@ target_sources( - ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/timer.cpp - ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/timer_impl.hpp - ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/utf.cpp -+ ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp - ) - - target_compile_definitions( --- -2.32.0 -
[-] [+]	Added	_service:tar_git:0001-Use-CURL-for-downloads.patch ^
@@ -0,0 +1,37 @@ +From 41c947eb608ecc6f79adeef84615e3dcdc9cede8 Mon Sep 17 00:00:00 2001 +From: Rinigus <rinigus.git@gmail.com> +Date: Mon, 1 Jan 2024 11:58:58 +0200 +Subject: [PATCH] Use CURL for downloads + +As Qt 5.6 does not allow to download tiles offline from localhost, +replace qt http with curl implementation +--- + vendor/maplibre-native/platform/qt/qt.cmake \| 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/vendor/maplibre-native/platform/qt/qt.cmake b/vendor/maplibre-native/platform/qt/qt.cmake +index f14e864cd..ab6a9d08d 100644 +--- a/vendor/maplibre-native/platform/qt/qt.cmake ++++ b/vendor/maplibre-native/platform/qt/qt.cmake +@@ -87,10 +87,6 @@ target_sources( + ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/async_task_impl.hpp + ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/gl_functions.cpp + ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/headless_backend_qt.cpp +- ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_file_source.cpp +- ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_file_source.hpp +- ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_request.cpp +- ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_request.hpp + ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/image.cpp + ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/number_format.cpp + ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/local_glyph_rasterizer.cpp +@@ -108,6 +104,7 @@ target_sources( + ${PROJECT_SOURCE_DIR}/platform/qt/src/utils/renderer_observer.hpp + ${PROJECT_SOURCE_DIR}/platform/qt/src/utils/scheduler.cpp + ${PROJECT_SOURCE_DIR}/platform/qt/src/utils/scheduler.hpp ++ ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp + ) + + target_compile_definitions( +-- +2.41.0 +
[-] [+]	Deleted	_service:tar_git:0002-Add-long-int-to-toString.patch ^
@@ -1,28 +0,0 @@ -From 8f118816d7cf9b6279e8ff4113c4503ec69564c5 Mon Sep 17 00:00:00 2001 -From: Rinigus <rinigus.git@gmail.com> -Date: Sun, 5 Dec 2021 15:50:30 +0200 -Subject: [PATCH 2/2] Add long int to toString - ---- - include/mbgl/util/string.hpp \| 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp -index 9ed5a49e5..fbd6121d3 100644 ---- a/include/mbgl/util/string.hpp -+++ b/include/mbgl/util/string.hpp -@@ -58,6 +58,11 @@ inline std::string toString(unsigned long long t) { - return toString(static_cast<uint64_t>(t)); - } - -+template <typename = std::enable_if<!std::is_same<int64_t, long int>::value>> -+inline std::string toString(long int t) { -+ return toString(static_cast<int64_t>(t)); -+} -+ - template <typename = std::enable_if<!std::is_same<int64_t, long long>::value>> - inline std::string toString(long long t) { - return toString(static_cast<int64_t>(t)); --- -2.32.0 -
[-] [+]	Added	_service:tar_git:0002-Fixes-for-compilation-on-SFOS.patch ^
@@ -0,0 +1,39 @@ +From ea23b6964d1710e7c13d293cc36c7c92c512770b Mon Sep 17 00:00:00 2001 +From: Rinigus <rinigus.git@gmail.com> +Date: Mon, 1 Jan 2024 14:11:26 +0200 +Subject: [PATCH] Fixes for compilation on SFOS + +--- + src/core/map.cpp \| 2 +- + src/core/types.hpp \| 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/map.cpp b/src/core/map.cpp +index d3ff668..6235622 100644 +--- a/src/core/map.cpp ++++ b/src/core/map.cpp +@@ -847,7 +847,7 @@ QPointF Map::pixelForCoordinate(const Coordinate &coordinate_) const { + const mbgl::ScreenCoordinate pixel = d_ptr->mapObj->pixelForLatLng( + mbgl::LatLng{coordinate_.first, coordinate_.second}); + +- return {pixel.x, pixel.y}; ++ return {(qreal)pixel.x, (qreal)pixel.y}; + } + + /*! +diff --git a/src/core/types.hpp b/src/core/types.hpp +index fd346da..4a82730 100644 +--- a/src/core/types.hpp ++++ b/src/core/types.hpp +@@ -42,7 +42,7 @@ struct Q_MAPLIBRE_CORE_EXPORT Style { + CustomMap = 100 + }; + +- explicit Style(QString url_, QString name_ = QString()) ++ explicit Style(QString url_ = QString(), QString name_ = QString()) + : url(std::move(url_)), + name(std::move(name_)) {} + +-- +2.41.0 +
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/rinigus/pkg-maplibre-gl-native</param> <param name="branch"></param> - <param name="revision">2.0.1.0</param> + <param name="revision">2.1.0+git.23.12.28.0</param> <param name="debian">N</param> <param name="dumb">N</param> </service>
	Deleted	_service:tar_git:qmaplibregl-2.0.1.0.tar.gz ^
	Added	_service:tar_git:qmaplibregl-2.1.0+git.23.12.28.0.tar.gz ^