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.56.0 → 0.62.0 #34541

Merged
merged 3 commits into from Feb 21, 2018
Merged

poppler: 0.56.0 → 0.62.0 #34541

merged 3 commits into from Feb 21, 2018

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Feb 2, 2018

Motivation for this change

Long overdue update:

Full changelog

This breaks cups-filters even with the update, cc @layus.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Poppler 0.62 removes QT4 support. We would drop it but unfortunately,
some things still rely on it.
@grahamc
Copy link
Member

grahamc commented Feb 3, 2018

@GrahamcOfBorg eval

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/cr2i25qw5369nf613rkryxhyr6y98swd-poppler-qt4-0.61.1/lib/libpoppler-glib.so.8.9.0
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/cr2i25qw5369nf613rkryxhyr6y98swd-poppler-qt4-0.61.1/lib 
patching script interpreter paths in /nix/store/cr2i25qw5369nf613rkryxhyr6y98swd-poppler-qt4-0.61.1
checking for references to /tmp/nix-build-poppler-qt4-0.61.1.drv-0 in /nix/store/cr2i25qw5369nf613rkryxhyr6y98swd-poppler-qt4-0.61.1...
shrinking RPATHs of ELF executables and libraries in /nix/store/7i4c2v5dwyh1hhjjh0f7ars57jfsv6ri-poppler-qt4-0.61.1-dev
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/7i4c2v5dwyh1hhjjh0f7ars57jfsv6ri-poppler-qt4-0.61.1-dev/lib 
patching script interpreter paths in /nix/store/7i4c2v5dwyh1hhjjh0f7ars57jfsv6ri-poppler-qt4-0.61.1-dev
checking for references to /tmp/nix-build-poppler-qt4-0.61.1.drv-0 in /nix/store/7i4c2v5dwyh1hhjjh0f7ars57jfsv6ri-poppler-qt4-0.61.1-dev...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

patching script interpreter paths in /nix/store/2ywllz4xxq1r5vqkfq3dxm6cd81n40c1-poppler-qt4-0.61.1
checking for references to /build in /nix/store/2ywllz4xxq1r5vqkfq3dxm6cd81n40c1-poppler-qt4-0.61.1...
shrinking RPATHs of ELF executables and libraries in /nix/store/jzd68mr0rywhplg7r9ly50j1lp65h02h-poppler-qt4-0.61.1-dev
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/jzd68mr0rywhplg7r9ly50j1lp65h02h-poppler-qt4-0.61.1-dev/lib
patching script interpreter paths in /nix/store/jzd68mr0rywhplg7r9ly50j1lp65h02h-poppler-qt4-0.61.1-dev
checking for references to /build in /nix/store/jzd68mr0rywhplg7r9ly50j1lp65h02h-poppler-qt4-0.61.1-dev...
/nix/store/idw2rdbxa6amv1m2d1hi72c7jv6j3yy6-poppler-glib-0.62.0
/nix/store/2q4xal0swsff6i4q9h4gwwr1qxqi70n8-poppler-data-0.4.8
/nix/store/2ywllz4xxq1r5vqkfq3dxm6cd81n40c1-poppler-qt4-0.61.1

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

clang++ -c -pipe -stdlib=libc++ -mmacosx-version-min=10.7 -O2 -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -DQT_UIC_CPP_GENERATOR -DQT_COMPAT -DQT_UIC3 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3 -DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -I../../../mkspecs/unsupported/macx-clang-libc++ -I. -I../../../lib/QtCore.framework/Versions/4/Headers -I../../../include/QtCore -I../../../lib/QtGui.framework/Versions/4/Headers -I../../../include/QtGui -I../../../lib/QtXml.framework/Versions/4/Headers -I../../../include/QtXml -I../../../lib/Qt3Support.framework/Versions/4/Headers -I../../../include/Qt3Support -I../../../include -I../uic -I../uic/cpp -I../uic -I. -I.moc/release-shared -F/private/tmp/nix-build-qt-4.8.7.drv-0/qt-everywhere-opensource-src-4.8.7/lib -o .obj/release-shared/widgetinfo.o widgetinfo.cpp
clang++ -c -pipe -stdlib=libc++ -mmacosx-version-min=10.7 -O2 -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -DQT_UIC_CPP_GENERATOR -DQT_COMPAT -DQT_UIC3 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3 -DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -I../../../mkspecs/unsupported/macx-clang-libc++ -I. -I../../../lib/QtCore.framework/Versions/4/Headers -I../../../include/QtCore -I../../../lib/QtGui.framework/Versions/4/Headers -I../../../include/QtGui -I../../../lib/QtXml.framework/Versions/4/Headers -I../../../include/QtXml -I../../../lib/Qt3Support.framework/Versions/4/Headers -I../../../include/Qt3Support -I../../../include -I../uic -I../uic/cpp -I../uic -I. -I.moc/release-shared -F/private/tmp/nix-build-qt-4.8.7.drv-0/qt-everywhere-opensource-src-4.8.7/lib -o .obj/release-shared/embed.o embed.cpp
clang++ -c -pipe -stdlib=libc++ -mmacosx-version-min=10.7 -O2 -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -DQT_UIC_CPP_GENERATOR -DQT_COMPAT -DQT_UIC3 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3 -DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -I../../../mkspecs/unsupported/macx-clang-libc++ -I. -I../../../lib/QtCore.framework/Versions/4/Headers -I../../../include/QtCore -I../../../lib/QtGui.framework/Versions/4/Headers -I../../../include/QtGui -I../../../lib/QtXml.framework/Versions/4/Headers -I../../../include/QtXml -I../../../lib/Qt3Support.framework/Versions/4/Headers -I../../../include/Qt3Support -I../../../include -I../uic -I../uic/cpp -I../uic -I. -I.moc/release-shared -F/private/tmp/nix-build-qt-4.8.7.drv-0/qt-everywhere-opensource-src-4.8.7/lib -o .obj/release-shared/qt3to4.o qt3to4.cpp
clang++ -c -pipe -stdlib=libc++ -mmacosx-version-min=10.7 -O2 -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -DQT_UIC_CPP_GENERATOR -DQT_COMPAT -DQT_UIC3 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3 -DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -I../../../mkspecs/unsupported/macx-clang-libc++ -I. -I../../../lib/QtCore.framework/Versions/4/Headers -I../../../include/QtCore -I../../../lib/QtGui.framework/Versions/4/Headers -I../../../include/QtGui -I../../../lib/QtXml.framework/Versions/4/Headers -I../../../include/QtXml -I../../../lib/Qt3Support.framework/Versions/4/Headers -I../../../include/Qt3Support -I../../../include -I../uic -I../uic/cpp -I../uic -I. -I.moc/release-shared -F/private/tmp/nix-build-qt-4.8.7.drv-0/qt-everywhere-opensource-src-4.8.7/lib -o .obj/release-shared/deps.o deps.cpp
clang++ -c -pipe -stdlib=libc++ -mmacosx-version-min=10.7 -O2 -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -DQT_UIC_CPP_GENERATOR -DQT_COMPAT -DQT_UIC3 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3 -DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -I../../../mkspecs/unsupported/macx-clang-libc++ -I. -I../../../lib/QtCore.framework/Versions/4/Headers -I../../../include/QtCore -I../../../lib/QtGui.framework/Versions/4/Headers -I../../../include/QtGui -I../../../lib/QtXml.framework/Versions/4/Headers -I../../../include/QtXml -I../../../lib/Qt3Support.framework/Versions/4/Headers -I../../../include/Qt3Support -I../../../include -I../uic -I../uic/cpp -I../uic -I. -I.moc/release-shared -F/private/tmp/nix-build-qt-4.8.7.drv-0/qt-everywhere-opensource-src-4.8.7/lib -o .obj/release-shared/uic.o uic.cpp
clang++ -c -pipe -stdlib=libc++ -mmacosx-version-min=10.7 -O2 -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -DQT_UIC_CPP_GENERATOR -DQT_COMPAT -DQT_UIC3 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3 -DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -I../../../mkspecs/unsupported/macx-clang-libc++ -I. -I../../../lib/QtCore.framework/Versions/4/Headers -I../../../include/QtCore -I../../../lib/QtGui.framework/Versions/4/Headers -I../../../include/QtGui -I../../../lib/QtXml.framework/Versions/4/Headers -I../../../include/QtXml -I../../../lib/Qt3Support.framework/Versions/4/Headers -I../../../include/Qt3Support -I../../../include -I../uic -I../uic/cpp -I../uic -I. -I.moc/release-shared -F/private/tmp/nix-build-qt-4.8.7.drv-0/qt-everywhere-opensource-src-4.8.7/lib -o .obj/release-shared/ui3reader.o ui3reader.cpp
clang++ -c -pipe -stdlib=libc++ -mmacosx-version-min=10.7 -O2 -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -DQT_UIC_CPP_GENERATOR -DQT_COMPAT -DQT_UIC3 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3 -DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -I../../../mkspecs/unsupported/macx-clang-libc++ -I. -I../../../lib/QtCore.framework/Versions/4/Headers -I../../../include/QtCore -I../../../lib/QtGui.framework/Versions/4/Headers -I../../../include/QtGui -I../../../lib/QtXml.framework/Versions/4/Headers -I../../../include/QtXml -I../../../lib/Qt3Support.framework/Versions/4/Headers -I../../../include/Qt3Support -I../../../include -I../uic -I../uic/cpp -I../uic -I. -I.moc/release-shared -F/private/tmp/nix-build-qt-4.8.7.drv-0/qt-everywhere-opensource-src-4.8.7/lib -o .obj/release-shared/main.o main.cpp
building of '/nix/store/flwz29yx1ldry902a1rksylgqzvvwdi8-qt-4.8.7.drv' timed out after 1800 seconds
cannot build derivation '/nix/store/z7829w98hls0n0dsma8bsl86b9836hlj-poppler-qt4-0.61.1.drv': 1 dependencies couldn't be built
error: build of '/nix/store/xr51wa4yb1z0sa0cs28j5sqsv09x1xip-poppler-glib-0.62.0.drv', '/nix/store/z7829w98hls0n0dsma8bsl86b9836hlj-poppler-qt4-0.61.1.drv' failed

@jtojnar jtojnar changed the base branch from master to staging February 15, 2018 20:46
@vcunat
Copy link
Member

vcunat commented Feb 21, 2018

This looks OK. Is it waiting for something?

@jtojnar
Copy link
Contributor Author

jtojnar commented Feb 21, 2018

Just waiting for a next wave of staging merges.

@vcunat vcunat merged commit a711891 into NixOS:staging Feb 21, 2018
vcunat added a commit that referenced this pull request Feb 21, 2018
@jtojnar jtojnar deleted the poppler-0.62.0 branch February 21, 2018 23:56
@vcunat
Copy link
Member

vcunat commented Feb 22, 2018

There was apparently some incompatible API upgrade, as texlive fails now: https://hydra.nixos.org/build/69904985 – hard to say ATM what else is affected.

@jtojnar
Copy link
Contributor Author

jtojnar commented Feb 22, 2018

@mpickering
Copy link
Contributor

This patch means poppler doesn't build for me on darwin. If I revert 1f6bdea then it builds fine.

build flags: -j1 -l1
[1/158] Building CXX object CMakeFiles/poppler.dir/goo/gfile.cc.o
[2/158] Building CXX object CMakeFiles/poppler.dir/goo/gmempp.cc.o
[3/158] Building CXX object CMakeFiles/poppler.dir/goo/GooHash.cc.o
FAILED: CMakeFiles/poppler.dir/goo/GooHash.cc.o 
/nix/store/dhbvzckljywvqls1wcq373dmr34nbpyj-clang-wrapper-5.0.1/bin/clang++  -DUSE_OPENJPEG2 -Dpoppler_EXPORTS -I../ -I../fofi -I../goo -I../poppler -I. -Ipoppler -I/nix/store/arsv0j30n86738r9svkfrhaj4n0ichl3-curl-7.58.0-dev/include -I/Library/Frameworks/Mono.framework/Headers -I/nix/store/fqh4n07a6s95b4j9g6zi2mnif5l6id9a-freetype-2.7.1-dev/include/freetype2 -I/nix/store/4g8dcp0ddp8ch2by42rbjrmn0pc3m6gd-zlib-1.2.11-dev/include -I/nix/store/ldc346z91bv4qkykzvlcva1iahdh3vfi-openjpeg-2.3.0-dev/include/openjpeg-2.3 -I/Library/Frameworks/UnixImageIO.framework/Headers -O3 -DNDEBUG -arch x86_64 -fPIC -MD -MT CMakeFiles/poppler.dir/goo/GooHash.cc.o -MF CMakeFiles/poppler.dir/goo/GooHash.cc.o.d -o CMakeFiles/poppler.dir/goo/GooHash.cc.o -c ../goo/GooHash.cc
../goo/GooHash.cc:358:12: error: use of undeclared identifier 'nullptr'
    return nullptr;
           ^
1 error generated.
ninja: build stopped: subcommand failed.

@jtojnar
Copy link
Contributor Author

jtojnar commented Mar 17, 2018

@mpickering see #35667

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