From b94a24c634f761bbcc225b2220ec69292b097c7996f0592f21937df6f0565cbc Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 17 Aug 2015 16:12:41 +0000 Subject: [PATCH 1/8] - 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 - 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 --- doxygen-1.5.9-64archs.patch | 50 ----------- doxygen-1.5.9-man.patch | 30 ------- doxygen-1.8.10.src.tar.gz | 3 + doxygen-1.8.9.1.src.tar.gz | 3 - ...ooter.patch => doxygen-modify_footer.patch | 14 +-- doxygen.changes | 16 ++++ doxygen.spec | 85 ++++++++++++------ doxywizard.changes | 7 ++ doxywizard.spec | 87 +++---------------- 9 files changed, 100 insertions(+), 195 deletions(-) delete mode 100644 doxygen-1.5.9-64archs.patch delete mode 100644 doxygen-1.5.9-man.patch create mode 100644 doxygen-1.8.10.src.tar.gz delete mode 100644 doxygen-1.8.9.1.src.tar.gz rename doxygen-1.7.0-modify_footer.patch => doxygen-modify_footer.patch (51%) diff --git a/doxygen-1.5.9-64archs.patch b/doxygen-1.5.9-64archs.patch deleted file mode 100644 index 885a280..0000000 --- a/doxygen-1.5.9-64archs.patch +++ /dev/null @@ -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 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 - { diff --git a/doxygen-1.5.9-man.patch b/doxygen-1.5.9-man.patch deleted file mode 100644 index 549ada1..0000000 --- a/doxygen-1.5.9-man.patch +++ /dev/null @@ -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 diff --git a/doxygen-1.8.10.src.tar.gz b/doxygen-1.8.10.src.tar.gz new file mode 100644 index 0000000..22cba57 --- /dev/null +++ b/doxygen-1.8.10.src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93 +size 4818276 diff --git a/doxygen-1.8.9.1.src.tar.gz b/doxygen-1.8.9.1.src.tar.gz deleted file mode 100644 index a5836ff..0000000 --- a/doxygen-1.8.9.1.src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec -size 5007458 diff --git a/doxygen-1.7.0-modify_footer.patch b/doxygen-modify_footer.patch similarity index 51% rename from doxygen-1.7.0-modify_footer.patch rename to doxygen-modify_footer.patch index ab27ac6..07f1c0c 100644 --- a/doxygen-1.7.0-modify_footer.patch +++ b/doxygen-modify_footer.patch @@ -11,16 +11,4 @@ Index: Doxyfile HTML_DYNAMIC_SECTIONS = YES HTML_INDEX_NUM_ENTRIES = 100 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: YES. -+The default value is: NO. - - - This tag requires that the tag \ref cfg_generate_html "GENERATE_HTML" is set to \c YES. + diff --git a/doxygen.changes b/doxygen.changes index 39d95c1..8da8ef7 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -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 diff --git a/doxygen.spec b/doxygen.spec index 2386289..62f46b3 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -17,25 +17,55 @@ Name: doxygen -Version: 1.8.9.1 +Version: 1.8.10 Release: 0 Summary: Automated C, C++, and Java Documentation Generator License: GPL-2.0+ Group: Development/Tools/Doc Generators Url: http://www.stack.nl/~dimitri/doxygen/ Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz -Patch0: %{name}-1.5.9-64archs.patch -Patch3: %{name}-1.5.9-man.patch -Patch4: %{name}-1.7.0-modify_footer.patch -Patch5: %{name}-no-lowercase-man-names.patch +# suse specific +Patch0: %{name}-modify_footer.patch +# suse specific +Patch1: %{name}-no-lowercase-man-names.patch BuildRequires: bison +BuildRequires: cmake BuildRequires: fdupes BuildRequires: flex 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: poppler-tools BuildRequires: python-base 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 %description @@ -63,34 +93,37 @@ This package contains only documentation %prep %setup -q %patch0 -%patch3 -%patch4 -%patch5 -p1 +%patch1 -p1 %build -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 --prefix %{_prefix} --install %{_bindir}/install -make %{?_smp_mflags} - -# generate html documentation -./bin/doxygen +mkdir build +pushd build +sed -i 's:man/man1:share/&:' ../doc/CMakeLists.txt +cmake -G "Unix Makefiles" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \ + -Dbuild_doc=ON \ + -DDOC_INSTALL_DIR=share/doc/packages/%{name}-doc \ + .. +make %{?_smp_mflags} +make docs %{?_smp_mflags} +popd %install -install -d -m 755 %{buildroot}%{_docdir}/doxygen -make install INSTALL=%{buildroot}/usr DOCDIR=%{buildroot}%{_docdir}/doxygen -install -m 644 LICENSE LANGUAGE.HOWTO PLATFORMS README.md VERSION %{buildroot}%{_docdir}/doxygen -cp -a doxygen_docs/html %{buildroot}%{_docdir}/%{name}-doc -%fdupes -s %{buildroot}%{_docdir}/%{name}-doc +cd build +make install %{?_smp_mflags} +rm %{buildroot}%{_mandir}/man1/{doxysearch,doxyindexer,doxywizard}.1 + +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 +%check +cd build +make tests %{?_smp_mflags} +%endif %files %defattr(-,root,root) %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}/* %files doc diff --git a/doxywizard.changes b/doxywizard.changes index 33641ed..f5e2ce5 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -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 diff --git a/doxywizard.spec b/doxywizard.spec index e70a838..3f051ef 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -17,7 +17,7 @@ Name: doxywizard -Version: 1.8.9.1 +Version: 1.8.10 Release: 0 Summary: Graphical User Interface for Doxygen License: GPL-2.0+ @@ -25,32 +25,15 @@ Group: Development/Tools/Doc Generators Url: http://www.stack.nl/~dimitri/doxygen/ Source: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz 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: cmake BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: libjpeg-devel Requires: doxygen = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} BuildRequires: libqt4-devel >= 4.3 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 Doxywizard is a graphical front-end to read/edit/write doxygen @@ -58,69 +41,27 @@ configuration files. %prep %setup -q -n doxygen-%{version} -%patch0 -%patch2 -%patch5 %build -%if 0%{?suse_version} -export QTDIR=/usr -%endif -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} -export QTDIR=%{_libdir}/qt4/ -export PATH=${QTDIR}/bin:${PATH} -%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 +mkdir build +pushd build +cmake -G "Unix Makefiles" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \ + -Dbuild_wizard=ON \ + .. make %{?_smp_mflags} - -%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 -%check -make test %{?_smp_mflags} -%endif +popd %install -make install INSTALL=%{buildroot}/usr -rm -f %{buildroot}%{_bindir}/{doxygen,doxytag} -%if 0%{?suse_version} - %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 +cd build +make install %{?_smp_mflags} +rm %{buildroot}%{_bindir}/doxygen +%suse_update_desktop_file -i doxywizard Development Documentation %files %defattr(-,root,root) %attr(755,root,root) %{_bindir}/doxywizard %{_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 From 350a378755338854e62c43e74527ba5818746098ea906c8d4c1e7bdb60c87bc2 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 18 Aug 2015 07:09:17 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=88 --- doxywizard-1.5.9-flex.patch | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 doxywizard-1.5.9-flex.patch diff --git a/doxywizard-1.5.9-flex.patch b/doxywizard-1.5.9-flex.patch deleted file mode 100644 index 46562e9..0000000 --- a/doxywizard-1.5.9-flex.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/config.l -+++ src/config.l -@@ -409,6 +409,7 @@ - - %} - -+%option never-interactive - %option nounput - %option noyywrap - From 83944930bbf9990240972c451f6e81457b6923fa5b9f6d03d91c25054a1bd6e6 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 18 Aug 2015 13:13:27 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=89 --- doxygen-doc.spec | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ doxygen.spec | 61 ++++-------------------------- doxywizard.spec | 6 ++- 3 files changed, 111 insertions(+), 54 deletions(-) create mode 100644 doxygen-doc.spec diff --git a/doxygen-doc.spec b/doxygen-doc.spec new file mode 100644 index 0000000..74cc3ce --- /dev/null +++ b/doxygen-doc.spec @@ -0,0 +1,98 @@ +# +# spec file for package doxygen-doc +# +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: doxygen-doc +Version: 1.8.10 +Release: 0 +Summary: Automated C, C++, and Java Documentation Generator +License: GPL-2.0+ +Group: Development/Tools/Doc Generators +Url: http://www.stack.nl/~dimitri/doxygen/ +Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz +BuildRequires: bison +BuildRequires: cmake +BuildRequires: fdupes +BuildRequires: flex +BuildRequires: gcc-c++ +# see graphviz.spec: +# "If you need output in png format you also need to install graphviz-gnome." +BuildRequires: graphviz-gnome +BuildRequires: poppler-tools +BuildRequires: python-base +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Doxygen is a documentation system for C, C++, Java, and IDL. It can +generate an online class browser (in HTML) and an offline reference +manual (in LaTeX) from a set of documented source files. The +documentation is extracted directly from the sources. Doxygen is +developed on a Linux platform, but it runs on most other UNIX flavors +as well. An executable for Windows 95/NT is also available. + +This package contains only documentation + +%prep +%setup -q -n doxygen-%{version} + +%build +mkdir build +pushd build +cmake -G "Unix Makefiles" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \ + -Dbuild_doc=ON \ + -DDOC_INSTALL_DIR=share/doc/packages/%{name}-doc \ + .. +make docs %{?_smp_mflags} +popd + +%install +pushd build +make install docs %{?_smp_mflags} +popd +rm %{buildroot}%{_bindir}/doxygen +rm -r %{buildroot}/usr/man/man1/ +%fdupes -s %{buildroot}%{_docdir}/%{name}-doc + +%files +%defattr(-,root,root) +%doc %{_docdir}/%{name}-doc + +%changelog diff --git a/doxygen.spec b/doxygen.spec index 62f46b3..15bbe89 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -30,37 +30,11 @@ Patch0: %{name}-modify_footer.patch Patch1: %{name}-no-lowercase-man-names.patch BuildRequires: bison BuildRequires: cmake -BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ -# see graphviz.spec: -# "If you need output in png format you also need to install graphviz-gnome." -BuildRequires: graphviz-gnome -BuildRequires: libpng-devel -BuildRequires: poppler-tools BuildRequires: python-base 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 @@ -74,21 +48,7 @@ generate an online class browser (in HTML) and an offline reference manual (in LaTeX) from a set of documented source files. The documentation is extracted directly from the sources. Doxygen is developed on a Linux platform, but it runs on most other UNIX flavors -as well. An executable for Windows 95/NT is also available. - -%package doc -Summary: Documentation for %{name} -Group: Documentation - -%description doc -Doxygen is a documentation system for C, C++, Java, and IDL. It can -generate an online class browser (in HTML) and an offline reference -manual (in LaTeX) from a set of documented source files. The -documentation is extracted directly from the sources. Doxygen is -developed on a Linux platform, but it runs on most other UNIX flavors -as well. An executable for Windows 95/NT is also available. - -This package contains only documentation +as well. %prep %setup -q @@ -98,26 +58,25 @@ This package contains only documentation %build mkdir build pushd build -sed -i 's:man/man1:share/&:' ../doc/CMakeLists.txt cmake -G "Unix Makefiles" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \ - -Dbuild_doc=ON \ - -DDOC_INSTALL_DIR=share/doc/packages/%{name}-doc \ .. make %{?_smp_mflags} -make docs %{?_smp_mflags} popd %install -cd build +pushd build make install %{?_smp_mflags} -rm %{buildroot}%{_mandir}/man1/{doxysearch,doxyindexer,doxywizard}.1 +popd +mkdir -p %{buildroot}%{_mandir}/man1/ +install -m 644 doc/doxygen.1 %{buildroot}%{_mandir}/man1/ %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 %check -cd build +pushd build make tests %{?_smp_mflags} +popd %endif %files @@ -126,8 +85,4 @@ make tests %{?_smp_mflags} %attr(444,root,root) %doc %{_mandir}/man1/doxygen.1.gz %attr(755,root,root) %{_bindir}/* -%files doc -%defattr(-,root,root) -%doc %{_docdir}/%{name}-doc - %changelog diff --git a/doxywizard.spec b/doxywizard.spec index 3f051ef..caf1668 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -54,14 +54,18 @@ make %{?_smp_mflags} popd %install -cd build +pushd build make install %{?_smp_mflags} +popd rm %{buildroot}%{_bindir}/doxygen +mkdir -p %{buildroot}%{_mandir}/man1/ +install -m 644 doc/doxywizard.1 %{buildroot}%{_mandir}/man1/ %suse_update_desktop_file -i doxywizard Development Documentation %files %defattr(-,root,root) %attr(755,root,root) %{_bindir}/doxywizard %{_datadir}/applications/doxywizard.desktop +%{_mandir}/man1/doxywizard.1.gz %changelog From 49ccf02d875f003b4bd78d4af6aa00ff398517dd8f3802acaacc304158342800 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 19 Aug 2015 08:00:57 +0000 Subject: [PATCH 4/8] - doxygen-doc package created OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=90 --- doxygen-doc.changes | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doxygen-doc.changes diff --git a/doxygen-doc.changes b/doxygen-doc.changes new file mode 100644 index 0000000..103a2da --- /dev/null +++ b/doxygen-doc.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Wed Aug 19 08:00:39 UTC 2015 - pgajdos@suse.com + +- doxygen-doc package created + From 19d91ee541c389323e4d920370e41e37eaa529f971af3e41f4c818dabbb1c052 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 24 Aug 2015 14:41:48 +0000 Subject: [PATCH 5/8] Accepting request 326432 from home:scarabeus_iv:branches:devel:tools - Set proper minimal cmake version required - Use system stack for cmake params and obey cflags - Add patch to build required static libs: * doxygen-no-shared-libs.patch - Refresh patch: * doxygen-no-lowercase-man-names.patch - Add patch to avoid no-return-in-nonvoid function error: * vhdlparser-no-return.patch - Set proper minimal cmake version required - Use system stack for cmake params and obey cflags - Add patch to build required static libs: * doxygen-no-shared-libs.patch - Refresh patch: * doxygen-no-lowercase-man-names.patch - Add patch to avoid no-return-in-nonvoid function error: * vhdlparser-no-return.patch - Set proper minimal cmake version required - Use system stack for cmake params and obey cflags - Add patch to build required static libs: * doxygen-no-shared-libs.patch - Refresh patch: * doxygen-no-lowercase-man-names.patch - Add patch to avoid no-return-in-nonvoid function error: * vhdlparser-no-return.patch OBS-URL: https://build.opensuse.org/request/show/326432 OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=91 --- doxygen-doc.changes | 12 + doxygen-doc.spec | 37 ++- doxygen-no-lowercase-man-names.patch | 8 +- doxygen-no-shared-libs.patch | 54 +++ doxygen.changes | 12 + doxygen.spec | 39 ++- doxywizard.changes | 12 + doxywizard.spec | 32 +- vhdlparser-no-return.patch | 476 +++++++++++++++++++++++++++ 9 files changed, 633 insertions(+), 49 deletions(-) create mode 100644 doxygen-no-shared-libs.patch create mode 100644 vhdlparser-no-return.patch diff --git a/doxygen-doc.changes b/doxygen-doc.changes index 103a2da..94e4c07 100644 --- a/doxygen-doc.changes +++ b/doxygen-doc.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Aug 21 10:01:07 UTC 2015 - tchvatal@suse.com + +- Set proper minimal cmake version required +- Use system stack for cmake params and obey cflags +- Add patch to build required static libs: + * doxygen-no-shared-libs.patch +- Refresh patch: + * doxygen-no-lowercase-man-names.patch +- Add patch to avoid no-return-in-nonvoid function error: + * vhdlparser-no-return.patch + ------------------------------------------------------------------- Wed Aug 19 08:00:39 UTC 2015 - pgajdos@suse.com diff --git a/doxygen-doc.spec b/doxygen-doc.spec index 74cc3ce..63be4a3 100644 --- a/doxygen-doc.spec +++ b/doxygen-doc.spec @@ -24,8 +24,13 @@ License: GPL-2.0+ Group: Development/Tools/Doc Generators Url: http://www.stack.nl/~dimitri/doxygen/ Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz +# PATCH-FIX-UPSTREAM: declare static library where we don't want to provide +# shared one +Patch2: doxygen-no-shared-libs.patch +# PATCH-FIX-UPSTREAM: add missing returns to non-void functions +Patch3: vhdlparser-no-return.patch BuildRequires: bison -BuildRequires: cmake +BuildRequires: cmake >= 2.8.12 BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ @@ -64,35 +69,37 @@ generate an online class browser (in HTML) and an offline reference manual (in LaTeX) from a set of documented source files. The documentation is extracted directly from the sources. Doxygen is developed on a Linux platform, but it runs on most other UNIX flavors -as well. An executable for Windows 95/NT is also available. +as well. This package contains only documentation %prep %setup -q -n doxygen-%{version} +%patch2 -p1 +%patch3 -p1 %build -mkdir build -pushd build -cmake -G "Unix Makefiles" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \ - -Dbuild_doc=ON \ - -DDOC_INSTALL_DIR=share/doc/packages/%{name}-doc \ - .. +export CFLAGS="%{optflags} -fPIC" +export CXXFLAGS="%{optflags} -fPIC" +%cmake \ + -DDOC_INSTALL_DIR=share/doc/packages/%{name} \ + -Dbuild_doc=ON \ + -Dbuild_xmlparser=OFF \ + -Dbuild_search=OFF \ + -Dbuild_wizard=OFF \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" make docs %{?_smp_mflags} -popd %install -pushd build -make install docs %{?_smp_mflags} -popd +%cmake_install docs rm %{buildroot}%{_bindir}/doxygen rm -r %{buildroot}/usr/man/man1/ %fdupes -s %{buildroot}%{_docdir}/%{name}-doc %files %defattr(-,root,root) -%doc %{_docdir}/%{name}-doc +%doc %{_docdir}/%{name} %changelog diff --git a/doxygen-no-lowercase-man-names.patch b/doxygen-no-lowercase-man-names.patch index 7b9d593..3150e62 100644 --- a/doxygen-no-lowercase-man-names.patch +++ b/doxygen-no-lowercase-man-names.patch @@ -1,8 +1,8 @@ -Index: doxygen-1.8.1/src/fortranscanner.l +Index: doxygen-1.8.10/src/fortranscanner.l =================================================================== ---- doxygen-1.8.1.orig/src/fortranscanner.l -+++ doxygen-1.8.1/src/fortranscanner.l -@@ -1892,7 +1891,6 @@ static void initEntry() +--- doxygen-1.8.10.orig/src/fortranscanner.l ++++ doxygen-1.8.10/src/fortranscanner.l +@@ -2090,7 +2090,6 @@ static void initEntry() */ static void addCurrentEntry(int case_insens) { diff --git a/doxygen-no-shared-libs.patch b/doxygen-no-shared-libs.patch new file mode 100644 index 0000000..f78f54a --- /dev/null +++ b/doxygen-no-shared-libs.patch @@ -0,0 +1,54 @@ +Index: doxygen-1.8.10/libmd5/CMakeLists.txt +=================================================================== +--- doxygen-1.8.10.orig/libmd5/CMakeLists.txt ++++ doxygen-1.8.10/libmd5/CMakeLists.txt +@@ -1,3 +1,3 @@ +-add_library(md5 ++add_library(md5 STATIC + md5.c + ) +Index: doxygen-1.8.10/qtools/CMakeLists.txt +=================================================================== +--- doxygen-1.8.10.orig/qtools/CMakeLists.txt ++++ doxygen-1.8.10/qtools/CMakeLists.txt +@@ -52,6 +52,6 @@ qwaitcondition_win32.cpp + ) + endif() + +-add_library(qtools ++add_library(qtools STATIC + ${qtools_src} + ) +Index: doxygen-1.8.10/src/CMakeLists.txt +=================================================================== +--- doxygen-1.8.10.orig/src/CMakeLists.txt ++++ doxygen-1.8.10/src/CMakeLists.txt +@@ -106,7 +106,7 @@ FLEX_TARGET(config config.l + BISON_TARGET(vhdlparser vhdlparser.y ${GENERATED_SRC}/vhdlparser.cpp COMPILE_FLAGS "-l -p vhdlscannerYY") + BISON_TARGET(constexp constexp.y ${GENERATED_SRC}/ce_parse.cpp COMPILE_FLAGS "-l -p constexpYY") + +-add_library(doxycfg ++add_library(doxycfg STATIC + ${GENERATED_SRC}/lang_cfg.h + ${GENERATED_SRC}/config.cpp + ${GENERATED_SRC}/configoptions.cpp +@@ -114,7 +114,7 @@ add_library(doxycfg + portable_c.c + ) + +-add_library(_doxygen ++add_library(_doxygen STATIC + # custom generated files + ${GENERATED_SRC}/lang_cfg.h + ${GENERATED_SRC}/settings.h +Index: doxygen-1.8.10/vhdlparser/CMakeLists.txt +=================================================================== +--- doxygen-1.8.10.orig/vhdlparser/CMakeLists.txt ++++ doxygen-1.8.10/vhdlparser/CMakeLists.txt +@@ -1,5 +1,5 @@ + include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools) +-add_library(vhdlparser ++add_library(vhdlparser STATIC + CharStream.cc + ParseException.cc + Token.cc diff --git a/doxygen.changes b/doxygen.changes index 8da8ef7..3b41e8c 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Aug 21 09:41:39 UTC 2015 - tchvatal@suse.com + +- Set proper minimal cmake version required +- Use system stack for cmake params and obey cflags +- Add patch to build required static libs: + * doxygen-no-shared-libs.patch +- Refresh patch: + * doxygen-no-lowercase-man-names.patch +- Add patch to avoid no-return-in-nonvoid function error: + * vhdlparser-no-return.patch + ------------------------------------------------------------------- Mon Aug 17 14:52:48 UTC 2015 - pgajdos@suse.com diff --git a/doxygen.spec b/doxygen.spec index 15bbe89..a06173b 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -28,19 +28,23 @@ Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar Patch0: %{name}-modify_footer.patch # suse specific Patch1: %{name}-no-lowercase-man-names.patch +# PATCH-FIX-UPSTREAM: declare static library where we don't want to provide +# shared one +Patch2: doxygen-no-shared-libs.patch +# PATCH-FIX-UPSTREAM: add missing returns to non-void functions +Patch3: vhdlparser-no-return.patch BuildRequires: bison -BuildRequires: cmake +BuildRequires: cmake >= 2.8.12 BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: python-base BuildRequires: python-xml - +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 # for make tests BuildRequires: libxml2-tools BuildRequires: texlive-bibtex %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Doxygen is a documentation system for C, C++, Java, and IDL. It can @@ -51,24 +55,27 @@ developed on a Linux platform, but it runs on most other UNIX flavors as well. %prep -%setup -q +%setup -q %patch0 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build -mkdir build -pushd build -cmake -G "Unix Makefiles" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \ - .. -make %{?_smp_mflags} -popd +export CFLAGS="%{optflags} -fPIC" +export CXXFLAGS="%{optflags} -fPIC" +%cmake \ + -Dbuild_doc=OFF \ + -Dbuild_xmlparser=ON \ + -Dbuild_search=OFF \ + -Dbuild_wizard=OFF \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" +make %{?_smp_mflags} %install -pushd build -make install %{?_smp_mflags} -popd +%cmake_install mkdir -p %{buildroot}%{_mandir}/man1/ install -m 644 doc/doxygen.1 %{buildroot}%{_mandir}/man1/ @@ -82,7 +89,7 @@ popd %files %defattr(-,root,root) %doc LICENSE -%attr(444,root,root) %doc %{_mandir}/man1/doxygen.1.gz +%attr(444,root,root) %{_mandir}/man1/doxygen.1.gz %attr(755,root,root) %{_bindir}/* %changelog diff --git a/doxywizard.changes b/doxywizard.changes index f5e2ce5..6db72cc 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Aug 21 09:42:05 UTC 2015 - tchvatal@suse.com + +- Set proper minimal cmake version required +- Use system stack for cmake params and obey cflags +- Add patch to build required static libs: + * doxygen-no-shared-libs.patch +- Refresh patch: + * doxygen-no-lowercase-man-names.patch +- Add patch to avoid no-return-in-nonvoid function error: + * vhdlparser-no-return.patch + ------------------------------------------------------------------- Mon Aug 17 16:07:31 UTC 2015 - pgajdos@suse.com diff --git a/doxywizard.spec b/doxywizard.spec index caf1668..683a153 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -25,15 +25,20 @@ Group: Development/Tools/Doc Generators Url: http://www.stack.nl/~dimitri/doxygen/ Source: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz Source1: doxywizard.desktop +# PATCH-FIX-UPSTREAM: declare static library where we don't want to provide +# shared one +Patch2: doxygen-no-shared-libs.patch +# PATCH-FIX-UPSTREAM: add missing returns to non-void functions +Patch3: vhdlparser-no-return.patch BuildRequires: bison -BuildRequires: cmake +BuildRequires: cmake >= 2.8.12 BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: libjpeg-devel -Requires: doxygen = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libqt4-devel >= 4.3 BuildRequires: update-desktop-files +Requires: doxygen = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Doxywizard is a graphical front-end to read/edit/write doxygen @@ -41,22 +46,21 @@ configuration files. %prep %setup -q -n doxygen-%{version} +%patch2 -p1 +%patch3 -p1 %build -mkdir build -pushd build -cmake -G "Unix Makefiles" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \ - -Dbuild_wizard=ON \ - .. +export CFLAGS="%{optflags} -fPIC" +export CXXFLAGS="%{optflags} -fPIC" +%cmake \ + -Dbuild_wizard=ON \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" make %{?_smp_mflags} -popd %install -pushd build -make install %{?_smp_mflags} -popd +%cmake_install rm %{buildroot}%{_bindir}/doxygen mkdir -p %{buildroot}%{_mandir}/man1/ install -m 644 doc/doxywizard.1 %{buildroot}%{_mandir}/man1/ diff --git a/vhdlparser-no-return.patch b/vhdlparser-no-return.patch new file mode 100644 index 0000000..70eb359 --- /dev/null +++ b/vhdlparser-no-return.patch @@ -0,0 +1,476 @@ +Index: doxygen-1.8.10/vhdlparser/VhdlParser.cc +=================================================================== +--- doxygen-1.8.10.orig/vhdlparser/VhdlParser.cc ++++ doxygen-1.8.10/vhdlparser/VhdlParser.cc +@@ -62,6 +62,7 @@ return tok->image.c_str(); + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -118,6 +119,7 @@ return str; + } + } + assert(false); ++return QCString(); + } + + +@@ -187,6 +189,7 @@ s+="(";s+=s1+")";return s; + } + } + assert(false); ++return QCString(); + } + + +@@ -231,6 +234,7 @@ return "&"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -403,6 +407,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -634,6 +639,7 @@ return s; + } + } + assert(false); ++return QCString(); + } + + +@@ -847,6 +853,7 @@ return tok->image.c_str(); + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -1718,6 +1725,7 @@ return " others "; + } + } + assert(false); ++return QCString(); + } + + +@@ -2009,6 +2017,7 @@ return s+"#"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -2621,6 +2630,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -2712,6 +2722,7 @@ return s+" inertial "; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -2813,6 +2824,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -2846,6 +2858,7 @@ return tok->image.c_str(); + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -2913,6 +2926,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -3043,6 +3057,7 @@ return tok->image.c_str(); + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -3241,6 +3256,7 @@ return "file"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -3728,6 +3744,7 @@ return "all"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -3844,6 +3861,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -3878,6 +3896,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -4116,6 +4135,7 @@ return "or" ; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -4212,6 +4232,7 @@ s1="not ";return s1+s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -4363,6 +4384,7 @@ return tok->image.c_str(); + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -4683,6 +4705,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -4844,6 +4867,7 @@ return tok->image.c_str(); + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -5130,6 +5154,7 @@ return s; + } + } + assert(false); ++return QCString(); + } + + +@@ -5248,6 +5273,7 @@ s1="configuration ";return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -5293,6 +5319,7 @@ return tok->image.c_str(); + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -5401,6 +5428,7 @@ if (parse_sec==GEN_SEC) + } + } + assert(false); ++return QCString(); + } + + +@@ -5666,6 +5694,7 @@ QCString q=lab+" for "+s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -5743,6 +5772,7 @@ return s; + } + } + assert(false); ++return QCString(); + } + + +@@ -5805,6 +5835,7 @@ return "null"; + } + } + assert(false); ++return QCString(); + } + + +@@ -5950,6 +5981,7 @@ return "not"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -6016,6 +6048,7 @@ return "linkage"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -6071,6 +6104,7 @@ return tok->image.c_str(); + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -6511,6 +6545,7 @@ return s; + } + } + assert(false); ++return QCString(); + } + + +@@ -6592,6 +6627,7 @@ return "type"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -7402,6 +7438,7 @@ return s; + } + } + assert(false); ++return QCString(); + } + + +@@ -7674,6 +7711,7 @@ return s; + } + } + assert(false); ++return QCString(); + } + + +@@ -8033,6 +8071,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -8212,6 +8251,7 @@ return "/="; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -8384,6 +8424,7 @@ return s+" "+s1+"%"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -8745,6 +8786,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_ + } + } + assert(false); ++return QCString(); + } + + +@@ -8856,6 +8898,7 @@ return "ror"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -8889,6 +8932,7 @@ return "-"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -8983,6 +9027,7 @@ return s+s1+"<="+s2+s3+";"; + } + } + assert(false); ++return QCString(); + } + + +@@ -9087,6 +9132,7 @@ return "bus"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -9157,6 +9203,7 @@ return "all"; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -9630,6 +9677,7 @@ return s; + } + } + assert(false); ++return QCString(); + } + + +@@ -10045,6 +10093,7 @@ return " all "; + } + } + assert(false); ++return QCString(); + } + + +@@ -10081,6 +10130,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -10183,6 +10233,7 @@ return s; + } + } + assert(false); ++return QCString(); + } + + +@@ -10267,6 +10318,7 @@ return ""; + } + } + assert(false); ++return QCString(); + } + + +@@ -10458,6 +10510,7 @@ return ""; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -10692,6 +10745,7 @@ return " unaffected "; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -11176,6 +11230,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -11666,6 +11721,7 @@ return t->image.data(); + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -11710,6 +11766,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + +@@ -11755,6 +11812,7 @@ return "."+s; + } + } + assert(false); ++return QCString(); + } + + +@@ -12557,6 +12615,7 @@ return s; + errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true; + } + assert(false); ++return QCString(); + } + + From 1406d9d5ed8494c44dcfd459c3f3156c31ee6d8e14f37872e487be04ef643c83 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 27 Aug 2015 08:18:38 +0000 Subject: [PATCH 6/8] Accepting request 327292 from home:pluskalm:branches:devel:tools - Move checks to doxywizard package to avoid build cycle - Move checks to doxywizard package to avoid build cycle OBS-URL: https://build.opensuse.org/request/show/327292 OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=92 --- doxygen.changes | 5 +++++ doxygen.spec | 12 ------------ doxywizard.changes | 5 +++++ doxywizard.spec | 12 ++++++++++++ 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/doxygen.changes b/doxygen.changes index 3b41e8c..a57e1b6 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 27 07:34:04 UTC 2015 - mpluskal@suse.com + +- Move checks to doxywizard package to avoid build cycle + ------------------------------------------------------------------- Fri Aug 21 09:41:39 UTC 2015 - tchvatal@suse.com diff --git a/doxygen.spec b/doxygen.spec index a06173b..25d8854 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -40,11 +40,6 @@ BuildRequires: gcc-c++ BuildRequires: python-base BuildRequires: python-xml BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 -# for make tests -BuildRequires: libxml2-tools -BuildRequires: texlive-bibtex -%endif %description Doxygen is a documentation system for C, C++, Java, and IDL. It can @@ -79,13 +74,6 @@ make %{?_smp_mflags} mkdir -p %{buildroot}%{_mandir}/man1/ install -m 644 doc/doxygen.1 %{buildroot}%{_mandir}/man1/ -%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 -%check -pushd build -make tests %{?_smp_mflags} -popd -%endif - %files %defattr(-,root,root) %doc LICENSE diff --git a/doxywizard.changes b/doxywizard.changes index 6db72cc..239af06 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 27 07:34:32 UTC 2015 - mpluskal@suse.com + +- Move checks to doxywizard package to avoid build cycle + ------------------------------------------------------------------- Fri Aug 21 09:42:05 UTC 2015 - tchvatal@suse.com diff --git a/doxywizard.spec b/doxywizard.spec index 683a153..aa19b5b 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -39,6 +39,11 @@ BuildRequires: libqt4-devel >= 4.3 BuildRequires: update-desktop-files Requires: doxygen = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 +# for make tests +BuildRequires: libxml2-tools +BuildRequires: texlive-bibtex +%endif %description Doxywizard is a graphical front-end to read/edit/write doxygen @@ -59,6 +64,13 @@ export CXXFLAGS="%{optflags} -fPIC" -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" make %{?_smp_mflags} +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 +%check +pushd build +make tests %{?_smp_mflags} +popd +%endif + %install %cmake_install rm %{buildroot}%{_bindir}/doxygen From 988d1498c3c7982962a6a1ec5aba8affb5b6276dd71eda619a2ba4b87087796b Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 31 Aug 2015 10:52:05 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=93 --- doxygen.changes | 5 ----- doxygen.spec | 12 ++++++++++++ doxywizard.changes | 5 ----- doxywizard.spec | 12 ------------ 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/doxygen.changes b/doxygen.changes index a57e1b6..3b41e8c 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Aug 27 07:34:04 UTC 2015 - mpluskal@suse.com - -- Move checks to doxywizard package to avoid build cycle - ------------------------------------------------------------------- Fri Aug 21 09:41:39 UTC 2015 - tchvatal@suse.com diff --git a/doxygen.spec b/doxygen.spec index 25d8854..a06173b 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -40,6 +40,11 @@ BuildRequires: gcc-c++ BuildRequires: python-base BuildRequires: python-xml BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 +# for make tests +BuildRequires: libxml2-tools +BuildRequires: texlive-bibtex +%endif %description Doxygen is a documentation system for C, C++, Java, and IDL. It can @@ -74,6 +79,13 @@ make %{?_smp_mflags} mkdir -p %{buildroot}%{_mandir}/man1/ install -m 644 doc/doxygen.1 %{buildroot}%{_mandir}/man1/ +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 +%check +pushd build +make tests %{?_smp_mflags} +popd +%endif + %files %defattr(-,root,root) %doc LICENSE diff --git a/doxywizard.changes b/doxywizard.changes index 239af06..6db72cc 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Aug 27 07:34:32 UTC 2015 - mpluskal@suse.com - -- Move checks to doxywizard package to avoid build cycle - ------------------------------------------------------------------- Fri Aug 21 09:42:05 UTC 2015 - tchvatal@suse.com diff --git a/doxywizard.spec b/doxywizard.spec index aa19b5b..683a153 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -39,11 +39,6 @@ BuildRequires: libqt4-devel >= 4.3 BuildRequires: update-desktop-files Requires: doxygen = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 -# for make tests -BuildRequires: libxml2-tools -BuildRequires: texlive-bibtex -%endif %description Doxywizard is a graphical front-end to read/edit/write doxygen @@ -64,13 +59,6 @@ export CXXFLAGS="%{optflags} -fPIC" -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" make %{?_smp_mflags} -%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 -%check -pushd build -make tests %{?_smp_mflags} -popd -%endif - %install %cmake_install rm %{buildroot}%{_bindir}/doxygen From 18f3d1f6121b7fe5e8e24d099bad120a8614c6c81f9c4fa6ba54c4ed8db84eca Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 4 Sep 2015 16:35:03 +0000 Subject: [PATCH 8/8] - Move checks to doxywizard package to avoid build cycle - Move checks to doxywizard package to avoid build cycle OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=94 --- doxygen.changes | 5 +++++ doxygen.spec | 12 ------------ doxywizard.changes | 5 +++++ doxywizard.spec | 14 ++++++++++++++ 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/doxygen.changes b/doxygen.changes index 3b41e8c..a57e1b6 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 27 07:34:04 UTC 2015 - mpluskal@suse.com + +- Move checks to doxywizard package to avoid build cycle + ------------------------------------------------------------------- Fri Aug 21 09:41:39 UTC 2015 - tchvatal@suse.com diff --git a/doxygen.spec b/doxygen.spec index a06173b..25d8854 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -40,11 +40,6 @@ BuildRequires: gcc-c++ BuildRequires: python-base BuildRequires: python-xml BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 -# for make tests -BuildRequires: libxml2-tools -BuildRequires: texlive-bibtex -%endif %description Doxygen is a documentation system for C, C++, Java, and IDL. It can @@ -79,13 +74,6 @@ make %{?_smp_mflags} mkdir -p %{buildroot}%{_mandir}/man1/ install -m 644 doc/doxygen.1 %{buildroot}%{_mandir}/man1/ -%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 -%check -pushd build -make tests %{?_smp_mflags} -popd -%endif - %files %defattr(-,root,root) %doc LICENSE diff --git a/doxywizard.changes b/doxywizard.changes index 6db72cc..239af06 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 27 07:34:32 UTC 2015 - mpluskal@suse.com + +- Move checks to doxywizard package to avoid build cycle + ------------------------------------------------------------------- Fri Aug 21 09:42:05 UTC 2015 - tchvatal@suse.com diff --git a/doxywizard.spec b/doxywizard.spec index 683a153..76afcc4 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -39,6 +39,11 @@ BuildRequires: libqt4-devel >= 4.3 BuildRequires: update-desktop-files Requires: doxygen = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 +# for make tests +BuildRequires: libxml2-tools +BuildRequires: texlive-bibtex +%endif %description Doxywizard is a graphical front-end to read/edit/write doxygen @@ -59,6 +64,15 @@ export CXXFLAGS="%{optflags} -fPIC" -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" make %{?_smp_mflags} +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 +%check +# testing doxygen package here to avoid build +# cycle between latex and doxygen +pushd build +make tests %{?_smp_mflags} +popd +%endif + %install %cmake_install rm %{buildroot}%{_bindir}/doxygen