Hello community, here is the log from the commit of package kapidox for openSUSE:Factory checked in at 2016-11-17 12:26:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kapidox (Old) and /work/SRC/openSUSE:Factory/.kapidox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kapidox" Changes: -------- --- /work/SRC/openSUSE:Factory/kapidox/kapidox.changes 2016-10-23 12:53:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kapidox.new/kapidox.changes 2016-11-17 12:27:11.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Nov 5 20:09:56 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.28.0 + * [CSS] reverse changes done by doxygen 1.8.12 + * Add doxygenlayout file + * Update way of defining group names + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.28.0.php + +------------------------------------------------------------------- Old: ---- kapidox-5.27.0.tar.xz New: ---- kapidox-5.28.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kapidox.spec ++++++ --- /var/tmp/diff_new_pack.GjEpaR/_old 2016-11-17 12:27:12.000000000 +0100 +++ /var/tmp/diff_new_pack.GjEpaR/_new 2016-11-17 12:27:12.000000000 +0100 @@ -16,9 +16,9 @@ # -%define _tar_path 5.27 +%define _tar_path 5.28 Name: kapidox -Version: 5.27.0 +Version: 5.28.0 Release: 0 Requires: doxygen BuildRequires: fdupes ++++++ kapidox-5.27.0.tar.xz -> kapidox-5.28.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.27.0/docs/metainfo_syntax.md new/kapidox-5.28.0/docs/metainfo_syntax.md --- old/kapidox-5.27.0/docs/metainfo_syntax.md 2016-09-23 13:25:59.000000000 +0200 +++ new/kapidox-5.28.0/docs/metainfo_syntax.md 2016-11-03 14:47:06.000000000 +0100 @@ -12,6 +12,7 @@ ```yaml description: Library doing X and Y +fancyname: The FancyName # optional, else replaced by the `project()` value of the `CMakeLists.txt` maintainer: ochurlaud # optional, replaced by The KDE Community group: frameworks # optional subgroup: tier 1 # optional, a group must be defined @@ -39,7 +40,8 @@ irc: kde # optional, overwrite group field, if both not defined, default to kde-devel mailinglist: mylib-dev # optional, overwrite group field, if both not defined, default to kde-devel -group_info: # optional, only once per group, the name is defined by the 'group' key above. +group_info: # optional, only once per group + name: frameworks # optional, else the name is defined by the 'group' key above. fancyname: The KDE Frameworks maintainer: dfaure irc: kde-devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.27.0/metainfo.yaml new/kapidox-5.28.0/metainfo.yaml --- old/kapidox-5.27.0/metainfo.yaml 2016-09-23 13:25:59.000000000 +0200 +++ new/kapidox-5.28.0/metainfo.yaml 2016-11-03 14:47:06.000000000 +0100 @@ -17,6 +17,7 @@ - src group_info: + name: frameworks fancyname: The KDE Frameworks maintainer: dfaure mailinglist: kde-frameworks-devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.27.0/setup.py new/kapidox-5.28.0/setup.py --- old/kapidox-5.27.0/setup.py 2016-09-23 13:25:59.000000000 +0200 +++ new/kapidox-5.28.0/setup.py 2016-11-03 14:47:06.000000000 +0100 @@ -6,7 +6,7 @@ setup( name='kapidox', - version='5.27.0', + version='5.28.0', description='KDE API documentation generation tools', maintainer = 'Alex Merry', maintainer_email = 'alex.me...@kde.org', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.27.0/src/kapidox/data/DoxygenLayout.xml new/kapidox-5.28.0/src/kapidox/data/DoxygenLayout.xml --- old/kapidox-5.27.0/src/kapidox/data/DoxygenLayout.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kapidox-5.28.0/src/kapidox/data/DoxygenLayout.xml 2016-11-03 14:47:06.000000000 +0100 @@ -0,0 +1,194 @@ +<doxygenlayout version="1.0"> + <!-- Generated by doxygen 1.8.7 --> + <!-- Navigation index tabs for HTML output --> + <navindex> + <tab type="mainpage" visible="yes" title=""/> + <tab type="pages" visible="yes" title="" intro=""/> + <tab type="modules" visible="yes" title="" intro=""/> + <tab type="namespaces" visible="yes" title=""> + <tab type="namespacelist" visible="yes" title="" intro=""/> + <tab type="namespacemembers" visible="yes" title="" intro=""/> + </tab> + <tab type="classes" visible="yes" title=""> + <tab type="classlist" visible="yes" title="" intro=""/> + <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> + <tab type="hierarchy" visible="yes" title="" intro=""/> + <tab type="classmembers" visible="yes" title="" intro=""/> + </tab> + <tab type="files" visible="yes" title=""> + <tab type="filelist" visible="yes" title="" intro=""/> + <tab type="globals" visible="yes" title="" intro=""/> + </tab> + <tab type="examples" visible="yes" title="" intro=""/> + </navindex> + + <!-- Layout definition for a class page --> + <class> + <briefdescription visible="yes"/> + <includes visible="$SHOW_INCLUDE_FILES"/> + <inheritancegraph visible="$CLASS_GRAPH"/> + <collaborationgraph visible="$COLLABORATION_GRAPH"/> + <memberdecl> + <nestedclasses visible="yes" title=""/> + <publictypes title=""/> + <services title=""/> + <interfaces title=""/> + <properties title=""/> + <signals title=""/> + <publicslots title=""/> + <publicmethods title=""/> + <publicstaticmethods title=""/> + <publicattributes title=""/> + <publicstaticattributes title=""/> + <protectedtypes title=""/> + <protectedslots title=""/> + <protectedmethods title=""/> + <protectedstaticmethods title=""/> + <protectedattributes title=""/> + <protectedstaticattributes title=""/> + <packagetypes title=""/> + <packagemethods title=""/> + <packagestaticmethods title=""/> + <packageattributes title=""/> + <packagestaticattributes title=""/> + <events title=""/> + <privatetypes title=""/> + <privateslots title=""/> + <privatemethods title=""/> + <privatestaticmethods title=""/> + <privateattributes title=""/> + <privatestaticattributes title=""/> + <friends title=""/> + <related title="" subtitle=""/> + <membergroups visible="yes"/> + </memberdecl> + <detaileddescription title=""/> + <memberdef> + <inlineclasses title=""/> + <typedefs title=""/> + <enums title=""/> + <properties title=""/> + <services title=""/> + <interfaces title=""/> + <constructors title=""/> + <functions title=""/> + <related title=""/> + <variables title=""/> + <events title=""/> + </memberdef> + <allmemberslink visible="yes"/> + <usedfiles visible="$SHOW_USED_FILES"/> + <authorsection visible="yes"/> + </class> + + <!-- Layout definition for a namespace page --> + <namespace> + <briefdescription visible="yes"/> + <memberdecl> + <nestednamespaces visible="yes" title=""/> + <constantgroups visible="yes" title=""/> + <classes visible="yes" title=""/> + <typedefs title=""/> + <enums title=""/> + <functions title=""/> + <variables title=""/> + <membergroups visible="yes"/> + </memberdecl> + <detaileddescription title=""/> + <memberdef> + <inlineclasses title=""/> + <typedefs title=""/> + <enums title=""/> + <functions title=""/> + <variables title=""/> + </memberdef> + <authorsection visible="yes"/> + </namespace> + + <!-- Layout definition for a file page --> + <file> + <briefdescription visible="yes"/> + <includes visible="$SHOW_INCLUDE_FILES"/> + <includegraph visible="$INCLUDE_GRAPH"/> + <includedbygraph visible="$INCLUDED_BY_GRAPH"/> + <sourcelink visible="yes"/> + <memberdecl> + <classes visible="yes" title=""/> + <namespaces visible="yes" title=""/> + <constantgroups visible="yes" title=""/> + <defines title=""/> + <typedefs title=""/> + <enums title=""/> + <functions title=""/> + <variables title=""/> + <membergroups visible="yes"/> + </memberdecl> + <detaileddescription title=""/> + <memberdef> + <inlineclasses title=""/> + <defines title=""/> + <typedefs title=""/> + <enums title=""/> + <functions title=""/> + <variables title=""/> + </memberdef> + <authorsection/> + </file> + + <!-- Layout definition for a group page --> + <group> + <briefdescription visible="yes"/> + <groupgraph visible="$GROUP_GRAPHS"/> + <memberdecl> + <nestedgroups visible="yes" title=""/> + <dirs visible="yes" title=""/> + <files visible="yes" title=""/> + <namespaces visible="yes" title=""/> + <classes visible="yes" title=""/> + <defines title=""/> + <typedefs title=""/> + <enums title=""/> + <enumvalues title=""/> + <functions title=""/> + <variables title=""/> + <signals title=""/> + <publicslots title=""/> + <protectedslots title=""/> + <privateslots title=""/> + <events title=""/> + <properties title=""/> + <friends title=""/> + <membergroups visible="yes"/> + </memberdecl> + <detaileddescription title=""/> + <memberdef> + <pagedocs/> + <inlineclasses title=""/> + <defines title=""/> + <typedefs title=""/> + <enums title=""/> + <enumvalues title=""/> + <functions title=""/> + <variables title=""/> + <signals title=""/> + <publicslots title=""/> + <protectedslots title=""/> + <privateslots title=""/> + <events title=""/> + <properties title=""/> + <friends title=""/> + </memberdef> + <authorsection visible="yes"/> + </group> + + <!-- Layout definition for a directory page --> + <directory> + <briefdescription visible="yes"/> + <directorygraph visible="yes"/> + <memberdecl> + <dirs visible="yes"/> + <files visible="yes"/> + </memberdecl> + <detaileddescription title=""/> + </directory> +</doxygenlayout> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.27.0/src/kapidox/data/htmlresource/css/kapidox.css new/kapidox-5.28.0/src/kapidox/data/htmlresource/css/kapidox.css --- old/kapidox-5.27.0/src/kapidox/data/htmlresource/css/kapidox.css 2016-09-23 13:25:59.000000000 +0200 +++ new/kapidox-5.28.0/src/kapidox/data/htmlresource/css/kapidox.css 2016-11-03 14:47:06.000000000 +0100 @@ -293,6 +293,11 @@ /** * classes */ + +.memtitle { + display: none; +} + .memproto, dl.reflist dt { background: #0057ae; border-radius: 0; @@ -301,6 +306,7 @@ .memname { color: #eeeeee; + font-weight: bold; text-shadow: none; } @@ -308,13 +314,19 @@ color: #aaaabb; font-weight: bold; } + .memproto a.el { color: #ccccee; font-weight: bold; } +.memproto .paramtype { + font-weight: bold; +} + .memproto .paramname { color: #f7800a; + font-weight: bold; } .memproto span.mlabel { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.27.0/src/kapidox/generator.py new/kapidox-5.28.0/src/kapidox/generator.py --- old/kapidox-5.27.0/src/kapidox/generator.py 2016-09-23 13:25:59.000000000 +0200 +++ new/kapidox-5.28.0/src/kapidox/generator.py 2016-11-03 14:47:06.000000000 +0100 @@ -606,6 +606,11 @@ HTML_FOOTER=ctx.doxdatadir + '/footer.html' ) + # Set a layout so that properties are first + writer.write_entries( + LAYOUT_FILE=ctx.doxdatadir + '/DoxygenLayout.xml' + ) + # Always write these, even if QHP is disabled, in case Doxygen.local # overrides it writer.write_entries( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.27.0/src/kapidox/models.py new/kapidox-5.28.0/src/kapidox/models.py --- old/kapidox-5.27.0/src/kapidox/models.py 2016-09-23 13:25:59.000000000 +0200 +++ new/kapidox-5.28.0/src/kapidox/models.py 2016-11-03 14:47:06.000000000 +0100 @@ -116,8 +116,8 @@ # else the product is directly the library def __init__(self, metainfo, all_maintainers): if 'group_info' in metainfo: - self.name = utils.serialize_name(metainfo['group']) - self.fancyname = metainfo['group_info'].get('fancyname', string.capwords(metainfo['group'])) + self.name = utils.serialize_name(metainfo['group_info']['name']) + self.fancyname = metainfo['group_info'].get('fancyname', string.capwords(metainfo['group_info']['name'])) self.description = metainfo['group_info'].get('description') self.long_description = metainfo['group_info'].get('long_description', []) self.maintainers = utils.set_maintainers(metainfo['group_info'].get('maintainer'), @@ -133,6 +133,7 @@ self.irc = metainfo['group_info'].get('irc', 'kde-devel') self.mailinglist = metainfo['group_info'].get('mailinglist', 'kde-devel') self.subproducts = self._extract_subproducts(metainfo['group_info']) + self.part_of_group = True elif 'group' not in metainfo: self.name = utils.serialize_name(metainfo['name']) @@ -147,6 +148,7 @@ self.libraries = [] self.irc = None self.mailinglist = None + self.part_of_group = False else: raise ValueError("I do not recognize a product in {}." .format(metainfo['name'])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.27.0/src/kapidox/preprocessing.py new/kapidox-5.28.0/src/kapidox/preprocessing.py --- old/kapidox-5.27.0/src/kapidox/preprocessing.py 2016-09-23 13:25:59.000000000 +0200 +++ new/kapidox-5.28.0/src/kapidox/preprocessing.py 2016-11-03 14:47:06.000000000 +0100 @@ -159,7 +159,7 @@ dirs[:] = [d for d in dirs if not d[0] == '.'] metainfo = create_metainfo(path) if metainfo is not None: - if metainfo['public_lib']: + if metainfo['public_lib'] or 'group_info' in metainfo: metalist.append(metainfo) else: logging.warning("{} has no public libraries" @@ -210,10 +210,17 @@ expand_platform_all(dct, available_platforms) platforms = dct - lib = Library(metainfo, products, platforms, all_maintainers) - libraries.append(lib) - groups = [p for p in list(products.values()) if len(p.libraries) > 1] + if metainfo['public_lib']: + lib = Library(metainfo, products, platforms, all_maintainers) + libraries.append(lib) + + groups = [] + for key in products.copy(): + if len(products[key].libraries) == 0: + del products[key] + elif products[key].part_of_group: + groups.append(products[key]) return list(products.values()), groups, libraries, available_platforms
