Date: Tuesday, December 1, 2020 @ 17:46:19 Author: jlichtblau Revision: 767184
archrelease: copy trunk to community-x86_64 Added: qmapshack/repos/community-x86_64/FindPROJ4.patch (from rev 767183, qmapshack/trunk/FindPROJ4.patch) qmapshack/repos/community-x86_64/FindQuaZip5.patch (from rev 767183, qmapshack/trunk/FindQuaZip5.patch) qmapshack/repos/community-x86_64/PKGBUILD (from rev 767183, qmapshack/trunk/PKGBUILD) Deleted: qmapshack/repos/community-x86_64/FindPROJ4.patch qmapshack/repos/community-x86_64/FindQuaZip5.patch qmapshack/repos/community-x86_64/PKGBUILD qmapshack/repos/community-x86_64/qmapshack-qt5.15-compile.patch --------------------------------+ FindPROJ4.patch | 316 +++++++++++++++++++-------------------- FindQuaZip5.patch | 96 +++++------ PKGBUILD | 81 ++++----- qmapshack-qt5.15-compile.patch | 67 -------- 4 files changed, 245 insertions(+), 315 deletions(-) Deleted: FindPROJ4.patch =================================================================== --- FindPROJ4.patch 2020-12-01 17:45:48 UTC (rev 767183) +++ FindPROJ4.patch 2020-12-01 17:46:19 UTC (rev 767184) @@ -1,158 +0,0 @@ -Description: Add FindPROJ4.cmake. -Origin: https://salsa.debian.org/debian/openorienteering-mapper/raw/debian/0.8.4-1/cmake/FindPROJ4.cmake - ---- /dev/null -+++ b/cmake/Modules/FindPROJ4.cmake -@@ -0,0 +1,152 @@ -+#.rst: -+# FindPROJ4 -+# -------- -+# -+# Find the proj includes and library. -+# -+# IMPORTED Targets -+# ^^^^^^^^^^^^^^^^ -+# -+# This module defines :prop_tgt:`IMPORTED` target ``PROJ4::proj``, -+# if Proj.4 has been found. -+# -+# Result Variables -+# ^^^^^^^^^^^^^^^^ -+# -+# This module defines the following variables: -+# -+# :: -+# -+# PROJ4_INCLUDE_DIRS - where to find proj_api.h, etc. -+# PROJ4_LIBRARIES - List of libraries when using libproj. -+# PROJ4_FOUND - True if libproj found. -+# -+# :: -+# -+# PROJ4_VERSION - The version of libproj found (x.y.z) -+# PROJ4_VERSION_MAJOR - The major version of libproj -+# PROJ4_VERSION_MINOR - The minor version of libproj -+# PROJ4_VERSION_PATCH - The patch version of libproj -+# PROJ4_VERSION_TWEAK - always 0 -+# PROJ4_VERSION_COUNT - The number of version components, always 3 -+# -+# Hints -+# ^^^^^ -+# -+# A user may set ``PROJ4_ROOT`` to a libproj installation root to tell this -+# module where to look exclusively. -+ -+#============================================================================= -+# Copyright 2016 Kai Pastor -+# -+# -+# This file was derived from CMake 3.5's module FindZLIB.cmake -+# which has the following terms: -+# -+# Copyright 2001-2011 Kitware, Inc. -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions are -+# met: -+# -+# * Redistributions of source code must retain the above copyright notice, -+# this list of conditions and the following disclaimer. -+# -+# * Redistributions in binary form must reproduce the above copyright notice, -+# this list of conditions and the following disclaimer in the documentation -+# and/or other materials provided with the distribution. -+# -+# * The names of Kitware, Inc., the Insight Consortium, or the names of -+# any consortium members, or of any contributors, may not be used to -+# endorse or promote products derived from this software without -+# specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' -+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR -+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+#============================================================================= -+ -+# Search PROJ4_ROOT exclusively if it is set. -+if(PROJ4_ROOT) -+ set(_PROJ4_SEARCH PATHS ${PROJ4_ROOT} NO_DEFAULT_PATH) -+else() -+ set(_PROJ4_SEARCH) -+endif() -+ -+find_path(PROJ4_INCLUDE_DIR NAMES proj_api.h ${_PROJ4_SEARCH} PATH_SUFFIXES include) -+mark_as_advanced(PROJ4_INCLUDE_DIR) -+ -+if(PROJ4_INCLUDE_DIR AND EXISTS "${PROJ4_INCLUDE_DIR}/proj_api.h") -+ file(STRINGS "${PROJ4_INCLUDE_DIR}/proj_api.h" PROJ4_H REGEX "^#define PJ_VERSION [0-9]+$") -+ -+ string(REGEX REPLACE "^.*PJ_VERSION ([0-9]).*$" "\\1" PROJ4_VERSION_MAJOR "${PROJ4_H}") -+ string(REGEX REPLACE "^.*PJ_VERSION [0-9]([0-9]).*$" "\\1" PROJ4_VERSION_MINOR "${PROJ4_H}") -+ string(REGEX REPLACE "^.*PJ_VERSION [0-9][0-9]([0-9]).*$" "\\1" PROJ4_VERSION_PATCH "${PROJ4_H}") -+ set(PROJ4_VERSION "${PROJ4_VERSION_MAJOR}.${PROJ4_VERSION_MINOR}.${PROJ4_VERSION_PATCH}") -+ set(PROJ4_VERSION_COUNT 3) -+endif() -+ -+# Allow PROJ4_LIBRARY to be set manually, as the location of the proj library -+if(NOT PROJ4_LIBRARY) -+ set(PROJ4_NAMES proj) -+ set(PROJ4_NAMES_DEBUG projd) -+ if(WIN32 AND DEFINED PROJ4_VERSION_MAJOR AND DEFINED PROJ4_VERSION_MINOR) -+ list(APPEND PROJ4_NAMES proj_${PROJ4_VERSION_MAJOR}_${PROJ4_VERSION_MINOR}) -+ list(APPEND PROJ4_NAMES projd_${PROJ4_VERSION_MAJOR}_${PROJ4_VERSION_MINOR}) -+ endif() -+ find_library(PROJ4_LIBRARY_RELEASE NAMES ${PROJ4_NAMES} ${_PROJ4_SEARCH} PATH_SUFFIXES lib) -+ find_library(PROJ4_LIBRARY_DEBUG NAMES ${PROJ4_NAMES_DEBUG} ${_PROJ4_SEARCH} PATH_SUFFIXES lib) -+ include(SelectLibraryConfigurations) -+ select_library_configurations(PROJ4) -+endif() -+ -+# handle the QUIETLY and REQUIRED arguments and set PROJ4_FOUND to TRUE if -+# all listed variables are TRUE -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(PROJ4 -+ REQUIRED_VARS -+ PROJ4_LIBRARY -+ PROJ4_INCLUDE_DIR -+ VERSION_VAR -+ PROJ4_VERSION -+) -+ -+if(PROJ4_FOUND) -+ set(PROJ4_INCLUDE_DIRS ${PROJ4_INCLUDE_DIR}) -+ -+ if(NOT PROJ4_LIBRARIES) -+ set(PROJ4_LIBRARIES ${PROJ4_LIBRARY}) -+ endif() -+ -+ if(NOT TARGET PROJ4::proj) -+ add_library(PROJ4::proj UNKNOWN IMPORTED) -+ set_target_properties(PROJ4::proj PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES "${PROJ4_INCLUDE_DIRS}") -+ -+ if(PROJ4_LIBRARY_RELEASE) -+ set_property(TARGET PROJ4::proj APPEND PROPERTY -+ IMPORTED_CONFIGURATIONS RELEASE) -+ set_target_properties(PROJ4::proj PROPERTIES -+ IMPORTED_LOCATION_RELEASE "${PROJ4_LIBRARY_RELEASE}") -+ endif() -+ -+ if(PROJ4_LIBRARY_DEBUG) -+ set_property(TARGET PROJ4::proj APPEND PROPERTY -+ IMPORTED_CONFIGURATIONS DEBUG) -+ set_target_properties(PROJ4::proj PROPERTIES -+ IMPORTED_LOCATION_DEBUG "${PROJ4_LIBRARY_DEBUG}") -+ endif() -+ -+ if(NOT PROJ4_LIBRARY_RELEASE AND NOT PROJ4_LIBRARY_DEBUG) -+ set_property(TARGET PROJ4::proj APPEND PROPERTY -+ IMPORTED_LOCATION "${PROJ4_LIBRARY}") -+ endif() -+ endif() -+endif() Copied: qmapshack/repos/community-x86_64/FindPROJ4.patch (from rev 767183, qmapshack/trunk/FindPROJ4.patch) =================================================================== --- FindPROJ4.patch (rev 0) +++ FindPROJ4.patch 2020-12-01 17:46:19 UTC (rev 767184) @@ -0,0 +1,158 @@ +Description: Add FindPROJ4.cmake. +Origin: https://salsa.debian.org/debian/openorienteering-mapper/raw/debian/0.8.4-1/cmake/FindPROJ4.cmake + +--- /dev/null ++++ b/cmake/Modules/FindPROJ4.cmake +@@ -0,0 +1,152 @@ ++#.rst: ++# FindPROJ4 ++# -------- ++# ++# Find the proj includes and library. ++# ++# IMPORTED Targets ++# ^^^^^^^^^^^^^^^^ ++# ++# This module defines :prop_tgt:`IMPORTED` target ``PROJ4::proj``, ++# if Proj.4 has been found. ++# ++# Result Variables ++# ^^^^^^^^^^^^^^^^ ++# ++# This module defines the following variables: ++# ++# :: ++# ++# PROJ4_INCLUDE_DIRS - where to find proj_api.h, etc. ++# PROJ4_LIBRARIES - List of libraries when using libproj. ++# PROJ4_FOUND - True if libproj found. ++# ++# :: ++# ++# PROJ4_VERSION - The version of libproj found (x.y.z) ++# PROJ4_VERSION_MAJOR - The major version of libproj ++# PROJ4_VERSION_MINOR - The minor version of libproj ++# PROJ4_VERSION_PATCH - The patch version of libproj ++# PROJ4_VERSION_TWEAK - always 0 ++# PROJ4_VERSION_COUNT - The number of version components, always 3 ++# ++# Hints ++# ^^^^^ ++# ++# A user may set ``PROJ4_ROOT`` to a libproj installation root to tell this ++# module where to look exclusively. ++ ++#============================================================================= ++# Copyright 2016 Kai Pastor ++# ++# ++# This file was derived from CMake 3.5's module FindZLIB.cmake ++# which has the following terms: ++# ++# Copyright 2001-2011 Kitware, Inc. ++# ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions are ++# met: ++# ++# * Redistributions of source code must retain the above copyright notice, ++# this list of conditions and the following disclaimer. ++# ++# * Redistributions in binary form must reproduce the above copyright notice, ++# this list of conditions and the following disclaimer in the documentation ++# and/or other materials provided with the distribution. ++# ++# * The names of Kitware, Inc., the Insight Consortium, or the names of ++# any consortium members, or of any contributors, may not be used to ++# endorse or promote products derived from this software without ++# specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' ++# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ++# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++#============================================================================= ++ ++# Search PROJ4_ROOT exclusively if it is set. ++if(PROJ4_ROOT) ++ set(_PROJ4_SEARCH PATHS ${PROJ4_ROOT} NO_DEFAULT_PATH) ++else() ++ set(_PROJ4_SEARCH) ++endif() ++ ++find_path(PROJ4_INCLUDE_DIR NAMES proj_api.h ${_PROJ4_SEARCH} PATH_SUFFIXES include) ++mark_as_advanced(PROJ4_INCLUDE_DIR) ++ ++if(PROJ4_INCLUDE_DIR AND EXISTS "${PROJ4_INCLUDE_DIR}/proj_api.h") ++ file(STRINGS "${PROJ4_INCLUDE_DIR}/proj_api.h" PROJ4_H REGEX "^#define PJ_VERSION [0-9]+$") ++ ++ string(REGEX REPLACE "^.*PJ_VERSION ([0-9]).*$" "\\1" PROJ4_VERSION_MAJOR "${PROJ4_H}") ++ string(REGEX REPLACE "^.*PJ_VERSION [0-9]([0-9]).*$" "\\1" PROJ4_VERSION_MINOR "${PROJ4_H}") ++ string(REGEX REPLACE "^.*PJ_VERSION [0-9][0-9]([0-9]).*$" "\\1" PROJ4_VERSION_PATCH "${PROJ4_H}") ++ set(PROJ4_VERSION "${PROJ4_VERSION_MAJOR}.${PROJ4_VERSION_MINOR}.${PROJ4_VERSION_PATCH}") ++ set(PROJ4_VERSION_COUNT 3) ++endif() ++ ++# Allow PROJ4_LIBRARY to be set manually, as the location of the proj library ++if(NOT PROJ4_LIBRARY) ++ set(PROJ4_NAMES proj) ++ set(PROJ4_NAMES_DEBUG projd) ++ if(WIN32 AND DEFINED PROJ4_VERSION_MAJOR AND DEFINED PROJ4_VERSION_MINOR) ++ list(APPEND PROJ4_NAMES proj_${PROJ4_VERSION_MAJOR}_${PROJ4_VERSION_MINOR}) ++ list(APPEND PROJ4_NAMES projd_${PROJ4_VERSION_MAJOR}_${PROJ4_VERSION_MINOR}) ++ endif() ++ find_library(PROJ4_LIBRARY_RELEASE NAMES ${PROJ4_NAMES} ${_PROJ4_SEARCH} PATH_SUFFIXES lib) ++ find_library(PROJ4_LIBRARY_DEBUG NAMES ${PROJ4_NAMES_DEBUG} ${_PROJ4_SEARCH} PATH_SUFFIXES lib) ++ include(SelectLibraryConfigurations) ++ select_library_configurations(PROJ4) ++endif() ++ ++# handle the QUIETLY and REQUIRED arguments and set PROJ4_FOUND to TRUE if ++# all listed variables are TRUE ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(PROJ4 ++ REQUIRED_VARS ++ PROJ4_LIBRARY ++ PROJ4_INCLUDE_DIR ++ VERSION_VAR ++ PROJ4_VERSION ++) ++ ++if(PROJ4_FOUND) ++ set(PROJ4_INCLUDE_DIRS ${PROJ4_INCLUDE_DIR}) ++ ++ if(NOT PROJ4_LIBRARIES) ++ set(PROJ4_LIBRARIES ${PROJ4_LIBRARY}) ++ endif() ++ ++ if(NOT TARGET PROJ4::proj) ++ add_library(PROJ4::proj UNKNOWN IMPORTED) ++ set_target_properties(PROJ4::proj PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${PROJ4_INCLUDE_DIRS}") ++ ++ if(PROJ4_LIBRARY_RELEASE) ++ set_property(TARGET PROJ4::proj APPEND PROPERTY ++ IMPORTED_CONFIGURATIONS RELEASE) ++ set_target_properties(PROJ4::proj PROPERTIES ++ IMPORTED_LOCATION_RELEASE "${PROJ4_LIBRARY_RELEASE}") ++ endif() ++ ++ if(PROJ4_LIBRARY_DEBUG) ++ set_property(TARGET PROJ4::proj APPEND PROPERTY ++ IMPORTED_CONFIGURATIONS DEBUG) ++ set_target_properties(PROJ4::proj PROPERTIES ++ IMPORTED_LOCATION_DEBUG "${PROJ4_LIBRARY_DEBUG}") ++ endif() ++ ++ if(NOT PROJ4_LIBRARY_RELEASE AND NOT PROJ4_LIBRARY_DEBUG) ++ set_property(TARGET PROJ4::proj APPEND PROPERTY ++ IMPORTED_LOCATION "${PROJ4_LIBRARY}") ++ endif() ++ endif() ++endif() Deleted: FindQuaZip5.patch =================================================================== --- FindQuaZip5.patch 2020-12-01 17:45:48 UTC (rev 767183) +++ FindQuaZip5.patch 2020-12-01 17:46:19 UTC (rev 767184) @@ -1,48 +0,0 @@ -Description: Add FindQuaZip5.cmake. -Origin: https://raw.githubusercontent.com/nomacs/nomacs/3.12/ImageLounge/cmake/FindQuaZip5.cmake - ---- /dev/null -+++ b/cmake/Modules/FindQuaZip5.cmake -@@ -0,0 +1,42 @@ -+# QUAZIP_FOUND - QuaZip library was found -+# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir -+# QUAZIP_INCLUDE_DIRS - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR) -+# QUAZIP_LIBRARIES - List of QuaZip libraries -+# QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers -+ -+ -+IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) -+ # in cache already -+ SET(QUAZIP_FOUND TRUE) -+ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) -+ IF (Qt5Core_FOUND) -+ set(QUAZIP_LIB_VERSION_SUFFIX 5) -+ ENDIF() -+ IF (WIN32) -+ FIND_PATH(QUAZIP_LIBRARY_DIR -+ WIN32_DEBUG_POSTFIX d -+ NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll -+ HINTS "C:/Programme/" "C:/Program Files" -+ PATH_SUFFIXES QuaZip/lib -+ ) -+ FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR}) -+ FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip) -+ FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h) -+ ELSE(WIN32) -+ FIND_PACKAGE(PkgConfig) -+ pkg_check_modules(PC_QUAZIP quazip quazip1-qt5) -+ FIND_LIBRARY(QUAZIP_LIBRARIES -+ WIN32_DEBUG_POSTFIX d -+ NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5 -+ HINTS /usr/lib /usr/lib64 -+ ) -+ FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h -+ HINTS /usr/include /usr/local/include -+ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} QuaZip-Qt5-1.0/quazip -+ ) -+ FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) -+ ENDIF (WIN32) -+ INCLUDE(FindPackageHandleStandardArgs) -+ SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR}) -+ find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS) -+ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) Copied: qmapshack/repos/community-x86_64/FindQuaZip5.patch (from rev 767183, qmapshack/trunk/FindQuaZip5.patch) =================================================================== --- FindQuaZip5.patch (rev 0) +++ FindQuaZip5.patch 2020-12-01 17:46:19 UTC (rev 767184) @@ -0,0 +1,48 @@ +Description: Add FindQuaZip5.cmake. +Origin: https://raw.githubusercontent.com/nomacs/nomacs/3.12/ImageLounge/cmake/FindQuaZip5.cmake + +--- /dev/null ++++ b/cmake/Modules/FindQuaZip5.cmake +@@ -0,0 +1,42 @@ ++# QUAZIP_FOUND - QuaZip library was found ++# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir ++# QUAZIP_INCLUDE_DIRS - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR) ++# QUAZIP_LIBRARIES - List of QuaZip libraries ++# QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers ++ ++ ++IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) ++ # in cache already ++ SET(QUAZIP_FOUND TRUE) ++ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) ++ IF (Qt5Core_FOUND) ++ set(QUAZIP_LIB_VERSION_SUFFIX 5) ++ ENDIF() ++ IF (WIN32) ++ FIND_PATH(QUAZIP_LIBRARY_DIR ++ WIN32_DEBUG_POSTFIX d ++ NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll ++ HINTS "C:/Programme/" "C:/Program Files" ++ PATH_SUFFIXES QuaZip/lib ++ ) ++ FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR}) ++ FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip) ++ FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h) ++ ELSE(WIN32) ++ FIND_PACKAGE(PkgConfig) ++ pkg_check_modules(PC_QUAZIP quazip quazip1-qt5) ++ FIND_LIBRARY(QUAZIP_LIBRARIES ++ WIN32_DEBUG_POSTFIX d ++ NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5 ++ HINTS /usr/lib /usr/lib64 ++ ) ++ FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h ++ HINTS /usr/include /usr/local/include ++ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} QuaZip-Qt5-1.0/quazip QuaZip-Qt5-1.1/quazip ++ ) ++ FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) ++ ENDIF (WIN32) ++ INCLUDE(FindPackageHandleStandardArgs) ++ SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR}) ++ find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS) ++ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-12-01 17:45:48 UTC (rev 767183) +++ PKGBUILD 2020-12-01 17:46:19 UTC (rev 767184) @@ -1,42 +0,0 @@ -# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> -# Contributor: Sanpi <sanpi+...@homecomputing.fr> -# Contributor: Martin Brodbeck <mar...@brodbeck-online.de> - -pkgname=qmapshack -pkgver=1.15.0 -pkgrel=2 -pkgdesc='Plan your next outdoor trip' -arch=('x86_64') -url='https://github.com/Maproom/qmapshack/wiki' -license=('GPL3') -depends=('desktop-file-utils' 'gdal' 'hicolor-icon-theme' 'proj' 'qt5-webengine' - 'quazip' 'routino>=3.1' 'alglib' 'qt5-tools') -makedepends=('cmake' 'patch') -source=($pkgname-$pkgver.tar.gz::https://github.com/Maproom/$pkgname/archive/V_$pkgver.tar.gz - FindPROJ4.patch - FindQuaZip5.patch - qmapshack-qt5.15-compile.patch) -sha256sums=('a3a470657a66a21a59e812dd6f9351845ce3300c00c25622dcb4a3818ed884f2' - '1ffb847b098fedf01e347971da33c58b3fbf1a0f27205d48f6eb52206e228046' - '81f9c65f284875005b128674c31fac411b19ee6d5afd0f7f5266f2b6e834b249' - 'd4ecc3a27b35308511ddbe56d71a4d63289310e5f58f5152fba156259b08fdd9') - -prepare() { - cd "$pkgname-V_$pkgver" - patch -Np1 -i "${srcdir}"/FindPROJ4.patch - patch -Np1 -i "${srcdir}"/FindQuaZip5.patch - patch -Np1 -i "${srcdir}"/qmapshack-qt5.15-compile.patch -} - -build() { - cd "$pkgname-V_$pkgver" - - cmake ./ -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "$pkgname-V_$pkgver" - - make DESTDIR="${pkgdir}" install -} Copied: qmapshack/repos/community-x86_64/PKGBUILD (from rev 767183, qmapshack/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-12-01 17:46:19 UTC (rev 767184) @@ -0,0 +1,39 @@ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: Sanpi <sanpi+...@homecomputing.fr> +# Contributor: Martin Brodbeck <mar...@brodbeck-online.de> + +pkgname=qmapshack +pkgver=1.15.1 +pkgrel=1 +pkgdesc='Plan your next outdoor trip' +arch=('x86_64') +url='https://github.com/Maproom/qmapshack/wiki' +license=('GPL3') +depends=('desktop-file-utils' 'gdal' 'hicolor-icon-theme' 'proj' 'qt5-webengine' + 'quazip' 'routino>=3.1' 'alglib' 'qt5-tools') +makedepends=('cmake' 'patch') +source=($pkgname-$pkgver.tar.gz::https://github.com/Maproom/$pkgname/archive/V_$pkgver.tar.gz + FindPROJ4.patch + FindQuaZip5.patch) +sha256sums=('91cc5cbb2fe74af424fd9dda143b126443566ebbb3c739e7dc2e154c89995187' + '1ffb847b098fedf01e347971da33c58b3fbf1a0f27205d48f6eb52206e228046' + 'be1bd07c47c15fedbadf932b4a0611aa34f61dfd693ec3c18bc5f73e607e5232') + +prepare() { + cd "$pkgname-V_$pkgver" + patch -Np1 -i "${srcdir}"/FindPROJ4.patch + patch -Np1 -i "${srcdir}"/FindQuaZip5.patch +} + +build() { + cd "$pkgname-V_$pkgver" + + cmake ./ -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$pkgname-V_$pkgver" + + make DESTDIR="${pkgdir}" install +} Deleted: qmapshack-qt5.15-compile.patch =================================================================== --- qmapshack-qt5.15-compile.patch 2020-12-01 17:45:48 UTC (rev 767183) +++ qmapshack-qt5.15-compile.patch 2020-12-01 17:46:19 UTC (rev 767184) @@ -1,67 +0,0 @@ -diff -ruN qmapshack-V_1.15.0-orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp ---- qmapshack-V_1.15.0-orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp 2020-06-14 12:22:49.000000000 +0200 -+++ qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp 2020-07-10 17:05:41.238391674 +0200 -@@ -38,6 +38,7 @@ - - #include <QtWidgets> - #include <QtXml> -+#include <QPainterPath> - - IGisItem::key_t CGisItemWpt::keyUserFocus; - QMap<searchProperty_e, CGisItemWpt::fSearch> CGisItemWpt::keywordLambdaMap; -diff -ruN qmapshack-V_1.15.0-orig/src/qmapshack/helpers/CDraw.cpp qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp ---- qmapshack-V_1.15.0-orig/src/qmapshack/helpers/CDraw.cpp 2020-06-14 12:22:49.000000000 +0200 -+++ qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp 2020-07-10 17:06:06.955057192 +0200 -@@ -24,6 +24,7 @@ - #include <QImage> - #include <QPointF> - #include <QtMath> -+#include <QPainterPath> - - QPen CDraw::penBorderBlue(QColor(10, 10, 150, 220), 2); - QPen CDraw::penBorderGray(Qt::lightGray, 2); -diff -ruN qmapshack-V_1.15.0-orig/src/qmapshack/map/CMapIMG.cpp qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp ---- qmapshack-V_1.15.0-orig/src/qmapshack/map/CMapIMG.cpp 2020-06-14 12:22:49.000000000 +0200 -+++ qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp 2020-07-10 17:06:37.215055842 +0200 -@@ -33,6 +33,7 @@ - #include "units/IUnit.h" - - #include <QtWidgets> -+#include <QPainterPath> - - #undef DEBUG_SHOW_SECT_DESC - #undef DEBUG_SHOW_TRE_DATA -diff -ruN qmapshack-V_1.15.0-orig/src/qmapshack/mouse/IMouseSelect.cpp qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp ---- qmapshack-V_1.15.0-orig/src/qmapshack/mouse/IMouseSelect.cpp 2020-06-14 12:22:49.000000000 +0200 -+++ qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp 2020-07-10 17:07:03.928387982 +0200 -@@ -23,6 +23,7 @@ - #include "mouse/IScrOpt.h" - - #include <QtWidgets> -+#include <QPainterPath> - - IMouseSelect::IMouseSelect(CGisDraw *gis, CCanvas *canvas, CMouseAdapter *mouse) - : IMouse(gis, canvas, mouse) -diff -ruN qmapshack-V_1.15.0-orig/src/qmaptool/helpers/CDraw.cpp qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp ---- qmapshack-V_1.15.0-orig/src/qmaptool/helpers/CDraw.cpp 2020-06-14 12:22:49.000000000 +0200 -+++ qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp 2020-07-10 17:07:57.688385582 +0200 -@@ -24,6 +24,7 @@ - #include <QImage> - #include <QPointF> - #include <QtMath> -+#include <QPainterPath> - - QPen CDraw::penBorderBlue(QColor(10,10,150,220),2); - QPen CDraw::penBorderGray(Qt::lightGray,2); -diff -ruN qmapshack-V_1.15.0-orig/src/qmaptool/overlay/COverlayCutMap.cpp qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp ---- qmapshack-V_1.15.0-orig/src/qmaptool/overlay/COverlayCutMap.cpp 2020-06-14 12:22:49.000000000 +0200 -+++ qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp 2020-07-10 17:08:27.798384237 +0200 -@@ -24,6 +24,8 @@ - - #include <functional> - #include <QtWidgets> -+#include <QPainterPath> -+ - using std::bind; - - static inline qreal sqr(qreal a)