Date: Sat, 17 Sep 2016 09:21:43 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422303 - in head/archivers/quazip-qt5: . files Message-ID: <201609170921.u8H9Lh1H089749@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat Sep 17 09:21:42 2016 New Revision: 422303 URL: https://svnweb.freebsd.org/changeset/ports/422303 Log: Update archivers/quazip and archivers/quazip-qt5 to 0.7.2 * archivers/quazip Regenerate the qztest.pro patch for archivers/quazip * archivers/quazip-qt5 Drop the coinstallability patch as it is now part of the release Add upstreamed patch by rakuco@ to fix linking Reviewed by: rakuco Approved by: rakuco (mentor) Differential Revision: https://reviews.freebsd.org/D7726 Added: head/archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt (contents, props changed) Deleted: head/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version Modified: head/archivers/quazip-qt5/Makefile head/archivers/quazip-qt5/distinfo head/archivers/quazip-qt5/pkg-plist Modified: head/archivers/quazip-qt5/Makefile ============================================================================== --- head/archivers/quazip-qt5/Makefile Sat Sep 17 09:20:17 2016 (r422302) +++ head/archivers/quazip-qt5/Makefile Sat Sep 17 09:21:42 2016 (r422303) @@ -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 pa LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake +USES= cmake:outsource USE_LDCONFIG= yes USE_QT5= core buildtools_build qmake_build Modified: head/archivers/quazip-qt5/distinfo ============================================================================== --- head/archivers/quazip-qt5/distinfo Sat Sep 17 09:20:17 2016 (r422302) +++ head/archivers/quazip-qt5/distinfo Sat Sep 17 09:21:42 2016 (r422303) @@ -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 Added: head/archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt Sat Sep 17 09:21:42 2016 (r422303) @@ -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}) Modified: head/archivers/quazip-qt5/pkg-plist ============================================================================== --- head/archivers/quazip-qt5/pkg-plist Sat Sep 17 09:20:17 2016 (r422302) +++ head/archivers/quazip-qt5/pkg-plist Sat Sep 17 09:21:42 2016 (r422303) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609170921.u8H9Lh1H089749>