From 51680739a18e8c40567123dbf38accae99dcdf13b943ca2d9245a06658caaf0e Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 14 Mar 2018 13:00:19 +0000 Subject: [PATCH 1/4] KDE Frameworks 5.44.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kapidox?expand=0&rev=133 --- kapidox-5.43.0.tar.xz | 3 --- kapidox-5.44.0.tar.xz | 3 +++ kapidox.changes | 12 ++++++++++++ kapidox.spec | 4 ++-- 4 files changed, 17 insertions(+), 5 deletions(-) delete mode 100644 kapidox-5.43.0.tar.xz create mode 100644 kapidox-5.44.0.tar.xz diff --git a/kapidox-5.43.0.tar.xz b/kapidox-5.43.0.tar.xz deleted file mode 100644 index 7b037da..0000000 --- a/kapidox-5.43.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:812454d75a8d50ecad67f82a030945b27c448dbfe6f9be9311ef63e0e9456530 -size 395592 diff --git a/kapidox-5.44.0.tar.xz b/kapidox-5.44.0.tar.xz new file mode 100644 index 0000000..8113303 --- /dev/null +++ b/kapidox-5.44.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:446ea08e3ad750563129f8d41c9200dee30322c345f23025385b69d8273bc656 +size 395668 diff --git a/kapidox.changes b/kapidox.changes index 026cadb..de02c67 100644 --- a/kapidox.changes +++ b/kapidox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Mar 12 23:29:40 CET 2018 - lbeltrame@kde.org + +- Update to 5.44.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.44.0.php +- Changes since 5.43.0: + * QCH files are now generated and available. + remove unused variables and functions + * Remove some unused arguments from the input parsing + * Exit in error if the output directory is not empty. + Some other small fixes (kde#390904) + ------------------------------------------------------------------- Mon Feb 12 23:42:07 CET 2018 - lbeltrame@kde.org diff --git a/kapidox.spec b/kapidox.spec index dd61a6e..b5c2b14 100644 --- a/kapidox.spec +++ b/kapidox.spec @@ -16,13 +16,13 @@ # -%define _tar_path 5.43 +%define _tar_path 5.44 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kapidox -Version: 5.43.0 +Version: 5.44.0 Release: 0 Requires: doxygen BuildRequires: fdupes From 24e7309aaee4651c7156797975d6dc6733af6a071a93b10657443ff7def2c0bf Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 14 Mar 2018 13:43:25 +0000 Subject: [PATCH 2/4] - Add 0001-Look-first-for-qhelpgenerator-qt5-for-help-generatio.patch: * Look for qhelpgenerator-qt5 first (as it's named in openSUSE) - Add 0001-Remove-shebangs-from-non-executable-files.patch: * Remove shebangs from non-executable files - Add an explicit dependency on libqt5-qttools (needed for QCH generation) OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kapidox?expand=0&rev=134 --- ...helpgenerator-qt5-for-help-generatio.patch | 55 +++++++++++++++++++ ...e-shebangs-from-non-executable-files.patch | 43 +++++++++++++++ kapidox.changes | 10 ++++ kapidox.spec | 30 ++++++---- 4 files changed, 126 insertions(+), 12 deletions(-) create mode 100644 0001-Look-first-for-qhelpgenerator-qt5-for-help-generatio.patch create mode 100644 0001-Remove-shebangs-from-non-executable-files.patch diff --git a/0001-Look-first-for-qhelpgenerator-qt5-for-help-generatio.patch b/0001-Look-first-for-qhelpgenerator-qt5-for-help-generatio.patch new file mode 100644 index 0000000..3d44346 --- /dev/null +++ b/0001-Look-first-for-qhelpgenerator-qt5-for-help-generatio.patch @@ -0,0 +1,55 @@ +From 64dac1ad3c8db765dd269ee6ec8a4549bb93d598 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame +Date: Wed, 14 Mar 2018 09:25:02 +0100 +Subject: [PATCH] Look first for qhelpgenerator-qt5 for help generation + +Summary: +A number of distributions uses the -qt5 suffix for Qt command line +tools, to make sure they can coexist with the Qt4 equivalents. + +This change uses `distutils`'s `find_executable` to look for the -qt5 +suffix of `qhelpgenerator`. If it is not found, it falls back to the +un-suffixed version. + +Reviewers: #frameworks, ochurlaud + +Subscribers: #documentation + +Tags: #frameworks, #documentation + +Differential Revision: https://phabricator.kde.org/D11315 +--- + src/kapidox/generator.py | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/kapidox/generator.py b/src/kapidox/generator.py +index 3fdf5e7..3346a47 100644 +--- a/src/kapidox/generator.py ++++ b/src/kapidox/generator.py +@@ -30,6 +30,7 @@ + from __future__ import division, absolute_import, print_function, unicode_literals + + import codecs ++from distutils.spawn import find_executable + import datetime + import os + import logging +@@ -928,5 +929,14 @@ def create_qch(products, tagfiles): + name = product.name+".qhp" + outname = product.name+".qch" + tree_out.write(name, encoding="utf-8", xml_declaration=True) +- subprocess.call(["qhelpgenerator", name, '-o', 'qch/'+outname]) ++ ++ # On many distributions, qhelpgenerator from Qt5 is suffixed with ++ # "-qt5". Look for it first, and fall back to unsuffixed one if ++ # not found. ++ qhelpgenerator = find_executable("qhelpgenerator-qt5") ++ ++ if qhelpgenerator is None: ++ qhelpgenerator = "qhelpgenerator" ++ ++ subprocess.call([qhelpgenerator, name, '-o', 'qch/'+outname]) + os.remove(name) +-- +2.16.2 + diff --git a/0001-Remove-shebangs-from-non-executable-files.patch b/0001-Remove-shebangs-from-non-executable-files.patch new file mode 100644 index 0000000..0af69e8 --- /dev/null +++ b/0001-Remove-shebangs-from-non-executable-files.patch @@ -0,0 +1,43 @@ +From b9d46fec4437ababe8a77e197059733633977c89 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame +Date: Wed, 14 Mar 2018 14:34:15 +0100 +Subject: [PATCH] Remove shebangs from non-executable files + +Summary: +These files are meant to be used as part of the import, not directly. +Therefore it makes no sense to have /usr/bin/env python calls on top. +(Other files correctly don't have shebangs) + +Reviewers: #frameworks, ochurlaud + +Subscribers: #documentation + +Tags: #frameworks, #documentation + +Differential Revision: https://phabricator.kde.org/D11330 +--- + src/kapidox/depdiagram/generate.py | 1 - + src/kapidox/hlfunctions.py | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/kapidox/depdiagram/generate.py b/src/kapidox/depdiagram/generate.py +index 20fae6f..af80d51 100644 +--- a/src/kapidox/depdiagram/generate.py ++++ b/src/kapidox/depdiagram/generate.py +@@ -1,4 +1,3 @@ +-#! /usr/bin/env python + # -*- coding: utf-8 -*- + # + # Copyright 2014 Aurélien Gâteau +diff --git a/src/kapidox/hlfunctions.py b/src/kapidox/hlfunctions.py +index 26571b8..ed1dd68 100644 +--- a/src/kapidox/hlfunctions.py ++++ b/src/kapidox/hlfunctions.py +@@ -1,4 +1,3 @@ +-#! /usr/bin/env python + # -*- coding: utf-8 -*- + # + # Copyright 2014 Alex Merry +-- +2.16.2 + diff --git a/kapidox.changes b/kapidox.changes index de02c67..ac47736 100644 --- a/kapidox.changes +++ b/kapidox.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Mar 14 13:37:16 UTC 2018 - lbeltrame@kde.org + +- Add 0001-Look-first-for-qhelpgenerator-qt5-for-help-generatio.patch: + * Look for qhelpgenerator-qt5 first (as it's named in openSUSE) +- Add 0001-Remove-shebangs-from-non-executable-files.patch: + * Remove shebangs from non-executable files +- Add an explicit dependency on libqt5-qttools (needed for QCH + generation) + ------------------------------------------------------------------- Mon Mar 12 23:29:40 CET 2018 - lbeltrame@kde.org diff --git a/kapidox.spec b/kapidox.spec index b5c2b14..451c539 100644 --- a/kapidox.spec +++ b/kapidox.spec @@ -27,33 +27,39 @@ Release: 0 Requires: doxygen BuildRequires: fdupes BuildRequires: kf5-filesystem -BuildRequires: python -Requires: python-Jinja2 -Recommends: python-PyYAML +BuildRequires: python3 +Requires: python3-Jinja2 +Recommends: python3-PyYAML Requires: doxygen Requires: graphviz Requires: graphviz-gd -Requires: python-xml -Summary: KDE Base Libraries +Requires: libqt5-qttools +Requires: python3-xml +Summary: Scripts and data for building API documentation License: BSD-2-Clause Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Remove-shebangs-from-non-executable-files.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Look-first-for-qhelpgenerator-qt5-for-help-generatio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description -This package contains the core libraries of the K Desktop Environment. - -This package is absolutely necessary for using KDE applications. +The kapidox framework enables the generation of API documentation from +Doxygen-formatted codde comments in a standard format and style. %prep %setup -q +%autopatch -p1 %build - python setup.py build + python3 setup.py build %install - python setup.py install --prefix=%{_kf5_prefix} --root=%{buildroot} + python3 setup.py install --prefix=%{_kf5_prefix} --root=%{buildroot} %fdupes %{buildroot} %files @@ -66,7 +72,7 @@ This package is absolutely necessary for using KDE applications. %{_kf5_mandir}/man1/depdiagram-generate-all.1* %{_kf5_mandir}/man1/depdiagram-generate.1* %{_kf5_mandir}/man1/depdiagram-prepare.1* -%{python_sitelib}/kapidox/ -%{python_sitelib}/kapidox-*.egg-info +%{python3_sitelib}/kapidox/ +%{python3_sitelib}/kapidox-*.egg-info %changelog From 66e23ef606925dfe887ec86a508705cc92d5a33e14bf3a21654ba9f436f4c642 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 14 Mar 2018 14:03:50 +0000 Subject: [PATCH 3/4] - Rework summary and description to match what this package does - Switch from Python 2 to Python 3 usage OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kapidox?expand=0&rev=135 --- kapidox.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kapidox.changes b/kapidox.changes index ac47736..fa925d9 100644 --- a/kapidox.changes +++ b/kapidox.changes @@ -7,6 +7,8 @@ Wed Mar 14 13:37:16 UTC 2018 - lbeltrame@kde.org * Remove shebangs from non-executable files - Add an explicit dependency on libqt5-qttools (needed for QCH generation) +- Rework summary and description to match what this package does +- Switch from Python 2 to Python 3 usage ------------------------------------------------------------------- Mon Mar 12 23:29:40 CET 2018 - lbeltrame@kde.org From e1bd0a3a72c0433f05adaba4b1cac60d02428c9dc9b1464d8ceeea3bc241e420 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 14 Mar 2018 14:05:40 +0000 Subject: [PATCH 4/4] - Rework summary and description to match what this package actually does - Reformat the spec with spec-cleaner OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kapidox?expand=0&rev=136 --- kapidox.changes | 4 +++- kapidox.spec | 26 ++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/kapidox.changes b/kapidox.changes index fa925d9..6be1f4b 100644 --- a/kapidox.changes +++ b/kapidox.changes @@ -7,8 +7,10 @@ Wed Mar 14 13:37:16 UTC 2018 - lbeltrame@kde.org * Remove shebangs from non-executable files - Add an explicit dependency on libqt5-qttools (needed for QCH generation) -- Rework summary and description to match what this package does +- Rework summary and description to match what this package actually + does - Switch from Python 2 to Python 3 usage +- Reformat the spec with spec-cleaner ------------------------------------------------------------------- Mon Mar 12 23:29:40 CET 2018 - lbeltrame@kde.org diff --git a/kapidox.spec b/kapidox.spec index 451c539..70f521e 100644 --- a/kapidox.spec +++ b/kapidox.spec @@ -24,17 +24,6 @@ Name: kapidox Version: 5.44.0 Release: 0 -Requires: doxygen -BuildRequires: fdupes -BuildRequires: kf5-filesystem -BuildRequires: python3 -Requires: python3-Jinja2 -Recommends: python3-PyYAML -Requires: doxygen -Requires: graphviz -Requires: graphviz-gd -Requires: libqt5-qttools -Requires: python3-xml Summary: Scripts and data for building API documentation License: BSD-2-Clause Group: System/GUI/KDE @@ -44,7 +33,16 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-% Patch0: 0001-Remove-shebangs-from-non-executable-files.patch # PATCH-FIX-UPSTREAM Patch1: 0001-Look-first-for-qhelpgenerator-qt5-for-help-generatio.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: fdupes +BuildRequires: kf5-filesystem +BuildRequires: python3 +Requires: doxygen +Requires: graphviz +Requires: graphviz-gd +Requires: libqt5-qttools +Requires: python3-Jinja2 +Requires: python3-xml +Recommends: python3-PyYAML BuildArch: noarch %description @@ -63,8 +61,8 @@ Doxygen-formatted codde comments in a standard format and style. %fdupes %{buildroot} %files -%defattr(-,root,root) -%doc README* LICENSE +%license LICENSE +%doc README* %{_kf5_bindir}/kapidox_generate %{_kf5_bindir}/depdiagram-generate %{_kf5_bindir}/depdiagram-generate-all