rpm/kapidox
SHA256
1
0
Fork 0
forked from pool/kapidox
Code Pull Requests Activity

Accepting request 596848 from KDE:Frameworks5

Browse Source 
KDE Frameworks 5.45

OBS-URL: https://build.opensuse.org/request/show/596848
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kapidox?expand=0&rev=51
This commit is contained in:
Dominique Leuenberger 2018-04-20 15:28:01 +00:00 committed by Git OBS Bridge
commit 2ca177d70a
6 changed files with 19 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
0001-Look-first-for-qhelpgenerator-qt5-for-help-generatio.patch
View File

@ -1,55 +0,0 @@
From 64dac1ad3c8db765dd269ee6ec8a4549bb93d598 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
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

43
0001-Remove-shebangs-from-non-executable-files.patch
View File

@ -1,43 +0,0 @@
From b9d46fec4437ababe8a77e197059733633977c89 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
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 <agateau@kde.org>
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 <alex.merry@kdemail.net>
--
2.16.2

3
kapidox-5.44.0.tar.xz
View File

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

3
kapidox-5.45.0.tar.xz Normal file
View File

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

14
kapidox.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sat Apr 14 13:19:02 CEST 2018 - lbeltrame@kde.org
- Update to 5.45.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/kde-frameworks-5.45.0.php
- Changes since 5.44.0:
* Remove shebangs from non-executable files
* Look first for qhelpgenerator-qt5 for help generation
- Dropped patches, now upstream:
* 0001-Look-first-for-qhelpgenerator-qt5-for-help-generatio.patch
* 0001-Remove-shebangs-from-non-executable-files.patch
-------------------------------------------------------------------
Wed Mar 14 13:37:16 UTC 2018 - lbeltrame@kde.org

9
kapidox.spec
View File

@ -16,23 +16,19 @@
#
%define _tar_path 5.44
%define _tar_path 5.45
# 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.44.0
Version: 5.45.0
Release: 0
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
BuildRequires: fdupes
BuildRequires: kf5-filesystem
BuildRequires: python3
@ -51,7 +47,6 @@ Doxygen-formatted codde comments in a standard format and style.
%prep
%setup -q
%autopatch -p1
%build
python3 setup.py build