rpm/doxygen
SHA256
1
0
Fork 0
forked from pool/doxygen
Code Pull Requests Activity

Accepting request 617747 from devel:tools

Browse Source 
- fix build with qt 5.11
  + doxywizard-qt-5.11.patch

OBS-URL: https://build.opensuse.org/request/show/617747
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=73
This commit is contained in:
Dominique Leuenberger 2018-07-04 21:48:01 +00:00 committed by Git OBS Bridge
commit 55154e9243
4 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doxygen.spec
View File

@ -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
@ -80,7 +80,7 @@ mkdir -p %{buildroot}%{_mandir}/man1/
install -m 644 doc/doxygen.1 %{buildroot}%{_mandir}/man1/
%files
%doc LICENSE
%license LICENSE
%attr(644,root,root) %{_mandir}/man1/doxygen.1%{?ext_man}
%attr(755,root,root) %{_bindir}/*

38
doxywizard-qt-5.11.patch Normal file
View File

@ -0,0 +1,38 @@
--- a/addon/doxywizard/CMakeLists.txt
+++ a/addon/doxywizard/CMakeLists.txt
@@ -4,9 +4,6 @@ if (NOT force_qt4)
if (Qt5Core_FOUND)
message(STATUS "Using Qt5")
find_package(Qt5 COMPONENTS Widgets Gui Xml)
- macro(qt_use_modules)
- qt5_use_modules(${ARGN})
- endmacro()
macro(qt_wrap_cpp)
qt5_wrap_cpp(${ARGN})
endmacro()
@@ -23,8 +20,6 @@ if (NOT Qt5Core_FOUND)
message(STATUS "Using Qt4")
endif()
find_package(Qt4 REQUIRED COMPONENTS QtCore QtXml QtGui)
- macro(qt_use_modules)
- endmacro()
macro(qt_wrap_cpp)
qt4_wrap_cpp(${ARGN})
endmacro()
@@ -104,9 +99,11 @@ ${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}
-)
+
+if(Qt5Core_FOUND)
+ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml)
+else()
+ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
+endif()
install(TARGETS doxywizard DESTINATION bin)

6
doxywizard.changes
View File

@ -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

4
doxywizard.spec
View File

@ -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"