diff mbox series

[bug#34408] gnu: emacs-pdf-tools: Update to 0.90.

Message ID 874l9cjz39.fsf@librem.i-did-not-set--mail-host-address--so-tickle-me
State Accepted
Headers show
Series [bug#34408] gnu: emacs-pdf-tools: Update to 0.90. | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

Alex ter Weele Feb. 9, 2019, 11:56 p.m. UTC 
I think this is necessary because of the new version of poppler. See
https://github.com/politza/pdf-tools/commit/581b65f5babb5462f287521d13824ac803ab1fa3.

Comments

Ricardo Wurmus Feb. 10, 2019, 4:10 a.m. UTC | #1 
Alex ter Weele <alex.ter.weele@gmail.com> writes:

> I think this is necessary because of the new version of poppler. See
> https://github.com/politza/pdf-tools/commit/581b65f5babb5462f287521d13824ac803ab1fa3.

Someone already updated emacs-pdf-tools in commit
2becddeb0c2885cf9767072e0677a1913807976f.

Thanks anyway!

--
Ricardo
diff mbox series

Patch

From e94414e8a6d15e3a34a086b75324f643930a50b7 Mon Sep 17 00:00:00 2001
From: Alex ter Weele <alex.ter.weele@gmail.com>
Date: Sat, 9 Feb 2019 17:14:34 -0600
Subject: [PATCH] gnu: emacs-pdf-tools: Update to 0.90.

* gnu/packages/emacs-xyz.scm (emacs-pdf-tools): Update to 0.90. [patches]
  remove.

* gnu/packages/patches/emacs-pdf-tools-poppler.patch: delete it, as the
  changes have been released in pdf-tools 0.90.

* gnu/local.mk (dist_patch_DATA): remove patch.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/emacs-xyz.scm                    |  5 +--
 .../patches/emacs-pdf-tools-poppler.patch     | 41 -------------------
 3 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 gnu/packages/patches/emacs-pdf-tools-poppler.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index cf8d29e4ce..37083ca916 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -726,7 +726,6 @@  dist_patch_DATA =						\
   %D%/packages/patches/emacs-fix-scheme-indent-function.patch	\
   %D%/packages/patches/emacs-json-reformat-fix-tests.patch	\
   %D%/packages/patches/emacs-highlight-stages-add-gexp.patch	\
-  %D%/packages/patches/emacs-pdf-tools-poppler.patch		\
   %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch	\
   %D%/packages/patches/emacs-source-date-epoch.patch		\
   %D%/packages/patches/emacs-realgud-fix-configure-ac.patch	\
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 5d8aa0e863..da27278b11 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1532,7 +1532,7 @@  filters, new key bindings and faces.  It can be enabled by
 (define-public emacs-pdf-tools
   (package
     (name "emacs-pdf-tools")
-    (version "0.80")
+    (version "0.90")
     (home-page "https://github.com/politza/pdf-tools")
     (source (origin
               (method git-fetch)
@@ -1541,8 +1541,7 @@  filters, new key bindings and faces.  It can be enabled by
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s"))
-              (patches (search-patches "emacs-pdf-tools-poppler.patch"))))
+                "0iv2g5kd14zk3r5dzdw7b7hk4b5w7qpbilcqkja46jgxbb6xnpl9"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; there are no tests
diff --git a/gnu/packages/patches/emacs-pdf-tools-poppler.patch b/gnu/packages/patches/emacs-pdf-tools-poppler.patch
deleted file mode 100644
index 0477508fa9..0000000000
--- a/gnu/packages/patches/emacs-pdf-tools-poppler.patch
+++ /dev/null
@@ -1,41 +0,0 @@ 
-Fix build issue with recent Poppler:
-  <https://github.com/politza/pdf-tools/issues/372>.
-
-This combines upstream commits
-6cd76dec9aece2a8daa90f17ab77fbf773157a1d..50a5297b82e26cfd52f6c00645ddc1057099d6a7
-for this file.
-
-diff --git a/server/poppler-hack.cc b/server/poppler-hack.cc
-index 0c62f73..427f9df 100644
---- a/server/poppler-hack.cc
-+++ b/server/poppler-hack.cc
-@@ -51,7 +51,10 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST;
-     double y2;
-   };
- 
--  char *_xpoppler_goo_string_to_utf8(GooString *s)
-+  // This function does not modify its argument s, but for
-+  // compatibility reasons (e.g. getLength in GooString.h before 2015)
-+  // with older poppler code, it can't be declared as such.
-+  char *_xpoppler_goo_string_to_utf8(/* const */ GooString *s)
-   {
-     char *result;
- 
-@@ -85,7 +88,7 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST;
-   // Set the rectangle of an annotation.  It was first added in v0.26.
-   void xpoppler_annot_set_rectangle (PopplerAnnot *a, PopplerRectangle *rectangle)
-   {
--    GooString *state = a->annot->getAppearState ();
-+    GooString *state = (GooString*) a->annot->getAppearState ();
-     char *ustate = _xpoppler_goo_string_to_utf8 (state);
- 
-     a->annot->setRect (rectangle->x1, rectangle->y1,
-@@ -105,7 +108,7 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST;
-     g_return_val_if_fail (POPPLER_IS_ANNOT_MARKUP (poppler_annot), NULL);
- 
-     annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT (poppler_annot)->annot);
--    text = annot->getDate ();
-+    text = (GooString*) annot->getDate ();
- 
-     return text ? _xpoppler_goo_string_to_utf8 (text) : NULL;
-   }
-- 
2.20.1