This is an automated email from the git hooks/post-receive script. justin-time-guest pushed a commit to branch master in repository libquazip.
commit a73f424e3278613b951e4991661d8f53e5cb1a80 Author: Stefan Ahlers <[email protected]> Date: Sun Jan 3 22:56:05 2016 +0100 Add a patch for the CMakeList.txt files and remove obsolete patches This commit adds a patch to backport the changes of the CMakeList.txt files from upstream to fix coinstallation issues. It also removes all obsolete patches, which were releated to the qmake buildsystem. --- debian/patches/cmake-fix.patch | 65 ++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 7 +++-- 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/debian/patches/cmake-fix.patch b/debian/patches/cmake-fix.patch new file mode 100644 index 0000000..1850060 --- /dev/null +++ b/debian/patches/cmake-fix.patch @@ -0,0 +1,65 @@ +Author: Stefan Ahlers <[email protected]> +Description: Backport unreleased upstream changes of the CMakeLists.txt files +Last-Update: 2016-01-03 +Origin: upstream, http://sourceforge.net/p/quazip/code/ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,10 +10,11 @@ + + 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) +@@ -33,7 +34,7 @@ + endif() + + # Use system zlib on unix and Qt ZLIB on Windows +-IF(UNIX) ++IF(UNIX OR MINGW) + find_package(ZLIB REQUIRED) + ELSE(UNIX) + SET(ZLIB_INCLUDE_DIRS "${QT_ROOT}/src/3rdparty/zlib" CACHE STRING "Path to ZLIB headers of Qt") +@@ -48,7 +49,9 @@ + + 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) +--- a/quazip/CMakeLists.txt ++++ b/quazip/CMakeLists.txt +@@ -14,10 +14,18 @@ + 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}) ++add_library(quazip_static STATIC ${SRCS}) ++ ++# Windows uses .lib extension for both static and shared library ++# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name ++if (NOT WIN32) ++ set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX}) ++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 ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES}) ++target_link_libraries(${QUAZIP_LIB_TARGET_NAME} quazip_static ${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} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) diff --git a/debian/patches/series b/debian/patches/series index b535ee8..d293241 100755 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,8 @@ #no-test-build.patch -qztest-link-to-qt5.patch +#qztest-link-to-qt5.patch #multiarch_version.patch -quazip-qt5-target-name.patch +#quazip-qt5-target-name.patch logo-breach.patch -change_suffix.patch +#change_suffix.patch +cmake-fix.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libquazip.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
