Package: release.debian.org User: release.debian.org@packages.debian.org Usertags: unblock Dear Release team, Please unblock package sip4. It partially reverts the change that caused qgis to FTBFS (see #924833, #923184). I have verified that qgis builds successfully now. The debdiff and the qgis build log with new sip4 are attached. unblock sip4/4.19.14+dfsg-2 -- Dmitry Shachnev
diff -Nru sip4-4.19.14+dfsg/debian/changelog sip4-4.19.14+dfsg/debian/changelog --- sip4-4.19.14+dfsg/debian/changelog 2019-02-23 15:05:07.000000000 +0300 +++ sip4-4.19.14+dfsg/debian/changelog 2019-03-31 17:45:47.000000000 +0300 @@ -1,3 +1,9 @@ +sip4 (4.19.14+dfsg-2) unstable; urgency=medium + + * Do not add SIP_OVERRIDE to the generated C++ code, to fix QGIS build. + + -- Dmitry Shachnev <mitya57@debian.org> Sun, 31 Mar 2019 17:45:47 +0300 + sip4 (4.19.14+dfsg-1) unstable; urgency=medium * New upstream release. diff -Nru sip4-4.19.14+dfsg/debian/patches/no_override.diff sip4-4.19.14+dfsg/debian/patches/no_override.diff --- sip4-4.19.14+dfsg/debian/patches/no_override.diff 1970-01-01 03:00:00.000000000 +0300 +++ sip4-4.19.14+dfsg/debian/patches/no_override.diff 2019-03-31 17:45:47.000000000 +0300 @@ -0,0 +1,22 @@ +From: Dmitry Shachnev <mitya57@debian.org> +Date: Sun, 31 Mar 2019 17:40:56 +0300 +Subject: Do not add SIP_OVERRIDE keyword to the generated code. + +This partially reverts upstream changeset 3ccc5b6f9e1f. +--- + sipgen/gencode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sipgen/gencode.c b/sipgen/gencode.c +index 83af4f7..e14c4f0 100644 +--- a/sipgen/gencode.c ++++ b/sipgen/gencode.c +@@ -9331,7 +9331,7 @@ static void generateOverloadDecl(FILE *fp, ifaceFileDef *scope, overDef *od) + generateBaseType(scope, ad, TRUE, STRIP_NONE, fp); + } + +- prcode(fp, ")%s%X SIP_OVERRIDE", (isConst(od) ? " const" : ""), od->exceptions); ++ prcode(fp, ")%s%X", (isConst(od) ? " const" : ""), od->exceptions); + + restoreArgs(od->cppsig); + } diff -Nru sip4-4.19.14+dfsg/debian/patches/series sip4-4.19.14+dfsg/debian/patches/series --- sip4-4.19.14+dfsg/debian/patches/series 2019-02-23 15:05:07.000000000 +0300 +++ sip4-4.19.14+dfsg/debian/patches/series 2019-03-31 17:45:47.000000000 +0300 @@ -1 +1,2 @@ pyqt4_no_nullptr.diff +no_override.diff
Attachment:
qgis_2.18.28+dfsg-2_amd64.build.gz
Description: application/gzip
Attachment:
signature.asc
Description: PGP signature