diff options
| author | yangfl <yangfl@users.noreply.github.com> | 2018-10-17 19:45:11 +0800 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2018-10-17 21:35:42 -0300 |
| commit | 2d67ef7d4d1f9b1f7ca57c5de77cbb14d8e38f26 (patch) | |
| tree | 6452f77b81fefbc4539ddea14e21aafeb3c268b6 /debian/patches/0002-Resolve-const-ness-of-some-variables.patch | |
| parent | 8da900f399abeb2de8a8559807a2e46a23519d01 (diff) | |
Backport upstream commits to fix FTBFS with poppler 0.69.0
It's a bit messy to use 3 patches, but it has the advantage of being
all upstream.
Diffstat (limited to 'debian/patches/0002-Resolve-const-ness-of-some-variables.patch')
| -rw-r--r-- | debian/patches/0002-Resolve-const-ness-of-some-variables.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/0002-Resolve-const-ness-of-some-variables.patch b/debian/patches/0002-Resolve-const-ness-of-some-variables.patch new file mode 100644 index 0000000..70ebed6 --- /dev/null +++ b/debian/patches/0002-Resolve-const-ness-of-some-variables.patch @@ -0,0 +1,34 @@ +From 6505a0e817495b85897c9380161034ae611ddd90 Mon Sep 17 00:00:00 2001 +From: Andreas Politz <politza@hochschule-trier.de> +Date: Sat, 21 Apr 2018 18:05:15 +0200 +Subject: [PATCH] Resolve const'ness of some variables + +--- + server/poppler-hack.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/server/poppler-hack.cc b/server/poppler-hack.cc +index 0c62f73..a508136 100644 +--- a/server/poppler-hack.cc ++++ b/server/poppler-hack.cc +@@ -51,7 +51,7 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST; + double y2; + }; + +- char *_xpoppler_goo_string_to_utf8(GooString *s) ++ char *_xpoppler_goo_string_to_utf8(const GooString *s) + { + char *result; + +@@ -100,7 +100,7 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST; + gchar *xpoppler_annot_markup_get_created (PopplerAnnotMarkup *poppler_annot) + { + AnnotMarkup *annot; +- GooString *text; ++ const GooString *text; + + g_return_val_if_fail (POPPLER_IS_ANNOT_MARKUP (poppler_annot), NULL); + +-- +2.19.1 + |