From 9320ac1a2e1d36a3101e333f2b41ffa108bbbdea Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 27 Apr 2016 15:40:40 +0200 Subject: [PATCH] Fix build for qt5 --- quazip-0.7.2-fix_static.patch | 26 ++++++++++++++++++++++++++ quazip.spec | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 quazip-0.7.2-fix_static.patch diff --git a/quazip-0.7.2-fix_static.patch b/quazip-0.7.2-fix_static.patch new file mode 100644 index 0000000..60ec615 --- /dev/null +++ b/quazip-0.7.2-fix_static.patch @@ -0,0 +1,26 @@ +diff -up quazip-0.7.2/quazip/CMakeLists.txt.orig quazip-0.7.2/quazip/CMakeLists.txt +--- quazip-0.7.2/quazip/CMakeLists.txt.orig 2016-01-03 07:01:40.000000000 +0100 ++++ quazip-0.7.2/quazip/CMakeLists.txt 2016-04-27 14:07:12.492586196 +0200 +@@ -15,17 +15,17 @@ qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) + set(SRCS ${SRCS} ${MOC_SRCS}) + + add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS}) +-add_library(quazip_static STATIC ${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}) ++ set_target_properties(${QUAZIP_LIB_TARGET_NAME} 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) ++set_target_properties(${QUAZIP_LIB_TARGET_NAME} 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_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}) ++install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) diff --git a/quazip.spec b/quazip.spec index 4499e89..92b94d1 100644 --- a/quazip.spec +++ b/quazip.spec @@ -5,6 +5,7 @@ Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: quazip-0.7.2-fix_static.patch BuildRequires: cmake BuildRequires: qt4-devel BuildRequires: qt5-qtbase-devel @@ -57,6 +58,7 @@ for developing applications that use %{name}. %prep %setup -q +%patch0 -p1 -b .orig %build mkdir build-qt4 @@ -110,6 +112,7 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog * Tue Apr 12 2016 Nicolas Chauvet - 0.7.2-1 - Update to 0.7.2 +- Add patch to fix build with qt5 (disable static version) * Thu Feb 04 2016 Fedora Release Engineering - 0.7.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild