Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

poppler: 0.81.0 -> 0.83.0 #74558

Merged
merged 4 commits into from Dec 3, 2019
Merged

Conversation

r-ryantm
Copy link
Contributor

@r-ryantm r-ryantm commented Nov 29, 2019

This robot has been hijacked.

meta.description for poppler_utils is: '"A PDF rendering library"'.

meta.homepage for poppler_utils is: '"https://poppler.freedesktop.org/"

Rebuild report (if merged into master) (click to expand)

1170 total rebuild path(s)

364 package rebuild(s)

362 x86_64-linux rebuild(s)
330 i686-linux rebuild(s)
145 x86_64-darwin rebuild(s)
333 aarch64-linux rebuild(s)

First fifty rebuilds by attrpath
R
adapta-gtk-theme
aesop
apt
apvlv
arc-theme
arx-libertatis
asciidoc-full
asciidoc-full-with-plugins
asymptote
auctex
autofs5
bibata-cursors
bibata-cursors-translucent
bibata-extra-cursors
bookworm
btrbk
calibre
capitaine-cursors
cddlib
chrome-gnome-shell
cups-filters
dblatex
dblatexFull
deepin.dde-api
deepin.dde-control-center
deepin.dde-daemon
deepin.dde-dock
deepin.dde-file-manager
deepin.dde-kwin
deepin.dde-launcher
deepin.dde-session-ui
deepin.deepin-desktop-base
deepin.deepin-desktop-schemas
deepin.deepin-wallpapers
deja-dup
denemo
diff-pdf
diffpdf
digikam
disorderfs
dolphin
dragon
dropbox-cli
dwarf-fortress-packages.dwarf-fortress-full
dwarf-fortress-packages.dwarf-therapist
dwarf-fortress-packages.dwarf-therapist-original
dwarf-therapist
eaglemode
eclib

cc @ttuegel for testing.

@ttuegel
Copy link
Member

ttuegel commented Dec 2, 2019

@GrahamcOfBorg build cups-filters

@jtojnar jtojnar self-assigned this Dec 2, 2019
@jtojnar jtojnar changed the title poppler_utils: 0.81.0 -> 0.82.0 poppler: 0.81.0 -> 0.83.0 Dec 2, 2019
@jtojnar
Copy link
Contributor

jtojnar commented Dec 2, 2019

I upgraded this directly to 0.83.0, changelogs:

Had to patch TeXLive since it did not build. cc @dtzWill

Successfully ran:

nix-build -A cups-filters -A texlive.bin.core -A poppler -A poppler_min -A poppler_gi -A poppler_utils -A libsForQt5.poppler

@jtojnar jtojnar removed their assignment Dec 2, 2019
@jtojnar jtojnar changed the base branch from staging to master December 2, 2019 22:16
@jtojnar
Copy link
Contributor

jtojnar commented Dec 2, 2019

@GrahamcOfBorg build cups-filters texlive.bin.core poppler poppler_min poppler_gi poppler_utils libsForQt5.poppler

@jtojnar jtojnar self-assigned this Dec 2, 2019
@jtojnar

This comment has been minimized.

@jtojnar
Copy link
Contributor

jtojnar commented Dec 3, 2019

Inkscape builds.

@worldofpeace
Copy link
Contributor

worldofpeace commented Dec 3, 2019

Lol, @jtojnar. The header for the PR actually got me nervous for a second 🤣

@dtzWill
Copy link
Member

dtzWill commented Dec 3, 2019

LGTM, thanks!

@jtojnar
Copy link
Contributor

jtojnar commented Dec 3, 2019

$ nix build -f . xfce.tumbler gnome3.evince zathura kdeApplications.okular frescobaldi bookworm paperwork aesop openscenegraph pdfmod recoll pdfarranger calibre diff-pdf green-pdfviewer gummi valentina diffpdf gImageReader epdfview pdf-quench apvlv nixnote2 qpdfview pdfpc eaglemode xournalpp pqiv krita fbida krop photoqt gimp yacreader gscan2pdf inkscape xournal qcomicbook poppler_data tikzit pdf2djvu pdfgrep pdfsandwich pdftag leela pdf2svg lumina.lumina-pdf mate.atril kdeFrameworks.kfilemetadata gdal --keep-going
builder for '/nix/store/q608f1xicsnrc7bik550ivcfpasdvnbi-pdf2djvu-0.9.14.drv' failed with exit code 2; last 10 log lines:
  /nix/store/vgn1sxcj5ma9m5bhjps1q9jx3q2ab27c-gcc-8.3.0/include/c++/8.3.0/bits/unique_ptr.h:316:7: note: candidate: 'std::unique_ptr<_Tp, _Dp>& std::unique_ptr<_Tp, _Dp>::operator=(std::nullptr_t) [with _Tp = GlobalParams; _Dp = std::default_delete<GlobalParams>; std::nullptr_t = std::nullptr_t]'
         operator=(nullptr_t) noexcept
         ^~~~~~~~
  /nix/store/vgn1sxcj5ma9m5bhjps1q9jx3q2ab27c-gcc-8.3.0/include/c++/8.3.0/bits/unique_ptr.h:316:7: note:   no known conversion for argument 1 from 'GlobalParams*' to 'std::nullptr_t'
  pdf-backend.cc: In static member function 'static void pdf::Renderer::convert_path(pdf::gfx::State*, pdf::splash::Path&)':
  pdf-backend.cc:503:40: error: invalid conversion from 'const GfxPath*' to 'pdf::gfx::Path*' {aka 'GfxPath*'} [-fpermissive]
     pdf::gfx::Path *path = state->getPath();
                            ~~~~~~~~~~~~~~^~
  make: *** [<builtin>: pdf-backend.o] Error 1
  make: *** Waiting for unfinished jobs....
[1 built (1 failed), 0.0 MiB DL]
error: build of '/nix/store/q608f1xicsnrc7bik550ivcfpasdvnbi-pdf2djvu-0.9.14.drv' failed

@joachifm joachifm removed their request for review December 3, 2019 10:56
@dtzWill
Copy link
Member

dtzWill commented Dec 3, 2019 via email

@ofborg ofborg bot requested a review from pSub December 3, 2019 13:47
@jtojnar
Copy link
Contributor

jtojnar commented Dec 3, 2019

Yup, added the patches.

Let’s wait for https://gitlab.com/inkscape/inkscape/merge_requests/1092 to be merged so we can drop that hack:

https://github.com/NixOS/nixpkgs/blob/56772fb08dc47967180f7ba81235399f716e3883/pkgs/applications/graphics/inkscape/default.nix#L37-L40

Then it should be good to go.

@jtojnar jtojnar merged commit d2da320 into NixOS:master Dec 3, 2019
@worldofpeace
Copy link
Contributor

Thanks @jtojnar

jtojnar added a commit that referenced this pull request Dec 4, 2019
@jtojnar
Copy link
Contributor

jtojnar commented Dec 4, 2019

There are two more failures on staging-next:

diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix
index 7da04f6e7c3..479c4ed0bbb 100644
--- a/pkgs/applications/kde/kitinerary.nix
+++ b/pkgs/applications/kde/kitinerary.nix
@@ -7,6 +7,27 @@
 mkDerivation {
   name = "kitinerary";
   patches = [
+    # Fix build with Poppler 0.82
+    (fetchpatch {
+      url = "https://github.com/KDE/kitinerary/commit/0f8b2babcc69c490ae6548bda7ceeb1ffd27a9e3.patch";
+      sha256 = "0fx1hiqk16jyb0ih695fidyjqm9yj60lxrd3cs58iyc75kgws040";
+    })
+    (fetchpatch {
+      url = "https://github.com/KDE/kitinerary/commit/071c6b558813d2778158781574a27aea47af5762.patch";
+      sha256 = "0sj7prprak0iwq2av4k2a0r56cx0cv7b96nkybj4nngl6y7k92af";
+    })
+    (fetchpatch {
+      url = "https://github.com/KDE/kitinerary/commit/b51e08cf544814100c21875f63d93a08c5f97c49.patch";
+      sha256 = "0ryz11ssvf00hvkrvwkrg4dvhaxlcizhi0cr40hfxlblh3pyzpnr";
+    })
+    (fetchpatch {
+      url = "https://github.com/KDE/kitinerary/commit/0aad35fb31cbb27799065de9207283f8e814c438.patch";
+      sha256 = "09djphr03cviimxdf113g92afv9kb9ch37l56xah41lh78phc5i7";
+    })
+    (fetchpatch {
+      url = "https://github.com/KDE/kitinerary/commit/5e001bf0cc7651c4cbc2c43f4fc14e41bbfc71d6.patch";
+      sha256 = "02imbjycy6zgxdnbchpha72nidbiqcgi6jfw4qpn7c3l717r3yq5";
+    })
     # Fix build with Poppler 0.83
     # https://phabricator.kde.org/D25644
     (fetchpatch {

dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Dec 4, 2019
Another fallout from NixOS#74558

(cherry picked from commit a46fa21)
@r-ryantm r-ryantm deleted the auto-update/poppler-utils branch December 7, 2019 22:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants