From 4706d4449817a4029ec03179b5d7830f76ef29af Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Jan 02 2013 16:13:30 +0000 Subject: 1.8.3 --- diff --git a/.gitignore b/.gitignore index 4961594..fdc7fdd 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ doxygen-1.7.1.src.tar.gz /doxygen-1.8.1.1.src.tar.gz /doxygen-1.8.1.2.src.tar.gz /doxygen-1.8.2.src.tar.gz +/doxygen-1.8.3.src.tar.gz diff --git a/doxygen-1.8.1-config.patch b/doxygen-1.8.1-config.patch deleted file mode 100644 index 8f43391..0000000 --- a/doxygen-1.8.1-config.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -up doxygen-1.8.1/addon/doxywizard/Makefile.in.config doxygen-1.8.1/addon/doxywizard/Makefile.in ---- doxygen-1.8.1/addon/doxywizard/Makefile.in.config 2012-01-29 16:23:25.000000000 +0100 -+++ doxygen-1.8.1/addon/doxywizard/Makefile.in 2012-06-06 12:13:51.676758161 +0200 -@@ -10,8 +10,6 @@ - # See the GNU General Public License for more details. - # - --QMAKE=qmake $(MKSPECS) -- - all: Makefile.doxywizard - $(MAKE) -f Makefile.doxywizard - -@@ -29,11 +27,11 @@ distclean: Makefile.doxywizard - $(RM) Makefile.doxywizard - - install: -- $(INSTTOOL) -d $(INSTALL)/bin -- $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin -- $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR) -+ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin -+ $(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin -+ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR) - cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1 -- $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1 -+ $(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1 - rm doxywizard.1 - - FORCE: -diff -up doxygen-1.8.1/configure.config doxygen-1.8.1/configure ---- doxygen-1.8.1/configure.config 2012-05-20 13:17:10.000000000 +0200 -+++ doxygen-1.8.1/configure 2012-06-06 12:13:51.676758161 +0200 -@@ -274,9 +274,10 @@ if test "$f_wizard" = YES; then - if test -z "$QTDIR"; then - echo " QTDIR environment variable not set!" - echo -n " 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 - fi - done - else -@@ -491,6 +492,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.1/Makefile.in.config doxygen-1.8.1/Makefile.in ---- doxygen-1.8.1/Makefile.in.config 2012-02-20 22:00:49.000000000 +0100 -+++ doxygen-1.8.1/Makefile.in 2012-06-06 12:13:51.677758162 +0200 -@@ -44,8 +44,6 @@ distclean: clean - - DATE=$(shell date "+%B %Y") - --MAN1DIR = man/man1 -- - install: doxywizard_install - $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin - $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin -diff -up doxygen-1.8.1/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.1/tmake/lib/linux-g++/tmake.conf ---- doxygen-1.8.1/tmake/lib/linux-g++/tmake.conf.config 2012-03-11 20:44:01.000000000 +0100 -+++ doxygen-1.8.1/tmake/lib/linux-g++/tmake.conf 2012-06-06 12:45:27.981776883 +0200 -@@ -11,7 +11,7 @@ TMAKE_CC = gcc - TMAKE_CFLAGS = -pipe - TMAKE_CFLAGS_WARN_ON = -Wall -W -fno-exceptions - 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.2-multilib.patch b/doxygen-1.8.2-multilib.patch deleted file mode 100644 index e3ddba2..0000000 --- a/doxygen-1.8.2-multilib.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up doxygen-1.8.2/src/htmlgen.cpp.multilib doxygen-1.8.2/src/htmlgen.cpp ---- doxygen-1.8.2/src/htmlgen.cpp.multilib 2012-08-11 16:29:09.000000000 +0200 -+++ doxygen-1.8.2/src/htmlgen.cpp 2012-08-13 12:48:09.824309711 +0200 -@@ -123,6 +123,17 @@ static unsigned char tab_b_png[36] = - 202, 204, 206, 208, 210, 214, 216, 203, 185 - }; - -+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] = - { -@@ -822,6 +833,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 }, -@@ -1481,13 +1493,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.3-config.patch b/doxygen-1.8.3-config.patch new file mode 100644 index 0000000..f202c80 --- /dev/null +++ b/doxygen-1.8.3-config.patch @@ -0,0 +1,95 @@ +diff -up doxygen-1.8.3/addon/doxywizard/Makefile.in.config doxygen-1.8.3/addon/doxywizard/Makefile.in +--- doxygen-1.8.3/addon/doxywizard/Makefile.in.config 2012-01-29 16:23:25.000000000 +0100 ++++ doxygen-1.8.3/addon/doxywizard/Makefile.in 2013-01-02 16:45:56.206014990 +0100 +@@ -10,8 +10,6 @@ + # See the GNU General Public License for more details. + # + +-QMAKE=qmake $(MKSPECS) +- + all: Makefile.doxywizard + $(MAKE) -f Makefile.doxywizard + +@@ -29,11 +27,11 @@ distclean: Makefile.doxywizard + $(RM) Makefile.doxywizard + + install: +- $(INSTTOOL) -d $(INSTALL)/bin +- $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin +- $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR) ++ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin ++ $(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin ++ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR) + cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1 +- $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1 ++ $(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1 + rm doxywizard.1 + + FORCE: +diff -up doxygen-1.8.3/configure.config doxygen-1.8.3/configure +--- doxygen-1.8.3/configure.config 2012-12-27 12:24:51.000000000 +0100 ++++ doxygen-1.8.3/configure 2013-01-02 16:45:56.206014990 +0100 +@@ -280,9 +280,10 @@ if test "$f_wizard" = YES; then + if test -z "$QTDIR"; then + echo " QTDIR environment variable not set!" + echo -n " 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 + fi + done + else +@@ -514,6 +515,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.3/Makefile.in.config doxygen-1.8.3/Makefile.in +--- doxygen-1.8.3/Makefile.in.config 2012-12-25 13:17:27.000000000 +0100 ++++ doxygen-1.8.3/Makefile.in 2013-01-02 16:50:44.919183628 +0100 +@@ -53,8 +53,6 @@ distclean: 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.3/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.3/tmake/lib/linux-g++/tmake.conf +--- doxygen-1.8.3/tmake/lib/linux-g++/tmake.conf.config 2012-12-22 19:49:04.000000000 +0100 ++++ doxygen-1.8.3/tmake/lib/linux-g++/tmake.conf 2013-01-02 16:52:08.828039570 +0100 +@@ -11,7 +11,7 @@ TMAKE_CC = gcc + TMAKE_CFLAGS = -pipe + 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.3-multilib.patch b/doxygen-1.8.3-multilib.patch new file mode 100644 index 0000000..7cb1c92 --- /dev/null +++ b/doxygen-1.8.3-multilib.patch @@ -0,0 +1,43 @@ +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.spec b/doxygen.spec index 6ed9a6f..c859396 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -1,6 +1,6 @@ Summary: A documentation system for C/C++ Name: doxygen -Version: 1.8.2 +Version: 1.8.3 Release: 1%{?dist} Epoch: 1 Group: Development/Tools @@ -13,9 +13,9 @@ Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz Source1: doxywizard.png Source2: doxywizard.desktop -Patch1: doxygen-1.8.1-config.patch +Patch1: doxygen-1.8.3-config.patch Patch2: doxygen-1.8.1.1-html_timestamp_default_false.patch -Patch3: doxygen-1.8.2-multilib.patch +Patch3: doxygen-1.8.3-multilib.patch BuildRequires: perl BuildRequires: texlive-dvips @@ -103,6 +103,9 @@ rm -rf %{buildroot} %{_datadir}/pixmaps/* %changelog +* Wed Jan 02 2013 Than Ngo - 1:1.8.3-1 +- 1.8.3 + * Mon Aug 13 2012 Than Ngo - 1:1.8.2-1 - 1.8.2 diff --git a/sources b/sources index c9c40e0..bb3c915 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 1a84da877450422c5fc49e525c546cd4 doxywizard.png -6fa7baf995fa3f71cfc09e264ba88a83 doxygen-1.8.2.src.tar.gz +54245ba38a30f50fd7ae6e62fc05de15 doxygen-1.8.3.src.tar.gz