diff options
| author | Pi-Cla <pirateclip@protonmail.com> | 2022-05-05 00:05:22 -0600 |
|---|---|---|
| committer | Vedang Manerikar <ved.manerikar@gmail.com> | 2022-05-21 20:06:15 -0400 |
| commit | 97a298192978788db9adbe723b1aa384e2ddf638 (patch) | |
| tree | b1aa4af1f458477e126a008dfbf8db05b04d2f98 /server/test/docker/templates | |
| parent | fedd930a09a497c03df3ce5204ccbd80da724662 (diff) | |
Remove usage of all private poppler headers in pdf-tools
This commit also removes C++ entirely, as it is not needed anymore for
correct compilation of `epdfinfo`. The following changes are made:
- Remove private headers from all the server code. This involves:
- Replace private header functionality with the correct public
functions provided by poppler.
- Remove unneeded headers around date checks
- Delete dead-code (headers, m4 macros)
- Remove C++, g++ and similar aliases from all the code. Also:
- Remove related information from the README
- Remove related information from CI and Dockerfiles
Work done by: @Pi-Cla
Closes: #105, #103, #109, #114
Diffstat (limited to 'server/test/docker/templates')
14 files changed, 14 insertions, 18 deletions
diff --git a/server/test/docker/templates/centos-7.Dockerfile.in b/server/test/docker/templates/centos-7.Dockerfile.in index 62f2eb4..cdebbef 100644 --- a/server/test/docker/templates/centos-7.Dockerfile.in +++ b/server/test/docker/templates/centos-7.Dockerfile.in @@ -1,3 +1,3 @@ # -*- dockerfile -*- FROM centos:7 -RUN yum update -y && yum install -y gcc gcc-c++ poppler-glib-devel +RUN yum update -y && yum install -y gcc poppler-glib-devel diff --git a/server/test/docker/templates/debian-10.Dockerfile.in b/server/test/docker/templates/debian-10.Dockerfile.in index 1808b78..139db32 100644 --- a/server/test/docker/templates/debian-10.Dockerfile.in +++ b/server/test/docker/templates/debian-10.Dockerfile.in @@ -1,3 +1,3 @@ # -*- dockerfile -*- FROM debian:10 -RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev +RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/debian-8.Dockerfile.in b/server/test/docker/templates/debian-8.Dockerfile.in index adcc6d3..e7c7a15 100644 --- a/server/test/docker/templates/debian-8.Dockerfile.in +++ b/server/test/docker/templates/debian-8.Dockerfile.in @@ -1,4 +1,3 @@ # -*- dockerfile -*- FROM debian:8 -RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev - +RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/debian-9.Dockerfile.in b/server/test/docker/templates/debian-9.Dockerfile.in index 1f4ece7..db166c3 100644 --- a/server/test/docker/templates/debian-9.Dockerfile.in +++ b/server/test/docker/templates/debian-9.Dockerfile.in @@ -1,4 +1,3 @@ # -*- dockerfile -*- FROM debian:9 -RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev - +RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/fedora-32.Dockerfile.in b/server/test/docker/templates/fedora-32.Dockerfile.in index 46a0907..1ee8a68 100644 --- a/server/test/docker/templates/fedora-32.Dockerfile.in +++ b/server/test/docker/templates/fedora-32.Dockerfile.in @@ -1,3 +1,3 @@ # -*- dockerfile -*- FROM fedora:32 -RUN dnf update -y && dnf install -y gcc gcc-c++ poppler-glib-devel +RUN dnf update -y && dnf install -y gcc poppler-glib-devel diff --git a/server/test/docker/templates/fedora-33.Dockerfile.in b/server/test/docker/templates/fedora-33.Dockerfile.in index 06cae7b..13b0ae0 100644 --- a/server/test/docker/templates/fedora-33.Dockerfile.in +++ b/server/test/docker/templates/fedora-33.Dockerfile.in @@ -1,3 +1,3 @@ # -*- dockerfile -*- FROM fedora:33 -RUN dnf update -y && dnf install -y gcc gcc-c++ poppler-glib-devel +RUN dnf update -y && dnf install -y gcc poppler-glib-devel diff --git a/server/test/docker/templates/fedora-34.Dockerfile.in b/server/test/docker/templates/fedora-34.Dockerfile.in index 63e6abb..0a43238 100644 --- a/server/test/docker/templates/fedora-34.Dockerfile.in +++ b/server/test/docker/templates/fedora-34.Dockerfile.in @@ -1,3 +1,3 @@ # -*- dockerfile -*- FROM fedora:34 -RUN dnf update -y && dnf install -y gcc gcc-c++ poppler-glib-devel +RUN dnf update -y && dnf install -y gcc poppler-glib-devel diff --git a/server/test/docker/templates/fedora-35.Dockerfile.in b/server/test/docker/templates/fedora-35.Dockerfile.in index 09a25b2..1baf076 100644 --- a/server/test/docker/templates/fedora-35.Dockerfile.in +++ b/server/test/docker/templates/fedora-35.Dockerfile.in @@ -1,3 +1,3 @@ # -*- dockerfile -*- FROM fedora:35 -RUN dnf update -y && dnf install -y gcc gcc-c++ poppler-glib-devel +RUN dnf update -y && dnf install -y gcc poppler-glib-devel diff --git a/server/test/docker/templates/ubuntu-14.Dockerfile.in b/server/test/docker/templates/ubuntu-14.Dockerfile.in index 1c9aaa7..5cd2bbe 100644 --- a/server/test/docker/templates/ubuntu-14.Dockerfile.in +++ b/server/test/docker/templates/ubuntu-14.Dockerfile.in @@ -1,4 +1,3 @@ # -*- dockerfile -*- FROM ubuntu:trusty -RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev - +RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/ubuntu-16.Dockerfile.in b/server/test/docker/templates/ubuntu-16.Dockerfile.in index e7d477e..e166f43 100644 --- a/server/test/docker/templates/ubuntu-16.Dockerfile.in +++ b/server/test/docker/templates/ubuntu-16.Dockerfile.in @@ -1,4 +1,3 @@ # -*- dockerfile -*- FROM ubuntu:xenial -RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev - +RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/ubuntu-18.Dockerfile.in b/server/test/docker/templates/ubuntu-18.Dockerfile.in index a445804..5c04f3d 100644 --- a/server/test/docker/templates/ubuntu-18.Dockerfile.in +++ b/server/test/docker/templates/ubuntu-18.Dockerfile.in @@ -1,3 +1,3 @@ # -*- dockerfile -*- FROM ubuntu:bionic -RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev +RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/ubuntu-20.10.Dockerfile.in b/server/test/docker/templates/ubuntu-20.10.Dockerfile.in index 1235de3..ff3294a 100644 --- a/server/test/docker/templates/ubuntu-20.10.Dockerfile.in +++ b/server/test/docker/templates/ubuntu-20.10.Dockerfile.in @@ -1,3 +1,3 @@ # -*- dockerfile -*- FROM ubuntu:groovy -RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev +RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/ubuntu-20.Dockerfile.in b/server/test/docker/templates/ubuntu-20.Dockerfile.in index 80053e8..a039e5e 100644 --- a/server/test/docker/templates/ubuntu-20.Dockerfile.in +++ b/server/test/docker/templates/ubuntu-20.Dockerfile.in @@ -1,3 +1,3 @@ # -*- dockerfile -*- FROM ubuntu:focal -RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev +RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev diff --git a/server/test/docker/templates/ubuntu-21.Dockerfile.in b/server/test/docker/templates/ubuntu-21.Dockerfile.in index b4f462f..809d7ed 100644 --- a/server/test/docker/templates/ubuntu-21.Dockerfile.in +++ b/server/test/docker/templates/ubuntu-21.Dockerfile.in @@ -1,3 +1,3 @@ # -*- dockerfile -*- FROM ubuntu:hirsute -RUN apt-get update -y && apt-get install -y gcc g++ libpoppler-glib-dev +RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev |