c_cpp/doxygen
SHA256
8
0
Fork 0
forked from pool/doxygen
Code Pull Requests Activity

- updated to 1.8.10

Browse Source 
* Change the build system to use cmake.
  * Add support for basic XML syntax highlighting
  * Added documentation for ``` style fenced code block and more 
    robust parsing
  * Added function arguments to the LaTeX toc
  * Added support for language codes
  * etc. see http://www.stack.nl/~dimitri/doxygen/manual/changelog.html
- removed unneded patches:
  - doxygen-1.5.9-64archs.patch
  - doxygen-1.5.9-man.patch
  - doxygen-1.7.0-modify_footer.patch renamed to doxygen-modify_footer.patch

- updated to 1.8.10, see doxygen.changes
- move tests to doxygen.spec
- remove doxywizard-1.5.9-flex.patch

OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=87
This commit is contained in:
Petr Gajdos
2015-08-17 16:12:41 +00:00
committed by Git OBS Bridge
parent 402355f25d
commit b94a24c634
9 changed files with 100 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
doxygen-1.5.9-64archs.patch
View File

@@ -1,50 +0,0 @@
---
qtools/qgdict.cpp | 6 +++---
src/util.cpp | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
--- qtools/qgdict.cpp.orig
+++ qtools/qgdict.cpp
@@ -996,15 +996,15 @@ QDataStream &QGDict::read( QDataStream &
break;
case IntKey:
{
- Q_UINT32 k;
+ unsigned long k;
s >> k;
read( s, d );
- look_int( k, d, op_insert );
+ look_int( (long)k, d, op_insert );
}
break;
case PtrKey:
{
- Q_UINT32 k;
+ unsigned long k;
s >> k;
read( s, d );
// ### cannot insert 0 - this renders the thing
--- src/util.cpp.orig
+++ src/util.cpp
@@ -4774,10 +4774,10 @@ QCString convertNameToFile(const char *n
{
static QDict<int> usedNames(10007);
usedNames.setAutoDelete(TRUE);
- static int count=1;
+ static long int count=1;
int *value=usedNames.find(name);
- int num;
+ long int num;
if (value==0)
{
usedNames.insert(name,new int(count));
@@ -4787,7 +4787,7 @@ QCString convertNameToFile(const char *n
{
num = *value;
}
- result.sprintf("a%05d",num);
+ result.sprintf("a%05ld",num);
}
else // long names
{

30
doxygen-1.5.9-man.patch
View File

@@ -1,30 +0,0 @@
---
Makefile.in | 2 --
configure | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
Index: Makefile.in
===================================================================
--- Makefile.in.orig 2013-10-21 20:09:13.000000000 +0200
+++ Makefile.in 2014-01-02 10:06:25.115127423 +0100
@@ -78,8 +78,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
Index: configure
===================================================================
--- configure.orig 2013-12-24 17:14:46.000000000 +0100
+++ configure 2014-01-02 10:06:25.115127423 +0100
@@ -704,6 +704,7 @@
DOXYDOCS = ..
DOCDIR = $f_docdir
QTDIR = $QTDIR
+MAN1DIR = share/man/man1
EOF
if test "$f_dot" != NO; then

3
doxygen-1.8.10.src.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93
size 4818276

3
doxygen-1.8.9.1.src.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec
size 5007458

12
doxygen-1.7.0-modify_footer.patch → doxygen-modify_footer.patch
View File

@@ -11,16 +11,4 @@ Index: Doxyfile
HTML_DYNAMIC_SECTIONS = YES HTML_DYNAMIC_SECTIONS = YES
HTML_INDEX_NUM_ENTRIES = 100 HTML_INDEX_NUM_ENTRIES = 100
GENERATE_DOCSET = YES GENERATE_DOCSET = YES
Index: doc/config.doc
===================================================================
--- doc/config.doc.orig 2014-04-13 10:34:33.000000000 +0200
+++ doc/config.doc 2014-05-13 09:08:41.420140828 +0200
@@ -2035,7 +2035,7 @@
multiple runs.
-The default value is: <code>YES</code>.
+The default value is: <code>NO</code>.
This tag requires that the tag \ref cfg_generate_html "GENERATE_HTML" is set to \c YES.

16
doxygen.changes
View File

@@ -1,3 +1,19 @@
-------------------------------------------------------------------
Mon Aug 17 14:52:48 UTC 2015 - pgajdos@suse.com
- updated to 1.8.10
* Change the build system to use cmake.
* Add support for basic XML syntax highlighting
* Added documentation for ``` style fenced code block and more
robust parsing
* Added function arguments to the LaTeX toc
* Added support for language codes
* etc. see http://www.stack.nl/~dimitri/doxygen/manual/changelog.html
- removed unneded patches:
- doxygen-1.5.9-64archs.patch
- doxygen-1.5.9-man.patch
- doxygen-1.7.0-modify_footer.patch renamed to doxygen-modify_footer.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 2 15:22:37 UTC 2015 - pgajdos@suse.com Mon Mar 2 15:22:37 UTC 2015 - pgajdos@suse.com

85
doxygen.spec
View File

@@ -17,25 +17,55 @@
Name: doxygen Name: doxygen
Version: 1.8.9.1 Version: 1.8.10
Release: 0 Release: 0
Summary: Automated C, C++, and Java Documentation Generator Summary: Automated C, C++, and Java Documentation Generator
License: GPL-2.0+ License: GPL-2.0+
Group: Development/Tools/Doc Generators Group: Development/Tools/Doc Generators
Url: http://www.stack.nl/~dimitri/doxygen/ Url: http://www.stack.nl/~dimitri/doxygen/
Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
Patch0: %{name}-1.5.9-64archs.patch # suse specific
Patch3: %{name}-1.5.9-man.patch Patch0: %{name}-modify_footer.patch
Patch4: %{name}-1.7.0-modify_footer.patch # suse specific
Patch5: %{name}-no-lowercase-man-names.patch Patch1: %{name}-no-lowercase-man-names.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: flex BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: graphviz # see graphviz.spec:
# "If you need output in png format you also need to install graphviz-gnome."
BuildRequires: graphviz-gnome
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: poppler-tools
BuildRequires: python-base BuildRequires: python-base
BuildRequires: python-xml BuildRequires: python-xml
BuildRequires: texlive-colortbl
BuildRequires: texlive-courier
BuildRequires: texlive-dvips
BuildRequires: texlive-epstopdf
BuildRequires: texlive-fancyhdr
BuildRequires: texlive-float
BuildRequires: texlive-helvetic
BuildRequires: texlive-latex
BuildRequires: texlive-makeindex
BuildRequires: texlive-metafont
BuildRequires: texlive-multirow
BuildRequires: texlive-natbib
BuildRequires: texlive-psnfss
BuildRequires: texlive-rsfs
BuildRequires: texlive-sectsty
BuildRequires: texlive-symbol
BuildRequires: texlive-times
BuildRequires: texlive-tocloft
BuildRequires: texlive-wasy
BuildRequires: texlive-wasysym
BuildRequires: texlive-xtab
%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
# for make tests
BuildRequires: libxml2-tools
BuildRequires: texlive-bibtex
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@@ -63,34 +93,37 @@ This package contains only documentation
%prep %prep
%setup -q %setup -q
%patch0 %patch0
%patch3 %patch1 -p1
%patch4
%patch5 -p1
%build %build
mintoc= mkdir build
%ifarch ppc64 pushd build
mintoc="-DENGLISH_ONLY" sed -i 's:man/man1:share/&:' ../doc/CMakeLists.txt
%endif cmake -G "Unix Makefiles" \
sed -i~ "/^TMAKE_CFLAGS_RELEASE.*/s@^.*@TMAKE_CFLAGS_RELEASE = %{optflags} $mintoc@" tmake/lib/linux-g++/tmake.conf -DCMAKE_BUILD_TYPE=Release \
# custom configure script -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \
./configure --prefix %{_prefix} --install %{_bindir}/install -Dbuild_doc=ON \
make %{?_smp_mflags} -DDOC_INSTALL_DIR=share/doc/packages/%{name}-doc \
..
# generate html documentation make %{?_smp_mflags}
./bin/doxygen make docs %{?_smp_mflags}
popd
%install %install
install -d -m 755 %{buildroot}%{_docdir}/doxygen cd build
make install INSTALL=%{buildroot}/usr DOCDIR=%{buildroot}%{_docdir}/doxygen make install %{?_smp_mflags}
install -m 644 LICENSE LANGUAGE.HOWTO PLATFORMS README.md VERSION %{buildroot}%{_docdir}/doxygen rm %{buildroot}%{_mandir}/man1/{doxysearch,doxyindexer,doxywizard}.1
cp -a doxygen_docs/html %{buildroot}%{_docdir}/%{name}-doc
%fdupes -s %{buildroot}%{_docdir}/%{name}-doc %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
%check
cd build
make tests %{?_smp_mflags}
%endif
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE %doc LICENSE
%attr(444,root,root) %doc %{_mandir}/man1/doxygen.1.* %attr(444,root,root) %doc %{_mandir}/man1/doxygen.1.gz
%attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_bindir}/*
%files doc %files doc

7
doxywizard.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Aug 17 16:07:31 UTC 2015 - pgajdos@suse.com
- updated to 1.8.10, see doxygen.changes
- move tests to doxygen.spec
- remove doxywizard-1.5.9-flex.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 20 11:41:18 UTC 2015 - mpluskal@suse.com Fri Feb 20 11:41:18 UTC 2015 - mpluskal@suse.com

87
doxywizard.spec
View File

@@ -17,7 +17,7 @@
Name: doxywizard Name: doxywizard
Version: 1.8.9.1 Version: 1.8.10
Release: 0 Release: 0
Summary: Graphical User Interface for Doxygen Summary: Graphical User Interface for Doxygen
License: GPL-2.0+ License: GPL-2.0+
@@ -25,32 +25,15 @@ Group: Development/Tools/Doc Generators
Url: http://www.stack.nl/~dimitri/doxygen/ Url: http://www.stack.nl/~dimitri/doxygen/
Source: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz Source: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
Source1: doxywizard.desktop Source1: doxywizard.desktop
Patch0: doxygen-1.5.9-64archs.patch
Patch2: %{name}-1.5.9-flex.patch
Patch5: doxygen-1.5.9-man.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake
BuildRequires: flex BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
Requires: doxygen = %{version} Requires: doxygen = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
BuildRequires: libqt4-devel >= 4.3 BuildRequires: libqt4-devel >= 4.3
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
%endif
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
BuildRequires: desktop-file-utils
BuildRequires: qt4-devel >= 4.3.0
%endif
%if 0%{?mandriva_version} || 0%{?mdkversion}
BuildRequires: libqt4-devel >= 4.3
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
%endif
%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
BuildRequires: libxml2-tools
BuildRequires: texlive-bibtex
%endif
%description %description
Doxywizard is a graphical front-end to read/edit/write doxygen Doxywizard is a graphical front-end to read/edit/write doxygen
@@ -58,69 +41,27 @@ configuration files.
%prep %prep
%setup -q -n doxygen-%{version} %setup -q -n doxygen-%{version}
%patch0
%patch2
%patch5
%build %build
%if 0%{?suse_version} mkdir build
export QTDIR=/usr pushd build
%endif cmake -G "Unix Makefiles" \
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} -DCMAKE_BUILD_TYPE=Release \
export QTDIR=%{_libdir}/qt4/ -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \
export PATH=${QTDIR}/bin:${PATH} -Dbuild_wizard=ON \
%endif ..
%if 0%{?mandriva_version} || 0%{?mdkversion}
export QTDIR=%{_libexecdir}/qt4/
%if 0%{?mandriva_version} <= 2009 || 0%{?mdkversion} <= 200900
export PATH=${QTDIR}/bin:${PATH}
%endif
%endif
mintoc=
%ifarch ppc64
mintoc="-DENGLISH_ONLY"
%endif
sed -i~ "/^TMAKE_CFLAGS_RELEASE.*/s@^.*@TMAKE_CFLAGS_RELEASE = %{optflags} $mintoc@" tmake/lib/linux-g++/tmake.conf
# custom configure script
./configure --with-doxywizard
make %{?_smp_mflags} make %{?_smp_mflags}
popd
%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
%check
make test %{?_smp_mflags}
%endif
%install %install
make install INSTALL=%{buildroot}/usr cd build
rm -f %{buildroot}%{_bindir}/{doxygen,doxytag} make install %{?_smp_mflags}
%if 0%{?suse_version} rm %{buildroot}%{_bindir}/doxygen
%suse_update_desktop_file -i doxywizard Development Documentation %suse_update_desktop_file -i doxywizard Development Documentation
%endif
%if 0%{?fedora_version}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ --add-category Development --add-category Documentation %{SOURCE1}
%endif
%if 0%{?mandriva_version} || 0%{?mdkversion}
install -d -m 755 %{buildroot}%{_datadir}/applications/
install %{SOURCE1} %{buildroot}%{_datadir}/applications/
%endif
rm -f %{buildroot}%{_mandir}/man1/{doxygen,doxytag}.1
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%attr(755,root,root) %{_bindir}/doxywizard %attr(755,root,root) %{_bindir}/doxywizard
%{_datadir}/applications/doxywizard.desktop %{_datadir}/applications/doxywizard.desktop
%attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.*
%if 0%{?mandriva_version} || 0%{?mdkversion}
%post
%{update_menus}
%{update_desktop_database}
%endif
%if 0%{?mandriva_version} || 0%{?mdkversion}
%postun
%{clean_menus}
%{clean_desktop_database}
%endif
%changelog %changelog