diff -Nru gir-to-d-0.17.0/debian/changelog gir-to-d-0.18.0/debian/changelog --- gir-to-d-0.17.0/debian/changelog 2019-01-25 09:06:39.000000000 +0000 +++ gir-to-d-0.18.0/debian/changelog 2019-02-10 19:52:40.000000000 +0000 @@ -1,8 +1,10 @@ -gir-to-d (0.17.0-1build1) disco; urgency=medium +gir-to-d (0.18.0-1) unstable; urgency=medium - * No-change rebuild for phobos soname changes. + * New upstream version: 0.18.0 + * Update to dh compat level 12 + * Bump standards version: No changes needed - -- Matthias Klose Fri, 25 Jan 2019 09:06:39 +0000 + -- Matthias Klumpp Sun, 10 Feb 2019 20:52:40 +0100 gir-to-d (0.17.0-1) unstable; urgency=medium diff -Nru gir-to-d-0.17.0/debian/compat gir-to-d-0.18.0/debian/compat --- gir-to-d-0.17.0/debian/compat 2018-08-29 21:55:55.000000000 +0000 +++ gir-to-d-0.18.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru gir-to-d-0.17.0/debian/control gir-to-d-0.18.0/debian/control --- gir-to-d-0.17.0/debian/control 2018-08-29 21:57:55.000000000 +0000 +++ gir-to-d-0.18.0/debian/control 2019-02-10 19:52:40.000000000 +0000 @@ -3,11 +3,11 @@ Priority: optional Maintainer: Debian D Language Group Uploaders: Matthias Klumpp -Build-Depends: debhelper (>= 11), - dh-dlang (>= 0.6), +Build-Depends: debhelper-compat (= 12), + dh-dlang (>= 0.6.2), meson (>= 0.46), pkg-config -Standards-Version: 4.2.0 +Standards-Version: 4.3.0 Homepage: https://github.com/gtkd-developers/gir-to-d Vcs-Git: https://salsa.debian.org/d-team/gir-to-d.git Vcs-Browser: https://salsa.debian.org/d-team/gir-to-d diff -Nru gir-to-d-0.17.0/debian/rules gir-to-d-0.18.0/debian/rules --- gir-to-d-0.17.0/debian/rules 2018-08-29 21:55:55.000000000 +0000 +++ gir-to-d-0.18.0/debian/rules 2019-02-10 19:52:40.000000000 +0000 @@ -9,6 +9,3 @@ override_dh_missing: dh_missing --fail-missing - -override_dh_makeshlibs: - dh_makeshlibs -V diff -Nru gir-to-d-0.17.0/GNUmakefile gir-to-d-0.18.0/GNUmakefile --- gir-to-d-0.17.0/GNUmakefile 2018-12-21 23:44:44.000000000 +0000 +++ gir-to-d-0.18.0/GNUmakefile 2019-02-10 19:52:16.000000000 +0000 @@ -2,7 +2,7 @@ OS=$(shell uname || uname -s) ARCH=$(shell arch || uname -m) -GIR_TO_D_VERSION=v0.16.0 +GIR_TO_D_VERSION=v0.18.0 ifndef DC ifneq ($(strip $(shell which dmd 2>/dev/null)),) diff -Nru gir-to-d-0.17.0/meson.build gir-to-d-0.18.0/meson.build --- gir-to-d-0.17.0/meson.build 2018-12-21 23:44:44.000000000 +0000 +++ gir-to-d-0.18.0/meson.build 2019-02-10 19:52:16.000000000 +0000 @@ -1,4 +1,4 @@ -project('GIR-to-D', 'd', version: '0.16.0') +project('GIR-to-D', 'd', version: '0.18.0') source = [ 'source/girtod.d', diff -Nru gir-to-d-0.17.0/source/girtod.d gir-to-d-0.18.0/source/girtod.d --- gir-to-d-0.17.0/source/girtod.d 2018-12-21 23:44:44.000000000 +0000 +++ gir-to-d-0.18.0/source/girtod.d 2019-02-10 19:52:16.000000000 +0000 @@ -64,19 +64,22 @@ if ( args.length > 1 ) handlePrintFiles(args, wrapper); - if ( wrapper.inputDir.exists && wrapper.inputDir.isFile() ) - { - lookupFile = wrapper.inputDir.baseName(); - wrapper.inputDir = wrapper.inputDir.dirName(); - } - try { //Read in the GIR and API files. - if ( lookupFile.extension == ".gir" ) - wrapper.proccessGIR(lookupFile); + if ( wrapper.inputDir.extension == ".gir" ) + { + wrapper.proccessGIR(wrapper.inputDir); + } else + { + if ( wrapper.inputDir.exists && wrapper.inputDir.isFile() ) + { + lookupFile = wrapper.inputDir.baseName(); + wrapper.inputDir = wrapper.inputDir.dirName(); + } wrapper.proccess(lookupFile); + } if ( printFree ) wrapper.printFreeFunctions(); diff -Nru gir-to-d-0.17.0/source/gtd/GirAlias.d gir-to-d-0.18.0/source/gtd/GirAlias.d --- gir-to-d-0.17.0/source/gtd/GirAlias.d 2018-12-21 23:44:44.000000000 +0000 +++ gir-to-d-0.18.0/source/gtd/GirAlias.d 2019-02-10 19:52:16.000000000 +0000 @@ -63,6 +63,9 @@ doc ~= "\n\nDeprecated: "~ reader.front.value; reader.popFront(); break; + case "source-position": + reader.skipTag(); + break; default: error("Unexpected tag: ", reader.front.value, " in GirAlias: ", name, reader); } diff -Nru gir-to-d-0.17.0/source/gtd/GirConstant.d gir-to-d-0.18.0/source/gtd/GirConstant.d --- gir-to-d-0.17.0/source/gtd/GirConstant.d 2018-12-21 23:44:44.000000000 +0000 +++ gir-to-d-0.18.0/source/gtd/GirConstant.d 2019-02-10 19:52:16.000000000 +0000 @@ -73,6 +73,9 @@ doc ~= "\n\nDeprecated: "~ reader.front.value; reader.popFront(); break; + case "source-position": + reader.skipTag(); + break; default: error("Unexpected tag: ", reader.front.value, " in GirConstant: ", name, reader); } diff -Nru gir-to-d-0.17.0/source/gtd/GirEnum.d gir-to-d-0.18.0/source/gtd/GirEnum.d --- gir-to-d-0.17.0/source/gtd/GirEnum.d 2018-12-21 23:44:44.000000000 +0000 +++ gir-to-d-0.18.0/source/gtd/GirEnum.d 2019-02-10 19:52:16.000000000 +0000 @@ -85,6 +85,9 @@ //pack.parseFunction(reader); reader.skipTag(); break; + case "source-position": + reader.skipTag(); + break; default: error("Unexpected tag: ", reader.front.value, " in GirEnum: ", name, reader); } @@ -170,6 +173,9 @@ doc ~= "\n\nDeprecated: "~ reader.front.value; reader.popFront(); break; + case "source-position": + reader.skipTag(); + break; case "type": if ( reader.front.attributes["name"] == "utf8" ) value = "\""~ value ~"\""; diff -Nru gir-to-d-0.17.0/source/gtd/GirField.d gir-to-d-0.18.0/source/gtd/GirField.d --- gir-to-d-0.17.0/source/gtd/GirField.d 2018-12-21 23:44:44.000000000 +0000 +++ gir-to-d-0.18.0/source/gtd/GirField.d 2019-02-10 19:52:16.000000000 +0000 @@ -92,6 +92,9 @@ callback = new GirFunction(wrapper, null); callback.parse(reader); break; + case "source-position": + reader.skipTag(); + break; default: error("Unexpected tag: ", reader.front.value, " in GirField: ", name, reader); } diff -Nru gir-to-d-0.17.0/source/gtd/GirFunction.d gir-to-d-0.18.0/source/gtd/GirFunction.d --- gir-to-d-0.17.0/source/gtd/GirFunction.d 2018-12-21 23:44:44.000000000 +0000 +++ gir-to-d-0.18.0/source/gtd/GirFunction.d 2019-02-10 19:52:16.000000000 +0000 @@ -180,6 +180,9 @@ reader.popFront(); } break; + case "source-position": + reader.skipTag(); + break; default: error("Unexpected tag: ", reader.front.value, " in GirFunction: ", name, reader); } @@ -1479,6 +1482,9 @@ type.name = "..."; type.cType = "..."; break; + case "source-position": + reader.skipTag(); + break; default: error("Unexpected tag: ", reader.front.value, " in GirParam: ", name, reader); } diff -Nru gir-to-d-0.17.0/source/gtd/GirPackage.d gir-to-d-0.18.0/source/gtd/GirPackage.d --- gir-to-d-0.17.0/source/gtd/GirPackage.d 2018-12-21 23:44:44.000000000 +0000 +++ gir-to-d-0.18.0/source/gtd/GirPackage.d 2019-02-10 19:52:16.000000000 +0000 @@ -117,7 +117,11 @@ checkVersion(reader.front.attributes["version"]); if ( "c:identifier-prefixes" in reader.front.attributes ) - cTypePrefix = reader.front.attributes["c:identifier-prefixes"]; + { + auto p = reader.front.attributes["c:identifier-prefixes"]; + if ( p.length ) + cTypePrefix = p.split(',')[0]; + } if ( "shared-library" in reader.front.attributes ) { diff -Nru gir-to-d-0.17.0/source/gtd/GirStruct.d gir-to-d-0.18.0/source/gtd/GirStruct.d --- gir-to-d-0.17.0/source/gtd/GirStruct.d 2018-12-21 23:44:44.000000000 +0000 +++ gir-to-d-0.18.0/source/gtd/GirStruct.d 2019-02-10 19:52:16.000000000 +0000 @@ -207,6 +207,7 @@ break; case "prerequisite": // Determines whitch base class the implementor of an interface must implement. case "property": + case "source-position": reader.skipTag(); break; default: @@ -1176,6 +1177,9 @@ field.gtkStruct = strct; fields ~= field; break; + case "source-position": + reader.skipTag(); + break; default: error("Unexpected tag: ", reader.front.value, " in GirUnion: ", name, reader); } diff -Nru gir-to-d-0.17.0/source/gtd/GirType.d gir-to-d-0.18.0/source/gtd/GirType.d --- gir-to-d-0.17.0/source/gtd/GirType.d 2018-12-21 23:44:44.000000000 +0000 +++ gir-to-d-0.18.0/source/gtd/GirType.d 2019-02-10 19:52:16.000000000 +0000 @@ -83,6 +83,12 @@ cType = cType.replace("unsigned ", "u"); } + if ( name == "long double" ) + { + name = "real"; + cType = "real"; + } + cType = cType.replace("volatile ", ""); if ( cType == "unsigned" )