GNOME.org
 

[gnome-photos] Add a flatpak manifest

commit 159fa3ba9085f4ca345d6394fade6f7ebadd601f
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Mar 8 13:33:12 2017 +0100

    Add a flatpak manifest
    
    This is copied over from the gnome-apps-nightly repository, and will
    be used for the nightly builds in the future.
    
    https://wiki.gnome.org/Initiatives/GnomeGoals/FlatpakManifests
    
    https://bugzilla.gnome.org/show_bug.cgi?id=779380

 flatpak/exiv2-no-builddir.patch |   25 ++++
 flatpak/libraw-pkgconfig.patch  |   44 +++++++
 flatpak/org.gnome.Photos.json   |  254 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 323 insertions(+), 0 deletions(-)
---
diff --git a/flatpak/exiv2-no-builddir.patch b/flatpak/exiv2-no-builddir.patch
new file mode 100644
index 0000000..1df8c22
--- /dev/null
+++ b/flatpak/exiv2-no-builddir.patch
@@ -0,0 +1,25 @@
+From ba7a8cfe30342592e277ad41837f0eb5c6e88648 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Wed, 20 Jan 2016 17:00:19 +0000
+Subject: [PATCH] Disable builddir for exiv2
+
+It's not supported.
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index 4cd76eb..7848532 100755
+--- a/configure
++++ b/configure
+@@ -19914,6 +19914,8 @@ fi
+ # Configuration summary.
+ # ---------------------------------------------------------------------------
+ 
++echo \#buildapi-variable-no-builddir >/dev/null
++
+ echo ""
+ echo "------------------------------------------------------------------"
+ echo "-- Exiv2 $VERSION feature configuration summary"
+-- 
+2.5.0
diff --git a/flatpak/libraw-pkgconfig.patch b/flatpak/libraw-pkgconfig.patch
new file mode 100644
index 0000000..505fdd7
--- /dev/null
+++ b/flatpak/libraw-pkgconfig.patch
@@ -0,0 +1,44 @@
+From bf4b0b6a3ec1579916475295ac42a5f98559a04b Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Fri, 12 Feb 2016 18:29:35 +0000
+Subject: [PATCH] Add pkg-config file to LibRaw
+
+Taken from the Fedora package.
+---
+ libraw.pc.in   | 5 +++--
+ libraw_r.pc.in | 5 +++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/libraw.pc.in b/libraw.pc.in
+index 0e530b2..0c635f0 100644
+--- a/libraw.pc.in
++++ b/libraw.pc.in
+@@ -5,7 +5,8 @@ includedir=@includedir@
+ 
+ Name: libraw
+ Description: Raw image decoder library (non-thread-safe)
+-Requires: @PACKAGE_REQUIRES@
++Requires.private: @PACKAGE_REQUIRES@
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
++Libs: -L${libdir} -lraw@PC_OPENMP@
++Libs.private: -lstdc++
+ Cflags: -I${includedir}/libraw
+diff --git a/libraw_r.pc.in b/libraw_r.pc.in
+index a7f4535..c4e6028 100644
+--- a/libraw_r.pc.in
++++ b/libraw_r.pc.in
+@@ -5,7 +5,8 @@ includedir=@includedir@
+ 
+ Name: libraw
+ Description: Raw image decoder library (thread-safe)
+-Requires: @PACKAGE_REQUIRES@
++Requires.private: @PACKAGE_REQUIRES@
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
++Libs: -L${libdir} -lraw_r@PC_OPENMP@
++Libs.private: -lstdc++
+ Cflags: -I${includedir}/libraw
+-- 
+2.5.0
+
diff --git a/flatpak/org.gnome.Photos.json b/flatpak/org.gnome.Photos.json
new file mode 100644
index 0000000..9944e1c
--- /dev/null
+++ b/flatpak/org.gnome.Photos.json
@@ -0,0 +1,254 @@
+{
+    "app-id": "org.gnome.Photos",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "master",
+    "sdk": "org.gnome.Sdk",
+    "command": "gnome-photos",
+    "tags": ["nightly"],
+    "desktop-file-name-prefix": "(Nightly) ",
+    "finish-args": [
+        /* X11 + XShm access */
+        "--share=ipc", "--socket=x11",
+        /* Wayland access */
+        "--socket=wayland",
+        /* Access to users pictures */
+        "--filesystem=xdg-pictures", "--filesystem=xdg-download",
+        /* Needs to talk to the network: */
+        "--share=network",
+        /* Tracker access */
+        "--talk-name=org.freedesktop.Tracker1",
+        "--talk-name=org.freedesktop.Tracker1.Miner.Extract",
+        /* dleyna-renderer access */
+        "--talk-name=com.intel.dleyna-renderer",
+        /* SettingsDaemon for org.gnome.SettingsDaemon.Housekeeping:EmptyTrash method */
+        "--talk-name=org.gnome.SettingsDaemon",
+        /* Needed for dconf to work */
+        "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
+        "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
+    ],
+    "build-options" : {
+        "cflags": "-O2 -g",
+        "cxxflags": "-O2 -g",
+        "env": {
+            "V": "1"
+        }
+    },
+    "cleanup": ["/include", "/lib/pkgconfig",
+                "/share/pkgconfig", "/share/aclocal",
+                "/man", "/share/man", "/share/gtk-doc",
+                "/share/vala",
+                "*.la", "*.a"
+               ],
+    "modules": [
+           {
+            "name": "babl",
+            "build-options" : {
+                "arch" : {
+                    "i386" : {
+                        "config-opts" : [
+                            "--build=i586-unknown-linux-gnu"
+                        ]
+                    },
+                   "arm" : {
+                        "config-opts" : [
+                            "--build=arm-unknown-linux-gnueabi"
+                       ]
+                   }
+                }
+            },
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://git.gnome.org/babl"
+                }
+            ]
+        },
+        {
+            "name": "geocode-glib",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://git.gnome.org/geocode-glib"
+                }
+            ]
+        },
+        {
+            /* required by libgfbgraph */
+            /* we need rest-0.7 so we use a tarball for it */
+            "name": "librest",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/rest/0.8/rest-0.8.0.tar.xz";,
+                    "sha256": "e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647"
+                }
+            ]
+        },
+        {
+            /* required by libgfbgraph */
+            "name": "gnome-online-accounts",
+            "config-opts": ["--disable-telepathy", "--disable-documentation", "--disable-backend"],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://git.gnome.org/gnome-online-accounts"
+                }
+            ]
+        },
+        {
+            "name": "libgfbgraph",
+            "cleanup": [ "/doc" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://git.gnome.org/libgfbgraph"
+                }
+            ]
+        },
+        {
+            /* required by libgdata */
+            "name": "liboauth",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "http://netix.dl.sourceforge.net/project/liboauth/liboauth-1.0.3.tar.gz";,
+                    "sha256": "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f"
+                }
+            ]
+        },
+        {
+            "name": "libgdata",
+            "config-opts": ["--disable-always-build-tests", "--disable-Werror", "--disable-static" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://git.gnome.org/libgdata"
+                }
+            ]
+        },
+        {
+            "name": "libraw",
+            "config-opts": [ "--disable-examples", "--disable-static" ],
+            "cleanup": [ "/share/doc" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/LibRaw/LibRaw.git";
+                },
+                {
+                    "type": "shell",
+                    "commands": [
+                        "make -f Makefile.devel regenerate",
+                        "autoreconf --force --install"
+                    ]
+                },
+                {
+                    "type": "patch",
+                    "path": "libraw-pkgconfig.patch"
+                }
+            ]
+        },
+        {
+            "name": "gegl",
+            "cleanup": [ "/bin" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://git.gnome.org/gegl"
+                }
+            ]
+        },
+        {
+            "name": "exiv2",
+            "cleanup": [ "/bin" ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "http://www.exiv2.org/exiv2-0.25.tar.gz";,
+                    "sha256": "c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4"
+                },
+                {
+                    "type": "patch",
+                    "path": "exiv2-no-builddir.patch"
+                },
+                {
+                    "type": "shell",
+                    "commands": [
+                        "cp -f /usr/share/gnu-config/config.sub ./config/",
+                        "cp -f /usr/share/gnu-config/config.guess ./config/"
+                    ]
+                }
+            ]
+        },
+        {
+            /* moved before gegl because it adds features */
+            /* use an archive because git master has a problem with --disable-introspection option */
+            "name": "gexiv2",
+            "config-opts": [ "--disable-introspection" ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/gexiv2/0.10/gexiv2-0.10.4.tar.xz";,
+                    "sha256": "ad8d31afdc0a1932cc44c4cfcea449497c0d0b445c0ad2f9735707b306e71ca4"
+                }
+            ]
+        },
+        {
+            "name": "gnome-desktop",
+            "config-opts": ["--disable-debug-tools", "--disable-udev"],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://git.gnome.org/gnome-desktop"
+                }
+            ]
+        },
+        {
+            "name": "grilo",
+            "cleanup": [ "/bin" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://git.gnome.org/grilo"
+                }
+            ]
+        },
+        {
+            "name": "grilo-plugins",
+            "cleanup": [ "/include" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://git.gnome.org/grilo-plugins"
+                }
+            ]
+        },
+        {
+            "name": "tracker",
+            "cleanup": [ "/bin", "/etc", "/libexec" ],
+            "config-opts": [ "--disable-miner-apps", "--disable-static",
+                             "--disable-tracker-extract", "--disable-tracker-needle",
+                             "--disable-tracker-preferences", "--disable-artwork",
+                             "--disable-tracker-writeback", "--disable-miner-user-guides"],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://git.gnome.org/tracker"
+                }
+            ]
+        },
+        {
+            /* doesn't compile without --disable-Werror */
+            "name": "gnome-photos",
+            "config-opts": [ "--disable-documentation","--disable-Werror"],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "git://git.gnome.org/gnome-photos"
+                }
+            ]
+        }
+    ]
+}
+
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]