[gnome-build-meta/mcatanzaro/revert-poppler-openjpeg] Revert "Move poppler to SDK"



commit 86cd62da0dd04db1be363f64d33f547adf0dc872
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Wed Jan 30 18:07:21 2019 -0600

    Revert "Move poppler to SDK"
    
    This reverts commit 8e3fb71a475783546f516fbf7fa806ec4aec9750.

 elements/core-deps.bst                  | 1 +
 elements/{sdk => core-deps}/poppler.bst | 6 ------
 elements/core/evince.bst                | 2 +-
 elements/sdk-platform.bst               | 1 -
 4 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index acda5236..c2c10b1a 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -113,6 +113,7 @@ depends:
 - core-deps/parted.bst
 - core-deps/phodav.bst
 - core-deps/polkit.bst
+- core-deps/poppler.bst
 - core-deps/popt.bst
 - core-deps/portablexdr.bst
 - core-deps/portaudio.bst
diff --git a/elements/sdk/poppler.bst b/elements/core-deps/poppler.bst
similarity index 66%
rename from elements/sdk/poppler.bst
rename to elements/core-deps/poppler.bst
index b3537738..1d21266a 100644
--- a/elements/sdk/poppler.bst
+++ b/elements/core-deps/poppler.bst
@@ -1,9 +1,3 @@
-# WARNING WARNING WARNING
-#
-# poppler's C++ API does not provide a stable API or ABI. The poppler-glib API,
-# however, is stable. Applications using the GNOME runtime should only use the
-# poppler-glib API. Applications using the C++ API will break in future updates.
-#
 kind: cmake
 sources:
 - kind: tar
diff --git a/elements/core/evince.bst b/elements/core/evince.bst
index ea2d64e2..79272815 100644
--- a/elements/core/evince.bst
+++ b/elements/core/evince.bst
@@ -6,6 +6,7 @@ sources:
 depends:
 - core-deps/gspell.bst
 - core-deps/libgxps.bst
+- core-deps/poppler.bst
 - core/nautilus.bst
 - sdk/adwaita-icon-theme.bst
 - filename: sdk/appstream-glib.bst
@@ -15,7 +16,6 @@ depends:
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/libsecret.bst
-- sdk/poppler.bst
 - sdk/yelp-tools.bst
 - filename: base/buildsystem-autotools.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 95cc05a7..529c9607 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -47,7 +47,6 @@ depends:
 - sdk/mozjs60.bst
 - sdk/os-release.bst
 - sdk/pango.bst
-- sdk/poppler.bst
 - sdk/pycairo.bst
 - sdk/pygobject.bst
 - sdk/vte.bst


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