Control: tags 941718 + patch
Control: tags 941718 + pending
I've prepared an NMU for poppler (versioned as 0.71.0-5.1) and uploaded
it to DELAYED/5. Please feel free to tell me if I should delay it longer,
or supersede it with your own upload.
I've also attached the patch I used.
Thanks,
smcv
diffstat for poppler-0.71.0 poppler-0.71.0
.gitattributes | 1
changelog | 9 ++
patches/Silence-deprecation-warnings-for-PopplerAttachment-c.patch | 39 ++++++++++
patches/series | 1
4 files changed, 50 insertions(+)
diff -Nru poppler-0.71.0/debian/changelog poppler-0.71.0/debian/changelog
--- poppler-0.71.0/debian/changelog 2019-05-27 21:51:48.000000000 +0100
+++ poppler-0.71.0/debian/changelog 2019-10-04 09:27:52.000000000 +0100
@@ -1,3 +1,12 @@
+poppler (0.71.0-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * d/p/Silence-deprecation-warnings-for-PopplerAttachment-c.patch:
+ Silence deprecation warnings for GTime, fixing autopkgtest
+ (Closes: #941718)
+
+ -- Simon McVittie <[email protected]> Fri, 04 Oct 2019 09:27:52 +0100
+
poppler (0.71.0-5) unstable; urgency=medium
* CVE-2018-10872 (Closes: #926530)
diff -Nru poppler-0.71.0/debian/.gitattributes poppler-0.71.0/debian/.gitattributes
--- poppler-0.71.0/debian/.gitattributes 1970-01-01 01:00:00.000000000 +0100
+++ poppler-0.71.0/debian/.gitattributes 2019-10-04 09:27:52.000000000 +0100
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff -Nru poppler-0.71.0/debian/patches/series poppler-0.71.0/debian/patches/series
--- poppler-0.71.0/debian/patches/series 2019-05-27 21:51:48.000000000 +0100
+++ poppler-0.71.0/debian/patches/series 2019-10-04 09:27:52.000000000 +0100
@@ -14,3 +14,4 @@
bug924029-goostring-null-pointers.patch
CVE-2019-10872.patch
CVE-2019-12293.patch
+Silence-deprecation-warnings-for-PopplerAttachment-c.patch
diff -Nru poppler-0.71.0/debian/patches/Silence-deprecation-warnings-for-PopplerAttachment-c.patch poppler-0.71.0/debian/patches/Silence-deprecation-warnings-for-PopplerAttachment-c.patch
--- poppler-0.71.0/debian/patches/Silence-deprecation-warnings-for-PopplerAttachment-c.patch 1970-01-01 01:00:00.000000000 +0100
+++ poppler-0.71.0/debian/patches/Silence-deprecation-warnings-for-PopplerAttachment-c.patch 2019-10-04 09:27:52.000000000 +0100
@@ -0,0 +1,39 @@
+From: Simon McVittie <[email protected]>
+Date: Fri, 4 Oct 2019 09:08:18 +0100
+Subject: Silence deprecation warnings for PopplerAttachment->ctime,
+ ->mtime
+
+GTime is not Y2038-safe, and is now marked as deprecated. Don't trigger
+deprecation warnings for projects that include poppler headers but
+do not otherwise use GTime.
+
+Part of #765.
+
+Signed-off-by: Simon McVittie <[email protected]>
+Forwarded: https://gitlab.freedesktop.org/poppler/poppler/merge_requests/364
+Bug-Debian: https://bugs.debian.org/941718
+---
+ glib/poppler-attachment.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/glib/poppler-attachment.h b/glib/poppler-attachment.h
+index 5a8a7e08..03b83952 100644
+--- a/glib/poppler-attachment.h
++++ b/glib/poppler-attachment.h
+@@ -54,6 +54,8 @@ typedef gboolean (*PopplerAttachmentSaveFunc) (const gchar *buf,
+ gpointer data,
+ GError **error);
+
++/* GTime is deprecated, but is part of our ABI here (see #715, #765). */
++G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ struct _PopplerAttachment
+ {
+ GObject parent;
+@@ -65,6 +67,7 @@ struct _PopplerAttachment
+ GTime ctime;
+ GString *checksum;
+ };
++G_GNUC_END_IGNORE_DEPRECATIONS
+
+ typedef struct _PopplerAttachmentClass
+ {
From: Simon McVittie <[email protected]>
Date: Fri, 4 Oct 2019 09:08:18 +0100
Subject: Silence deprecation warnings for PopplerAttachment->ctime,
->mtime
GTime is not Y2038-safe, and is now marked as deprecated. Don't trigger
deprecation warnings for projects that include poppler headers but
do not otherwise use GTime.
Part of #765.
Signed-off-by: Simon McVittie <[email protected]>
Forwarded: https://gitlab.freedesktop.org/poppler/poppler/merge_requests/364
Bug-Debian: https://bugs.debian.org/941718
---
glib/poppler-attachment.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/glib/poppler-attachment.h b/glib/poppler-attachment.h
index 5a8a7e08..03b83952 100644
--- a/glib/poppler-attachment.h
+++ b/glib/poppler-attachment.h
@@ -54,6 +54,8 @@ typedef gboolean (*PopplerAttachmentSaveFunc) (const gchar *buf,
gpointer data,
GError **error);
+/* GTime is deprecated, but is part of our ABI here (see #715, #765). */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
struct _PopplerAttachment
{
GObject parent;
@@ -65,6 +67,7 @@ struct _PopplerAttachment
GTime ctime;
GString *checksum;
};
+G_GNUC_END_IGNORE_DEPRECATIONS
typedef struct _PopplerAttachmentClass
{
