diff --git a/doxygen.spec b/doxygen.spec index 2160d08..e80f938 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -21,7 +21,7 @@ Version: 1.8.14 Release: 0 Summary: Automated C, C++, and Java Documentation Generator # qtools are used for building and they are GPL-3.0 licensed -License: GPL-2.0+ AND GPL-3.0 +License: GPL-2.0-or-later AND GPL-3.0-only Group: Development/Tools/Doc Generators Url: http://www.stack.nl/~dimitri/doxygen/ Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz diff --git a/doxywizard-qt-5.11.patch b/doxywizard-qt-5.11.patch new file mode 100644 index 0000000..a2a8eb8 --- /dev/null +++ b/doxywizard-qt-5.11.patch @@ -0,0 +1,15 @@ +Index: doxygen-1.8.14/addon/doxywizard/CMakeLists.txt +=================================================================== +--- doxygen-1.8.14.orig/addon/doxywizard/CMakeLists.txt ++++ doxygen-1.8.14/addon/doxywizard/CMakeLists.txt +@@ -104,9 +104,8 @@ ${GENERATED_SRC_WIZARD}/configdoc.cpp + ${doxywizard_MOC} + ${doxywizard_RESOURCES_RCC} + ) +-qt_use_modules(doxywizard Core Gui Widgets Xml) + target_link_libraries(doxywizard +-${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ++ Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml + ) + + install(TARGETS doxywizard DESTINATION bin) diff --git a/doxywizard.changes b/doxywizard.changes index 47684f4..8797e4a 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 19 09:51:37 UTC 2018 - pgajdos@suse.com + +- fix build with qt 5.11 + + doxywizard-qt-5.11.patch + ------------------------------------------------------------------- Fri Jan 5 12:23:15 UTC 2018 - dimstar@opensuse.org diff --git a/doxywizard.spec b/doxywizard.spec index a1588d3..3a7ef8a 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -21,13 +21,14 @@ Version: 1.8.14 Release: 0 Summary: Graphical User Interface for Doxygen # qtools are used for building and they are GPL-3.0 licensed -License: GPL-2.0+ AND GPL-3.0 +License: GPL-2.0-or-later AND GPL-3.0-only Group: Development/Tools/Doc Generators Url: http://www.stack.nl/~dimitri/doxygen/ Source: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz Source1: doxywizard.desktop # PATCH-FIX-UPSTREAM: add missing returns to non-void functions Patch3: vhdlparser-no-return.patch +Patch4: doxywizard-qt-5.11.patch BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: flex @@ -54,6 +55,7 @@ configuration files. %prep %setup -q -n doxygen-%{version} %patch3 -p1 +%patch4 -p1 %build export CFLAGS="%{optflags} -fPIC"