[packages/doxygen] Revert "up to 1.8.18" (incompatible with ancient texlive)
atler
atler at pld-linux.org
Fri May 1 17:57:25 CEST 2020
commit 42d9878c6bd31df083506826217ce9ac2f278edc
Author: Jan Palus <atler at pld-linux.org>
Date: Fri May 1 17:54:28 2020 +0200
Revert "up to 1.8.18" (incompatible with ancient texlive)
This reverts commit 30f44f026d9ec9668564313f64a53be77d9e0722.
doxygen-manual_pdf.patch | 14 --------------
doxygen-qt-dirs.patch | 30 ++++++++++++++++++++++++++++++
doxygen.spec | 45 +++++++++++++++++++++++++++++----------------
3 files changed, 59 insertions(+), 30 deletions(-)
---
diff --git a/doxygen.spec b/doxygen.spec
index a99fb5a..97cc865 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -9,28 +9,26 @@ Summary(pt_BR.UTF-8): Um sistema de documentação para C/C++
Summary(ru.UTF-8): Система документирования для C та C++
Summary(uk.UTF-8): Система документування для C та C++
Name: doxygen
-Version: 1.8.18
-Release: 1
+Version: 1.8.8
+Release: 2
Epoch: 1
License: GPL v2
Group: Development/Tools
-Source0: http://doxygen.nl/files/%{name}-%{version}.src.tar.gz
-# Source0-md5: eda8e82fcc58970894029b0399776cb5
-Patch0: %{name}-manual_pdf.patch
+Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
+# Source0-md5: 0cbe6912fcac302a984bfcfb9231fec9
+Patch0: %{name}-qt-dirs.patch
URL: http://www.doxygen.org/
-%{?with_qt:BuildRequires: Qt5Gui-devel}
-%{?with_qt:BuildRequires: Qt5Xml-devel}
+%{?with_qt:BuildRequires: QtGui-devel >= 4.3}
+%{?with_qt:BuildRequires: QtXml-devel >= 4.3}
BuildRequires: bison
-BuildRequires: cmake >= 3.3
BuildRequires: flex
BuildRequires: ghostscript
BuildRequires: ghostscript-fonts-std
BuildRequires: libpng-devel
-# c++14
-BuildRequires: libstdc++-devel >= 6:5.0
+BuildRequires: libstdc++-devel
BuildRequires: perl-base
-%{?with_qt:BuildRequires: qt5-build}
-%{?with_qt:BuildRequires: qt5-qmake}
+%{?with_qt:BuildRequires: qt4-build >= 4.3}
+%{?with_qt:BuildRequires: qt4-qmake >= 4.3}
BuildRequires: texlive-latex
BuildRequires: texlive-pdftex
# I don't know what is the exact names in TI, please correct
@@ -142,10 +140,25 @@ Wizard gráfico para o Doxygen.
%patch0 -p1
%build
-%cmake \
- -DBUILD_SHARED_LIBS=OFF \
- -Dbuild_doc=ON \
- -Dbuild_wizard=%{?with_qt:ON}%{!?with_qt:OFF}
+# don't change it to %%configure, not autoconf-generated!
+./configure \
+ --prefix %{_prefix} \
+ --perl %{__perl} \
+ --install %{_bindir}/install \
+ %{?with_qt:--with-doxywizard}
+
+%{__make} \
+ CC="%{__cc}" \
+ CXX="%{__cxx}" \
+ LINK="%{__cxx}" \
+ QMAKE="%{_bindir}/qmake-qt4" \
+ QTDIR="%{_prefix}" \
+ CFLAGS="%{rpmcflags}" \
+ CXXFLAGS="%{rpmcxxflags} -DQT_LITE_UNICODE -DNODEBUG" \
+ LFLAGS="%{rpmldflags}"
+
+%{__make} docs
+#%%{__make} pdf
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/doxygen-manual_pdf.patch b/doxygen-manual_pdf.patch
deleted file mode 100644
index edddf33..0000000
--- a/doxygen-manual_pdf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- doxygen-1.8.18/doc/CMakeLists.txt.orig 2020-01-03 23:51:18.000000000 +0100
-+++ doxygen-1.8.18/doc/CMakeLists.txt 2020-05-01 12:39:52.747056284 +0200
-@@ -212,11 +212,6 @@
- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
- )
-
--install(FILES
-- "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
--)
--
- if (build_doc_chm)
- install(FILES
- "${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm"
diff --git a/doxygen-qt-dirs.patch b/doxygen-qt-dirs.patch
new file mode 100644
index 0000000..5a26027
--- /dev/null
+++ b/doxygen-qt-dirs.patch
@@ -0,0 +1,30 @@
+--- doxygen-1.8.6/configure.orig 2013-12-24 17:14:46.000000000 +0100
++++ doxygen-1.8.6/configure 2014-01-29 20:59:58.925766639 +0100
+@@ -326,7 +326,7 @@
+ if test -z "$QTDIR"; then
+ echo " QTDIR environment variable not set!"
+ printf " Checking for Qt..."
+- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
++ for d in /usr/{libx32,lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
+ if test -x "$d/bin/qmake"; then
+ QTDIR=$d
+ break 2
+@@ -704,6 +704,7 @@
+ DOXYDOCS = ..
+ DOCDIR = $f_docdir
+ QTDIR = $QTDIR
++MAN1DIR = share/man/man1
+ EOF
+
+ if test "$f_dot" != NO; then
+--- doxygen-1.8.3/Makefile.in.orig 2013-01-02 21:33:10.021332601 +0100
++++ doxygen-1.8.3/Makefile.in 2013-01-03 16:32:34.159907679 +0100
+@@ -53,8 +53,6 @@
+
+ DATE=$(shell date "+%B %Y")
+
+-MAN1DIR = man/man1
+-
+ install: doxywizard_install doxysearch_install
+ $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
+ $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/doxygen.git/commitdiff/42d9878c6bd31df083506826217ce9ac2f278edc
More information about the pld-cvs-commit
mailing list