[epiphany] flatpak: remove debug patches and temporarily bundled modules
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] flatpak: remove debug patches and temporarily bundled modules
- Date: Sun, 27 Jan 2019 21:10:26 +0000 (UTC)
commit 9110d5e53a51c6bd92227d796d8e8463e70c04f8
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Sun Jan 27 15:07:35 2019 -0600
flatpak: remove debug patches and temporarily bundled modules
We no longer need debug patches for GTK+ and libdazzle.
OpenJPEG and poppler are now both part of the SDK, so we can drop these
too.
While we're at it, let's remove these build options that are nowadays
set by default.
flatpak/dazzle-dse-test-fix.patch | 68 ---------------------------------------
flatpak/gtk-debug.patch | 39 ----------------------
flatpak/org.gnome.Epiphany.json | 56 --------------------------------
3 files changed, 163 deletions(-)
---
diff --git a/flatpak/org.gnome.Epiphany.json b/flatpak/org.gnome.Epiphany.json
index bcc647bb1..a49ca680d 100644
--- a/flatpak/org.gnome.Epiphany.json
+++ b/flatpak/org.gnome.Epiphany.json
@@ -24,13 +24,6 @@
"--filesystem=xdg-download",
"--talk-name=org.freedesktop.Notifications"
],
- "build-options" : {
- "cflags" : "-O2 -g",
- "cxxflags" : "-O2 -g",
- "env" : {
- "V" : "1"
- }
- },
"cleanup" : [
"/include",
"/lib/pkgconfig",
@@ -43,25 +36,6 @@
"*.a"
],
"modules" : [
- {
- "name" : "gtk",
- "config-opts" : [
- "--libdir=/app/lib"
- ],
- "buildsystem" : "autotools",
- "builddir" : true,
- "sources" : [
- {
- "type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/gtk.git",
- "branch" : "gtk-3-24"
- },
- {
- "type" : "patch",
- "path" : "gtk-debug.patch"
- }
- ]
- },
{
"name" : "libdazzle",
"config-opts" : [
@@ -75,10 +49,6 @@
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/libdazzle.git"
},
- {
- "type" : "patch" ,
- "path" : "dazzle-dse-test-fix.patch"
- }
]
},
{
@@ -98,32 +68,6 @@
}
]
},
- {
- "name": "openjpeg2",
- "buildsystem": "cmake-ninja",
- "builddir": true,
- "sources": [
- {
- "type": "git",
- "url": "https://github.com/szukw000/openjpeg.git",
- "branch": "v2.1.2"
- }
- ]
- },
- {
- "name" : "poppler",
- "buildsystem" : "cmake-ninja",
- "builddir": true,
- "config-opts" : [
- "-DENABLE_TESTING=OFF"
- ],
- "sources" : [
- {
- "type" : "git",
- "url" : "https://anongit.freedesktop.org/git/poppler/poppler.git"
- }
- ]
- },
{
"name" : "evince",
"buildsystem" : "meson",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]