cpet
/
openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak with archivers/quazip 1.3 

ok sdk@
This commit is contained in:
rsadowski 2022-08-29 13:32:54 +00:00
parent 66040956b4
commit 0a1b363751
5 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
geo/qmapshack/Makefile
View File

@ -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 \

21
geo/qmapshack/patches/patch-CMakeLists_txt
View File

@ -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)

20
geo/qmapshack/patches/patch-src_qmapshack_CMakeLists_txt
View File

@ -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)

9
graphics/nomacs/Makefile
View File

@ -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,<quazip/JlCompress.h>,<quazip5/JlCompress.h>,' {} \;
's,<quazip5/JlCompress.h>,<quazip/JlCompress.h>,' {} \;
.include <bsd.port.mk>

26
graphics/nomacs/patches/patch-cmake_Unix_cmake Normal file
View File

@ -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)