[arch-commits] Commit in gtk-doc/trunk (2 files)

[Evangelos Foutras]

    Date: Sunday, November 12, 2017 @ 10:50:46
  Author: foutrelis
Revision: 309587

upgpkg: gtk-doc 1.26+23+g8ad03e1-1

Bump to newer commit that seems to fix unicode errors in gtkdoc-rebase.

Modified:
  gtk-doc/trunk/PKGBUILD
Deleted:
  gtk-doc/trunk/0001-gtkdoc-Don-t-immediately-choke-on-non-UTF-8-files.patch

--------------------------------------------------------------+
 0001-gtkdoc-Don-t-immediately-choke-on-non-UTF-8-files.patch |   86 ----------
 PKGBUILD                                                     |   11 -
 2 files changed, 4 insertions(+), 93 deletions(-)

Deleted: 0001-gtkdoc-Don-t-immediately-choke-on-non-UTF-8-files.patch
===================================================================
--- 0001-gtkdoc-Don-t-immediately-choke-on-non-UTF-8-files.patch	2017-11-12 09:53:39 UTC (rev 309586)
+++ 0001-gtkdoc-Don-t-immediately-choke-on-non-UTF-8-files.patch	2017-11-12 10:50:46 UTC (rev 309587)
@@ -1,86 +0,0 @@
-From f4e102a45feb94030002f102f3ef6474401bcd1a Mon Sep 17 00:00:00 2001
-Message-Id: <f4e102a45feb94030002f102f3ef6474401bcd1a.1502882026.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Wed, 16 Aug 2017 13:00:09 +0200
-Subject: [PATCH] gtkdoc: Don't immediately choke on non-UTF-8 files
-
----
- gtkdoc/mkdb.py | 13 +++++++++++--
- gtkdoc/scan.py | 12 ++++++++++--
- 2 files changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/gtkdoc/mkdb.py b/gtkdoc/mkdb.py
-index e103138f3dc6ede4..382195df6348c6a5 100644
---- a/gtkdoc/mkdb.py
-+++ b/gtkdoc/mkdb.py
-@@ -24,7 +24,7 @@ Creates the DocBook files from the source comments.
- """
- 
- from __future__ import print_function
--from six import iteritems, iterkeys
-+from six import iteritems, iterkeys, PY2
- 
- from collections import OrderedDict
- import logging
-@@ -3665,18 +3665,27 @@ def ScanSourceFile(ifile, ignore_files):
- 
-     logging.info("Scanning source file: %s", ifile)
- 
--    SRCFILE = open(ifile)
-+    SRCFILE = open(ifile, 'rb')
-     in_comment_block = False
-     symbol = None
-     in_part = ''
-     description = ''
-     return_desc = ''
-     since_desc = stability_desc = deprecated_desc = ''
-     params = OrderedDict()
-     param_name = None
-     line_number = 0
-     for line in SRCFILE:
-         line_number += 1
-+
-+        # FIXME Make a better effort at scanning non-UTF-8 files
-+        if not PY2:
-+            try:
-+                line = line.decode()
-+            except UnicodeDecodeError:
-+                logging.warn('Skipping non-UTF-8 line: %r', line)
-+                continue
-+
-         # Look for the start of a comment block.
-         if not in_comment_block:
-             if re.search(r'^\s*/\*.*\*/', line):
-diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py
-index 084351959ba9c700..e8b88e8e88bda7ee 100644
---- a/gtkdoc/scan.py
-+++ b/gtkdoc/scan.py
-@@ -34,7 +34,7 @@ organized into sections ready to output the XML pages.
- """
- 
- from __future__ import print_function
--from six import iteritems, iterkeys
-+from six import iteritems, iterkeys, PY2
- 
- import logging
- import os
-@@ -226,7 +226,15 @@ def ScanHeader(input_file, section_list, decl_list, get_types, options):
- 
-     logging.info('Scanning %s', input_file)
- 
--    for line in open(input_file):
-+    for line in open(input_file, 'rb'):
-+        # FIXME Make a better effort at scanning non-UTF-8 files
-+        if not PY2:
-+            try:
-+                line = line.decode()
-+            except UnicodeDecodeError:
-+                logging.warn('Skipping non-UTF-8 line: %r', line)
-+                continue
-+
-         # If this is a private header, skip it.
-         if re.search(r'%^\s*/\*\s*<\s*private_header\s*>\s*\*/', line):
-             return
--- 
-2.14.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-12 09:53:39 UTC (rev 309586)
+++ PKGBUILD	2017-11-12 10:50:46 UTC (rev 309587)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk-doc
-pkgver=1.26+10+g01844e7
+pkgver=1.26+23+g8ad03e1
 pkgrel=1
 pkgdesc="Documentation tool for public library API"
 url="https://www.gtk.org/gtk-doc/"
@@ -12,11 +12,9 @@
 makedepends=(dblatex git yelp-tools)
 checkdepends=(bc gtk3)
 optdepends=('dblatex: PDF support')
-_commit=01844e70cae73bfc95a7746fd958c1756a62c340  # master
-source=("git+https://git.gnome.org/browse/gtk-doc#commit=$_commit"
-        0001-gtkdoc-Don-t-immediately-choke-on-non-UTF-8-files.patch)
-sha256sums=('SKIP'
-            'ff885d4c6cd4697ebd5855cf57a674dbd1b5a17c2b315e437638ad4a993bd133')
+_commit=8ad03e164f3091df68a9fed5492b54cd61d0ac51  # master
+source=("git+https://git.gnome.org/browse/gtk-doc#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -25,7 +23,6 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../0001-gtkdoc-Don-t-immediately-choke-on-non-UTF-8-files.patch
 
   # Recover a file from the old version, because GStreamer/common needs it
   git checkout 1db161bd708cdfb88b362ea0b5d047034d9c3272 -- gtkdoc-common.pl.in