[poppler,gdal] Major update to poppler; poppler feature for gdal #22720

dg0yt · 2022-01-23T18:18:28Z

What does your PR fix?

Updates poppler to 22.02.0.
Switches to upstreams official gitlab repo. (github is a mirror and lags.)
Revises dependencies and feature interface for poppler:
- The Cairo backend can be requested via a feature now. (Used to be hard dependency on osx.)
- Unstable API/ABI headers (used by packages like GDAL) can be requested via a feature now.
- The default font configuration backend follows upstream. Windows defaults to win32 instead of fontconfig.
- gperf is no longer used. (There are ready-to-use files. We can avoid patching and cross platform issues.)
  Adds a poppler feature to gdal. (Based on initial work by @m-kuhn in [gdal] Add poppler #22583.)
Which triplets are supported/not supported? Have you updated the CI baseline?

all but uwp, yes (arm64-windows no longer blocked by gperf)
Does your PR follow the maintainer guide?

yes
If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

yes

Todo:

Fix exported pkgconfig files (static dependencies)
Export unofficial cmake target configuration
Verified exported poppler config and gdal wrapper via gdal[core,poppler,tools] CI runs.

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json
index 76dfbc4..3b94f4e 100644
--- a/ports/poppler/vcpkg.json
+++ b/ports/poppler/vcpkg.json
@@ -52,12 +52,6 @@
         }
       ]
     },
-    "fontconfig": {
-      "description": "Use fontconfig",
-      "dependencies": [
-        "fontconfig"
-      ]
-    },
     "font-configuration": {
       "description": "Defaut font configuration backend",
       "dependencies": [
@@ -71,6 +65,12 @@
         }
       ]
     },
+    "fontconfig": {
+      "description": "Use fontconfig",
+      "dependencies": [
+        "fontconfig"
+      ]
+    },
     "splash": {
       "description": "The splash backend is always enabled. This option is kept for compatibility.",
       "dependencies": [

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout df40d1c476dc02d71b113e4a63c3a32b00ebb5bd -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index b8df750..075ee8d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5401,8 +5401,8 @@
       "port-version": 4
     },
     "poppler": {
-      "baseline": "20.12.1",
-      "port-version": 6
+      "baseline": "22.0.1",
+      "port-version": 0
     },
     "popsift": {
       "baseline": "0.9",
diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json
index 0b609a3..0965afe 100644
--- a/versions/p-/poppler.json
+++ b/versions/p-/poppler.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4d910633c772683b5bfa9404228fceaba68fd939",
+      "version": "22.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "3f15f5c09cc977692e0c081d39e7e85f2229efe1",
       "version": "20.12.1",

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json
index 76dfbc4..3b94f4e 100644
--- a/ports/poppler/vcpkg.json
+++ b/ports/poppler/vcpkg.json
@@ -52,12 +52,6 @@
         }
       ]
     },
-    "fontconfig": {
-      "description": "Use fontconfig",
-      "dependencies": [
-        "fontconfig"
-      ]
-    },
     "font-configuration": {
       "description": "Defaut font configuration backend",
       "dependencies": [
@@ -71,6 +65,12 @@
         }
       ]
     },
+    "fontconfig": {
+      "description": "Use fontconfig",
+      "dependencies": [
+        "fontconfig"
+      ]
+    },
     "splash": {
       "description": "The splash backend is always enabled. This option is kept for compatibility.",
       "dependencies": [

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout df40d1c476dc02d71b113e4a63c3a32b00ebb5bd -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index b8df750..075ee8d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5401,8 +5401,8 @@
       "port-version": 4
     },
     "poppler": {
-      "baseline": "20.12.1",
-      "port-version": 6
+      "baseline": "22.0.1",
+      "port-version": 0
     },
     "popsift": {
       "baseline": "0.9",
diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json
index 0b609a3..91e9e83 100644
--- a/versions/p-/poppler.json
+++ b/versions/p-/poppler.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9b4dfc97042ad1f48473ecefaaa77a27d95f85c7",
+      "version": "22.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "3f15f5c09cc977692e0c081d39e7e85f2229efe1",
       "version": "20.12.1",

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json
index 76dfbc4..3b94f4e 100644
--- a/ports/poppler/vcpkg.json
+++ b/ports/poppler/vcpkg.json
@@ -52,12 +52,6 @@
         }
       ]
     },
-    "fontconfig": {
-      "description": "Use fontconfig",
-      "dependencies": [
-        "fontconfig"
-      ]
-    },
     "font-configuration": {
       "description": "Defaut font configuration backend",
       "dependencies": [
@@ -71,6 +65,12 @@
         }
       ]
     },
+    "fontconfig": {
+      "description": "Use fontconfig",
+      "dependencies": [
+        "fontconfig"
+      ]
+    },
     "splash": {
       "description": "The splash backend is always enabled. This option is kept for compatibility.",
       "dependencies": [

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout df40d1c476dc02d71b113e4a63c3a32b00ebb5bd -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index b8df750..075ee8d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5401,8 +5401,8 @@
       "port-version": 4
     },
     "poppler": {
-      "baseline": "20.12.1",
-      "port-version": 6
+      "baseline": "22.0.1",
+      "port-version": 0
     },
     "popsift": {
       "baseline": "0.9",
diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json
index 0b609a3..dba2740 100644
--- a/versions/p-/poppler.json
+++ b/versions/p-/poppler.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8c3cdf8e728363b73dd28b1ee8f59196aa4bdb77",
+      "version": "22.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "3f15f5c09cc977692e0c081d39e7e85f2229efe1",
       "version": "20.12.1",

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json
index d5ee3d1..8a853b1 100644
--- a/ports/poppler/vcpkg.json
+++ b/ports/poppler/vcpkg.json
@@ -45,12 +45,6 @@
         }
       ]
     },
-    "fontconfig": {
-      "description": "Use fontconfig",
-      "dependencies": [
-        "fontconfig"
-      ]
-    },
     "font-configuration": {
       "description": "Defaut font configuration backend",
       "dependencies": [
@@ -64,6 +58,12 @@
         }
       ]
     },
+    "fontconfig": {
+      "description": "Use fontconfig",
+      "dependencies": [
+        "fontconfig"
+      ]
+    },
     "splash": {
       "description": "The splash backend is always enabled. This option is kept for compatibility."
     },

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout df40d1c476dc02d71b113e4a63c3a32b00ebb5bd -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index b8df750..075ee8d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5401,8 +5401,8 @@
       "port-version": 4
     },
     "poppler": {
-      "baseline": "20.12.1",
-      "port-version": 6
+      "baseline": "22.0.1",
+      "port-version": 0
     },
     "popsift": {
       "baseline": "0.9",
diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json
index 0b609a3..94a913a 100644
--- a/versions/p-/poppler.json
+++ b/versions/p-/poppler.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1389a9fc794fce9273559e8a5e720ab2fc7387c0",
+      "version": "22.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "3f15f5c09cc977692e0c081d39e7e85f2229efe1",
       "version": "20.12.1",

dg0yt · 2022-01-24T08:25:18Z

UWP:

5>D:\buildtrees\poppler\src\er-22.01.0-24b8c57e16.clean\goo\gfile.cc(363,21): error C3861: 'CreateFileA': identifier not found [D:\buildtrees\poppler\x64-uwp-dbg\poppler.vcxproj]
5>D:\buildtrees\poppler\src\er-22.01.0-24b8c57e16.clean\goo\gfile.cc(370,21): error C3861: 'CreateFileW': identifier not found [D:\buildtrees\poppler\x64-uwp-dbg\poppler.vcxproj]

=> unsupported

dg0yt · 2022-01-31T09:15:43Z

This version of poppler is currently not usable with gdal. gdal uses the poppler C++ API, and poppler uses C++ 17 in the API (std::optional).
The C++17 requirement in poppler came app. three months ago. The newer version include security updates, so I wouldn't really want to go back. Not sure if this can be resolved in another way.

m-kuhn · 2022-01-31T10:12:17Z

Is there a ticket about this open on gdal side?

ports/poppler/portfile.cmake

dg0yt · 2022-02-11T04:47:43Z

I update license field for gdal and unofficial namespace for poppler exports. No other changes planned.

ports/gdal/vcpkg.json

LilyWangLL · 2022-02-14T09:13:34Z

@dg0yt poppler[fontconfig]:x64-windows build failed with the following error:

H:\Lily\22720\vcpkg\buildtrees\poppler\src\er-22.02.0-e605c044ce.clean\poppler\GlobalParams.cc(751): error C3861: 'strndup': identifier not found
H:\Lily\22720\vcpkg\buildtrees\poppler\src\er-22.02.0-e605c044ce.clean\poppler\GlobalParams.cc(719): warning C4996: 'strdup': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. See online help for details.

Other features test pass on x64-windows.

dg0yt · 2022-02-14T12:11:10Z

Okay, poppler[fontconfig] is now unsupported on windows (except mingw).

ports/poppler/vcpkg.json

dg0yt · 2022-02-16T18:01:19Z

AFAICS the author gave all required response.

ras0219-msft · 2022-02-17T17:45:44Z

ports/poppler/export-unofficial-poppler.patch

+    $<INSTALL_INTERFACE:include/poppler/fofi>
+    $<INSTALL_INTERFACE:include/poppler/goo>
+)
+set_target_properties(poppler PROPERTIES EXPORT_NAME poppler-private)


Why this rename? (considering we're already in the namespace unofficial::poppler::)

The name "poppler" is fine when used inside the Poppler project. However, upstream is really putting much emphasis on that this shall not be used by other projects and that such usage is entirely unsupported. However, some projects need it (e.g. GDAL). I want to carry upstreams point of view. Even more in the light of tools like `vcpkg? blindly reporting all targets as if they were public API.

I also want to add proper CMake config export upstream, and I expect better acceptance for this name.

ports/poppler/portfile.cmake

github-actions bot requested changes Jan 23, 2022

View reviewed changes

dg0yt force-pushed the poppler branch from 92cca47 to 1bdc5c8 Compare January 23, 2022 18:33

github-actions bot requested changes Jan 23, 2022

View reviewed changes

dg0yt force-pushed the poppler branch from f2da3d4 to f67f503 Compare January 23, 2022 21:52

github-actions bot requested changes Jan 23, 2022

View reviewed changes

dg0yt marked this pull request as draft January 23, 2022 21:54

JonLiu1993 assigned LilyWangLL Jan 24, 2022

LilyWangLL added the category:port-update The issue is with a library, which is requesting update new revision label Jan 24, 2022

dg0yt force-pushed the poppler branch from f67f503 to 4e08f20 Compare January 24, 2022 08:08

github-actions bot approved these changes Jan 24, 2022

View reviewed changes

dg0yt force-pushed the poppler branch 4 times, most recently from bf5d6ad to 728ea0c Compare February 1, 2022 07:58

dg0yt added 4 commits February 1, 2022 10:10

Major update to port poppler

553df92

Fixup usage requirements via main pc file

e225023

Add usage based on FindPkgConfig

7a48708

Export unofficial cmake config

7e67cdf

dg0yt force-pushed the poppler branch 3 times, most recently from 5b18956 to 4bbf2c0 Compare February 2, 2022 07:38

dg0yt and others added 4 commits February 2, 2022 09:06

uwp is unsupported

a4b3eb1

[gdal] Add poppler feature

69ceae3

[gdal] Update poppler dependency

61f18d6

[gdal] Add patch for poppler C++17 API

2ff37d9

JackBoosY suggested changes Feb 10, 2022

View reviewed changes

ports/poppler/portfile.cmake Show resolved Hide resolved

JackBoosY added the requires:author-response label Feb 10, 2022

dg0yt added 3 commits February 11, 2022 05:40

Merge remote-tracking branch 'origin/master' into poppler

0ee07e1

Add license field to gdal manifest

7754918

Add port name to unofficial namespace

17f3ea8

github-actions bot approved these changes Feb 11, 2022

View reviewed changes

dg0yt added 2 commits February 11, 2022 07:30

Rectify poppler version number

9ee3de3

Update versions

fbc5380

dg0yt force-pushed the poppler branch from b48052b to fbc5380 Compare February 11, 2022 06:31

github-actions bot approved these changes Feb 11, 2022

View reviewed changes

JackBoosY suggested changes Feb 11, 2022

View reviewed changes

ports/gdal/vcpkg.json Show resolved Hide resolved

JackBoosY approved these changes Feb 14, 2022

View reviewed changes

JackBoosY added requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function and removed requires:author-response labels Feb 14, 2022

LilyWangLL added the requires:author-response label Feb 14, 2022

dg0yt added 2 commits February 14, 2022 13:08

poppler[fontconfig] doesn't build for MSVC

2b0c2c9

Update versions

5caa6d3

github-actions bot approved these changes Feb 14, 2022

View reviewed changes

LilyWangLL requested changes Feb 15, 2022

View reviewed changes

ports/poppler/vcpkg.json Show resolved Hide resolved

dg0yt requested a review from LilyWangLL February 16, 2022 18:01

JackBoosY added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function labels Feb 17, 2022

ras0219-msft approved these changes Feb 17, 2022

View reviewed changes

vicroms merged commit d4422c3 into microsoft:master Feb 18, 2022

dg0yt deleted the poppler branch February 18, 2022 06:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[poppler,gdal] Major update to poppler; poppler feature for gdal #22720

[poppler,gdal] Major update to poppler; poppler feature for gdal #22720

dg0yt commented Jan 23, 2022 •

edited

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

dg0yt commented Jan 24, 2022

dg0yt commented Jan 31, 2022

m-kuhn commented Jan 31, 2022

dg0yt commented Feb 11, 2022

LilyWangLL commented Feb 14, 2022 •

edited

dg0yt commented Feb 14, 2022

dg0yt commented Feb 16, 2022

ras0219-msft Feb 17, 2022

dg0yt Feb 17, 2022

[poppler,gdal] Major update to poppler; poppler feature for gdal #22720

[poppler,gdal] Major update to poppler; poppler feature for gdal #22720

Conversation

dg0yt commented Jan 23, 2022 • edited

What does your PR fix?

Which triplets are supported/not supported? Have you updated the CI baseline?

Does your PR follow the maintainer guide?

If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

dg0yt commented Jan 24, 2022

dg0yt commented Jan 31, 2022

m-kuhn commented Jan 31, 2022

dg0yt commented Feb 11, 2022

LilyWangLL commented Feb 14, 2022 • edited

dg0yt commented Feb 14, 2022

dg0yt commented Feb 16, 2022

ras0219-msft Feb 17, 2022

Choose a reason for hiding this comment

dg0yt Feb 17, 2022

Choose a reason for hiding this comment

dg0yt commented Jan 23, 2022 •

edited

If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result?

LilyWangLL commented Feb 14, 2022 •

edited