Changes - SailfishOS Open Build Service

Changes of Revision 8c6ce43da97f8d2769e9ad209bd0f757

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:harbour-osmscout-server.changes
@@ -1,56 +1,3 @@ -* Sun May 16 2021 Rinigus <rinigus.git@gmail.com> - 2.0.2 -- [sfos] add support for aarch64 - -* Tue Mar 30 2021 Rinigus <rinigus.git@gmail.com> - 2.0.1 -- [uuitk] add tmp workaround for missing drawer property -- [uuitk] bump qt imports for Drawer - -* Mon Mar 29 2021 Rinigus <rinigus.git@gmail.com> - 2.0.0 -- [click] specify version while cloning Valhalla -- [gui] track server and show error page on disconnect -- [gui] try to activate server and start if it fails -- [kirigami] add missing property to text field -- [kirigami] force FormLayout into narrow mode -- [kirigami] set active text color to the theme link color -- [server] add tcp activation method -- [sfos] fix transitions to error page -- [silica] switch to Valhalla 3.1 -- [ubuntu touch] set Valhalla version via release tag - -* Wed Jan 22 2020 Rinigus <rinigus.git@gmail.com> - 1.16.0 -- [ubports] drop screensaver block while active - -* Sat Nov 30 2019 Rinigus <rinigus.git@gmail.com> - 1.15.6 -- [silica] adjust protobuf path - -* Fri Sep 20 2019 Rinigus <rinigus.git@gmail.com> - 1.15.0 -- [kirigami] drop forward navigation button -- [qtcontrols,kirigami] add checks into platform-specific code -- [silica] using no-invoker to avoid opt-gcc6 and invoker conflict - -* Sat May 18 2019 Rinigus <rinigus.git@gmail.com> - 1.14.4 -- [kirigami] fix updatesfound page - -* Mon May 13 2019 Rinigus <rinigus.git@gmail.com> - 1.14.3 -- [kirigami] simplify page stack - -* Sat Apr 27 2019 Rinigus <rinigus.git@gmail.com> - 1.14.0 -- [kirigami] fix aboutpage -- [kirigami] implement fileselector -- [qtcontrols] add fileselector -- [qtcontrols] fix menu drawer -- [qtcontrols,kirigami] add missing var in context -- [qtcontrols,kirigami] add support for wizard -- [silica] correct qml entry for main -- [silica] update application qml -- [wip] cross-platform rewrite of QML part - -* Mon Dec 03 2018 Rinigus <rinigus.git@gmail.com> - 1.13.0 -- [qtcontrols] fix row layout - -* Sun Nov 04 2018 Rinigus <rinigus.git@gmail.com> - 1.12.3 -- [qtcontrols] import theme in qml - * Sun Jul 22 2018 Rinigus <rinigus.git@gmail.com> - 1.9.0 - [wip] adding dbus support - [wip] add map matching of the current position as a service
[-] [+]	Changed	_service:tar_git:harbour-osmscout-server.spec ^
@@ -1,31 +1,30 @@ -# Define Sailfish as it is absent -%if !0%{?fedora} -%define sailfishos 1 -%endif +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.27 +# - -%if 0%{?sailfishos} Name: harbour-osmscout-server -%else -Name: osmscout-server -%endif -%if 0%{?sailfishos} +# >> macros %define __provides_exclude_from ^%{_datadir}/.$ -%define __requires_exclude ^libboost_filesystem\|libboost_regex\|libboost_system\|libboost_iostreams\|libboost_chrono\|libboost_thread\|libboost_date_time\|libprotobuf\|liblz4\|libfreetype\|libharfbuzz\|libjpeg\|libmapnik\|libproj\|libtiff.$ -%endif +%define __requires_exclude ^libboost_filesystem\|libboost_regex\|libboost_system\|libboost_iostreams\|libboost_chrono\|libboost_thread\|libboost_date_time\|libprotobuf\|libz\|liblz4\|libfreetype\|libharfbuzz\|libicudata\|libicui18n\|libicuuc\|libjpeg\|libmapnik\|libproj\|libtiff.$ +# << macros +%{!?qtc_qmake:%define qtc_qmake %qmake} +%{!?qtc_qmake5:%define qtc_qmake5 %qmake5} +%{!?qtc_make:%define qtc_make make} +%{?qtc_builddir:%define _builddir %qtc_builddir} Summary: OSM Scout Server -Version: 2.0.2 +Version: 1.9.0+master.20180730065815.5.g168333a Release: 1 Group: Qt/Qt -License: GPLv3 +License: LGPL URL: https://github.com/rinigus/osmscout-server Source0: %{name}-%{version}.tar.bz2 -%if 0%{?sailfishos} +Source100: harbour-osmscout-server.yaml Source101: harbour-osmscout-server-rpmlintrc -%endif - +Requires: sailfishsilica-qt5 >= 0.10.9 +BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Quick) @@ -33,17 +32,19 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Positioning) BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(marisa) -BuildRequires: pkgconfig(libmicrohttpd) -BuildRequires: pkgconfig(kyotocabinet) -BuildRequires: pkgconfig(libpostal) >= 1.0.0 +BuildRequires: libmarisa-devel +BuildRequires: libmicrohttpd-devel +BuildRequires: libosmscout-qt-devel +BuildRequires: libpostal-devel >= 1.0.0 +BuildRequires: libkyotocabinet-devel +BuildRequires: mapnik-devel +BuildRequires: libicu52-devel BuildRequires: qt5-qttools-linguist -BuildRequires: pkgconfig(libvalhalla) -BuildRequires: pkgconfig(date) +BuildRequires: valhalla-lite-devel BuildRequires: protobuf-devel BuildRequires: boost-devel >= 1.51 BuildRequires: boost-date-time >= 1.51 @@ -55,20 +56,6 @@ BuildRequires: lz4-devel BuildRequires: desktop-file-utils -%if 0%{?sailfishos} -Requires: sailfishsilica-qt5 >= 0.10.9 -BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 -BuildRequires: mapnik-devel -#BuildRequires: pkgconfig(libsystemd-daemon) -BuildRequires: pkgconfig(libsystemd) -%else -BuildRequires: pkgconfig(libsystemd) -BuildRequires: cmake(KF5Kirigami2) -BuildRequires: pkgconfig(Qt5QuickControls2) -BuildRequires: pkgconfig(mapnik) -%endif - - %description Server providing map tiles, search, and routing @@ -76,81 +63,86 @@ %prep %setup -q -n %{name}-%{version} +# >> setup +# << setup + %build +# >> build pre +# << build pre -%if 0%{?sailfishos} -%qmake5 VERSION='%{version}-%{release}' SCOUT_FLAVOR='silica' CONFIG+=use_dbusactivation VALHALLA_VERSION=3.1 -%else -%qmake5 VERSION='%{version}-%{release}' SCOUT_FLAVOR='kirigami' CONFIG+=use_dbusactivation VALHALLA_VERSION=3.1 -%endif +%qtc_qmake5 \ + VERSION='%{version}-%{release}' -make %{?_smp_mflags} +%qtc_make %{?_smp_mflags} + +# >> build post +# << build post %install rm -rf %{buildroot} -make install INSTALL_ROOT=%{buildroot} - -desktop-file-install --delete-original \ - --dir %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/.desktop +# >> install pre +# << install pre +%qmake5_install -%if 0%{?sailfishos} +# >> install post +################################ # ship all shared libraries not allowed in Harbour with the app mkdir -p %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libmapnik.so.3.0 %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libproj.so.12 %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libtiff.so.5 %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libharfbuzz.so.0 %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libjpeg.so.62 %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libfreetype.so.6 %{buildroot}%{_datadir}/%{name}/lib -#cp %{_libdir}/libicui18n.so.52 %{buildroot}%{_datadir}/%{name}/lib -#cp %{_libdir}/libicudata.so.52 %{buildroot}%{_datadir}/%{name}/lib -#cp %{_libdir}/libicuuc.so.52 %{buildroot}%{_datadir}/%{name}/lib - -cp %{_libdir}/libboost_filesystem-mt.so.* %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libboost_filesystem.so.* %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libboost_regex-mt.so.* %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libboost_regex.so.* %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libboost_system-mt.so.* %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libboost_system.so.* %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libboost_iostreams-mt.so.* %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libboost_date_time-mt.so.* %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libboost_chrono-mt.so.* %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/libboost_thread-mt.so.* %{buildroot}%{_datadir}/%{name}/lib - -cp %{_libdir}/libprotobuf.so* %{buildroot}%{_datadir}/%{name}/lib - -cp %{_libdir}/liblz4.so.1.8.1 %{buildroot}%{_datadir}/%{name}/lib -cp %{_libdir}/liblz4.so.1 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libmapnik.so.3.0 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libproj.so.12 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libtiff.so.5 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libharfbuzz.so.0 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libjpeg.so.62 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libfreetype.so.6 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libicui18n.so.52 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libicudata.so.52 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libicuuc.so.52 %{buildroot}%{_datadir}/%{name}/lib + +cp /usr/lib/libboost_filesystem-mt.so.1.51.0 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libboost_regex-mt.so.1.51.0 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libboost_regex.so.1.51.0 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libboost_system-mt.so.1.51.0 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libboost_system.so.1.51.0 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libboost_iostreams-mt.so.1.51.0 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libboost_date_time-mt.so.1.51.0 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libboost_chrono-mt.so.1.51.0 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libboost_thread-mt.so.1.51.0 %{buildroot}%{_datadir}/%{name}/lib + +cp /usr/lib/libprotobuf.so.8 %{buildroot}%{_datadir}/%{name}/lib + +cp /usr/lib/liblz4.so.1.8.1 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/liblz4.so.1 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libz.so.1.2.8 %{buildroot}%{_datadir}/%{name}/lib +cp /usr/lib/libz.so.1 %{buildroot}%{_datadir}/%{name}/lib # mapnik fonts and input plugins # not needed anymore since input plugins are linked # into main mapnik library and fonts are distributed with # the styles -#cp -r %{_libdir}/mapnik %{buildroot}%{_datadir}/%{name}/lib +#cp -r /usr/lib/mapnik %{buildroot}%{_datadir}/%{name}/lib strip %{buildroot}%{_datadir}/%{name}/lib/libmapnik.so.3.0 -#strip %{buildroot}%{_datadir}/%{name}/lib/libicudata.so.52
	Added	_service:tar_git:harbour-osmscout-server-1.9.0+master.20180730065815.5.g168333a.tar.bz2 ^
	Deleted	_service:tar_git:harbour-osmscout-server-2.0.2.tar.bz2 ^
[-] [+]	Added	_service:tar_git:harbour-osmscout-server.yaml ^
@@ -0,0 +1,80 @@ +Name: harbour-osmscout-server +Summary: OSM Scout Server +Version: 1.9.0 +Release: 1 +# The contents of the Group field should be one of the groups listed here: +# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS +Group: Qt/Qt +URL: https://github.com/rinigus/osmscout-server +License: LGPL +# This must be generated before uploading a package to a remote build service. +# Usually this line does not need to be modified. +Sources: +- '%{name}-%{version}.tar.bz2' +Description: \| + Server providing map tiles, search, and routing +Configure: none +# The qtc5 builder inserts macros to allow QtCreator to have fine +# control over qmake/make execution +Builder: qtc5 +QMakeOptions: +- VERSION='%{version}-%{release}' + +# This section specifies build dependencies that are resolved using pkgconfig. +# This is the preferred way of specifying build dependencies for your package. +PkgConfigBR: + - sailfishapp >= 1.0.2 + - Qt5Core + - Qt5Qml + - Qt5Quick + - Qt5Xml + - Qt5Sql + - Qt5Positioning + - Qt5DBus + - sqlite3 + - libsystemd-daemon + - zlib + - libcurl + +# Build dependencies without a pkgconfig setup can be listed here +PkgBR: + - libmarisa-devel + - libmicrohttpd-devel + - libosmscout-qt-devel + - libpostal-devel >= 1.0.0 + - libkyotocabinet-devel + - mapnik-devel + - libicu52-devel + - qt5-qttools-linguist + - valhalla-lite-devel + - protobuf-devel + - boost-devel >= 1.51 + - boost-date-time >= 1.51 + - boost-chrono >= 1.51 + - boost-filesystem >= 1.51 + - boost-iostreams >= 1.51 + - boost-regex >= 1.51 + - boost-system >= 1.51 + - lz4-devel + + +# Runtime dependencies which are not automatically detected +Requires: + - sailfishsilica-qt5 >= 0.10.9 + +RpmLintIgnore: + - arch-dependent-file-in-usr-share + - library-without-ldconfig-postin + - library-without-ldconfig-postun + - filename-too-long-for-joliet + +# All installed files +Files: + - '%{_bindir}' + - '%{_datadir}/%{name}' + - '%{_datadir}/applications/%{name}.desktop' + - '%{_datadir}/icons/hicolor/*/apps/%{name}.png' + - '%{_datadir}/%{name}/translations' + +# For more information about yaml and what's supported in Sailfish OS +# build system, please see https://wiki.merproject.org/wiki/Spectacle