From f293e096b286e025f555eedcf60081f0e1e574a3 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Jan 21 2015 15:49:06 +0000 Subject: update to 1.8.9.1 drop multilib patch. uppstream has a fix, it's not needed anymore --- diff --git a/.gitignore b/.gitignore index 9542c5d..8e90f47 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ doxygen-1.7.1.src.tar.gz /doxygen-1.8.6.src.tar.gz /doxygen-1.8.7.src.tar.gz /doxygen-1.8.8.src.tar.gz +/doxygen-1.8.9.1.src.tar.gz diff --git a/doxygen-1.8.3-multilib.patch b/doxygen-1.8.3-multilib.patch deleted file mode 100644 index 7cb1c92..0000000 --- a/doxygen-1.8.3-multilib.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up doxygen-1.8.3/src/htmlgen.cpp.multilib doxygen-1.8.3/src/htmlgen.cpp ---- doxygen-1.8.3/src/htmlgen.cpp.multilib 2012-12-25 11:27:52.000000000 +0100 -+++ doxygen-1.8.3/src/htmlgen.cpp 2013-01-02 17:08:57.559028518 +0100 -@@ -125,6 +125,17 @@ static unsigned char tab_b_png[36] = - 205, 207, 209, 211, 213, 217, 219, 206, 188 - }; - -+static unsigned char nav_g_png[95] = { -+0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -+0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, -+0x08, 0x06, 0x00, 0x00, 0x00, 0x02, 0x10, 0xf4, 0x31, 0x00, 0x00, 0x00, -+0x26, 0x49, 0x44, 0x41, 0x54, 0x78, 0x01, 0xed, 0xdd, 0x31, 0x0d, 0x00, -+0x00, 0x08, 0x03, 0xc1, 0x4f, 0x48, 0x17, 0x66, 0x84, 0xe1, 0x5f, 0x0d, -+0x2d, 0x3e, 0x7e, 0xb8, 0xe5, 0x4d, 0x20, 0x69, 0xcb, 0x4d, 0xe8, 0xc0, -+0x83, 0x07, 0x07, 0x0f, 0x53, 0x00, 0xbd, 0xfc, 0x82, 0x3c, 0x05, 0x00, -+0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -+}; -+ - // hovering tab background luma - static unsigned char tab_h_png[36] = - { -@@ -824,6 +835,7 @@ static ColoredImgDataItem colored_tab_da - { "tab_s.png", 1, 36, tab_s_png, 0 }, - { "nav_h.png", 1, 12, header_png, 0 }, - { "nav_f.png", 1, 56, func_header_png, 0 }, -+ { "nav_g.png", 1, 6, nav_g_png, 0 }, - { "bc_s.png", 8, 30, bc_s_png, bc_s_a_png }, - { "doxygen.png", 104,31, doxygen_png, doxygen_a_png }, - { "closed.png", 9, 9, closed_png, closed_a_png }, -@@ -1502,13 +1514,6 @@ void HtmlGenerator::writeTabData() - Doxygen::indexList->addStyleSheetFile("tabs.css"); - QCString dname=Config_getString("HTML_OUTPUT"); - writeColoredImgData(dname,colored_tab_data); -- -- { -- unsigned char shadow[6] = { 5, 5, 5, 5, 5, 5 }; -- unsigned char shadow_alpha[6] = { 80, 60, 40, 20, 10, 0 }; -- ColoredImage img(1,6,shadow,shadow_alpha,0,0,100); -- img.save(dname+"/nav_g.png"); -- } - } - - void HtmlGenerator::writeSearchData(const char *dir) diff --git a/doxygen-1.8.6-config.patch b/doxygen-1.8.6-config.patch deleted file mode 100644 index c0b2055..0000000 --- a/doxygen-1.8.6-config.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -up doxygen-1.8.6/addon/doxywizard/Makefile.in.config doxygen-1.8.6/addon/doxywizard/Makefile.in ---- doxygen-1.8.6/addon/doxywizard/Makefile.in.config 2013-12-26 12:17:57.281368574 -0700 -+++ doxygen-1.8.6/addon/doxywizard/Makefile.in 2013-12-26 12:20:44.673513404 -0700 -@@ -10,7 +10,6 @@ - # See the GNU General Public License for more details. - # - --QMAKE=$(QTDIR)/bin/qmake $(MKSPECS) - INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py - - all: Makefile.doxywizard -diff -up doxygen-1.8.6/configure.config doxygen-1.8.6/configure ---- doxygen-1.8.6/configure.config 2013-12-24 09:14:46.000000000 -0700 -+++ doxygen-1.8.6/configure 2013-12-26 12:20:20.542636493 -0700 -@@ -326,9 +326,10 @@ if test "$f_wizard" = YES; then - 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/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do - if test -x "$d/bin/qmake"; then - QTDIR=$d -+ QMAKE=$d/bin/qmake - break 2 - fi - done -@@ -704,6 +705,8 @@ INSTTOOL = $f_insttool - DOXYDOCS = .. - DOCDIR = $f_docdir - QTDIR = $QTDIR -+QMAKE = $QMAKE -+MAN1DIR = share/man/man1 - EOF - - if test "$f_dot" != NO; then -diff -up doxygen-1.8.6/Makefile.in.config doxygen-1.8.6/Makefile.in ---- doxygen-1.8.6/Makefile.in.config 2013-12-26 12:17:57.283368564 -0700 -+++ doxygen-1.8.6/Makefile.in 2013-12-26 12:19:17.796956667 -0700 -@@ -78,8 +78,6 @@ realclean: clean - - 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 -diff -up doxygen-1.8.6/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.6/tmake/lib/linux-g++/tmake.conf ---- doxygen-1.8.6/tmake/lib/linux-g++/tmake.conf.config 2013-11-02 08:18:53.000000000 -0600 -+++ doxygen-1.8.6/tmake/lib/linux-g++/tmake.conf 2013-12-26 12:18:38.268158455 -0700 -@@ -11,7 +11,7 @@ TMAKE_CC = gcc - TMAKE_CFLAGS = -pipe -fsigned-char - TMAKE_CFLAGS_WARN_ON = -Wall -W - TMAKE_CFLAGS_WARN_OFF = --TMAKE_CFLAGS_RELEASE = -O2 -+TMAKE_CFLAGS_RELEASE = $(RPM_OPT_FLAGS) - TMAKE_CFLAGS_DEBUG = -g - TMAKE_CFLAGS_SHLIB = -fPIC - TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YAC - - TMAKE_INCDIR = - TMAKE_LIBDIR = --TMAKE_INCDIR_X11 = /usr/X11R6/include --TMAKE_LIBDIR_X11 = /usr/X11R6/lib --TMAKE_INCDIR_QT = $(QTDIR)/include --TMAKE_LIBDIR_QT = $(QTDIR)/lib --TMAKE_INCDIR_OPENGL = /usr/X11R6/include --TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+TMAKE_INCDIR_X11 = -+TMAKE_LIBDIR_X11 = -+TMAKE_INCDIR_QT = -+TMAKE_LIBDIR_QT = -+TMAKE_INCDIR_OPENGL = -+TMAKE_LIBDIR_OPENGL = - - TMAKE_LINK = g++ - TMAKE_LINK_SHLIB = g++ diff --git a/doxygen-1.8.7-html_timestamp_default_false.patch b/doxygen-1.8.7-html_timestamp_default_false.patch deleted file mode 100644 index 9a2d1d4..0000000 --- a/doxygen-1.8.7-html_timestamp_default_false.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up doxygen-1.8.7/src/config.xml.than doxygen-1.8.7/src/config.xml ---- doxygen-1.8.7/src/config.xml.than 2014-05-12 13:54:38.000000000 +0200 -+++ doxygen-1.8.7/src/config.xml 2014-05-12 13:56:31.000000000 +0200 -@@ -1617,7 +1617,7 @@ to disable this feature. - - - -- -- + +- +-