[doxygen] 1.8.3

Than Ngo than at fedoraproject.org
Wed Jan 2 16:13:54 UTC 2013 

commit 4706d4449817a4029ec03179b5d7830f76ef29af
Author: Than Ngo <than at redhat.com>
Date:   Wed Jan 2 17:13:30 2013 +0100

    1.8.3

 .gitignore                                         |    1 +
 ....8.1-config.patch => doxygen-1.8.3-config.patch |   36 ++++++++++----------
 ...-multilib.patch => doxygen-1.8.3-multilib.patch |   16 ++++----
 doxygen.spec                                       |    9 +++--
 sources                                            |    2 +-
 5 files changed, 34 insertions(+), 30 deletions(-)
---
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.3-config.patch
similarity index 64%
rename from doxygen-1.8.1-config.patch
rename to doxygen-1.8.3-config.patch
index 8f43391..f202c80 100644
--- a/doxygen-1.8.1-config.patch
+++ b/doxygen-1.8.3-config.patch
@@ -1,6 +1,6 @@
-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
+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.
  # 
@@ -26,10 +26,10 @@ diff -up doxygen-1.8.1/addon/doxywizard/Makefile.in.config doxygen-1.8.1/addon/d
  	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
+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..."
@@ -41,7 +41,7 @@ diff -up doxygen-1.8.1/configure.config doxygen-1.8.1/configure
        fi
      done
    else
-@@ -491,6 +492,8 @@ INSTTOOL  = $f_insttool
+@@ -514,6 +515,8 @@ INSTTOOL  = $f_insttool
  DOXYDOCS  = ..
  DOCDIR    = $f_docdir
  QTDIR     = $QTDIR
@@ -50,24 +50,24 @@ diff -up doxygen-1.8.1/configure.config doxygen-1.8.1/configure
  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
+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 
+ install: doxywizard_install doxysearch_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
+ 	$(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 -fno-exceptions
+ TMAKE_CFLAGS_WARN_ON	= -Wall -W 
  TMAKE_CFLAGS_WARN_OFF	=
 -TMAKE_CFLAGS_RELEASE	= -O2
 +TMAKE_CFLAGS_RELEASE	= $(RPM_OPT_FLAGS)
diff --git a/doxygen-1.8.2-multilib.patch b/doxygen-1.8.3-multilib.patch
similarity index 75%
rename from doxygen-1.8.2-multilib.patch
rename to doxygen-1.8.3-multilib.patch
index e3ddba2..7cb1c92 100644
--- a/doxygen-1.8.2-multilib.patch
+++ b/doxygen-1.8.3-multilib.patch
@@ -1,8 +1,8 @@
-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 
+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] = {
@@ -19,7 +19,7 @@ diff -up doxygen-1.8.2/src/htmlgen.cpp.multilib doxygen-1.8.2/src/htmlgen.cpp
  // hovering tab background luma
  static unsigned char tab_h_png[36] =
  {
-@@ -822,6 +833,7 @@ static ColoredImgDataItem colored_tab_da
+@@ -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 },
@@ -27,8 +27,8 @@ diff -up doxygen-1.8.2/src/htmlgen.cpp.multilib doxygen-1.8.2/src/htmlgen.cpp
    { "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");
+@@ -1502,13 +1514,6 @@ void HtmlGenerator::writeTabData()
+   Doxygen::indexList->addStyleSheetFile("tabs.css");
    QCString dname=Config_getString("HTML_OUTPUT");
    writeColoredImgData(dname,colored_tab_data);
 -
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 <than at redhat.com> - 1:1.8.3-1
+- 1.8.3
+
 * Mon Aug 13 2012 Than Ngo <than at redhat.com> - 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

More information about the scm-commits mailing list