Hello community, here is the log from the commit of package kapidox for openSUSE:Factory checked in at 2014-10-07 15:59:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-09-12 17:04:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kapidox.new/kapidox.changes 2014-10-07 15:59:59.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Oct 4 17:59:46 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.3.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.3.0.php + +------------------------------------------------------------------- Old: ---- kapidox-5.2.0.tar.xz New: ---- kapidox-5.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kapidox.spec ++++++ --- /var/tmp/diff_new_pack.X9Cfdt/_old 2014-10-07 16:00:00.000000000 +0200 +++ /var/tmp/diff_new_pack.X9Cfdt/_new 2014-10-07 16:00:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: kapidox -Version: 5.2.0 +Version: 5.3.0 Release: 0 Requires: doxygen BuildRequires: fdupes ++++++ kapidox-5.2.0.tar.xz -> kapidox-5.3.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.2.0/setup.py new/kapidox-5.3.0/setup.py --- old/kapidox-5.2.0/setup.py 2014-09-02 21:01:58.000000000 +0200 +++ new/kapidox-5.3.0/setup.py 2014-10-04 13:32:59.000000000 +0200 @@ -5,7 +5,7 @@ setup( name='kapidox', - version='5.2.0', + version='5.3.0', description='KDE API documentation generation tools', maintainer = 'Aurélien Gâteau', maintainer_email = 'agateau@kde.org', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.2.0/src/kapidox/data/htmlresource/kde.css new/kapidox-5.3.0/src/kapidox/data/htmlresource/kde.css --- old/kapidox-5.2.0/src/kapidox/data/htmlresource/kde.css 2014-09-02 21:01:58.000000000 +0200 +++ new/kapidox-5.3.0/src/kapidox/data/htmlresource/kde.css 2014-10-04 13:32:59.000000000 +0200 @@ -207,6 +207,29 @@ .additional_info { float: right; text-align: right; + list-style-type: none; + border: 1px solid #0057ae; + padding: 0px 20px; +} +.additional_info li { + padding: 3px 0px; +} + +/* Comments */ +#comments { + border-top: 4px double #0057ae; + margin-top: 20px; + padding-top: 20px; +} + +.juvia-comment .juvia-metadata { + border: 1px solid #A8B8D9; + color: #253555; + font-weight: bold; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); + background: url('karchive/html/nav_f.png') repeat-x #E2E8F2 !important; + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + border-radius: 4px; } /* @@ -243,6 +266,11 @@ padding: 0.7em 0 0 0; } +.menu_box p { + margin-left: 1em; + margin-right: 1em; +} + .menu_box li { list-style-type: none; margin-left: 0.1em; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.2.0/src/kapidox/data/templates/comments.html new/kapidox-5.3.0/src/kapidox/data/templates/comments.html --- old/kapidox-5.2.0/src/kapidox/data/templates/comments.html 1970-01-01 01:00:00.000000000 +0100 +++ new/kapidox-5.3.0/src/kapidox/data/templates/comments.html 2014-10-04 13:32:59.000000000 +0200 @@ -0,0 +1,51 @@ +<div id="comments"></div> + +<script type="text/javascript" class="juvia"> +(function() { + var options = { + container : '#comments', + site_key : 'bnfczjwmqzb0lon8v3nfegabzlp3a4d', + topic_key : location.pathname, + topic_url : location.href, + topic_title : document.title || location.href, + include_base : !window.Juvia, + include_css : !window.Juvia, + comment_order: 'latest-first' + }; + + function makeQueryString(options) { + var key, params = []; + for (key in options) { + params.push( + encodeURIComponent(key) + + '=' + + encodeURIComponent(options[key])); + } + return params.join('&'); + } + + function makeApiUrl(options) { + // Makes sure that each call generates a unique URL, otherwise + // the browser may not actually perform the request. + if (!('_juviaRequestCounter' in window)) { + window._juviaRequestCounter = 0; + } + + var result = + 'https://commenting.kde.org/api/show_topic.js' + + '?_c=' + window._juviaRequestCounter + + '&' + makeQueryString(options); + window._juviaRequestCounter++; + return result; + } + + var s = document.createElement('script'); + s.async = true; + s.type = 'text/javascript'; + s.className = 'juvia'; + s.src = makeApiUrl(options); + (document.getElementsByTagName('head')[0] || + document.getElementsByTagName('body')[0]).appendChild(s); +})(); +</script> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.2.0/src/kapidox/data/templates/doxygen.html new/kapidox-5.3.0/src/kapidox/data/templates/doxygen.html --- old/kapidox-5.2.0/src/kapidox/data/templates/doxygen.html 2014-09-02 21:01:58.000000000 +0200 +++ new/kapidox-5.3.0/src/kapidox/data/templates/doxygen.html 2014-10-04 13:32:59.000000000 +0200 @@ -7,13 +7,18 @@ <h2><a name="content"></a>{{ dox.projectname }}</h2> {% if classname %} -<p class="additional_info"> - <a href="http://lxr.kde.org/ident?v=kf5-qt5&_i={{ classname }}">View on LXR</a> -</p> +<ul class="additional_info"> + <li><a href="http://lxr.kde.org/ident?v=kf5-qt5&_i={{ classname }}">View on LXR</a></li> + <li><a href="#comments">Comments</a></li> +</ul> {% endif %} {{ dox.content }} +{% if classname %} + {% include "comments.html" %} +{% endif %} + <div class="copyrights"> This file is part of the KDE documentation.<br/> Documentation copyright © {{copyright}}.<br/> @@ -28,10 +33,6 @@ {% endblock %} {% block sidebar %} -{% if fwinfo %} - {% include "fwinfo.html" %} -{% endif %} - <div class="menu_box"> <a name="cp-menu" /> <div class="menutitle"> @@ -69,6 +70,10 @@ </div> {% endif %} +{% if fwinfo %} + {% include "fwinfo.html" %} +{% endif %} + {% if group_menu %} <div class="menu_box"> <a name="cp-menu" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.2.0/src/kapidox/data/templates/fwinfo.html new/kapidox-5.3.0/src/kapidox/data/templates/fwinfo.html --- old/kapidox-5.2.0/src/kapidox/data/templates/fwinfo.html 2014-09-02 21:01:58.000000000 +0200 +++ new/kapidox-5.3.0/src/kapidox/data/templates/fwinfo.html 2014-10-04 13:32:59.000000000 +0200 @@ -1,12 +1,13 @@ <div class="menu_box"> <div class="menutitle"> <div> - <h2>{{ dox.projectname }} : {{ fwinfo.description }}</h2> + <h2>About</h2> </div> </div> - <p style="text-align: center"><a style="font-weight: bold;" href="http://inqlude.org/libraries/{{ fwinfo.fancyname|lower }}.html">Download on <span style="color: black;">#In<span style="color: #80C342;">q</span>lude</span></a></p> + <p>{{ fwinfo.description }}</p> + <dl> <dt>Maintainer</dt> <dd>{% include "fwmaintainer.html" %}</dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.2.0/src/kapidox/generator.py new/kapidox-5.3.0/src/kapidox/generator.py --- old/kapidox-5.2.0/src/kapidox/generator.py 2014-09-02 21:01:58.000000000 +0200 +++ new/kapidox-5.3.0/src/kapidox/generator.py 2014-10-04 13:32:59.000000000 +0200 @@ -36,6 +36,8 @@ import shutil import subprocess import sys +import tempfile +import time from fnmatch import fnmatch try: @@ -43,9 +45,9 @@ except ImportError: from urlparse import urljoin try: - from httplib import HTTPConnection + from urllib.request import urlretrieve except ImportError: - from http.client import HTTPConnection + from urllib import urlretrieve import jinja2 @@ -253,25 +255,107 @@ return [] +def cache_dir(): + """Find/create a semi-long-term cache directory. + + We do not use tempdir, except as a fallback, because temporary directories + are intended for files that only last for the program's execution. + """ + cachedir = None + if sys.platform == 'darwin': + try: + from AppKit import NSSearchPathForDirectoriesInDomains + # http://developer.apple.com/DOCUMENTATION/Cocoa/Reference/Foundation/Miscella... + # NSApplicationSupportDirectory = 14 + # NSUserDomainMask = 1 + # True for expanding the tilde into a fully qualified path + cachedir = os.path.join( + NSSearchPathForDirectoriesInDomains(14, 1, True)[0], + 'KApiDox') + except: + pass + elif os.name == "posix": + if 'HOME' in os.environ and os.path.exists(os.environ['HOME']): + cachedir = os.path.join(os.environ['HOME'], '.cache', 'kapidox') + elif os.name == "nt": + if 'APPDATA' in os.environ and os.path.exists(os.environ['APPDATA']): + cachedir = os.path.join(os.environ['APPDATA'], 'KApiDox') + if cachedir is None: + cachedir = os.path.join(tempfile.gettempdir(), 'kapidox') + if not os.path.isdir(cachedir): + os.makedirs(cachedir) + return cachedir + +def svn_export(remote, local, overwrite = False): + """Wraps svn export. + + Raises an exception on failure. + """ + try: + import svn.core, svn.client + logging.debug("Using Python libsvn bindings to fetch %s", remote) + ctx = svn.client.create_context() + ctx.auth_baton = svn.core.svn_auth_open([]) + + latest = svn.core.svn_opt_revision_t() + latest.type = svn.core.svn_opt_revision_head + + svn.client.export(remote, local, latest, True, ctx) + except ImportError: + logging.debug("Using external svn client to fetch %s", remote) + cmd = ['svn', 'export', '--quiet'] + if overwrite: + cmd.append('--force') + cmd += [remote, local] + try: + subprocess.check_call(cmd, stderr=subprocess.STDOUT) + except subprocess.CalledProcessError as e: + raise StandardException(e.output) + except FileNotFoundError as e: + logging.debug("External svn client not found") + return False + # subversion will set the timestamp to match the server + os.utime(local, None) + return True + def download_kde_identities(): """Download the "accounts" file on the KDE SVN repository in order to get the KDE identities with their name and e-mail address """ - logging.info("Downloading KDE identities") - conn = HTTPConnection("websvn.kde.org") - conn.request("GET", "/*checkout*/trunk/kde-common/accounts") - r = conn.getresponse() - - if r.status != 200: - logging.error("Unable to download identities: " + r.reason) - return {} + cache_file = os.path.join(cache_dir(), 'kde-accounts') + needs_download = True + if os.path.exists(cache_file): + logging.debug("Found cached identities file at %s", cache_file) + # not quite a day, so that generation on api.kde.org gets a fresh + # copy every time the daily cron job runs it + yesterday = time.time() - (23.5 * 3600) + if os.path.getmtime(cache_file) > yesterday: + needs_download = False + else: + logging.debug("Cached file too old; updating") + if needs_download: + logging.info("Downloading KDE identities") + try: + if not svn_export('svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts', + cache_file, + overwrite=True): + logging.debug("Falling back to using websvn to fetch identities file") + urlretrieve('http://websvn.kde.org/*checkout*/trunk/kde-common/accounts', + cache_file) + except Exception as e: + if os.path.exists(cache_file): + logging.error('Failed to update KDE identities: %s', e) + else: + logging.error('Failed to fetch KDE identities: %s', e) + return None maintainers = {} - for line in r.read().decode('utf8').split('\n'): - parts = line.split() - if len(parts) >= 3: - maintainers[parts[0]] = {'name': ' '.join(parts[1:-1]), 'email': parts[-1]} + with codecs.open(cache_file, 'r', encoding='utf8') as f: + for line in f: + parts = line.strip().split() + if len(parts) >= 3: + maintainers[parts[0]] = {'name': ' '.join(parts[1:-1]), 'email': parts[-1]} return maintainers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.2.0/src/kgenframeworksapidox new/kapidox-5.3.0/src/kgenframeworksapidox --- old/kapidox-5.2.0/src/kgenframeworksapidox 2014-09-02 21:01:58.000000000 +0200 +++ new/kapidox-5.3.0/src/kgenframeworksapidox 2014-10-04 13:32:59.000000000 +0200 @@ -280,6 +280,10 @@ { 'href': '../../index.html', 'text': 'Frameworks' + }, + { + 'href': 'index.html', + 'text': ctx.fancyname } ] }, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org