Changes - SailfishOS Open Build Service

Changes of Revision 3

[-] [+]	Changed	harbour-fotokopierer.spec
@@ -9,8 +9,8 @@ # << macros Summary: Document Scanner -Version: 0.4.7 -Release: 2%{?dist} +Version: 0.4.8 +Release: 1%{?dist} Group: Qt/Qt License: GPLv3+ URL: https://chiselapp.com/user/fifr/repository/fotokopierer @@ -71,7 +71,7 @@ # >> macros2 %global opencv_version 3.4.16 %global podofo_version 0.9.8 -%global freetype_version 2.13.0 +%global freetype_version 2.13.2 # << macros2 %prep @@ -94,49 +94,47 @@ mkdir -p 3rdparty/opencv pushd 3rdparty/opencv -if ! test -f Makefile; then -cmake ../../../3rdparty/opencv-%{opencv_version} \ --DCMAKE_INSTALL_PREFIX:PATH=$PWD/../../usr \ --DCMAKE_BUILD_TYPE=Release \ --DOPENCV_EXTRA_CXX_FLAGS="-U__SSE2__" \ --DBUILD_DOCS=OFF \ --DBUILD_EXAMPLES=OFF \ --DBUILD_FAT_JAVA_LIB=OFF \ --DBUILD_ITT=OFF \ --DBUILD_JAVA=OFF \ --DBUILD_PACKAGE=OFF \ --DBUILD_PERF_TESTS=OFF \ --DBUILD_SHARED_LIBS=OFF \ --DBUILD_TESTS=OFF \ --DBUILD_PROTOBUF=On \ --DBUILD_TIFF=OFF \ --DBUILD_JPEG=OFF \ --DBUILD_JPEG_TURBO_DISABLE=ON \ --DBUILD_opencv_apps=OFF \ --DBUILD_opencv_calib3d=OFF \ --DBUILD_opencv_dnn=OFF \ --DBUILD_opencv_features2d=OFF \ --DBUILD_opencv_flann=OFF \ --DBUILD_opencv_highgui=OFF \ --DBUILD_opencv_imgcodecs=OFF \ --DBUILD_opencv_ml=OFF \ --DBUILD_opencv_objdetect=OFF \ --DBUILD_opencv_photo=OFF \ --DBUILD_opencv_python2=OFF \ --DBUILD_opencv_python_bindings_generator=OFF \ --DBUILD_opencv_shape=OFF \ --DBUILD_opencv_stitching=OFF \ --DBUILD_opencv_superres=OFF \ --DBUILD_opencv_ts=OFF \ --DBUILD_opencv_video=OFF \ --DBUILD_opencv_videoio=OFF \ --DBUILD_opencv_videostab=OFF \ --DBUILD_opencv_world=OFF \ --DENABLE_PRECOMPILED_HEADERS=OFF \ --DWITH_JASPER=OFF \ --DWITH_OPENEXR=OFF \ --DWITH_WEBP=OFF -fi +test -f Makefile \|\| %cmake ../../../3rdparty/opencv-%{opencv_version} \ + -DCMAKE_INSTALL_PREFIX:PATH=$PWD/../../usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DOPENCV_EXTRA_CXX_FLAGS="-U__SSE2__" \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_FAT_JAVA_LIB=OFF \ + -DBUILD_ITT=OFF \ + -DBUILD_JAVA=OFF \ + -DBUILD_PACKAGE=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_PROTOBUF=On \ + -DBUILD_TIFF=OFF \ + -DBUILD_JPEG=OFF \ + -DBUILD_JPEG_TURBO_DISABLE=ON \ + -DBUILD_opencv_apps=OFF \ + -DBUILD_opencv_calib3d=OFF \ + -DBUILD_opencv_dnn=OFF \ + -DBUILD_opencv_features2d=OFF \ + -DBUILD_opencv_flann=OFF \ + -DBUILD_opencv_highgui=OFF \ + -DBUILD_opencv_imgcodecs=OFF \ + -DBUILD_opencv_ml=OFF \ + -DBUILD_opencv_objdetect=OFF \ + -DBUILD_opencv_photo=OFF \ + -DBUILD_opencv_python2=OFF \ + -DBUILD_opencv_python_bindings_generator=OFF \ + -DBUILD_opencv_shape=OFF \ + -DBUILD_opencv_stitching=OFF \ + -DBUILD_opencv_superres=OFF \ + -DBUILD_opencv_ts=OFF \ + -DBUILD_opencv_video=OFF \ + -DBUILD_opencv_videoio=OFF \ + -DBUILD_opencv_videostab=OFF \ + -DBUILD_opencv_world=OFF \ + -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DWITH_JASPER=OFF \ + -DWITH_OPENEXR=OFF \ + -DWITH_WEBP=OFF make %{?_smp_mflags} make libjpeg libtiff %{?_smp_mflags} make install @@ -144,39 +142,35 @@ mkdir -p 3rdparty/freetype pushd 3rdparty/freetype -if ! test -f Makefile; then -cmake ../../../3rdparty/freetype-%{freetype_version} \ --DCMAKE_INSTALL_PREFIX:PATH=$PWD/../../usr \ --DCMAKE_BUILD_TYPE=Release \ --DBUILD_SHARED_LIBS:BOOL=false \ --DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true -fi +test -f Makefile \|\| %cmake ../../../3rdparty/freetype-%{freetype_version} \ + -DCMAKE_INSTALL_PREFIX:PATH=$PWD/../../usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS:BOOL=false \ + -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true make %{?_smp_mflags} make install popd mkdir -p 3rdparty/podofo pushd 3rdparty/podofo -if ! test -f Makefile; then -cmake ../../../3rdparty/podofo-%{podofo_version} \ --DCMAKE_INSTALL_PREFIX:PATH=$PWD/../../usr \ --DPODOFO_BUILD_LIB_ONLY:BOOL=true \ --DCMAKE_BUILD_TYPE=Release \ --DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true \ --DCMAKE_INCLUDE_PATH="$PWD/../../../3rdparty/opencv-%{opencv_version}/3rdparty/libjpeg;$PWD/../../../3rdparty/opencv-%{opencv_version}/3rdparty/libtiff;$PWD/../../usr/include/freetype" \ --DCMAKE_LIBRARY_PATH="$PWD/../../usr/lib;$PWD/../../3rdparty/opencv/3rdparty/lib" \ --DCMAKE_CXX_FLAGS="-isystem $PWD/../../3rdparty/opencv/3rdparty/libtiff" \ --DLIBJPEG_LIBRARY_NAMES="jpeg,libjpeg" -fi +test -f Makefile \|\| %cmake ../../../3rdparty/podofo-%{podofo_version} \ + -DCMAKE_INSTALL_PREFIX:PATH=$PWD/../../usr \ + -DPODOFO_BUILD_LIB_ONLY:BOOL=true \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true \ + -DCMAKE_INCLUDE_PATH="$PWD/../../../3rdparty/opencv-%{opencv_version}/3rdparty/libjpeg;$PWD/../../../3rdparty/opencv-%{opencv_version}/3rdparty/libtiff;$PWD/../../usr/include/freetype" \ + -DCMAKE_LIBRARY_PATH="$PWD/../../usr/lib;$PWD/../../3rdparty/opencv/3rdparty/lib" \ + -DCMAKE_CXX_FLAGS="-isystem $PWD/../../3rdparty/opencv/3rdparty/libtiff" \ + -DLIBJPEG_LIBRARY_NAMES="jpeg,libjpeg" make %{?_smp_mflags} make install popd %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ --DCMAKE_PREFIX_PATH="$PWD/3rdparty/opencv;$PWD/usr" \ --DCMAKE_INCLUDE_PATH="$PWD/../3rdparty/opencv-%{opencv_version}/3rdparty/libjpeg;$PWD/../3rdparty/opencv-%{opencv_version}/3rdparty/libtiff;$PWD/usr/include" \ --DCMAKE_LIBRARY_PATH="$PWD/usr/lib;$PWD/3rdparty/opencv/3rdparty/lib" \ --DCMAKE_INSTALL_PREFIX=/usr .. + -DCMAKE_PREFIX_PATH="$PWD/3rdparty/opencv;$PWD/usr" \ + -DCMAKE_INCLUDE_PATH="$PWD/../3rdparty/opencv-%{opencv_version}/3rdparty/libjpeg;$PWD/../3rdparty/opencv-%{opencv_version}/3rdparty/libtiff;$PWD/usr/include" \ + -DCMAKE_LIBRARY_PATH="$PWD/usr/lib;$PWD/3rdparty/opencv/3rdparty/lib" \ + -DCMAKE_INSTALL_PREFIX=/usr .. make %{?_smp_mflags} popd
	Added	freetype-2.13.2.tar.gz ^
[-] [+]	Changed	harbour-fotokopierer-0.4.7.tar.gz/CMakeLists.txt ^
@@ -79,7 +79,7 @@ find_package(OpenSSL REQUIRED) find_package(Freetype REQUIRED) pkg_search_module(FONTCONFIG REQUIRED fontconfig) - set(PODOFO_LIBRARIES ${PODOFO_LIBRARIES} fontconfig OpenSSL::Crypto PNG::PNG ${JPEG_LIBRARIES} TIFF::TIFF Freetype::Freetype) + set(PODOFO_LIBRARIES ${PODOFO_LIBRARIES} ${FONTCONFIG_LIBRARIES} OpenSSL::Crypto PNG::PNG ${JPEG_LIBRARIES} TIFF::TIFF Freetype::Freetype) endif() find_package(Qt5 COMPONENTS Core Concurrent Gui Multimedia Quick)
[-] [+]	Changed	harbour-fotokopierer-0.4.7.tar.gz/rpm/harbour-fotokopierer.spec ^
@@ -1,7 +1,7 @@ -# +# # Do NOT Edit the Auto-generated Part! # Generated by: spectacle version 0.32 -# +# Name: harbour-fotokopierer @@ -10,7 +10,7 @@ Summary: Document Scanner Version: 0.4.7 -Release: 2%{?dist} +Release: 1%{?dist} Group: Qt/Qt License: GPLv3+ URL: https://chiselapp.com/user/fifr/repository/fotokopierer @@ -67,7 +67,6 @@ Help: https://chiselapp.com/user/fifr/repository/fotokopierer/forum Bugtracker: https://chiselapp.com/user/fifr/repository/fotokopierer/ticket - # >> macros2 %global opencv_version 3.4.16 %global podofo_version 0.9.8 @@ -158,8 +157,8 @@ -DPODOFO_BUILD_LIB_ONLY:BOOL=true \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true \ --DCMAKE_INCLUDE_PATH="%{_sourcedir}/../3rdparty/opencv-%{opencv_version}/3rdparty/libjpeg;%{_sourcedir}/../3rdparty/opencv-%{opencv_version}/3rdparty/libtiff;%{_sourcedir}/../3rdparty/freetype-%{freetype_version}/include/freetype" \ --DCMAKE_LIBRARY_PATH="%{_builddir}/rpmbuilddir-%{_arch}/3rdparty/freetype;%{_builddir}/rpmbuilddir-%{_arch}/3rdparty/opencv/3rdparty/lib" \ +-DCMAKE_INCLUDE_PATH="%{_sourcedir}/../3rdparty/opencv-%{opencv_version}/3rdparty/libjpeg;%{_sourcedir}/../3rdparty/opencv-%{opencv_version}/3rdparty/libtiff;%{_sourcedir}/../3rdparty/freetype-%{freetype_version}/include/freetype2" \ +-DCMAKE_LIBRARY_PATH="%{_builddir}/rpmbuilddir-%{_arch}/3rdparty/freetype/lib;%{_builddir}/rpmbuilddir-%{_arch}/3rdparty/opencv/3rdparty/lib" \ -DCMAKE_CXX_FLAGS="-isystem %{_builddir}/rpmbuilddir-%{_arch}/3rdparty/opencv/3rdparty/libtiff" \ -DLIBJPEG_LIBRARY_NAMES="jpeg,libjpeg"
[-] [+]	Changed	harbour-fotokopierer-0.4.7.tar.gz/rpm/harbour-fotokopierer.yaml ^
@@ -1,7 +1,7 @@ Name: harbour-fotokopierer Summary: Document Scanner Version: 0.4.7 -Release: 2%{?dist} +Release: 1%{?dist} # 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 @@ -18,6 +18,7 @@ Description: \| A camera-scanning application for Sailfish OS. + %if "%{?vendor}" == "chum" PackageName: Fotokopierer Type: desktop-application DeveloperName: Frank Fischer @@ -32,11 +33,11 @@ - https://chiselapp.com/user/fifr/repository/fotokopierer/uv/screenshot2.png - https://chiselapp.com/user/fifr/repository/fotokopierer/uv/screenshot3.png - https://chiselapp.com/user/fifr/repository/fotokopierer/uv/screenshot4.png - PackageIcon: https://chiselapp.com/user/fifr/repository/fotokopierer/uv/harbour-fotokopierer.svg Url: Homepage: https://chiselapp.com/user/fifr/repository/fotokopierer Help: https://chiselapp.com/user/fifr/repository/fotokopierer/forum Bugtracker: https://chiselapp.com/user/fifr/repository/fotokopierer/ticket + %endif Configure: none # Do not use automatic builder.
	Added	harbour-fotokopierer-0.4.8.tar.gz ^
[-] [+]	Changed	harbour-fotokopierer.yaml ^
@@ -1,7 +1,7 @@ Name: harbour-fotokopierer Summary: Document Scanner -Version: 0.4.7 -Release: 2%{?dist} +Version: 0.4.8 +Release: 1%{?dist} # 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