[gnome-build-meta/mcatanzaro/revert-poppler-openjpeg: 7/8] Revert "Move openjpeg to SDK"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/mcatanzaro/revert-poppler-openjpeg: 7/8] Revert "Move openjpeg to SDK"
- Date: Sun, 3 Feb 2019 16:58:50 +0000 (UTC)
commit 744766dc0b35ed0b7c3231525f9c45e2784ad219
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Wed Jan 30 18:07:11 2019 -0600
Revert "Move openjpeg to SDK"
This reverts commit 39c7be7a70853ebfea963d6b3aa907211f3aadef.
elements/core-deps.bst | 1 +
elements/{sdk => core-deps}/openjpeg.bst | 0
elements/sdk-platform.bst | 1 -
elements/sdk/WebKitGTK+.bst | 2 +-
elements/sdk/poppler.bst | 2 +-
5 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index b85f520e..acda5236 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -105,6 +105,7 @@ depends:
- core-deps/mpfr.bst
- core-deps/mtdev.bst
- core-deps/neon.bst
+- core-deps/openjpeg.bst
- core-deps/openldap.bst
- core-deps/osinfo-db-tools.bst
- core-deps/pangomm-1.4.bst
diff --git a/elements/sdk/openjpeg.bst b/elements/core-deps/openjpeg.bst
similarity index 100%
rename from elements/sdk/openjpeg.bst
rename to elements/core-deps/openjpeg.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 483b5234..d0c7e0d5 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -44,7 +44,6 @@ depends:
- sdk/libsecret.bst
- sdk/libsoup.bst
- sdk/mozjs60.bst
-- sdk/openjpeg.bst
- sdk/os-release.bst
- sdk/pango.bst
- sdk/poppler.bst
diff --git a/elements/sdk/WebKitGTK+.bst b/elements/sdk/WebKitGTK+.bst
index 6792d33e..f9a412dc 100644
--- a/elements/sdk/WebKitGTK+.bst
+++ b/elements/sdk/WebKitGTK+.bst
@@ -4,7 +4,7 @@ sources:
url: webkitgtk_org:webkitgtk-2.23.3.tar.xz
# When upgrading to next release:
# * Remove bug-193903.patch (including from files/)
-# * Add dependency on sdk/openjpeg.bst
+# * Add dependency on core-deps/openjpeg.bst
# * Delete this comment
# * Remember to create a merge request rather than pushing directly :)
- kind: patch
diff --git a/elements/sdk/poppler.bst b/elements/sdk/poppler.bst
index 65ba35d4..b3537738 100644
--- a/elements/sdk/poppler.bst
+++ b/elements/sdk/poppler.bst
@@ -9,8 +9,8 @@ sources:
- kind: tar
url: https://poppler.freedesktop.org/poppler-0.72.0.tar.xz
depends:
+- core-deps/openjpeg.bst
- sdk/gobject-introspection.bst
-- sdk/openjpeg.bst
- filename: sdk/gtk-doc.bst
type: build
- filename: desktop/cairo.bst
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]