From a1350961ab9a4bf2f9c5a328c721530cf187bb80 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Oct 08 2015 09:15:47 +0000 Subject: fix patch to apply (sorry) --- diff --git a/doxygen-1.8.10-drop-qt-arch-x86-64-definition.patch b/doxygen-1.8.10-drop-qt-arch-x86-64-definition.patch index 08a212f..5a92a14 100644 --- a/doxygen-1.8.10-drop-qt-arch-x86-64-definition.patch +++ b/doxygen-1.8.10-drop-qt-arch-x86-64-definition.patch @@ -17,19 +17,16 @@ Signed-off-by: Marcin Juszkiewicz addon/doxywizard/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt -index eb97388..9971679 100644 ---- a/addon/doxywizard/CMakeLists.txt -+++ b/addon/doxywizard/CMakeLists.txt -@@ -45,7 +45,7 @@ include_directories( +Index: doxygen-1.8.10/addon/doxywizard/CMakeLists.txt +=================================================================== +--- doxygen-1.8.10.orig/addon/doxywizard/CMakeLists.txt ++++ doxygen-1.8.10/addon/doxywizard/CMakeLists.txt +@@ -10,7 +10,7 @@ include_directories( set(GENERATED_SRC_WIZARD ${GENERATED_SRC}/doxywizard) file(MAKE_DIRECTORY ${GENERATED_SRC_WIZARD}) -add_definitions(-DQT_ARCH_X86_64 -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DUNICODE) +add_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DUNICODE) - if (NOT Qt5Core_FOUND) - include(${QT_USE_FILE}) - endif() --- -2.6.0 - + set(QT_USE_QTXML TRUE) + find_package(Qt4 REQUIRED) + include(${QT_USE_FILE}) diff --git a/doxygen.spec b/doxygen.spec index f05723f..df3419f 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -2,7 +2,7 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 1 Version: 1.8.10 -Release: 3%{?dist} +Release: 4%{?dist} # No version is specified. License: GPL+ @@ -119,6 +119,9 @@ desktop-file-install \ %changelog +* Thu Oct 08 2015 Marcin Juszkiewicz - 1:1.8.10-4 +- Fix patch to apply + * Thu Oct 08 2015 Marcin Juszkiewicz - 1:1.8.10-3 - drop QT_ARCH_X86_64 hardcoded definition to get doxygen built on aarch64 (it built by pure luck on other architectures)