SHA256
1
0
forked from pool/doxygen

- remove upstreamed doxywizard-qt-5.11.patch

OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=137
This commit is contained in:
Petr Gajdos 2019-01-11 08:13:45 +00:00 committed by Git OBS Bridge
parent 71c7b8e3c4
commit 27abbe9ba3
3 changed files with 5 additions and 40 deletions

View File

@ -1,38 +0,0 @@
--- 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)

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 11 08:13:11 UTC 2019 - Petr Gajdos <pgajdos@suse.com>
- remove upstreamed doxywizard-qt-5.11.patch
-------------------------------------------------------------------
Mon Dec 31 08:47:21 UTC 2018 - Petr Gajdos <pgajdos@suse.com>

View File

@ -28,7 +28,6 @@ Source: http://doxygen.nl/files/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
@ -55,7 +54,6 @@ configuration files.
%prep
%setup -q -n doxygen-%{version}
%patch3 -p1
%patch4 -p1
%build
export CFLAGS="%{optflags} -fPIC"