diff options
| -rw-r--r-- | archivers/quazip-qt5/Makefile | 4 | ||||
| -rw-r--r-- | archivers/quazip-qt5/distinfo | 5 | ||||
| -rw-r--r-- | archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version | 106 | ||||
| -rw-r--r-- | archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt | 27 | ||||
| -rw-r--r-- | archivers/quazip-qt5/pkg-plist | 1 |
5 files changed, 33 insertions, 110 deletions
diff --git a/archivers/quazip-qt5/Makefile b/archivers/quazip-qt5/Makefile index f8fc04e09049..19fa7843fb06 100644 --- a/archivers/quazip-qt5/Makefile +++ b/archivers/quazip-qt5/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= quazip -PORTVERSION= 0.7.1 +PORTVERSION= 0.7.2 CATEGORIES= archivers MASTER_SITES= SF PKGNAMESUFFIX= -qt5 @@ -12,7 +12,7 @@ COMMENT= Qt/C++ wrapper for ZIP/UNZIP package LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake +USES= cmake:outsource USE_LDCONFIG= yes USE_QT5= core buildtools_build qmake_build diff --git a/archivers/quazip-qt5/distinfo b/archivers/quazip-qt5/distinfo index 3c261ec568b7..4edd127359c0 100644 --- a/archivers/quazip-qt5/distinfo +++ b/archivers/quazip-qt5/distinfo @@ -1,2 +1,3 @@ -SHA256 (quazip-0.7.1.tar.gz) = 78c984103555c51e6f7ef52e3a2128e2beb9896871b2cc4d4dbd4d64bff132de -SIZE (quazip-0.7.1.tar.gz) = 390629 +TIMESTAMP = 1472674423 +SHA256 (quazip-0.7.2.tar.gz) = 91d827fbcafd099ae814cc18a8dd3bb709da6b8a27c918ee1c6c03b3f29440f4 +SIZE (quazip-0.7.2.tar.gz) = 466915 diff --git a/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version b/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version deleted file mode 100644 index 5e034c3c458b..000000000000 --- a/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version +++ /dev/null @@ -1,106 +0,0 @@ -This patch contains several upstream commits that will be part of the 0.7.2 -release that allow the port to be installed together with archivers/quazip (the -Qt4 version). It works by adding a "5" suffix to the files installed by the Qt5 -version of the port. - ------------------------------------------------------------------------- -r252 | alqualos | 2015-01-29 19:04:27 +0100 (Thu, 29 Jan 2015) | 1 line - -Link to correct Qt library (patch #23) ------------------------------------------------------------------------- -r254 | alqualos | 2015-01-29 19:18:07 +0100 (Thu, 29 Jan 2015) | 1 line - -Make quazip coinstallable for Qt5 and Qt4 (patch #22) ------------------------------------------------------------------------- -r255 | alqualos | 2015-01-29 19:22:35 +0100 (Thu, 29 Jan 2015) | 1 line - -Fix conflict between patches #23 and #22 ------------------------------------------------------------------------- -r257 | alqualos | 2015-02-06 16:45:25 +0100 (Fri, 06 Feb 2015) | 1 line - -Patch #25 (Make devel packages coinstallable too) ------------------------------------------------------------------------- - -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt.orig 2013-11-18 17:37:54 UTC -+++ CMakeLists.txt -@@ -10,10 +10,11 @@ endif() - - if (Qt5Core_FOUND) - set(QTCORE_LIBRARIES ${Qt5Core_LIBRARIES}) -+ set(QUAZIP_LIB_VERSION_SUFFIX 5) - # if there is no QT_ROOT, try to deduce it from Qt QtCore include - if ("${QT_ROOT}" STREQUAL "") - set(QT_ROOT ${QT_QTCORE_INCLUDE_DIR}/../..) -- endif() -+ endif() - include_directories(${Qt5Core_INCLUDE_DIRS}) - - macro(qt_wrap_cpp) -@@ -48,7 +49,9 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_D - - set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") - set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE) -+set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE -+ INTERNAL "Target name of libquazip" FORCE) - - add_subdirectory(quazip) - --install(FILES FindQuaZip.cmake DESTINATION ${CMAKE_ROOT}/Modules) -+install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules) ---- FindQuaZip.cmake.orig 2012-02-26 06:46:10 UTC -+++ FindQuaZip.cmake -@@ -9,14 +9,17 @@ IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRA - # 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.dll -+ NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll - HINTS "C:/Programme/" "C:/Program Files" - PATH_SUFFIXES QuaZip/lib - ) -- FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip.dll HINTS ${QUAZIP_LIBRARY_DIR}) -+ 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) -@@ -25,12 +28,12 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIB - pkg_check_modules(PC_QUAZIP quazip) - FIND_LIBRARY(QUAZIP_LIBRARIES - WIN32_DEBUG_POSTFIX d -- NAMES quazip -+ NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} - HINTS /usr/lib /usr/lib64 - ) - FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h - HINTS /usr/include /usr/local/include -- PATH_SUFFIXES quazip -+ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} - ) - FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) - ENDIF (WIN32) ---- quazip/CMakeLists.txt.orig 2013-08-10 16:00:00 UTC -+++ quazip/CMakeLists.txt -@@ -14,10 +14,10 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD) - qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) - set(SRCS ${SRCS} ${MOC_SRCS}) - --add_library(quazip SHARED ${SRCS}) --set_target_properties(quazip PROPERTIES VERSION 1.0.0 SOVERSION 1) -+add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS}) -+set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 1) - # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) --target_link_libraries(quazip ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES}) -+target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) - --install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip) --install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) -+install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) -+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) diff --git a/archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt b/archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt new file mode 100644 index 000000000000..91ba3552806c --- /dev/null +++ b/archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt @@ -0,0 +1,27 @@ +Properly link quazip_static against its dependencies + +From the looks of r256, it appears that the target_link_libraries() call in +quazip/CMakeLists.txt was modified with the intention of linking both +${QUAZIP_LIB_TARGET_NAME} and quazip_static against all required libraries. +However, target_link_libraries()'s syntax is such that the first argument is +the library that all other arguments will be linked against. In other words, +libquazip(5).so will link against quazip_static, which is not what is desired. + +Creator: Raphael Kubo da Costa + +https://sourceforge.net/p/quazip/patches/28/ + +Index: quazip/CMakeLists.txt +=================================================================== +--- quazip/CMakeLists.txt.orig 2016-01-03 06:01:40 UTC ++++ quazip/CMakeLists.txt +@@ -25,7 +25,8 @@ endif () + + set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION 1.0.0 SOVERSION 1 DEBUG_POSTFIX d) + # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) +-target_link_libraries(${QUAZIP_LIB_TARGET_NAME} quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) ++target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) ++target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) + + install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) + install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) diff --git a/archivers/quazip-qt5/pkg-plist b/archivers/quazip-qt5/pkg-plist index 25566ff772fb..aef91994d94c 100644 --- a/archivers/quazip-qt5/pkg-plist +++ b/archivers/quazip-qt5/pkg-plist @@ -14,6 +14,7 @@ include/quazip5/quazipfileinfo.h include/quazip5/quazipnewinfo.h include/quazip5/unzip.h include/quazip5/zip.h +lib/libquazip5.a lib/libquazip5.so lib/libquazip5.so.1 lib/libquazip5.so.1.0.0 |