From patchwork Sat Feb 9 23:56:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex ter Weele X-Patchwork-Id: 1009 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1C10616BE5; Sat, 9 Feb 2019 23:57:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9B65216BE2 for ; Sat, 9 Feb 2019 23:57:10 +0000 (GMT) Received: from localhost ([127.0.0.1]:51307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gscUg-00042r-3n for patchwork@mira.cbaines.net; Sat, 09 Feb 2019 18:57:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gscUa-00042l-4w for guix-patches@gnu.org; Sat, 09 Feb 2019 18:57:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gscUY-0000M3-WF for guix-patches@gnu.org; Sat, 09 Feb 2019 18:57:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42362) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gscUY-0000Lt-PL for guix-patches@gnu.org; Sat, 09 Feb 2019 18:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gscUY-0003je-Jv for guix-patches@gnu.org; Sat, 09 Feb 2019 18:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34408] [PATCH] gnu: emacs-pdf-tools: Update to 0.90. Resent-From: Alex ter Weele Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Feb 2019 23:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34408 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34408@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.154975658314311 (code B ref -1); Sat, 09 Feb 2019 23:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Feb 2019 23:56:23 +0000 Received: from localhost ([127.0.0.1]:41643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gscTv-0003ik-1D for submit@debbugs.gnu.org; Sat, 09 Feb 2019 18:56:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41201) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gscTt-0003iX-37 for submit@debbugs.gnu.org; Sat, 09 Feb 2019 18:56:21 -0500 Received: from lists.gnu.org ([209.51.188.17]:44597) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gscTn-0008RD-SI for submit@debbugs.gnu.org; Sat, 09 Feb 2019 18:56:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gscTm-0003xS-Kz for guix-patches@gnu.org; Sat, 09 Feb 2019 18:56:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gscTl-0008Pe-Ji for guix-patches@gnu.org; Sat, 09 Feb 2019 18:56:14 -0500 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]:38366) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gscTl-0008OC-88 for guix-patches@gnu.org; Sat, 09 Feb 2019 18:56:13 -0500 Received: by mail-qt1-x82d.google.com with SMTP id 2so8283414qtb.5 for ; Sat, 09 Feb 2019 15:56:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=/oJXBjdCD/e7fj8s+zs1LxgSK8hOcdlzFVsxk0SHzxE=; b=IOHK3iaEA/lQIymfabMUEyALB3uxhB9hS9Zl0n+0ihf9MeEaLcr010xtGq9ukXDPz4 8+3FgYfDTUCUCA8mA92SseeDpMzEyDvffm+6Z1bmA7DrNK8kpulAe6oHy76MfMokDlt4 XZ4OcGnw3UZoXNmXHJPBaJyJUU7q9x7UJjYHD8Kb9FP1PTaiiX1NG3yK0fdh8KNz54bn F5P9QX7LyGE/hREQPlLbmGIiiGgJUHvHqHcGyZh7reE+fMWYIMNyP1rmnqkCjmfC8fgQ c8hSpwM3/JC4F+UIm4VjWBgj3TIS+yW0sORlQBaNxyGcwpqgDZA9QWIe+O2ZvGnGgcKW Pm3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=/oJXBjdCD/e7fj8s+zs1LxgSK8hOcdlzFVsxk0SHzxE=; b=Wpdm9er6brx0I1dJBVMm+bAyD+AHv/J+hyQPefX/nwoj9z8HOVxxOVyr/MJxSd5F07 s/OAoVAw2bb9HGSxcnjnlP7n5F1jg4W89ebfBRKYooXfph3hLpT+Jkf0ivV6CAjWb9ES SCKUohnF8nSUA8xD9/qy1/Wcgea7eLfgqJpH/jM0rSahL2jOOlKixk767eNLLZN/fCdw ksGSlxI5tZkWoVTcMe1qeJ2Kun+cbhT8Q/pyMq7wE5B46X5G7W5PLFvSMMNh0P9b/n4B 7gg3i7PUa46hzvZqMrQhg4sC1pRZczwCz+H4rJls+tuLUqgRYY2hhST2gR5rvz9i+Lxz HlDw== X-Gm-Message-State: AHQUAuZs/KG5G98rwK4+GxhZCzNeJUfK9hgeWd3PDYSFdLof+5FbbMVO VF3Fc5tFNKuG+rRGG48Sdpt7gnwf X-Google-Smtp-Source: AHgI3IbosgEYydJKmVUj31phsYuGB9XrsrQb2JzwngFtu6DSbYO1pP+yEbfa2eg7wYP1fSFiRuVe9Q== X-Received: by 2002:a0c:fc09:: with SMTP id z9mr22187393qvo.157.1549756571523; Sat, 09 Feb 2019 15:56:11 -0800 (PST) Received: from librem (24-148-50-16.s5644.c3-0.mart-ubr1.chi-mart.il.cable.rcncustomer.com. [24.148.50.16]) by smtp.gmail.com with ESMTPSA id t40sm7856779qth.46.2019.02.09.15.56.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Feb 2019 15:56:10 -0800 (PST) From: Alex ter Weele X-Google-Original-From: Alex ter Weele Date: Sat, 09 Feb 2019 17:56:10 -0600 Message-ID: <874l9cjz39.fsf@librem.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches I think this is necessary because of the new version of poppler. See https://github.com/politza/pdf-tools/commit/581b65f5babb5462f287521d13824ac803ab1fa3. From e94414e8a6d15e3a34a086b75324f643930a50b7 Mon Sep 17 00:00:00 2001 From: Alex ter Weele 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: - . - -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(POPPLER_ANNOT (poppler_annot)->annot); -- text = annot->getDate (); -+ text = (GooString*) annot->getDate (); - - return text ? _xpoppler_goo_string_to_utf8 (text) : NULL; - } -- 2.20.1