[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 12 1 file changed, 12 insertions(+) New commits: commit 7da36fe953d67c9a14a42bfda28d44cd3bf1880c Author: Albert Astals Cid Date: Wed Aug 9 18:59:48 2023 +0200 Revert "CI: fedora mingw qt6 is borked again :/" This reverts commit 9f1885168bd380583390a805b580af1604a3990b. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0e5f972..3b87969a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,6 +85,18 @@ build_ubuntu_20_04: - ninja - ctest --output-on-failure +build_mingw64_fedora38: + stage: build + image: fedora:38 + before_script: +- dnf install -y 'dnf-command(builddep)' +- dnf builddep -y mingw64-poppler +- dnf -y install glibc-langpack-en make ninja-build mingw64-boost mingw64-curl mingw64-qt6-qtbase mingw64-gcc-c++ + script: +- mkdir -p build && cd build +- mingw64-cmake -G Ninja .. +- ninja + build_clazy_clang15: stage: build script:
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 12 1 file changed, 12 deletions(-) New commits: commit 9f1885168bd380583390a805b580af1604a3990b Author: Albert Astals Cid Date: Tue Aug 1 20:14:39 2023 +0200 CI: fedora mingw qt6 is borked again :/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b87969a..b0e5f972 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,18 +85,6 @@ build_ubuntu_20_04: - ninja - ctest --output-on-failure -build_mingw64_fedora38: - stage: build - image: fedora:38 - before_script: -- dnf install -y 'dnf-command(builddep)' -- dnf builddep -y mingw64-poppler -- dnf -y install glibc-langpack-en make ninja-build mingw64-boost mingw64-curl mingw64-qt6-qtbase mingw64-gcc-c++ - script: -- mkdir -p build && cd build -- mingw64-cmake -G Ninja .. -- ninja - build_clazy_clang15: stage: build script:
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 12 1 file changed, 12 insertions(+) New commits: commit cd99989705824202d157c33d48c998e9818ea2f3 Author: Sune Vuorela Date: Mon Jun 12 14:19:18 2023 +0200 Revert "Remove poppler mingw CI until it's fixed again" This reverts commit 2dcbf58328e5acaafaa73dc2e601e5737c685789. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0e5f972..3b87969a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,6 +85,18 @@ build_ubuntu_20_04: - ninja - ctest --output-on-failure +build_mingw64_fedora38: + stage: build + image: fedora:38 + before_script: +- dnf install -y 'dnf-command(builddep)' +- dnf builddep -y mingw64-poppler +- dnf -y install glibc-langpack-en make ninja-build mingw64-boost mingw64-curl mingw64-qt6-qtbase mingw64-gcc-c++ + script: +- mkdir -p build && cd build +- mingw64-cmake -G Ninja .. +- ninja + build_clazy_clang15: stage: build script:
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 12 1 file changed, 12 deletions(-) New commits: commit 2dcbf58328e5acaafaa73dc2e601e5737c685789 Author: Albert Astals Cid Date: Mon Jun 5 00:56:51 2023 +0200 Remove poppler mingw CI until it's fixed again https://bugzilla.redhat.com/show_bug.cgi?id=2212050 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b87969a..b0e5f972 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,18 +85,6 @@ build_ubuntu_20_04: - ninja - ctest --output-on-failure -build_mingw64_fedora38: - stage: build - image: fedora:38 - before_script: -- dnf install -y 'dnf-command(builddep)' -- dnf builddep -y mingw64-poppler -- dnf -y install glibc-langpack-en make ninja-build mingw64-boost mingw64-curl mingw64-qt6-qtbase mingw64-gcc-c++ - script: -- mkdir -p build && cd build -- mingw64-cmake -G Ninja .. -- ninja - build_clazy_clang15: stage: build script:
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit abc60c57be8f0dfb5b3b7b47ed9a086df9010503 Author: Albert Astals Cid Date: Sat Apr 22 16:35:09 2023 +0200 CI: Update Fedora to 38 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc728671..b83b69d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,9 +83,9 @@ build_ubuntu_20_04: - ninja - ctest --output-on-failure -build_mingw64_fedora37: +build_mingw64_fedora38: stage: build - image: fedora:37 + image: fedora:38 before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y mingw64-poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 770b0e130183104e30eb9138a68be187a689737b Author: Albert Astals Cid Date: Tue Mar 28 12:34:10 2023 +0200 CI: fix mingw diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb3fafbf..fc728671 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,7 +89,7 @@ build_mingw64_fedora37: before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y mingw64-poppler -- dnf -y install glibc-langpack-en make ninja-build mingw64-boost mingw64-curl mingw64-qt6-qtbase +- dnf -y install glibc-langpack-en make ninja-build mingw64-boost mingw64-curl mingw64-qt6-qtbase mingw64-gcc-c++ script: - mkdir -p build && cd build - mingw64-cmake -G Ninja ..
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 7608a427558e54ec401e6f5600ee0e9f4cf6f392
Author: Sune Vuorela
Date: Wed Mar 22 19:10:37 2023 +0100
CI: Use FDO_CI_CONCURRENT
the freedesktop.org ci system suggests to not use more parallel jobs
than whatever is put in that variable to avoid killing the systems.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93bf98c7..a1e95b1f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ build:
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
- cmake -G Ninja -DTESTDATADIR=$PWD/../test-data ..
-- ninja
+- ninja -j ${FDO_CI_CONCURRENT}
- ctest --output-on-failure
build_clang14_libcpp:
@@ -55,7 +55,7 @@ build_clang14_libcpp:
- clang++-14 -fPIC -shared -o goostring-format-checker.so
$srcdir/test/goostring-format-checker/goostring-format-checker.cc
-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-14/include/
- echo "We disable Qt6 tests since Qt6 exposes std::string in its ABI
which makes it not build in this CI since we're using libc++ but Qt6 in debian
is build with libstdc++"
- CC=clang-14 CXX=clang++-14 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker -Werror -Wno-deprecated-declarations"
-DTESTDATADIR=$srcdir/test-data -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DBUILD_QT6_TESTS=OFF $srcdir
-- ninja
+- ninja -j ${FDO_CI_CONCURRENT}
- ctest --output-on-failure
- echo "This is a complex way of not running clang-tidy over autogenerated
files, unfortunately -DCMAKE_CXX_CLANG_TIDY doesn't support that
https://gitlab.kitware.com/cmake/cmake/-/issues/19772";
- cat compile_commands.json | jq '[.[] | select(.file |
contains("'"$srcdir"'"))]' > compile_commands.aux.json
@@ -101,7 +101,7 @@ build_clazy_clang14:
- apt-get install --yes --no-install-recommends clazy clang-14
- mkdir -p build && cd build
- CC=clang-14 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations"
cmake -G Ninja ..
--
CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static"
ninja
+-
CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static"
ninja -j ${FDO_CI_CONCURRENT}
build_android:
stage: build
@@ -121,7 +121,7 @@ build_android:
-DENABLE_BOOST=OFF
-DCMAKE_CXX_FLAGS="-Werror
-Wno-deprecated-declarations"
-DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake'
-- ninja
+- ninja -j ${FDO_CI_CONCURRENT}
qt5_docs:
only:
@@ -172,7 +172,7 @@ glib_docs:
- apt-get install --yes --no-install-recommends gtk-doc-tools
- mkdir -p build && cd build
- cmake -G Ninja -DENABLE_GTK_DOC=YES ..
-- ninja glib-docs
+- ninja -j ${FDO_CI_CONCURRENT} glib-docs
cache: {}
artifacts:
paths:
[poppler] .gitlab-ci.yml qt6/tests
.gitlab-ci.yml |3 ++-
qt6/tests/CMakeLists.txt |4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7f0276bbc5f7f7b4fefa956d8893ee23c13226e2
Author: Albert Astals Cid
Date: Sat Dec 31 01:01:08 2022 +0100
CI: Cheat a bit in the build_clang14_libcpp build
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6bb126d2..93bf98c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,8 @@ build_clang14_libcpp:
- apt-get install --yes --no-install-recommends libclang-14-dev
llvm-14-dev libc++-14-dev libc++abi-14-dev clang-tidy-14 clang-14
libunwind-14-dev gperf jq
- srcdir=`pwd` && mkdir -p /tmp/poppler_build && cd /tmp/poppler_build
- clang++-14 -fPIC -shared -o goostring-format-checker.so
$srcdir/test/goostring-format-checker/goostring-format-checker.cc
-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-14/include/
-- CC=clang-14 CXX=clang++-14 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker -Werror -Wno-deprecated-declarations"
-DTESTDATADIR=$srcdir/test-data -DCMAKE_EXPORT_COMPILE_COMMANDS=ON $srcdir
+- echo "We disable Qt6 tests since Qt6 exposes std::string in its ABI
which makes it not build in this CI since we're using libc++ but Qt6 in debian
is build with libstdc++"
+- CC=clang-14 CXX=clang++-14 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker -Werror -Wno-deprecated-declarations"
-DTESTDATADIR=$srcdir/test-data -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DBUILD_QT6_TESTS=OFF $srcdir
- ninja
- ctest --output-on-failure
- echo "This is a complex way of not running clang-tidy over autogenerated
files, unfortunately -DCMAKE_CXX_CLANG_TIDY doesn't support that
https://gitlab.kitware.com/cmake/cmake/-/issues/19772";
diff --git a/qt6/tests/CMakeLists.txt b/qt6/tests/CMakeLists.txt
index d5f7184f..90ec00cc 100644
--- a/qt6/tests/CMakeLists.txt
+++ b/qt6/tests/CMakeLists.txt
@@ -22,7 +22,9 @@ macro(QT6_ADD_QTEST exe source)
${source}
)
poppler_add_test(${exe} BUILD_QT6_TESTS ${${test_name}_SOURCES})
-add_test(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
+if(BUILD_QT6_TESTS)
+ add_test(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
+endif()
target_link_libraries(${exe} poppler-qt6 Qt6::Widgets Qt6::Test Qt6::Gui)
endmacro()
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 40c737a450153bdde180e0ee6e069a08c8e04dc4
Author: Albert Astals Cid
Date: Thu Dec 1 22:08:40 2022 +0100
CI: Install Qt 6.2 in build_ubuntu_20_04
now that the other systems ship Qt 6.3 or newer we need at least one CI
with our minimum required Qt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fe388f7..6bb126d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ before_script:
- echo 'deb-src http://deb.debian.org/debian unstable main' >>
/etc/apt/sources.list
- apt-get update
- apt-get build-dep --yes --no-install-recommends poppler
- - apt-get install --yes --no-install-recommends ninja-build
libcurl4-openssl-dev git ca-certificates locales libgtk-3-dev wget p7zip-full
libbrotli-dev libboost-container-dev qt6-base-dev
+ - apt-get install --yes --no-install-recommends ninja-build
libcurl4-openssl-dev git ca-certificates locales libgtk-3-dev libbrotli-dev
libboost-container-dev qt6-base-dev
- echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen
- locale-gen
@@ -70,11 +70,17 @@ build_ubuntu_20_04:
image: ubuntu:20.04
before_script:
- apt-get update
-- apt-get install --yes --no-install-recommends build-essential cmake
ninja-build libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection
libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev ca-certificates
libcurl4-nss-dev liblcms2-dev libboost-container-dev libtiff-dev
+- apt-get install --yes --no-install-recommends build-essential cmake
ninja-build libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection
libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev ca-certificates
libcurl4-nss-dev liblcms2-dev libboost-container-dev libtiff-dev wget
p7zip-full git
+- wget -r -l1 -np
"https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_620/qt.qt6.620.gcc_64/";
-A "6.2.0-0-*qtbase-Linux-RHEL_8_2-GCC-Linux-RHEL_8_2-X86_64.7z"
+- 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_620/qt.qt6.620.gcc_64/6.2.0-0-*qtbase-Linux-RHEL_8_2-GCC-Linux-RHEL_8_2-X86_64.7z
+- wget -r -l1 -np
"https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_620/qt.qt6.620.gcc_64/";
-A "6.2.0-0-*icu-linux-Rhel7.2-x64.7z"
+- 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_620/qt.qt6.620.gcc_64/6.2.0-0-*icu-linux-Rhel7.2-x64.7z
script:
+- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
-- cmake -G Ninja ..
+- cmake -G Ninja -DTESTDATADIR=$PWD/../test-data
-DCMAKE_PREFIX_PATH=$PWD/../6.2.0/gcc_64/lib/cmake ..
- ninja
+- ctest --output-on-failure
build_mingw64_fedora37:
stage: build
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |1 - 1 file changed, 1 deletion(-) New commits: commit a5952ab70716a2d4f792a943c2dcf3068f1d6885 Author: Jeremy Bicha Date: Wed Nov 2 15:03:24 2022 +0100 Revert "CI: Fix Debian brokenness" This reverts commit 8fcaa7c622d24761a9ecb3922f95d072077d6f34. Debian's systemd 252-2 fixed the bug in 252-1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26bf1d1d..b5db08a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,6 @@ stages: - publish before_script: - - addgroup systemd-journal - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list - apt-get update - apt-get build-dep --yes --no-install-recommends poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |1 + 1 file changed, 1 insertion(+) New commits: commit 8fcaa7c622d24761a9ecb3922f95d072077d6f34 Author: Albert Astals Cid Date: Tue Nov 1 10:11:41 2022 +0100 CI: Fix Debian brokenness diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5db08a9..26bf1d1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ stages: - publish before_script: + - addgroup systemd-journal - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list - apt-get update - apt-get build-dep --yes --no-install-recommends poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 315ab3006fb24bf47b595343e6a3e90995f2a588 Author: Albert Astals Cid Date: Sat Sep 17 10:28:00 2022 +0200 CI: Update Fedora CI to 37, it's close enough to the release date diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad75bfb9..b5db08a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,9 +76,9 @@ build_ubuntu_18_04: - cmake -G Ninja .. - ninja -build_mingw64_fedora36: +build_mingw64_fedora37: stage: build - image: fedora:36 + image: fedora:37 before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y mingw64-poppler
[poppler] .gitlab-ci.yml goo/gfile.h poppler/CairoOutputDev.h poppler/Gfx.h poppler/GfxState.h poppler/GlobalParams.cc poppler/OutputDev.h poppler/PDFDoc.h poppler/PSOutputDev.h poppler/SplashOutputDe
.gitlab-ci.yml| 19 +--
README.contributors |2
goo/gfile.h | 10 +
poppler/CairoOutputDev.h | 100 ++---
poppler/Gfx.h | 10 +
poppler/GfxState.h| 65 +--
poppler/GlobalParams.cc |5
poppler/OutputDev.h | 107 +++---
poppler/PDFDoc.h | 260 --
poppler/PSOutputDev.h | 155 +--
poppler/SplashOutputDev.h | 15 ++
poppler/TextOutputDev.h | 125 +-
qt5/src/poppler-private.h |5
qt6/src/poppler-private.h |5
splash/Splash.h | 15 ++
utils/InMemoryFile.h |5
16 files changed, 715 insertions(+), 188 deletions(-)
New commits:
commit a94a444e5acff86e04d1688d862e81a82108cf03
Author: Albert Astals Cid
Date: Fri Jul 29 16:31:10 2022 +0200
CI: clang 13 -> 14
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 67ac1996..a067dc65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,9 +30,9 @@ clang_format:
stage: build
before_script:
- apt-get update
- - apt-get install --yes --no-install-recommends git clang-format-13
+ - apt-get install --yes --no-install-recommends git clang-format-14
script:
-- find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name
"*.cc" \) -exec clang-format-13 -i {} \;
+- find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name
"*.cc" \) -exec clang-format-14 -i {} \;
- git diff --exit-code
build:
@@ -44,28 +44,27 @@ build:
- ninja
- ctest --output-on-failure
-build_clang13_libcpp:
+build_clang14_libcpp:
stage: build
image: debian:bookworm
script:
- echo "We want to compile with C++23 here because it has some nice things
like deleted std::string nullptr constructor"
- sed -i -e "s@CMAKE_CXX_STANDARD 17@CMAKE_CXX_STANDARD 23@g"
CMakeLists.txt
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
-- apt-get install --yes --no-install-recommends libclang-13-dev
llvm-13-dev libc++-13-dev libc++abi-13-dev clang-tidy-13 clang-13
libunwind-13-dev gperf jq
+- apt-get install --yes --no-install-recommends libclang-14-dev
llvm-14-dev libc++-14-dev libc++abi-14-dev clang-tidy-14 clang-14
libunwind-14-dev gperf jq
- srcdir=`pwd` && mkdir -p /tmp/poppler_build && cd /tmp/poppler_build
-- clang++-13 -fPIC -shared -o goostring-format-checker.so
$srcdir/test/goostring-format-checker/goostring-format-checker.cc
-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-13/include/
-- CC=clang-13 CXX=clang++-13 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker -Werror -Wno-deprecated-declarations"
-DTESTDATADIR=$srcdir/test-data -DCMAKE_EXPORT_COMPILE_COMMANDS=ON $srcdir
+- clang++-14 -fPIC -shared -o goostring-format-checker.so
$srcdir/test/goostring-format-checker/goostring-format-checker.cc
-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-14/include/
+- CC=clang-14 CXX=clang++-14 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker -Werror -Wno-deprecated-declarations"
-DTESTDATADIR=$srcdir/test-data -DCMAKE_EXPORT_COMPILE_COMMANDS=ON $srcdir
- ninja
- ctest --output-on-failure
- echo "This is a complex way of not running clang-tidy over autogenerated
files, unfortunately -DCMAKE_CXX_CLANG_TIDY doesn't support that
https://gitlab.kitware.com/cmake/cmake/-/issues/19772";
- cat compile_commands.json | jq '[.[] | select(.file |
contains("'"$srcdir"'"))]' > compile_commands.aux.json
- cp compile_commands.aux.json compile_commands.json
-- echo "For some reason clang-tidy gets confused by -stdlib=libc++"
-- sed -i -e "s@-stdlib=libc++@ @g" compile_commands.json
-- echo "We're going to cheat and remove the moc includes so that we don't
lint autogenerated code, with clang-tidy 14 we can remove this and use
NOLINTBEGIN/NOLINTEND"
+- echo "Cheat a bit and remove the moc includes so that we don't lint
autogenerated code"
+- echo "Maybe we can replace this with NOLINTBEGIN in the future
https://github.com/llvm/llvm-project/issues/56983";
- find $srcdir/qt* -name *.cpp -exec sed -E -i '/#include .*moc"$/d' {} \;
- cp "$srcdir/.clang-tidy" .
-- run-clang-tidy-13
+- run-clang-tidy-14
build_ubuntu_18_04:
stage: build
diff --git a/README.contributors b/README.contributors
index 8cccd70f..b310a5b4 100644
--- a/README.contributors
+++ b/README.contributors
@@ -29,7 +29,7 @@ To get the clang-format warnings locally instead at CI time
we recommend you
to copy the hooks/pre-commit to your .git
cp hooks/pre-commit .git/hooks/
-We are using cl
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 ++ 1 file changed, 2 insertions(+) New commits: commit 56a7f817567d65ce62bea03af27c0e60340116f4 Author: Albert Astals Cid Date: Fri Aug 5 23:24:30 2022 +0200 CI: workaround cmake 3.24.0 issues https://gitlab.kitware.com/cmake/cmake/-/issues/23823 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7da7f82..67ac1996 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,6 +46,7 @@ build: build_clang13_libcpp: stage: build + image: debian:bookworm script: - echo "We want to compile with C++23 here because it has some nice things like deleted std::string nullptr constructor" - sed -i -e "s@CMAKE_CXX_STANDARD 17@CMAKE_CXX_STANDARD 23@g" CMakeLists.txt @@ -91,6 +92,7 @@ build_mingw64_fedora36: build_clazy_clang14: stage: build + image: debian:bookworm script: - apt-get install --yes --no-install-recommends clazy clang-14 - mkdir -p build && cd build
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 8f874169e5d43418873b40e86954b86c01f7ba99
Author: Albert Astals Cid
Date: Fri Jul 29 16:26:20 2022 +0200
Generate qt6 docs
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52d064b7..0c777a55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -132,6 +132,19 @@ qt5_docs:
paths:
- qt5/src/APIDOCS-html
+qt6_docs:
+ only:
+- master
+ stage: document
+ script:
+- apt-get install --yes --no-install-recommends doxygen graphviz
qt6-documentation-tools
+- cd qt6/src
+- ( cat Doxyfile ; echo "QHG_LOCATION=/usr/lib/qt6/bin/qhelpgenerator" ) |
doxygen -
+ cache: {}
+ artifacts:
+paths:
+ - qt6/src/APIDOCS-html
+
cpp_docs:
only:
- master
[poppler] .gitlab-ci.yml poppler/GfxState.cc poppler/GlobalParams.cc
.gitlab-ci.yml |1 +
poppler/GfxState.cc |2 ++
poppler/GlobalParams.cc |4
3 files changed, 7 insertions(+)
New commits:
commit 67190c0a05045d3c3eef4d5f0eaeb4435eb59c7c
Author: Albert Astals Cid
Date: Wed Apr 20 19:58:56 2022 +0200
CI: -Werror for the Android builder
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2722d68..52d064b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,6 +113,7 @@ build_android:
-DENABLE_DCTDECODER=unmaintained
-DENABLE_LIBOPENJPEG=unmaintained
-DENABLE_BOOST=OFF
+ -DCMAKE_CXX_FLAGS="-Werror
-Wno-deprecated-declarations"
-DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake'
- ninja
diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
index e2065a06..1c5e5c8b 100644
--- a/poppler/GfxState.cc
+++ b/poppler/GfxState.cc
@@ -664,6 +664,7 @@ static const double white_d65_X = 0.9505;
static const double white_d65_Y = 1.0;
static const double white_d65_Z = 1.0890;
+#ifdef USE_CMS
// D50 is the default white point as used in ICC profiles and in the lcms2
library
static const double white_d50_X = 0.96422;
static const double white_d50_Y = 1.0;
@@ -691,6 +692,7 @@ static void inline bradford_transform_to_d50(double &X,
double &Y, double &Z, co
Y = 0.43069901 * rho_in + 0.52894900 * gamma_in + 0.04035199 * beta_in;
Z = 0.00849698 * rho_in + 0.04086079 * gamma_in + 0.79284618 * beta_in;
}
+#endif
static void inline bradford_transform_to_d65(double &X, double &Y, double &Z,
const double source_whiteX, const double source_whiteY, const double
source_whiteZ)
{
diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index 570b592b..28a1e146 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -893,6 +893,8 @@ GooString *GlobalParams::findFontFile(const std::string
&fontName)
return path;
}
+#if defined(WITH_FONTCONFIGURATION_FONTCONFIG) ||
defined(WITH_FONTCONFIGURATION_WIN32)
+
static bool supportedFontForEmbedding(Unicode uChar, const char *filepath, int
faceIndex)
{
if (!GooString::endsWith(filepath, ".ttf") &&
!GooString::endsWith(filepath, ".ttc") && !GooString::endsWith(filepath,
".otf")) {
@@ -926,6 +928,8 @@ static bool supportedFontForEmbedding(Unicode uChar, const
char *filepath, int f
return glyph > 0;
}
+#endif
+
/* if you can't or don't want to use Fontconfig, you need to implement
this function for your platform. For Windows, it's in GlobalParamsWin.cc
*/
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bd7bc10636ce20159133f846dfc337f2ab92b5ed Author: Albert Astals Cid Date: Mon Apr 18 19:34:52 2022 +0200 CI: Update mingw to fedora 36 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 020a3bc6..a2722d68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,9 +77,9 @@ build_ubuntu_18_04: - cmake -G Ninja .. - ninja -build_mingw64_fedora35: +build_mingw64_fedora36: stage: build - image: fedora:35 + image: fedora:36 before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y mingw64-poppler
Re: [poppler] .gitlab-ci.yml qt5/demos
CI: make the libcpp build use C++23 It will help us make sure we don't do things like std::string s = nullptr; (since that is not possible on C++23) Very nice move! The std::string s = nullptr pitfall was very easy to fall into. Best, Oliver smime.p7s Description: S/MIME Cryptographic Signature
[poppler] .gitlab-ci.yml qt5/demos
.gitlab-ci.yml |2 ++
qt5/demos/viewer.cpp |4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit e60280ae8ff3ccfa4da434835e59b682af7ece6b
Author: Albert Astals Cid
Date: Wed Mar 30 23:45:23 2022 +0200
CI: make the libcpp build use C++23
Needs a small cast in the qt5 demo viewer to make the addition of two
different enums "ok"
It will help us make sure we don't do things like std::string s = nullptr;
(since that is not possible on C++23)
And also helps us future proof in case something else comes up
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf2acfa2..020a3bc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,6 +47,8 @@ build:
build_clang13_libcpp:
stage: build
script:
+- echo "We want to compile with C++23 here because it has some nice things
like deleted std::string nullptr constructor"
+- sed -i -e "s@CMAKE_CXX_STANDARD 17@CMAKE_CXX_STANDARD 23@g"
CMakeLists.txt
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- apt-get install --yes --no-install-recommends libclang-13-dev
llvm-13-dev libc++-13-dev libc++abi-13-dev clang-tidy-13 clang-13
libunwind-13-dev gperf jq
- srcdir=`pwd` && mkdir -p /tmp/poppler_build && cd /tmp/poppler_build
diff --git a/qt5/demos/viewer.cpp b/qt5/demos/viewer.cpp
index eebd08d1..d21fc3c5 100644
--- a/qt5/demos/viewer.cpp
+++ b/qt5/demos/viewer.cpp
@@ -54,14 +54,14 @@ PdfViewer::PdfViewer(QWidget *parent) :
QMainWindow(parent), m_currentPage(0), m
// setup the menus
QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
m_fileOpenAct = fileMenu->addAction(tr("&Open"), this,
&PdfViewer::slotOpenFile);
-m_fileOpenAct->setShortcut(Qt::CTRL + Qt::Key_O);
+m_fileOpenAct->setShortcut(static_cast(Qt::CTRL) + Qt::Key_O);
fileMenu->addSeparator();
m_fileSaveCopyAct = fileMenu->addAction(tr("&Save a Copy..."), this,
&PdfViewer::slotSaveCopy);
m_fileSaveCopyAct->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_S);
m_fileSaveCopyAct->setEnabled(false);
fileMenu->addSeparator();
QAction *act = fileMenu->addAction(tr("&Quit"), qApp,
&QApplication::closeAllWindows);
-act->setShortcut(Qt::CTRL + Qt::Key_Q);
+act->setShortcut(static_cast(Qt::CTRL) + Qt::Key_Q);
QMenu *viewMenu = menuBar()->addMenu(tr("&View"));
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7e402f251caa15d1eae1d61b7b81ef1ddd43856e Author: Albert Astals Cid Date: Mon Mar 28 17:14:50 2022 +0200 CI: We can go back to debian:unstable now diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2eaff66..bf2acfa2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: debian:testing +image: debian:unstable stages: - build @@ -6,7 +6,7 @@ stages: - publish before_script: - - echo 'deb-src http://deb.debian.org/debian testing main' >> /etc/apt/sources.list + - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list - apt-get update - apt-get build-dep --yes --no-install-recommends poppler - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libgtk-3-dev wget p7zip-full libbrotli-dev libboost-container-dev qt6-base-dev
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 426f149c57627277d0d8a7e7ee7a39c4802e7714 Author: Albert Astals Cid Date: Mon Mar 28 12:37:49 2022 +0200 CI: switch to debian testing while they fix the python migration mess diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf2acfa2..a2eaff66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: debian:unstable +image: debian:testing stages: - build @@ -6,7 +6,7 @@ stages: - publish before_script: - - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list + - echo 'deb-src http://deb.debian.org/debian testing main' >> /etc/apt/sources.list - apt-get update - apt-get build-dep --yes --no-install-recommends poppler - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libgtk-3-dev wget p7zip-full libbrotli-dev libboost-container-dev qt6-base-dev
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9e2dc642c5235037a8912512e67a6124ca69a2fa Author: Albert Astals Cid Date: Tue Mar 8 15:03:20 2022 +0100 CI: Install libtiff-dev for ubuntu diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35418db0..c824c3ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,7 @@ build_ubuntu_18_04: image: ubuntu:bionic before_script: - apt-get update -- apt-get install --yes --no-install-recommends build-essential cmake ninja-build libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev ca-certificates libcurl4-nss-dev liblcms2-dev libboost-container-dev +- apt-get install --yes --no-install-recommends build-essential cmake ninja-build libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev ca-certificates libcurl4-nss-dev liblcms2-dev libboost-container-dev libtiff-dev script: - mkdir -p build && cd build - cmake -G Ninja ..
[poppler] .gitlab-ci.yml glib/poppler-cached-file-loader.cc poppler/CairoOutputDev.cc
.gitlab-ci.yml |2 +-
glib/poppler-cached-file-loader.cc |4 +---
poppler/CairoOutputDev.cc |3 ---
3 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit ce644167f258e5a2f53e26976514a14866c77365
Author: Albert Astals Cid
Date: Tue Oct 26 23:40:41 2021 +0200
CI: Enable -Werror in the clang 13 builder too
We have it on the clazy builder too, but unfortunately clazy is still
built against clang 11 in debian:unstable so we get less coverage there
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 029d0e8e..35418db0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,7 @@ build_clang13_libcpp:
- mkdir -p build && cd build
- apt-get install --yes --no-install-recommends libclang-13-dev
llvm-13-dev libc++-13-dev libc++abi-13-dev clang-tidy-13 clang-13
libunwind-13-dev
- clang++-13 -fPIC -shared -o goostring-format-checker.so
../test/goostring-format-checker/goostring-format-checker.cc
-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-13/include/
-- CC=clang-13 CXX=clang++-13 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker" -DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy-13;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,google-explicit-constructor,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-suspicious-include,-performance-no-int-to-ptr,-bugprone-easily-swappable-parameters,-bugprone
-implicit-widening-of-multiplication-result;-warnings-as-errors=*" ..
-DCMAKE_PREFIX_PATH=$PWD/../6.1.0/gcc_64/lib/cmake
+- CC=clang-13 CXX=clang++-13 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker -Werror -Wno-deprecated-declarations"
-DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy-13;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,google-explicit-constructor,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-suspicious-include,-performance-no-int-to-ptr,-bugprone-
easily-swappable-parameters,-bugprone-implicit-widening-of-multiplication-result;-warnings-as-errors=*"
.. -DCMAKE_PREFIX_PATH=$PWD/../6.1.0/gcc_64/lib/cmake
- ninja
- ctest --output-on-failure
diff --git a/glib/poppler-cached-file-loader.cc
b/glib/poppler-cached-file-loader.cc
index def0cde8..097e6645 100644
--- a/glib/poppler-cached-file-loader.cc
+++ b/glib/poppler-cached-file-loader.cc
@@ -82,12 +82,11 @@ int PopplerCachedFileLoader::load(const
std::vector &ranges, CachedFi
{
char buf[CachedFileChunkSize];
gssize bytesRead;
-size_t rangeBytesRead, bytesToRead, size;
+size_t rangeBytesRead, bytesToRead;
if (length == (goffset)-1)
return 0;
-size = 0;
for (const ByteRange &range : ranges) {
bytesToRead = MIN(CachedFileChunkSize, range.length);
rangeBytesRead = 0;
@@ -98,7 +97,6 @@ int PopplerCachedFileLoader::load(const
std::vector &ranges, CachedFi
return -1;
writer->write(buf, bytesRead);
-size += bytesRead;
rangeBytesRead += bytesRead;
bytesToRead = range.length - rangeBytesRead;
} while (bytesRead > 0 && bytesToRead > 0);
diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index e3606418..93975609 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -2333,11 +2333,9 @@ void CairoOutputDev::drawImageMaskPrescaled(GfxState
*state, Object *ref, Stream
}
lastYStep = yStep;
-int k1 = y;
int xt = 0;
int xSrc = 0;
-int x1 = k1;
int n = yStep > 0 ? yStep : 1;
int origN = n;
@@ -2386,7 +2384,6 @@ void CairoOutputDev::drawImageMaskPrescaled(GfxState
*state, Object *ref, Stream
}
[poppler] .gitlab-ci.yml README.contributors
.gitlab-ci.yml | 18 +-
README.contributors |2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 967a1a1ab038baf03c6f4b5faffc106dec559ce6
Author: Albert Astals Cid
Date: Tue Oct 26 23:02:28 2021 +0200
CI: Use clang 13
bugprone-implicit-widening-of-multiplication-result may be nice to
enable one day, together with gcc's -Wconversion ^_^
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d811fd9..029d0e8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,9 +30,9 @@ clang_format:
stage: build
before_script:
- apt-get update
- - apt-get install --yes --no-install-recommends git clang-format-12
+ - apt-get install --yes --no-install-recommends git clang-format-13
script:
-- find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name
"*.cc" \) -exec clang-format-12 -i {} \;
+- find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name
"*.cc" \) -exec clang-format-13 -i {} \;
- git diff --exit-code
build:
@@ -48,7 +48,7 @@ build:
- ninja
- ctest --output-on-failure
-build_clang12_libcpp:
+build_clang13_libcpp:
stage: build
script:
- wget -r -l1 -np
"https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/";
-A "6.1.0-0-*qtbase-Linux-CentOS_8_3-GCC-Linux-CentOS_8_3-X86_64.7z"
@@ -57,9 +57,9 @@ build_clang12_libcpp:
- 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/6.1.0-0-*icu-linux-Rhel7.2-x64.7z
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
-- apt-get install --yes --no-install-recommends libclang-12-dev
llvm-12-dev libc++-12-dev libc++abi-12-dev clang-tidy-12 clang-12
libunwind-12-dev
-- clang++-12 -fPIC -shared -o goostring-format-checker.so
../test/goostring-format-checker/goostring-format-checker.cc
-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-12/include/
-- CC=clang-12 CXX=clang++-12 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker" -DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy-12;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,google-explicit-constructor,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-suspicious-include,-performance-no-int-to-ptr;-warnings-as-errors=*"
.. -DCMAKE_PREFIX_PATH=$
PWD/../6.1.0/gcc_64/lib/cmake
+- apt-get install --yes --no-install-recommends libclang-13-dev
llvm-13-dev libc++-13-dev libc++abi-13-dev clang-tidy-13 clang-13
libunwind-13-dev
+- clang++-13 -fPIC -shared -o goostring-format-checker.so
../test/goostring-format-checker/goostring-format-checker.cc
-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-13/include/
+- CC=clang-13 CXX=clang++-13 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker" -DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy-13;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,google-explicit-constructor,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-suspicious-include,-performance-no-int-to-ptr,-bugprone-easily-swappable-parameters,-bugprone
-implicit-widening-of-multiplication-result;-warnings-as-errors=*" ..
-DCMAKE_PREFIX_PATH=$PWD/../6.1.0/gcc_64/lib/cmake
- ninja
- ctest --output-on-failure
@@ -86,16 +86,16 @@ build_mingw64_fedora35:
- mingw64-cmake -G Ninja ..
- ninja
-build_clazy_clang12:
+build_clazy_clang13:
stage: build
script:
- wget -r -l1 -np
"https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/";
-A "6.1.0-0-*qtbase-Linux-CentOS_8_3-GCC-Linux-CentOS_8_3-X86_64.7z"
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b8fd5b275b7f0ed1f9460db16e7c5a569ded3d35 Author: Albert Astals Cid Date: Tue Oct 26 22:56:56 2021 +0200 CI: Also compile the qt6 frontend code in mingw diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04a6c9e5..6d811fd9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ build_mingw64_fedora35: before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y mingw64-poppler -- dnf -y install glibc-langpack-en make ninja-build mingw64-boost mingw64-curl +- dnf -y install glibc-langpack-en make ninja-build mingw64-boost mingw64-curl mingw64-qt6-qtbase script: - mkdir -p build && cd build - mingw64-cmake -G Ninja ..
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 09e2384245ea44c98254fd629c1a7b68a0b2a5aa Author: Albert Astals Cid Date: Tue Oct 26 22:34:52 2021 +0200 CI: Use fedora 35 for the mingw builder diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0442885d..04a6c9e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,9 +74,9 @@ build_ubuntu_18_04: - cmake -G Ninja .. - ninja -build_mingw64_fedora33: +build_mingw64_fedora35: stage: build - image: fedora:33 + image: fedora:35 before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y mingw64-poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 12 1 file changed, 4 insertions(+), 8 deletions(-) New commits: commit 72902cfa13aecb1827c2a9bba971154253657ecd Author: Albert Astals Cid Date: Fri Oct 15 19:02:17 2021 +0200 Fix Android CI diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 151c94ed..0442885d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,24 +102,20 @@ build_android: stage: build image: kdeorg/android-sdk before_script: -- wget https://download.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.xz -- tar xvfh freetype-2.10.1.tar.xz -- pushd freetype-2.10.1 -- CFLAGS=-std=gnu99 STANDALONE_EXTRA="--arch arm64" /opt/helpers/build-standalone "./autogen.sh && ./configure --enable-shared=no --prefix=/opt/popplerandroid-deps --host=aarch64-linux-android && make -j`nproc` && make install" -- popd +- echo "workaround for ECM Android toolchain wanting all binaries to be shared libraries" +- sed -i -e 's/ //g' /opt/nativetooling/share/ECM/toolchain/Android.cmake script: - mkdir -p build && cd build - 'ANDROID_ARCH_ABI=arm64-v8a cmake -G Ninja .. -DCMAKE_ANDROID_API=28 - -DCMAKE_INSTALL_PREFIX="/opt/popplerandroid-deps" - -DCMAKE_PREFIX_PATH="$QT_ANDROID;/opt/popplerandroid-deps" + -DCMAKE_PREFIX_PATH="/opt/Qt/;/opt/kdeandroid-arm64/" -DCMAKE_BUILD_TYPE=debug -DCMAKE_POSITION_INDEPENDENT_CODE=OFF -DENABLE_DCTDECODER=unmaintained -DENABLE_LIBOPENJPEG=unmaintained -DENABLE_BOOST=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake' -- ninja && ninja install +- ninja qt5_docs: only:
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 03cc342c2a06ff7550dd6ce9180c64d92f75a8ce Author: Albert Astals Cid Date: Mon Sep 20 09:34:47 2021 +0200 CI: Also compile the curl-dependent code on build_mingw64_fedora33 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9d9624b..c17e2fa7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ build_mingw64_fedora33: before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y mingw64-poppler -- dnf -y install glibc-langpack-en make ninja-build mingw64-boost +- dnf -y install glibc-langpack-en make ninja-build mingw64-boost mingw64-curl script: - mkdir -p build && cd build - mingw64-cmake -G Ninja ..
[poppler] .gitlab-ci.yml qt6/src
.gitlab-ci.yml| 12 ++--
qt6/src/poppler-link.cc |2 +-
qt6/src/poppler-page.cc |2 +-
qt6/src/poppler-private.h |1 -
4 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 646a1519d965895a4126b4e5f6fee2102d9c38a6
Author: Albert Astals Cid
Date: Fri Aug 27 15:45:27 2021 +0200
CI: Include qt6 on the clang-tidy and clazy builders
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46fb04c9..9781e7b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,11 +51,15 @@ build:
build_clang12_libcpp:
stage: build
script:
+- wget -r -l1 -np
"http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/";
-A "6.0.0-0-*qtbase-Linux-CentOS_8_1-GCC-Linux-CentOS_8_1-X86_64.7z"
+- 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-*qtbase-Linux-CentOS_8_1-GCC-Linux-CentOS_8_1-X86_64.7z
+- wget -r -l1 -np
"http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/";
-A "6.0.0-0-*icu-linux-Rhel7.2-x64.7z"
+- 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-*icu-linux-Rhel7.2-x64.7z
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
- apt-get install --yes --no-install-recommends libclang-12-dev
llvm-12-dev libc++-12-dev libc++abi-12-dev clang-tidy-12 clang-12
libunwind-12-dev
- clang++-12 -fPIC -shared -o goostring-format-checker.so
../test/goostring-format-checker/goostring-format-checker.cc
-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-12/include/
-- CC=clang-12 CXX=clang++-12 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker" -DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy-12;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-suspicious-include,-performance-no-int-to-ptr;-warnings-as-errors=*"
..
+- CC=clang-12 CXX=clang++-12 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker" -DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy-12;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-suspicious-include,-performance-no-int-to-ptr;-warnings-as-errors=*"
.. -DCMAKE_PREFIX_PATH=$PWD/../6.0.0/gcc_64/lib/cmak
e
- ninja
- ctest --output-on-failure
@@ -85,9 +89,13 @@ build_mingw64_fedora33:
build_clazy_clang12:
stage: build
script:
+- wget -r -l1 -np
"http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/";
-A "6.0.0-0-*qtbase-Linux-CentOS_8_1-GCC-Linux-CentOS_8_1-X86_64.7z"
+- 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-*qtbase-Linux-CentOS_8_1-GCC-Linux-CentOS_8_1-X86_64.7z
+- wget -r -l1 -np
"http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/";
-A "6.0.0-0-*icu-linux-Rhel7.2-x64.7z"
+- 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-*icu-linux-Rhel7.2-x64.7z
- apt-get install --yes --no-install-recommends clazy clang-12
- mkdir -p build && cd build
-- CC=clang-12 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations"
cmake -G Ninja ..
+- CC=clang-12 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations"
cmake -G Ninja .. -DCMAKE_PREFIX_PATH=$PWD/../6.0.0/gcc_64/lib/cmake
-
CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static"
ninja
build_android:
diff --gi
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 56822eb116b6f8a5c6c30cffd2991956ff62e142
Author: Albert Astals Cid
Date: Sat Aug 7 23:41:46 2021 +0200
Fix the build_clang12_libcpp CI
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac1e7516..46fb04c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,7 @@ build_clang12_libcpp:
script:
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
-- apt-get install --yes --no-install-recommends libclang-12-dev
llvm-12-dev libc++-12-dev libc++abi-12-dev clang-tidy-12 clang-12
+- apt-get install --yes --no-install-recommends libclang-12-dev
llvm-12-dev libc++-12-dev libc++abi-12-dev clang-tidy-12 clang-12
libunwind-12-dev
- clang++-12 -fPIC -shared -o goostring-format-checker.so
../test/goostring-format-checker/goostring-format-checker.cc
-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-12/include/
- CC=clang-12 CXX=clang++-12 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker" -DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy-12;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-suspicious-include,-performance-no-int-to-ptr;-warnings-as-errors=*"
..
- ninja
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit efa43f709a83f5401aa4d99a9412c8ea249663ea Author: Albert Astals Cid Date: Tue Apr 27 21:36:57 2021 +0200 CI: Use fedora 34 for mingw diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 74ad1d53..6e32eb70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,9 +70,9 @@ build_ubuntu_18_04: - cmake -G Ninja .. - ninja -build_mingw64_fedora: +build_mingw64_fedora34: stage: build - image: fedora + image: fedora:34 before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y mingw64-poppler ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 60fec72677af099e7865a09398263d2508944ad2 Author: Albert Astals Cid Date: Thu Apr 22 19:13:00 2021 +0200 CI: rename clazy CI to make it clear it uses a new C compiler diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ca5ac34..74ad1d53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,7 +82,7 @@ build_mingw64_fedora: - mingw64-cmake -G Ninja .. - ninja -build_clazy: +build_clazy_clang12: stage: build script: - apt-get install --yes --no-install-recommends clazy clang-12 ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml README.contributors
.gitlab-ci.yml | 18 +-
README.contributors |2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit d5ab9b5dbf0024f269001fcea87f4d01a44c2ec6
Author: Albert Astals Cid
Date: Wed Apr 21 16:42:09 2021 +0200
CI: Use clang-12
Disable new performance-no-int-to-ptr clang-tidy check since it triggers
too many issues deep in too many places
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59b9dac6..5ca5ac34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ before_script:
- echo 'deb-src http://deb.debian.org/debian unstable main' >>
/etc/apt/sources.list
- apt-get update
- apt-get build-dep --yes --no-install-recommends poppler
- - apt-get install --yes --no-install-recommends ninja-build
libcurl4-openssl-dev git ca-certificates locales libc++-dev libc++abi-dev clang
libgtk-3-dev clang-tidy wget p7zip-full libbrotli-dev
+ - apt-get install --yes --no-install-recommends ninja-build
libcurl4-openssl-dev git ca-certificates locales libgtk-3-dev wget p7zip-full
libbrotli-dev
- echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen
- locale-gen
@@ -30,9 +30,9 @@ clang_format:
stage: build
before_script:
- apt-get update
- - apt-get install --yes --no-install-recommends git clang-format-11
+ - apt-get install --yes --no-install-recommends git clang-format-12
script:
-- find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name
"*.cc" \) -exec clang-format-11 -i {} \;
+- find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name
"*.cc" \) -exec clang-format-12 -i {} \;
- git diff --exit-code
build:
@@ -48,14 +48,14 @@ build:
- ninja
- ctest --output-on-failure
-build_clang_libcpp:
+build_clang12_libcpp:
stage: build
script:
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
-- apt-get install --yes --no-install-recommends libclang-dev llvm-dev
-- clang++ -fPIC -shared -o goostring-format-checker.so
../test/goostring-format-checker/goostring-format-checker.cc
-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-11/include/
-- CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS="-stdlib=libc++
-Xclang -load -Xclang $PWD/goostring-format-checker.so -Xclang -add-plugin
-Xclang goostring-format-checker" -DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-suspicious-include;-warnings-as-errors=*"
..
+- apt-get install --yes --no-install-recommends libclang-12-dev
llvm-12-dev libc++-12-dev libc++abi-12-dev clang-tidy-12 clang-12
+- clang++-12 -fPIC -shared -o goostring-format-checker.so
../test/goostring-format-checker/goostring-format-checker.cc
-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-12/include/
+- CC=clang-12 CXX=clang++-12 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker" -DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy-12;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-suspicious-include,-performance-no-int-to-ptr;-warnings-as-errors=*"
..
- ninja
- ctest --output-on-failure
@@ -85,9 +85,9 @@ build_mingw64_fedora:
build_clazy:
stage: build
script:
-- apt-get install --yes --no-install-recommends clazy
+- apt-get install --yes --no-install-recommends clazy clang-12
- mkdir -p build && cd build
-- CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake
-G Ninja ..
+- CC=clang-12 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations"
cmake -G Ninja ..
-
CLAZY_CHECKS="level0,level1,level2,isempty-
[poppler] .gitlab-ci.yml poppler/Annot.cc poppler/Catalog.cc README.contributors
.gitlab-ci.yml |4 ++--
README.contributors |2 +-
poppler/Annot.cc| 21 +++--
poppler/Catalog.cc |8 ++--
4 files changed, 20 insertions(+), 15 deletions(-)
New commits:
commit 5b8f942fe4b9e0d3aeed3422b92362018d88429c
Author: Albert Astals Cid
Date: Wed Feb 3 22:05:42 2021 +0100
CI: new clang-format
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c143682..ea7dffa3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,9 +30,9 @@ clang_format:
stage: build
before_script:
- apt-get update
- - apt-get install --yes --no-install-recommends git clang-format-10
+ - apt-get install --yes --no-install-recommends git clang-format-11
script:
-- find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name
"*.cc" \) -exec clang-format-10 -i {} \;
+- find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name
"*.cc" \) -exec clang-format-11 -i {} \;
- git diff --exit-code
build:
diff --git a/README.contributors b/README.contributors
index 8c4162eb..e77d05e7 100644
--- a/README.contributors
+++ b/README.contributors
@@ -29,7 +29,7 @@ To get the clang-format warnings locally instead at CI time
we recommend you
to copy the hooks/pre-commit to your .git
cp hooks/pre-commit .git/hooks/
-We are using clang-format 10 on CI. Unfortunately clang-format is not totally
+We are using clang-format 11 on CI. Unfortunately clang-format is not totally
compatible with older versions of itself. If CI gives you trouble but your
local
clang-format disagrees, just apply the changes suggested by CI and then commit
with the --no-verify flag. If you get stuck, don't hesitate to ask the reviewer
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index 58dc2c85..59115cc2 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -219,16 +219,17 @@ static std::unique_ptr
getAdditionalAction(Annot::AdditionalActionsT
Object additionalActionsObject = additionalActions->fetch(doc->getXRef());
if (additionalActionsObject.isDict()) {
-const char *key =
-(type == Annot::actionCursorEntering ? "E"
- : type ==
Annot::actionCursorLeaving ? "X"
-
: type == Annot::actionMousePressed ? "D"
-
: type ==
Annot::actionMouseReleased ? "U"
-
: type == Annot::actionFocusIn ? "Fo"
-
: type == Annot::actionFocusOut
- ? "Bl"
- : type ==
Annot::actionPageOpening ? "PO"
-
: type == Annot::actionPageClosing ? "PC" : type ==
Annot::actionPageVisible ? "PV" : type == Annot::actionPageInvisible ? "PI" :
nullptr);
+const char *key = (type == Annot::actionCursorEntering ? "E"
+ : type == Annot::actionCursorLeaving ? "X"
+ : type == Annot::actionMousePressed ? "D"
+ : type == Annot::actionMouseReleased ? "U"
+ : type == Annot::actionFocusIn ? "Fo"
+ : type == Annot::actionFocusOut ? "Bl"
+ : type == Annot::actionPageOpening ? "PO"
+ : type == Annot::actionPageClosing ? "PC"
+ : type == Annot::actionPageVisible ? "PV"
+ : type == Annot::actionPageInvisible ? "PI"
+:
nullptr);
Object actionObject = additionalActionsObject.dictLookup(key);
if (actionObject.isDict())
diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc
index 001e3c5f..542f449a 100644
--- a/poppler/Catalog.cc
+++ b/poppler/Catalog.cc
@@ -1139,8 +1139,12 @@ std::unique_ptr
Catalog::getAdditionalAction(DocumentAdditionalActio
{
Object additionalActionsObject = additionalActions.fetch(doc->getXRef());
if (additionalActionsObject.isDict()) {
-const char *key =
-(type == actionCloseDocument ? "WC" : type ==
actionSaveDocumentStart ? "WS" : type == actionSaveDocumentFinish ? "DS" : type
== actionPrintDocumentStart ? "WP" : type == actionPrintDocumentFinish ? "DP"
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |1 - 1 file changed, 1 deletion(-) New commits: commit 11b2bc1b67a306af3ee5a731c95e856728b32bff Author: Albert Astals Cid Date: Mon Dec 21 18:37:01 2020 +0100 CI: Seems debian unstable clazy got fixed diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e998610..c99520d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,7 +82,6 @@ build_mingw64_fedora: build_clazy: stage: build - image: debian:testing script: - apt-get install --yes --no-install-recommends clazy - mkdir -p build && cd build ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bb599a7809edf73ecd48900bb9f103b0888be23e
Author: Albert Astals Cid
Date: Sat Dec 5 22:44:55 2020 +0100
CI: clang-tidy disable 3 new clang-tidy 11 warnings
At least the unsigned char one needs investiagtion, but let's unblock CI
for now
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b98e542..abf4f372 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,7 @@ build_clang_libcpp:
script:
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
-- CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++
-DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone;-warnings-as-errors=*"
..
+- CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++
-DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-signed-char-misuse,-bugprone-suspicious-include;-warnings-as-errors=*"
..
- ninja
- ctest --output-on-failure
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 1ad3bc825185d6cb0bc922d0dafdc3815558011d Author: Albert Astals Cid Date: Thu Oct 29 19:46:09 2020 +0100 CI: Use debian:unstable instead of fedora:31 that has a newer clazy clazy is broken in fedora 32 and 33 and i'm tired of complaining diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7a63d68..2d6ceb9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,12 +82,8 @@ build_mingw64_fedora: build_clazy: stage: build - image: fedora:31 - before_script: -- dnf install -y 'dnf-command(builddep)' -- dnf builddep -y poppler -- dnf -y install glibc-langpack-en make ninja-build clazy clang redhat-rpm-config libcurl-devel script: +- apt-get install --yes --no-install-recommends clazy - mkdir -p build && cd build - CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -G Ninja .. - CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static" ninja ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 4fee2408dad1a2e872810eadec89cb07dc982312
Author: Albert Astals Cid
Date: Tue Oct 6 01:08:16 2020 +0200
CI: qt6 try to account for the everchanging urls
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13f0f528..f7a63d68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,10 +38,10 @@ clang_format:
build:
stage: build
script:
-- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202010021647qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
-- 7z x
6.0.0-0-202010021647qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
-- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202010021647icu-linux-Rhel7.2-x64.7z
-- 7z x 6.0.0-0-202010021647icu-linux-Rhel7.2-x64.7z
+- wget -r -l1 -np
"http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/";
-A "6.0.0-0-*qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z"
+- 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-*qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
+- wget -r -l1 -np
"http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/";
-A "6.0.0-0-*icu-linux-Rhel7.2-x64.7z"
+- 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-*icu-linux-Rhel7.2-x64.7z
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
- cmake -G Ninja -DTESTDATADIR=$PWD/../test-data ..
-DCMAKE_PREFIX_PATH=$PWD/../6.0.0/gcc_64/lib/cmake
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 1ddb6aeff646e2df7b663c0186d4f9bc9859daba
Author: Albert Astals Cid
Date: Sun Oct 4 11:46:45 2020 +0200
CI: Update qt6 url
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18a35f06..13f0f528 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,10 +38,10 @@ clang_format:
build:
stage: build
script:
-- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009301637qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
-- 7z x
6.0.0-0-202009301637qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
-- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009301637icu-linux-Rhel7.2-x64.7z
-- 7z x 6.0.0-0-202009301637icu-linux-Rhel7.2-x64.7z
+- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202010021647qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
+- 7z x
6.0.0-0-202010021647qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
+- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202010021647icu-linux-Rhel7.2-x64.7z
+- 7z x 6.0.0-0-202010021647icu-linux-Rhel7.2-x64.7z
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
- cmake -G Ninja -DTESTDATADIR=$PWD/../test-data ..
-DCMAKE_PREFIX_PATH=$PWD/../6.0.0/gcc_64/lib/cmake
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 386555257158e1d170151b40dcea6bc90111e62f
Author: Albert Astals Cid
Date: Thu Oct 1 10:35:10 2020 +0200
CI: qt6: new tarballs
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b1f781e..18a35f06 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,10 +38,10 @@ clang_format:
build:
stage: build
script:
-- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009241627qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
-- 7z x
6.0.0-0-202009241627qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
-- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009241627icu-linux-Rhel7.2-x64.7z
-- 7z x 6.0.0-0-202009241627icu-linux-Rhel7.2-x64.7z
+- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009301637qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
+- 7z x
6.0.0-0-202009301637qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
+- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009301637icu-linux-Rhel7.2-x64.7z
+- 7z x 6.0.0-0-202009301637icu-linux-Rhel7.2-x64.7z
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
- cmake -G Ninja -DTESTDATADIR=$PWD/../test-data ..
-DCMAKE_PREFIX_PATH=$PWD/../6.0.0/gcc_64/lib/cmake
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 613d5f2a7b18e332896ea7829166ce9ce3234ab4
Author: Albert Astals Cid
Date: Fri Sep 25 01:36:41 2020 +0200
CI: Update qt6
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 211d40dc..9b1f781e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,10 +38,10 @@ clang_format:
build:
stage: build
script:
-- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009171622qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
-- 7z x
6.0.0-0-202009171622qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
-- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009171622icu-linux-Rhel7.2-x64.7z
-- 7z x 6.0.0-0-202009171622icu-linux-Rhel7.2-x64.7z
+- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009241627qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
+- 7z x
6.0.0-0-202009241627qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
+- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009241627icu-linux-Rhel7.2-x64.7z
+- 7z x 6.0.0-0-202009241627icu-linux-Rhel7.2-x64.7z
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
- cmake -G Ninja -DTESTDATADIR=$PWD/../test-data ..
-DCMAKE_PREFIX_PATH=$PWD/../6.0.0/gcc_64/lib/cmake
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 91d95545b48d3aec6220d943177b571466f9a116
Author: Albert Astals Cid
Date: Tue Sep 8 13:04:51 2020 +0200
CI: update qt6 links
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index baf8085e..89bb6bbc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,10 +38,10 @@ clang_format:
build:
stage: build
script:
-- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202008280953qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
-- 7z x
6.0.0-0-202008280953qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
-- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202008280953icu-linux-Rhel7.2-x64.7z
-- 7z x 6.0.0-0-202008280953icu-linux-Rhel7.2-x64.7z
+- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009070614qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
+- 7z x
6.0.0-0-202009070614qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
+- wget
http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009070614icu-linux-Rhel7.2-x64.7z
+- 7z x 6.0.0-0-202009070614icu-linux-Rhel7.2-x64.7z
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
- cmake -G Ninja -DTESTDATADIR=$PWD/../test-data ..
-DCMAKE_PREFIX_PATH=$PWD/../6.0.0/gcc_64/lib/cmake
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 2ec6bb9d0b1cfb3a1176e2b761b99c8e9d712642 Author: Albert Astals Cid Date: Wed Jul 8 00:52:17 2020 +0200 CI: image tweaks qt5_docs can go back to debian unstable clazy one still needs fedora 31, on fedora 32 clazy crashes, they are investigating it diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5adba60d..94c9d8d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,7 +82,7 @@ build_mingw64_fedora: build_clazy: stage: build - image: fedora + image: fedora:31 before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y poppler @@ -118,7 +118,6 @@ qt5_docs: only: - master stage: document - image: debian:testing variables: QT_SELECT: qt5 script: ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c290052d1060dbc53b565f1a34f1375324e2a668 Author: Albert Astals Cid Date: Sat Jul 4 01:17:34 2020 +0200 CI: add missing dependency in freetype diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61457be4..5adba60d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ before_script: - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list - apt-get update - apt-get build-dep --yes --no-install-recommends poppler - - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libc++-dev libc++abi-dev clang libgtk-3-dev clang-tidy wget p7zip-full + - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libc++-dev libc++abi-dev clang libgtk-3-dev clang-tidy wget p7zip-full libbrotli-dev - echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen - locale-gen ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |1 + 1 file changed, 1 insertion(+) New commits: commit 53368f1717e88e40fe65d27e919c9abca11beac3 Author: Albert Astals Cid Date: Wed Jun 24 22:34:00 2020 +0200 CI: switch qt5_docs to debian testing temporarily qttools5-dev-tools can't be installed in unstable at this point diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a7a9c4d..27b9a5b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,6 +105,7 @@ qt5_docs: only: - master stage: document + image: debian:testing variables: QT_SELECT: qt5 script: ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 9e302b6bf42c5d8b48bc5b6c04621e52d52da3f2
Author: Aleix Pol
Date: Sun Apr 19 22:51:21 2020 +
CI: android: adaptations to port to new version of the sdk
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13cdbe05..c5d49d7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,26 +81,24 @@ build_clazy:
build_android:
stage: build
- image: kdeorg/android-aarch64-sdk
+ image: kdeorg/android-sdk
before_script:
- wget
https://download.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.xz
- tar xvfh freetype-2.10.1.tar.xz
- pushd freetype-2.10.1
-- CFLAGS=-std=gnu99 /opt/helpers/build-standalone "./autogen.sh &&
./configure --enable-shared=no --prefix=/opt/popplerandroid-deps
--host=${ANDROID_NDK_TOOLCHAIN_PREFIX} && make -j`nproc` && make install"
+- CFLAGS=-std=gnu99 STANDALONE_EXTRA="--arch arm64"
/opt/helpers/build-standalone "./autogen.sh && ./configure --enable-shared=no
--prefix=/opt/popplerandroid-deps --host=aarch64-linux-android && make
-j`nproc` && make install"
- popd
script:
- mkdir -p build && cd build
-- 'cmake -G Ninja .. -DCMAKE_SYSTEM_NAME=Android
- -DCMAKE_ANDROID_STL_TYPE=c++_shared
- -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a
+- 'ANDROID_ARCH_ABI=arm64-v8a cmake -G Ninja ..
-DCMAKE_ANDROID_API=28
- -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang
-DCMAKE_INSTALL_PREFIX="/opt/popplerandroid-deps"
-DCMAKE_PREFIX_PATH="$QT_ANDROID;/opt/popplerandroid-deps"
-DCMAKE_BUILD_TYPE=debug
-DCMAKE_POSITION_INDEPENDENT_CODE=OFF
-DENABLE_DCTDECODER=unmaintained
- -DENABLE_LIBOPENJPEG=unmaintained'
+ -DENABLE_LIBOPENJPEG=unmaintained
+
-DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake'
- ninja && ninja install
qt5_docs:
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4fc44c017a4ba7775d3f8eea6bb959ac7c53031f Author: Albert Astals Cid Date: Mon Apr 20 00:13:28 2020 +0200 CI: back to debian:unstable Better to have newer compilers. etc to get "better" warnings diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6351643..13cdbe05 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: debian:testing +image: debian:unstable stages: - build ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 535db3f8c2d18b2a3c76794b5cc8d4d79f5aef70 Author: Albert Astals Cid Date: Thu Mar 26 22:30:17 2020 +0100 CI: Use debian testing while unstable is broken diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13cdbe05..a6351643 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: debian:unstable +image: debian:testing stages: - build ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bdafd6066df79e8183ee311fb086993c480b2c55
Author: Albert Astals Cid
Date: Thu Feb 20 21:24:19 2020 +0100
CI: Ignore bugprone-sizeof-expression for clang-tidy
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a07c3b6..13cdbe05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ build_clang_libcpp:
script:
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
-- CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++
-DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation;-warnings-as-errors=*"
..
+- CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++
-DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone;-warnings-as-errors=*"
..
- ninja
- ctest --output-on-failure
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml glib/poppler.cc poppler/CairoFontEngine.cc poppler/CairoFontEngine.h poppler/TextOutputDev.cc test/pdf-inspector.cc test/perf-test.cc test/perf-test-preview-dummy.cc
.gitlab-ci.yml |2 +-
glib/poppler.cc |2 +-
poppler/CairoFontEngine.cc |2 +-
poppler/CairoFontEngine.h |2 +-
poppler/TextOutputDev.cc|4 ++--
test/pdf-inspector.cc |6 +++---
test/perf-test-preview-dummy.cc |8
test/perf-test.cc | 12 ++--
8 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit f6071f61e433c333e2b34458314a263921ad5fa7
Author: Albert Astals Cid
Date: Mon Dec 2 22:25:42 2019 +0100
enable modernize-redundant-void-arg
No copyright, it's a mechanical change
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3566b21..9b17c0ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ build_clang_libcpp:
script:
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
-- CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++
-DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation;-warnings-as-errors=*"
..
+- CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++
-DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation;-warnings-as-errors=*"
..
- ninja
- ctest --output-on-failure
diff --git a/glib/poppler.cc b/glib/poppler.cc
index 01c3ae88..55347c2d 100644
--- a/glib/poppler.cc
+++ b/glib/poppler.cc
@@ -112,7 +112,7 @@ error_cb (void *data G_GNUC_UNUSED,
}
static void __attribute__((__constructor__))
-poppler_constructor (void)
+poppler_constructor ()
{
setErrorCallback (error_cb, nullptr);
}
diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
index 48b2521c..1f637cf5 100644
--- a/poppler/CairoFontEngine.cc
+++ b/poppler/CairoFontEngine.cc
@@ -85,7 +85,7 @@ CairoFont::matches(Ref &other, bool printingA) {
}
cairo_font_face_t *
-CairoFont::getFontFace(void) {
+CairoFont::getFontFace() {
return cairo_font_face;
}
diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h
index 0a9ce8be..89a2f4da 100644
--- a/poppler/CairoFontEngine.h
+++ b/poppler/CairoFontEngine.h
@@ -53,7 +53,7 @@ public:
CairoFont& operator=(const CairoFont &other) = delete;
virtual bool matches(Ref &other, bool printing);
- cairo_font_face_t *getFontFace(void);
+ cairo_font_face_t *getFontFace();
unsigned long getGlyph(CharCode code, const Unicode *u, int uLen);
double getSubstitutionCorrection(GfxFont *gfxFont);
diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
index 7848cb38..b9e71561 100644
--- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc
@@ -4458,7 +4458,7 @@ public:
const PDFRectangle *selection) override;
void endPage();
- GooString *getText(void);
+ GooString *getText();
std::vector **takeWordList(int *nLines);
private:
@@ -4564,7 +4564,7 @@ void TextSelectionDumper::endPage()
finishLine();
}
-GooString *TextSelectionDumper::getText (void)
+GooString *TextSelectionDumper::getText ()
{
GooString *text;
int i;
diff --git a/test/pdf-inspector.cc b/test/pdf-inspector.cc
index 17f5fc69..e41802b5 100644
--- a/test/pdf-inspector.cc
+++ b/test/pdf-inspector.cc
@@ -42,11 +42,11 @@ enum {
class PdfInspector {
public:
- PdfInspector(void);
+ PdfInspector();
void set_file_name (const char *file_name);
void load (const char *file_name);
- void run (void);
+ void run ();
void error_dialog (const char *error_message);
void analyze_page (int page);
@@ -63,7 +63,7 @@ private:
-PdfInspector::PdfInspector(void)
+PdfInspector::PdfInspector()
{
GtkWidget *widget;
GError* error = nullptr;
diff --git a/test/perf-test-preview-dummy.cc b/test/perf-test-preview-dummy.cc
index adc4d2e8..ab007278 100644
--- a/test/perf-test-preview-dummy.cc
+++ b/test/perf-test-preview-dummy.cc
@@ -8,19 +8,19 @@ get any visual feedback during testing.
#include "splash
[poppler] .gitlab-ci.yml poppler/GfxState.cc poppler/SplashOutputDev.cc utils/HtmlOutputDev.cc
.gitlab-ci.yml |2 +-
poppler/GfxState.cc| 22 +++---
poppler/SplashOutputDev.cc |8
utils/HtmlOutputDev.cc |2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 5713d0da012b734a28234455dcf817d5be20a98f
Author: Albert Astals Cid
Date: Fri Nov 29 16:19:53 2019 +0100
Enable readability-string-compare
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 406e1bcd..41de1a65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ build_clang_libcpp:
script:
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
-- CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++
-DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,,bugprone-*,readability-inconsistent-declaration-parameter-name,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation;-warnings-as-errors=*"
..
+- CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++
-DTESTDATADIR=$PWD/../test-data
-DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation;-warnings-as-errors=*"
..
- ninja
- ctest --output-on-failure
diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
index c2851d32..859889cb 100644
--- a/poppler/GfxState.cc
+++ b/poppler/GfxState.cc
@@ -2870,18 +2870,18 @@ GfxDeviceNColorSpace::GfxDeviceNColorSpace(int nCompsA,
overprintMask = 0;
mapping = nullptr;
for (int i = 0; i < nComps; ++i) {
-if (names[i].compare("None")) {
+if (names[i] != "None") {
nonMarking = false;
}
-if (!names[i].compare("Cyan")) {
+if (names[i] == "Cyan") {
overprintMask |= 0x01;
-} else if (!names[i].compare("Magenta")) {
+} else if (names[i] == "Magenta") {
overprintMask |= 0x02;
-} else if (!names[i].compare("Yellow")) {
+} else if (names[i] == "Yellow") {
overprintMask |= 0x04;
-} else if (!names[i].compare("Black")) {
+} else if (names[i] == "Black") {
overprintMask |= 0x08;
-} else if (!names[i].compare("All")) {
+} else if (names[i] == "All") {
overprintMask = 0x;
} else {
overprintMask = 0x0f;
@@ -3093,18 +3093,18 @@ void
GfxDeviceNColorSpace::createMapping(std::vector *
mapping = (int *)gmalloc(sizeof(int) * nComps);
unsigned int newOverprintMask = 0;
for (int i = 0; i < nComps; i++) {
-if (!names[i].compare("None")) {
+if (names[i] == "None") {
mapping[i] = -1;
-} else if (!names[i].compare("Cyan")) {
+} else if (names[i] == "Cyan") {
newOverprintMask |= 0x01;
mapping[i] = 0;
-} else if (!names[i].compare("Magenta")) {
+} else if (names[i] == "Magenta") {
newOverprintMask |= 0x02;
mapping[i] = 1;
-} else if (!names[i].compare("Yellow")) {
+} else if (names[i] == "Yellow") {
newOverprintMask |= 0x04;
mapping[i] = 2;
-} else if (!names[i].compare("Black")) {
+} else if (names[i] == "Black") {
newOverprintMask |= 0x08;
mapping[i] = 3;
} else {
diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index beb0d47c..ed094e68 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -1742,13 +1742,13 @@ void SplashOutputDev::setOverprintMask(GfxColorSpace
*colorSpace,
GfxDeviceNColorSpace *deviceNCS = (GfxDeviceNColorSpace *)colorSpace;
additive = mask == 0x0f && !deviceNCS->isNonMarking();
for (i = 0; i < deviceNCS->getNComps() && additive; i++) {
-if (deviceNCS->getColorantName(i).compare("Cyan") == 0) {
+if (deviceNCS->getColorantName(i) == "Cyan") {
additive = false;
-} else if (deviceNCS->getColorantName(i).compare("Magenta") == 0) {
+} else if (deviceNCS->getColorantName(i) == "Magenta") {
additive = false;
-} else if (deviceNCS->getColorantName(i).compare("Yellow") == 0) {
+} else if (deviceNCS->getColorantName(i) == "Yellow") {
additive = false;
-} else if (deviceNCS->getColorantName(i).compare("Black") == 0) {
+} else if (deviceNCS->getColorantName(i) == "Black") {
additive = false;
}
}
diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
index a3e4967a..52fe1d4d 100644
--- a/utils/HtmlOutputDev.cc
+++ b/utils/HtmlOutputDev.cc
@@ -1032,7 +1032,7 @@ std::string HtmlOutputDev::mapEncodingToHtml(const
std::string &encoding)
{
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit db2faed91c0d809b5eb264edd41fef3b5a4a9568
Author: Albert Astals Cid
Date: Sun Nov 24 10:15:52 2019 +0100
CI: savannah git is down, use tarballs
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2c87f63..2dba0f3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,8 +83,9 @@ build_android:
stage: build
image: kdeorg/android-aarch64-sdk
before_script:
-- git clone https://git.savannah.gnu.org/git/freetype/freetype2.git
--single-branch -b VER-2-8-1
-- pushd freetype2
+- wget
https://download.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.xz
+- tar xvfh freetype-2.10.1.tar.xz
+- pushd freetype-2.10.1
- CFLAGS=-std=gnu99 /opt/helpers/build-standalone "./autogen.sh &&
./configure --enable-shared=no --prefix=/opt/popplerandroid-deps
--host=${ANDROID_NDK_TOOLCHAIN_PREFIX} && make -j`nproc` && make install"
- popd
script:
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 4102e37e3cc52d087c73593125b6a0db497c0f03 Author: Albert Astals Cid Date: Thu Nov 7 13:48:00 2019 +0100 CI: tweak the fedora builders diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 635e9bf0..f2c87f63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,10 +61,10 @@ build_mingw64_fedora: before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y mingw64-poppler -- dnf -y install glibc-langpack-en mingw64-curl make ninja-build mingw64-openjpeg2-tools mingw32-openjpeg2-tools +- dnf -y install glibc-langpack-en make ninja-build script: - mkdir -p build && cd build -- mingw64-cmake -G Ninja .. -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/include/ +- mingw64-cmake -G Ninja .. - ninja build_clazy: @@ -73,7 +73,7 @@ build_clazy: before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y poppler -- dnf -y install glibc-langpack-en curl make ninja-build openjpeg2-tools clazy clang redhat-rpm-config +- dnf -y install glibc-langpack-en make ninja-build clazy clang redhat-rpm-config libcurl-devel script: - mkdir -p build && cd build - CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -G Ninja .. ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3ea23da616817fd18de2108d2ecef3da32e04853 Author: Albert Astals Cid Date: Thu Nov 7 13:05:47 2019 +0100 CI: we can go back to current fedora for clazy-ci diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 461a1b85..635e9bf0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,7 @@ build_mingw64_fedora: build_clazy: stage: build - image: fedora:30 + image: fedora before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y poppler ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aa7827ab29377ef00c2dfbb16082617690375513 Author: Albert Astals Cid Date: Wed Oct 30 22:21:04 2019 +0100 Use Fedora 30 for clazy while they fix Fedora 31 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 635e9bf0..461a1b85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,7 @@ build_mingw64_fedora: build_clazy: stage: build - image: fedora + image: fedora:30 before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y poppler ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 72ecb16fb7cfd76aab00a5d664eb05833b85dd77 Author: Albert Astals Cid Date: Mon Sep 2 21:35:03 2019 +0200 CI: Don't force a particular libc++ version diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a1e6f94..47991d44 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ before_script: - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list - apt-get update - apt-get build-dep --yes --no-install-recommends poppler - - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libc++-7-dev libc++abi-7-dev clang libgtk-3-dev + - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libc++-dev libc++abi-dev clang libgtk-3-dev - echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen - locale-gen ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit c6dbde146a47e2c899b57923b370470eddeb90f7
Author: Albert Astals Cid
Date: Wed Aug 21 13:00:17 2019 +0200
CI: Android move to the newer kdeorg sdk image
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b9fd4cb..e7804304 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,25 +81,25 @@ build_clazy:
build_android:
stage: build
- image: kdeorg/android-sdk
+ image: kdeorg/android-aarch64-sdk
before_script:
- git clone https://git.savannah.gnu.org/git/freetype/freetype2.git
--single-branch -b VER-2-8-1
- pushd freetype2
-- ANDROID_NDK_TOOLCHAIN_PREFIX=arm-linux-androideabi CFLAGS=-std=gnu99
/opt/helpers/build-standalone "./autogen.sh && ./configure
--prefix=/opt/popplerandroid-deps --host=${ANDROID_NDK_TOOLCHAIN_PREFIX} &&
make -j`nproc` && make install"
+- CFLAGS=-std=gnu99 /opt/helpers/build-standalone "./autogen.sh &&
./configure --enable-shared=no --prefix=/opt/popplerandroid-deps
--host=${ANDROID_NDK_TOOLCHAIN_PREFIX} && make -j`nproc` && make install"
- popd
script:
- mkdir -p build && cd build
- 'cmake -G Ninja .. -DCMAKE_SYSTEM_NAME=Android
-DCMAKE_ANDROID_STL_TYPE=c++_shared
- -DCMAKE_ANDROID_API=24
+ -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a
+ -DCMAKE_ANDROID_API=28
-DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang
-DCMAKE_INSTALL_PREFIX="/opt/popplerandroid-deps"
-DCMAKE_PREFIX_PATH="$QT_ANDROID;/opt/popplerandroid-deps"
-DCMAKE_BUILD_TYPE=debug
-DCMAKE_POSITION_INDEPENDENT_CODE=OFF
-DENABLE_DCTDECODER=unmaintained
- -DENABLE_LIBOPENJPEG=unmaintained
- -DENABLE_CPP=OFF'
+ -DENABLE_LIBOPENJPEG=unmaintained'
- ninja && ninja install
qt5_docs:
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit dfcd9b8ed7f164d1fa7eb964d0944a136f646d3f Author: Albert Astals Cid Date: Thu Jul 18 13:54:12 2019 +0200 CI: install glibc-langpack-en on fedora diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5cfb2366..1b9fd4cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,7 @@ build_mingw64_fedora: before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y mingw64-poppler -- dnf -y install mingw64-curl make ninja-build mingw64-openjpeg2-tools mingw32-openjpeg2-tools +- dnf -y install glibc-langpack-en mingw64-curl make ninja-build mingw64-openjpeg2-tools mingw32-openjpeg2-tools script: - mkdir -p build && cd build - mingw64-cmake -G Ninja .. -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/include/ @@ -73,7 +73,7 @@ build_clazy: before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y poppler -- dnf -y install curl make ninja-build openjpeg2-tools clazy clang redhat-rpm-config +- dnf -y install glibc-langpack-en curl make ninja-build openjpeg2-tools clazy clang redhat-rpm-config script: - mkdir -p build && cd build - CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -DSPLASH_CMYK=ON -G Ninja .. ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 15 +++ 1 file changed, 3 insertions(+), 12 deletions(-) New commits: commit c317087a9e5db4f6441b4e399837d5b9afbe46a0 Author: Albert Astals Cid Date: Fri Mar 22 00:21:12 2019 +0100 Stop requiring gcc 4.9 We now just support whatever Ubuntu 16.04 has as minimum (gcc 5.4.0) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b2bc767..575e6628 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,21 +44,12 @@ build_clang_libcpp: - ninja - ctest --output-on-failure -build_gcc_49: +build_ubuntu_16_04: stage: build - image: ubuntu:trusty + image: ubuntu:xenial before_script: - apt-get update -- apt-get install --yes software-properties-common -- add-apt-repository --yes ppa:ubuntu-toolchain-r/test -- add-apt-repository --yes ppa:george-edison55/cmake-3.x -- add-apt-repository --yes ppa:ricotz/testing -- add-apt-repository --yes ppa:aacid/openjp2trusty -- apt-get update -- apt-get install --yes build-essential cmake ninja-build gcc-4.9 g++-4.9 libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev -- update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 20 -- update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 20 -- update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.9 20 +- apt-get install --yes --no-install-recommends build-essential cmake ninja-build libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev ca-certificates script: - mkdir -p build && cd build - cmake -G Ninja .. ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit cb1e3809e3c5329ca4dbd29313c5c2241332874b
Author: Adam Reichold
Date: Wed Mar 20 21:39:14 2019 +0100
Add CI job to generate glib frontend HTML-based API documentation.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 809c3529..4b2bc767 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,6 +139,20 @@ cpp_docs:
paths:
- cpp/APIDOCS-html
+glib_docs:
+ only:
+- master
+ stage: document
+ script:
+- apt-get install --yes --no-install-recommends gtk-doc-tools
+- mkdir -p build && cd build
+- cmake -G Ninja -DENABLE_GTK_DOC=YES ..
+- ninja glib-docs
+ cache: {}
+ artifacts:
+paths:
+ - build/glib/reference/html
+
trigger_pages:
only:
- master
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 333bf1757bc68ce342ca708b881c75914a7c463a
Author: Adam Reichold
Date: Wed Mar 20 00:16:27 2019 +0100
Also build the Doxygen-based CPP frontend docs in the CI so that they can
be automatically published via GitLab Pages.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cbc34ee..809c3529 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,6 +126,19 @@ qt5_docs:
paths:
- qt5/src/APIDOCS-html
+cpp_docs:
+ only:
+- master
+ stage: document
+ script:
+- apt-get install --yes --no-install-recommends doxygen graphviz
+- cd cpp
+- doxygen
+ cache: {}
+ artifacts:
+paths:
+ - cpp/APIDOCS-html
+
trigger_pages:
only:
- master
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 33 +
1 file changed, 33 insertions(+)
New commits:
commit 20424e7b6a8b6505db1f6fea8318e9f089a8384c
Author: Adam Reichold
Date: Sat Feb 9 10:11:24 2019 +0100
Publish Qt5 frontend API documentation as GitLab artifacts and trigger
publish via GitLab pages.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1d49917..0cbc34ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,10 @@
image: debian:unstable
+stages:
+ - build
+ - document
+ - publish
+
before_script:
- echo 'deb-src http://deb.debian.org/debian unstable main' >>
/etc/apt/sources.list
- apt-get update
@@ -12,6 +17,7 @@ variables:
LANG: en_US.UTF-8
LANGUAGE: en_US:en
LC_ALL: en_US.UTF-8
+ DEBIAN_FRONTEND: noninteractive
TEST_DATA_URL:
https://gitlab.freedesktop.org/${CI_PROJECT_NAMESPACE}/test.git
UPSTREAM_TEST_DATA_URL: https://gitlab.freedesktop.org/poppler/test.git
@@ -104,3 +110,30 @@ build_android:
-DENABLE_LIBOPENJPEG=unmaintained
-DENABLE_CPP=OFF'
- ninja && ninja install
+
+qt5_docs:
+ only:
+- master
+ stage: document
+ variables:
+QT_SELECT: qt5
+ script:
+- apt-get install --yes --no-install-recommends doxygen graphviz qtchooser
qttools5-dev-tools
+- cd qt5/src
+- doxygen
+ cache: {}
+ artifacts:
+paths:
+ - qt5/src/APIDOCS-html
+
+trigger_pages:
+ only:
+- master
+ stage: publish
+ image: alpine:latest
+ before_script:
+- apk --update upgrade
+- apk add curl ca-certificates
+ script:
+- 'curl --request POST --form "token=$WEB_PAGE_TRIGGER" --form ref=master
https://gitlab.freedesktop.org/api/v4/projects/poppler%2Fpoppler-web-page/trigger/pipeline'
+ cache: {}
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 12d4c8a46dd7b37bdc475d88d81ec5eecae48627 Author: Albert Astals Cid Date: Tue Mar 12 22:59:59 2019 +0100 Switch clazy CI to regular fedora rawhide is broken at this point and the current "fedora" has also clazy 1.5 so that's enough for us diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75e17e38..a1d49917 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,7 +72,7 @@ build_mingw64_fedora: build_clazy: stage: build - image: fedora:rawhide + image: fedora before_script: - dnf install -y 'dnf-command(builddep)' - dnf builddep -y poppler ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 60b663236547efe8b3d87e0149050056ad9f0f60 Author: Albert Astals Cid Date: Wed Feb 13 20:26:07 2019 +0100 CI Use kdeorg/android-sdk instead of apol/asdk:clang it's a bit more official looking diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ee2e203..75e17e38 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,7 +84,7 @@ build_clazy: build_android: stage: build - image: apol/asdk:clang + image: kdeorg/android-sdk before_script: - git clone https://git.savannah.gnu.org/git/freetype/freetype2.git --single-branch -b VER-2-8-1 - pushd freetype2 ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml poppler/CairoOutputDev.cc poppler/CairoRescaleBox.cc qt5/src utils/ImageOutputDev.cc utils/pdftocairo.cc
.gitlab-ci.yml |2 +-
poppler/CairoOutputDev.cc |8
poppler/CairoRescaleBox.cc |2 +-
qt5/src/ArthurOutputDev.cc |6 +++---
utils/ImageOutputDev.cc|2 +-
utils/pdftocairo.cc|2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 5a72f3cd65d4c9481b0b5b2535e51057c7b9b291
Author: Albert Astals Cid
Date: Wed Feb 6 18:31:55 2019 +0100
Use reinterpret_cast to silence cast-align warnings
In ImageOutputDev it comes directly from malloc, and malloc guarantees
alignment for basic types, so we're good
In ArthurOutputDev it comes from QImage::bits that uses malloc
internally, so we're good
In cairo* it comes from cairo_image_surface_get_data that comes from
pixman_image_get_data that returns a uint32_t * so we're only going to
the original type alignment
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55b5d5ca..0ee2e203 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,7 +79,7 @@ build_clazy:
- dnf -y install curl make ninja-build openjpeg2-tools clazy clang
redhat-rpm-config
script:
- mkdir -p build && cd build
-- CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-cast-align
-Wno-deprecated-declarations" cmake -G Ninja ..
+- CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake
-G Ninja ..
-
CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static"
ninja
build_android:
diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index 02a6f262..30c9f57a 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -1826,7 +1826,7 @@ void CairoOutputDev::setSoftMask(GfxState * state, const
double * bbox, bool alp
cairo_destroy(maskCtx);
/* convert to a luminocity map */
-uint32_t *source_data = (uint32_t*)cairo_image_surface_get_data(source);
+uint32_t *source_data = reinterpret_cast(cairo_image_surface_get_data(source));
/* get stride in units of 32 bits */
ptrdiff_t stride = cairo_image_surface_get_stride(source)/4;
for (int y=0; y(buffer + y * row_stride);
pix = imgStr->getLine();
colorMap->getRGBLine (pix, dest, width);
}
@@ -2746,7 +2746,7 @@ void CairoOutputDev::drawSoftMaskedImage(GfxState *state,
Object *ref, Stream *s
buffer = cairo_image_surface_get_data (image);
row_stride = cairo_image_surface_get_stride (image);
for (y = 0; y < height; y++) {
-dest = (unsigned int *) (buffer + y * row_stride);
+dest = reinterpret_cast(buffer + y * row_stride);
pix = imgStr->getLine();
colorMap->getRGBLine (pix, dest, width);
}
@@ -3154,7 +3154,7 @@ public:
buffer = cairo_image_surface_get_data (image);
stride = cairo_image_surface_get_stride (image);
for (int y = 0; y < height; y++) {
-uint32_t *dest = (uint32_t *) (buffer + y * stride);
+uint32_t *dest = reinterpret_cast(buffer + y * stride);
getRow(y, dest);
}
} else {
diff --git a/poppler/CairoRescaleBox.cc b/poppler/CairoRescaleBox.cc
index 7f375a87..838d6348 100644
--- a/poppler/CairoRescaleBox.cc
+++ b/poppler/CairoRescaleBox.cc
@@ -279,7 +279,7 @@ bool CairoRescaleBox::downScaleImage(unsigned orig_width,
unsigned orig_height,
unsigned int *dest;
int dst_stride;
- dest = (unsigned int *)cairo_image_surface_get_data (dest_surface);
+ dest = reinterpret_cast(cairo_image_surface_get_data
(dest_surface));
dst_stride = cairo_image_surface_get_stride (dest_surface);
scanline = (uint32_t*)gmallocn (orig_width, sizeof(int));
diff --git a/qt5/src/ArthurOutputDev.cc b/qt5/src/ArthurOutputDev.cc
index 750dc1df..deb44514 100644
--- a/qt5/src/ArthurOutputDev.cc
+++ b/qt5/src/ArthurOutputDev.cc
@@ -1024,7 +1024,7 @@ void ArthurOutputDev::drawImageMask(GfxState *state,
Object *ref, Stream *str,
// TODO: Would using QImage::Format_Mono be more efficient here?
QImage image(width, height, QImage::Format_ARGB32);
- unsigned int *data = (unsigned int *)image.bits();
+ unsigned int *data = reinterpret_cast(image.bits());
int stride = image.bytesPerLine()/4;
QRgb fillColor = m_currentBrush.color().rgb();
@@ -1074,7 +1074,7 @@ void ArthurOutputDev::drawImage(GfxState *state, Object
*ref, Stream *str,
imgStr->reset();
image = QImage(width, height, QImage::Format_ARGB32);
- data = (unsigned int *)image.bits();
+ data = reinterpret_cast(image.bits());
stride = image.bytesPerLine()/4;
for (y = 0; y < height; y++) {
pix = imgStr->getLine();
@@ -1149,7 +1149,7 @@ void ArthurOutputDev::drawSoftMaskedImage(GfxState
*state, Object *ref, Stream *
maskImageStr->reset();
QImage image(width, height, QImage::Format_ARGB32);
- unsigned int *data = (unsigned int *)image.bits();
+ unsigned int *data = reinterpret_cast(image.bits());
int stride = image.bytesPerLine()/4;
std::vector maskLine(maskWidth);
diff --git a/utils/ImageO
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 23 +++
1 file changed, 23 insertions(+)
New commits:
commit 8315a1234fb4332d202e3a72893835906daa
Author: Aleix Pol
Date: Mon Nov 19 17:57:32 2018 +0100
Include an Android CI
It uses the following image:
https://phabricator.kde.org/source/sysadmin-ci-tooling/browse/master/system-images/android/sdk/Dockerfile-clang
The one we are using now as kdeorg/android-sdk is still using GCC which
can't compile poppler master (it can compile last stable version, but
new features are used now and it can't cope).
KDE will start using this clang version when Qt 5.12 releases and we
know there's no major regressions, but poppler can already start doing
so now.
It only checks that poppler builds correctly, doesn't execute anything.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d21b47f5..9b9b5ee8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,3 +82,26 @@ build_clazy:
- mkdir -p build && cd build
- CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-cast-align
-Wno-deprecated-declarations" cmake -G Ninja ..
-
CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static"
ninja
+
+build_android:
+ stage: build
+ image: apol/asdk:clang
+ before_script:
+- git clone https://git.savannah.gnu.org/git/freetype/freetype2.git
--single-branch -b VER-2-8-1
+- pushd freetype2
+- ANDROID_NDK_TOOLCHAIN_PREFIX=arm-linux-androideabi CFLAGS=-std=gnu99
/opt/helpers/build-standalone "./autogen.sh && ./configure
--prefix=/opt/popplerandroid-deps --host=${ANDROID_NDK_TOOLCHAIN_PREFIX} &&
make -j`nproc` && make install"
+- popd
+ script:
+- mkdir -p build && cd build
+- 'cmake -G Ninja .. -DCMAKE_SYSTEM_NAME=Android
+ -DCMAKE_ANDROID_STL_TYPE=c++_shared
+ -DCMAKE_ANDROID_API=24
+ -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang
+ -DCMAKE_INSTALL_PREFIX="/opt/popplerandroid-deps"
+
-DCMAKE_PREFIX_PATH="$QT_ANDROID;/opt/popplerandroid-deps"
+ -DCMAKE_BUILD_TYPE=debug
+ -DCMAKE_POSITION_INDEPENDENT_CODE=OFF
+ -DENABLE_DCTDECODER=unmaintained
+ -DENABLE_LIBOPENJPEG=unmaintained
+ -DENABLE_CPP=OFF'
+- ninja && ninja install
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5d1e0a3576cd05565988ec697905924948727a87 Author: Albert Astals Cid Date: Thu Nov 1 12:00:13 2018 +0100 Workaround debian unstable not wanting to install libc++-dev diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 611af34c..37f2ac29 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ before_script: - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list - apt-get update - apt-get build-dep --yes --no-install-recommends poppler - - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libc++-dev libc++abi-dev clang libgtk-3-dev + - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libc++-7-dev libc++abi-7-dev clang libgtk-3-dev - echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen - locale-gen ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0eb4224ae15b0c9ac641c829de0d4ae1b15b609d Author: Albert Astals Cid Date: Mon Oct 22 00:31:13 2018 +0200 also install libgtk3-dev so that glib demo is built diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a66fe30..89d0c2ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ before_script: - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list - apt-get update - apt-get build-dep --yes --no-install-recommends poppler - - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libc++-dev libc++abi-dev clang + - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libc++-dev libc++abi-dev clang libgtk-3-dev - echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen - locale-gen ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |3 --- 1 file changed, 3 deletions(-) New commits: commit 114ec1fc50595fdfadd1be6b2ae4fc1923f0cf50 Author: Albert Astals Cid Date: Tue Oct 16 19:43:30 2018 +0200 CI: fedora fixed their mingw packages, remove workaround diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0bc6652b..0a66fe30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,9 +65,6 @@ build_mingw64_fedora: - yum -y install yum-utils - yum-builddep -y mingw64-poppler - yum -y install mingw64-curl make ninja-build mingw64-openjpeg2-tools mingw32-openjpeg2-tools -- mv /usr/x86_64-w64-mingw32/sys-root/mingw/bin/opj2_decompress.exe /usr/x86_64-w64-mingw32/sys-root/mingw/bin/opj_decompress.exe -- mv /usr/x86_64-w64-mingw32/sys-root/mingw/bin/opj2_compress.exe /usr/x86_64-w64-mingw32/sys-root/mingw/bin/opj_compress.exe -- mv /usr/x86_64-w64-mingw32/sys-root/mingw/bin/opj2_dump.exe /usr/x86_64-w64-mingw32/sys-root/mingw/bin/opj_dump.exe script: - sed -i '/SYSTEM/d' glib/CMakeLists.txt - mkdir -p build && cd build ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit da428865c21f4be117a665224eaf465ffb9f8a6c
Author: Adam Reichold
Date: Sun Oct 7 22:43:25 2018 +0200
Fix typo in UPSTREAM_TEST_DATA_URL as while it does work anyway, it is
quite confusing.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14b87074..0bc6652b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
LANGUAGE: en_US:en
LC_ALL: en_US.UTF-8
TEST_DATA_URL:
https://gitlab.freedesktop.org/${CI_PROJECT_NAMESPACE}/test.git
- UPSTREAM_TEST_DATA_URL: https://@gitlab.freedesktop.org/poppler/test.git
+ UPSTREAM_TEST_DATA_URL: https://gitlab.freedesktop.org/poppler/test.git
cache:
key: "$CI_BUILD_NAME"
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 16 1 file changed, 16 insertions(+) New commits: commit 89b4f3b9be15e30dfe6a8de431b5de1e8c4f28f3 Author: Albert Astals Cid Date: Sat Oct 6 14:54:39 2018 +0200 mingw64 fedora build We find every so often that the windows build breaks since there's a few ifdef for windows, so CI it Has some mv because the openjpeg2 packages are a bit broken and removes a SYSTEM because i think something in their packages is also broken since i don't need to remove that when i build on my arch linux with mingw64 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92ec152e..14b87074 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,3 +57,19 @@ build_gcc_49: - mkdir -p build && cd build - cmake -G Ninja .. - ninja + +build_mingw64_fedora: + stage: build + image: fedora + before_script: +- yum -y install yum-utils +- yum-builddep -y mingw64-poppler +- yum -y install mingw64-curl make ninja-build mingw64-openjpeg2-tools mingw32-openjpeg2-tools +- mv /usr/x86_64-w64-mingw32/sys-root/mingw/bin/opj2_decompress.exe /usr/x86_64-w64-mingw32/sys-root/mingw/bin/opj_decompress.exe +- mv /usr/x86_64-w64-mingw32/sys-root/mingw/bin/opj2_compress.exe /usr/x86_64-w64-mingw32/sys-root/mingw/bin/opj_compress.exe +- mv /usr/x86_64-w64-mingw32/sys-root/mingw/bin/opj2_dump.exe /usr/x86_64-w64-mingw32/sys-root/mingw/bin/opj_dump.exe + script: +- sed -i '/SYSTEM/d' glib/CMakeLists.txt +- mkdir -p build && cd build +- mingw64-cmake -G Ninja .. +- ninja ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 80a2aa1ba039947f5c4e87a1ad7b5aa324d96407
Author: Adam Reichold
Date: Sun Sep 30 16:51:32 2018 +0200
Use git clone instead of and a relative CI project path to allow MR to
modify the test repository.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57f1c1a5..92ec152e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ before_script:
- echo 'deb-src http://deb.debian.org/debian unstable main' >>
/etc/apt/sources.list
- apt-get update
- apt-get build-dep --yes --no-install-recommends poppler
- - apt-get install --yes --no-install-recommends ninja-build
libcurl4-openssl-dev curl ca-certificates locales libc++-dev libc++abi-dev clang
+ - apt-get install --yes --no-install-recommends ninja-build
libcurl4-openssl-dev git ca-certificates locales libc++-dev libc++abi-dev clang
- echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen
- locale-gen
@@ -12,6 +12,8 @@ variables:
LANG: en_US.UTF-8
LANGUAGE: en_US:en
LC_ALL: en_US.UTF-8
+ TEST_DATA_URL:
https://gitlab.freedesktop.org/${CI_PROJECT_NAMESPACE}/test.git
+ UPSTREAM_TEST_DATA_URL: https://@gitlab.freedesktop.org/poppler/test.git
cache:
key: "$CI_BUILD_NAME"
@@ -21,18 +23,18 @@ cache:
build:
stage: build
script:
+- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
-- curl
https://gitlab.freedesktop.org/poppler/test/-/archive/master/test-master.tar.gz
| tar xz
-- cmake -G Ninja -DTESTDATADIR=$PWD/test-master ..
+- cmake -G Ninja -DTESTDATADIR=$PWD/../test-data ..
- ninja
- ctest --output-on-failure
build_clang_libcpp:
stage: build
script:
+- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
-- curl
https://gitlab.freedesktop.org/poppler/test/-/archive/master/test-master.tar.gz
| tar xz
-- CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++
-DTESTDATADIR=$PWD/test-master ..
+- CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++
-DTESTDATADIR=$PWD/../test-data ..
- ninja
- ctest --output-on-failure
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 35 +++ 1 file changed, 27 insertions(+), 8 deletions(-) New commits: commit 5bbb2fc4b159b003a22a9d3327ba290a7bba15f0 Author: Adam Reichold Date: Tue Sep 18 21:36:13 2018 +0200 Add a separate build job using Ubuntu 14.04 and GCC 4.9 to compatibility with older systems. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2bab4f24..57f1c1a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,11 @@ variables: LANGUAGE: en_US:en LC_ALL: en_US.UTF-8 +cache: + key: "$CI_BUILD_NAME" + paths: +- build/ + build: stage: build script: @@ -21,18 +26,32 @@ build: - cmake -G Ninja -DTESTDATADIR=$PWD/test-master .. - ninja - ctest --output-on-failure - cache: -paths: - - build/ build_clang_libcpp: stage: build script: -- mkdir -p build_clang && cd build_clang +- mkdir -p build && cd build - curl https://gitlab.freedesktop.org/poppler/test/-/archive/master/test-master.tar.gz | tar xz -- CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DTESTDATADIR=$PWD/test-master .. +- CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DTESTDATADIR=$PWD/test-master .. - ninja - ctest --output-on-failure - cache: -paths: - - build_clang/ + +build_gcc_49: + stage: build + image: ubuntu:trusty + before_script: +- apt-get update +- apt-get install --yes software-properties-common +- add-apt-repository --yes ppa:ubuntu-toolchain-r/test +- add-apt-repository --yes ppa:george-edison55/cmake-3.x +- add-apt-repository --yes ppa:ricotz/testing +- add-apt-repository --yes ppa:aacid/openjp2trusty +- apt-get update +- apt-get install --yes build-essential cmake ninja-build gcc-4.9 g++-4.9 libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev +- update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 20 +- update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 20 +- update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.9 20 + script: +- mkdir -p build && cd build +- cmake -G Ninja .. +- ninja ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) New commits: commit 38caf0adac8811e663b51656638177397f1400f6 Author: Albert Astals Cid Date: Fri Aug 31 10:00:15 2018 +0200 Add clang + libc++ testing pipeline Would have catched the missing array include in PSOutputDev diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ead5db15..2bab4f24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ before_script: - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list - apt-get update - apt-get build-dep --yes --no-install-recommends poppler - - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev curl ca-certificates locales + - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev curl ca-certificates locales libc++-dev libc++abi-dev clang - echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen - locale-gen @@ -24,3 +24,15 @@ build: cache: paths: - build/ + +build_clang_libcpp: + stage: build + script: +- mkdir -p build_clang && cd build_clang +- curl https://gitlab.freedesktop.org/poppler/test/-/archive/master/test-master.tar.gz | tar xz +- CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DTESTDATADIR=$PWD/test-master .. +- ninja +- ctest --output-on-failure + cache: +paths: + - build_clang/ ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] .gitlab-ci.yml
.gitlab-ci.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b8082c67943ea7ef7c115b86cffb0785da32d227 Author: Adam Reichold Date: Tue Aug 21 20:21:36 2018 +0200 Since the CI directory is cached, we need to make sure we create it if necessary instead of failing. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac585da9..b1a1302e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ variables: build: stage: build script: -- mkdir build && cd build +- mkdir -p build && cd build - curl https://gitlab.freedesktop.org/poppler/test/-/archive/master/test-master.tar.gz | tar xz - cmake -G Ninja -DTESTDATADIR=$PWD/test-master .. - ninja ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
