diff --git a/.gitignore b/.gitignore index acfdcc1..4961594 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ doxygen-1.7.1.src.tar.gz /doxygen-1.8.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 diff --git a/doxygen-1.8.1.1-multilib.patch b/doxygen-1.8.1.1-multilib.patch deleted file mode 100644 index 59813b7..0000000 --- a/doxygen-1.8.1.1-multilib.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up doxygen-1.8.1.1/src/htmlgen.cpp.multilib doxygen-1.8.1.1/src/htmlgen.cpp ---- doxygen-1.8.1.1/src/htmlgen.cpp.multilib 2012-05-28 21:19:06.000000000 +0200 -+++ doxygen-1.8.1.1/src/htmlgen.cpp 2012-06-20 15:44:15.891243536 +0200 -@@ -142,6 +142,17 @@ static unsigned char func_header_png[56] - 228, 228, 228, 229, 229, 229, 229, 229 - }; - -+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 - static unsigned char tab_h_png[36] = - { -@@ -752,6 +763,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, 32, 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 }, -@@ -1206,13 +1218,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.2-multilib.patch b/doxygen-1.8.2-multilib.patch new file mode 100644 index 0000000..e3ddba2 --- /dev/null +++ b/doxygen-1.8.2-multilib.patch @@ -0,0 +1,43 @@ +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.spec b/doxygen.spec index 7cc3fae..6ed9a6f 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -1,6 +1,6 @@ Summary: A documentation system for C/C++ Name: doxygen -Version: 1.8.1.2 +Version: 1.8.2 Release: 1%{?dist} Epoch: 1 Group: Development/Tools @@ -15,7 +15,7 @@ Source2: doxywizard.desktop Patch1: doxygen-1.8.1-config.patch Patch2: doxygen-1.8.1.1-html_timestamp_default_false.patch -Patch3: doxygen-1.8.1.1-multilib.patch +Patch3: doxygen-1.8.2-multilib.patch BuildRequires: perl BuildRequires: texlive-dvips @@ -103,6 +103,9 @@ rm -rf %{buildroot} %{_datadir}/pixmaps/* %changelog +* Mon Aug 13 2012 Than Ngo - 1:1.8.2-1 +- 1.8.2 + * Mon Jul 30 2012 Than Ngo - 1:1.8.1.2-1 - 1.8.1.2 diff --git a/sources b/sources index 3f0df94..c9c40e0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 1a84da877450422c5fc49e525c546cd4 doxywizard.png -9c62259c34d51d839dafd1f0d5d85f17 doxygen-1.8.1.2.src.tar.gz +6fa7baf995fa3f71cfc09e264ba88a83 doxygen-1.8.2.src.tar.gz