[gnome-build-meta/jjardon/poppler] Use poppler (and dependency openjpeg) from freedesktop-sdk



commit 0c284be7c711dcc0a89c205c28b825aaa2cf2b76
Author: Javier Jardón <jjardon gnome org>
Date:   Sun May 3 14:55:47 2020 +0100

    Use poppler (and dependency openjpeg) from freedesktop-sdk

 elements/core-deps.bst                |  1 -
 elements/core-deps/gegl.bst           |  2 +-
 elements/core-deps/poppler.bst        | 16 ----------------
 elements/core-deps/tracker-miners.bst |  4 ++--
 elements/core/evince.bst              |  2 +-
 elements/sdk-platform.bst             |  1 -
 elements/sdk/WebKitGTK.bst            |  2 +-
 elements/sdk/openjpeg.bst             | 19 -------------------
 junction.refs                         |  2 +-
 9 files changed, 6 insertions(+), 43 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 00c61b6b..51727572 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -113,7 +113,6 @@ depends:
 - core-deps/phodav.bst
 - core-deps/plymouth.bst
 - core-deps/polkit.bst
-- core-deps/poppler.bst
 - core-deps/portablexdr.bst
 - core-deps/portaudio.bst
 - core-deps/ppp.bst
diff --git a/elements/core-deps/gegl.bst b/elements/core-deps/gegl.bst
index 028e3508..2fa22f84 100644
--- a/elements/core-deps/gegl.bst
+++ b/elements/core-deps/gegl.bst
@@ -14,12 +14,12 @@ depends:
 - core-deps/babl.bst
 - core-deps/gexiv2.bst
 - core-deps/libraw.bst
-- core-deps/poppler.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/json-glib.bst
 - sdk/librsvg.bst
 - sdk/pango.bst
+- freedesktop-sdk.bst:components/poppler.bst
 - freedesktop-sdk.bst:components/sdl2.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
diff --git a/elements/core-deps/tracker-miners.bst b/elements/core-deps/tracker-miners.bst
index 177e5885..1d1fbeed 100644
--- a/elements/core-deps/tracker-miners.bst
+++ b/elements/core-deps/tracker-miners.bst
@@ -13,7 +13,6 @@ depends:
 - core-deps/libgsf.bst
 - core-deps/libgxps.bst
 - core-deps/libosinfo.bst
-- core-deps/poppler.bst
 - core-deps/totem-pl-parser.bst
 - core-deps/tracker.bst
 - sdk/dconf.bst
@@ -21,10 +20,11 @@ depends:
 - sdk/glib.bst
 - sdk/gst-plugins-base.bst
 - sdk/libsecret.bst
-- sdk/openjpeg.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
 - freedesktop-sdk.bst:components/libflac.bst
 - freedesktop-sdk.bst:components/libseccomp.bst
+- freedesktop-sdk.bst:components/openjpeg.bst
+- freedesktop-sdk.bst:components/poppler.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
diff --git a/elements/core/evince.bst b/elements/core/evince.bst
index 642e2e6a..83f2836e 100644
--- a/elements/core/evince.bst
+++ b/elements/core/evince.bst
@@ -9,12 +9,12 @@ build-depends:
 - sdk/appstream-glib.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:components/itstool.bst
+- freedesktop-sdk.bst:components/poppler.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/gspell.bst
 - core-deps/libgxps.bst
-- core-deps/poppler.bst
 - core/nautilus.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/glib.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index ca7ba1e4..f5b7659a 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -43,7 +43,6 @@ depends:
 - sdk/libsoup.bst
 - sdk/libwpe.bst
 - sdk/mozjs68.bst
-- sdk/openjpeg.bst
 - sdk/os-release.bst
 - sdk/pango.bst
 - sdk/pipewire.bst
diff --git a/elements/sdk/WebKitGTK.bst b/elements/sdk/WebKitGTK.bst
index 1b49fd62..aa4c4353 100644
--- a/elements/sdk/WebKitGTK.bst
+++ b/elements/sdk/WebKitGTK.bst
@@ -29,7 +29,6 @@ depends:
 - sdk/libsecret.bst
 - sdk/libsoup.bst
 - sdk/libwpe.bst
-- sdk/openjpeg.bst
 - sdk/pango.bst
 - sdk/woff2.bst
 - sdk/wpebackend-fdo.bst
@@ -37,6 +36,7 @@ depends:
 - freedesktop-sdk.bst:components/libtasn1.bst
 - freedesktop-sdk.bst:components/libwebp.bst
 - freedesktop-sdk.bst:components/libxslt.bst
+- freedesktop-sdk.bst:components/openjpeg.bst
 - freedesktop-sdk.bst:components/wayland.bst
 - freedesktop-sdk.bst:components/xorg-lib-xt.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/junction.refs b/junction.refs
index 65ae2890..531ba99b 100644
--- a/junction.refs
+++ b/junction.refs
@@ -1,6 +1,6 @@
 projects:
   gnome:
     freedesktop-sdk.bst:
-    - ref: freedesktop-sdk-19.08beta.9-758-gb37c36f4d0d6f27c76b71914cb81cc26c00e9bb6
+    - ref: freedesktop-sdk-19.08beta.9-778-g40fa6c17b1d40c49367113653feef3a136e5f494
     openh264-extension.bst:
     - ref: 08de6b4315f76b6b09a7cfc9889b61d072cf15ea


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]