From 0a1b36375192281dd7833695a93b9bd6caaa97fe Mon Sep 17 00:00:00 2001 From: rsadowski Date: Mon, 29 Aug 2022 13:32:54 +0000 Subject: [PATCH] Unbreak with archivers/quazip 1.3 ok sdk@ --- geo/qmapshack/Makefile | 7 ++--- geo/qmapshack/patches/patch-CMakeLists_txt | 21 +++++---------- .../patch-src_qmapshack_CMakeLists_txt | 20 -------------- graphics/nomacs/Makefile | 9 ++++--- .../nomacs/patches/patch-cmake_Unix_cmake | 26 +++++++++++++++++++ 5 files changed, 43 insertions(+), 40 deletions(-) delete mode 100644 geo/qmapshack/patches/patch-src_qmapshack_CMakeLists_txt create mode 100644 graphics/nomacs/patches/patch-cmake_Unix_cmake diff --git a/geo/qmapshack/Makefile b/geo/qmapshack/Makefile index b9a6942b48c..51402a2134c 100644 --- a/geo/qmapshack/Makefile +++ b/geo/qmapshack/Makefile @@ -5,7 +5,7 @@ COMMENT = map management tool GH_ACCOUNT = Maproom GH_PROJECT = qmapshack GH_TAGNAME = V_1.16.0 -REVISION = 0 +REVISION = 1 CATEGORIES = geo @@ -17,13 +17,14 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Help WANTLIB += Qt5Network Qt5Positioning Qt5PrintSupport Qt5Qml Qt5QmlModels WANTLIB += Qt5Quick Qt5Sql Qt5WebChannel Qt5WebEngineCore Qt5WebEngineWidgets -WANTLIB += Qt5Widgets Qt5Xml c gdal jpeg m proj quazip5 routino +WANTLIB += Qt5Widgets Qt5Xml c gdal jpeg m proj quazip1-qt5 routino +WANTLIB += z MODULES = devel/cmake x11/qt5 RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic -LIB_DEPENDS = archivers/quazip \ +LIB_DEPENDS = archivers/quazip>=1.3 \ devel/proj \ geo/gdal,-main \ geo/routino \ diff --git a/geo/qmapshack/patches/patch-CMakeLists_txt b/geo/qmapshack/patches/patch-CMakeLists_txt index 7c283d08614..f2f445814b5 100644 --- a/geo/qmapshack/patches/patch-CMakeLists_txt +++ b/geo/qmapshack/patches/patch-CMakeLists_txt @@ -1,21 +1,14 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -154,16 +154,12 @@ find_package(GDAL REQUIRED) - find_package(PROJ REQUIRED) - find_package(JPEG REQUIRED) - find_package(ROUTINO REQUIRED) --find_package(QuaZip-Qt5 REQUIRED) -+find_package(QuaZip5 REQUIRED) - find_package(ALGLIB ) # optional as we can use our local version - - - if(${Qt5Widgets_VERSION} VERSION_LESS 5.8.0) +@@ -162,10 +162,6 @@ if(${Qt5Widgets_VERSION} VERSION_LESS 5.8.0) message( SEND_ERROR "You need at least Qt5.8 or newer.") --endif() -- --if(${PROJ_VERSION} VERSION_LESS 7.2.1) -- message( SEND_ERROR "You need at least PROJ 7.2.1 or newer.") endif() +-if(${PROJ_VERSION} VERSION_LESS 7.2.1) +- message( SEND_ERROR "You need at least PROJ 7.2.1 or newer.") +-endif() +- if(USE_QT5DBus) + find_package(Qt5DBus REQUIRED) + if(Qt5DBus_FOUND) diff --git a/geo/qmapshack/patches/patch-src_qmapshack_CMakeLists_txt b/geo/qmapshack/patches/patch-src_qmapshack_CMakeLists_txt deleted file mode 100644 index 1b9c3a1ece8..00000000000 --- a/geo/qmapshack/patches/patch-src_qmapshack_CMakeLists_txt +++ /dev/null @@ -1,20 +0,0 @@ -Index: src/qmapshack/CMakeLists.txt ---- src/qmapshack/CMakeLists.txt.orig -+++ src/qmapshack/CMakeLists.txt -@@ -927,6 +927,7 @@ include_directories( - ${PROJ_INCLUDE_DIRS} - ${ROUTINO_INCLUDE_DIRS} - ${ALGLIB_INCLUDE_DIRS} -+ ${QUAZIP_INCLUDE_DIR} - ) - - if(APPLE) -@@ -974,7 +975,7 @@ target_link_libraries(${APPLICATION_NAME} - ${PROJ_LIBRARIES} - ${ROUTINO_LIBRARIES} - ${ALGLIB_LIBRARIES} -- QuaZip::QuaZip -+ ${QUAZIP_LIBRARIES} - ) - - if(APPLE) diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile index 75e250e0678..d9573b39a1b 100644 --- a/graphics/nomacs/Makefile +++ b/graphics/nomacs/Makefile @@ -3,6 +3,7 @@ COMMENT = small and fast Qt image viewer GH_ACCOUNT = nomacs GH_PROJECT = nomacs GH_TAGNAME = 3.17.2206 +REVISION = 0 CATEGORIES = graphics @@ -17,7 +18,7 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5Gui Qt5Network WANTLIB += Qt5PrintSupport Qt5Svg Qt5Widgets c exiv2 lcms2 m opencv_core -WANTLIB += opencv_imgproc quazip5 raw tiff +WANTLIB += opencv_imgproc quazip1-qt5 raw tiff z MODULES = devel/cmake \ x11/qt5 \ @@ -26,7 +27,7 @@ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic \ x11/qt5/qtimageformats -LIB_DEPENDS = archivers/quazip \ +LIB_DEPENDS = archivers/quazip>=1.3 \ graphics/exiv2 \ graphics/lcms2 \ graphics/libraw \ @@ -42,8 +43,10 @@ WRKDIST = ${WRKDIR}/${PKGNAME}/ImageLounge NO_TEST = Yes +CXXFLAGS += -I${LOCALBASE}/include/QuaZip-Qt5/ + pre-configure: find ${WRKSRC} -type f -name "*.cpp" -exec sed -i \ - 's,,,' {} \; + 's,,,' {} \; .include diff --git a/graphics/nomacs/patches/patch-cmake_Unix_cmake b/graphics/nomacs/patches/patch-cmake_Unix_cmake new file mode 100644 index 00000000000..8f625e4578c --- /dev/null +++ b/graphics/nomacs/patches/patch-cmake_Unix_cmake @@ -0,0 +1,26 @@ +Index: cmake/Unix.cmake +--- cmake/Unix.cmake.orig ++++ cmake/Unix.cmake +@@ -94,7 +94,6 @@ unset(QUAZIP_LIBS CACHE) + unset(QUAZIP_BUILD_DIRECTORY CACHE) + unset(QUAZIP_DEPENDENCY CACHE) + unset(QUAZIP_FOUND CACHE) +-unset(QUAZIP_LIBRARIES CACHE) + + unset(QUAZIP_HEADERS CACHE) + unset(QUAZIP_SOURCES CACHE) +@@ -104,11 +103,12 @@ if(ENABLE_QUAZIP) + if(USE_SYSTEM_QUAZIP) + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + +- find_package(QuaZip5 QUIET) +- if(NOT QUAZIP_FOUND) ++ find_package(QuaZip-Qt5 QUIET) ++ if(NOT QuaZip-Qt5_FOUND) + message(FATAL_ERROR "QUAZIP not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP") + else() + add_definitions(-DWITH_QUAZIP) ++ set(QUAZIP_LIBRARIES "QuaZip::QuaZip") + endif() + else() + find_package(ZLIB REQUIRED)