[shotwell/wip/always-enable-facedetect] CI: Enable Flatpak for stable branch
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell/wip/always-enable-facedetect] CI: Enable Flatpak for stable branch
- Date: Sat, 7 May 2022 07:10:31 +0000 (UTC)
commit cc92e7632004163621591b41a465e144555d7faa
Author: Jens Georg <mail jensge org>
Date: Sat May 7 09:07:45 2022 +0200
CI: Enable Flatpak for stable branch
.gitlab-ci.yml | 20 +++++
build-aux/libraw-pkgconfig.patch | 26 ++++++
build-aux/org.gnome.Shotwell.json | 161 ++++++++++++++++++++++++++++++++++++++
3 files changed, 207 insertions(+)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..904ffa70
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,20 @@
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+
+variables:
+ BUNDLE: "org.gnome.Shotwell.Devel.flatpak"
+ GIT_SUBMODULE_STRATEGY: recursive
+
+flatpak:
+ extends: ['.flatpak']
+ image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:41
+ variables:
+ MANIFEST_PATH: "flatpak/org.gnome.Shotwell.json"
+ RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
+ # Replace with your application name, as written in the manifest
+ FLATPAK_MODULE: "shotwell"
+ APP_ID: "org.gnome.Shotwell"
+
+nightly:
+ extends: '.publish_nightly'
+ dependencies: ['flatpak']
+ needs: ['flatpak']
diff --git a/build-aux/libraw-pkgconfig.patch b/build-aux/libraw-pkgconfig.patch
new file mode 100644
index 00000000..5b60b03b
--- /dev/null
+++ b/build-aux/libraw-pkgconfig.patch
@@ -0,0 +1,26 @@
+--- LibRaw-0.20-Beta1/libraw.pc.in~ 2020-05-13 14:22:12.656424311 +0200
++++ LibRaw-0.20-Beta1/libraw.pc.in 2020-05-13 14:22:27.481441569 +0200
+@@ -5,7 +5,8 @@
+
+ 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 -I${includedir}
+--- LibRaw-0.20-Beta1/libraw_r.pc.in~ 2020-05-13 14:22:18.034430572 +0200
++++ LibRaw-0.20-Beta1/libraw_r.pc.in 2020-05-13 14:22:27.481441569 +0200
+@@ -5,7 +5,8 @@
+
+ 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 -I${includedir}
diff --git a/build-aux/org.gnome.Shotwell.json b/build-aux/org.gnome.Shotwell.json
new file mode 100644
index 00000000..b1361ce0
--- /dev/null
+++ b/build-aux/org.gnome.Shotwell.json
@@ -0,0 +1,161 @@
+{
+ "app-id": "org.gnome.Shotwell",
+ "runtime": "org.gnome.Platform",
+ "runtime-version": "41",
+ "branch": "stable",
+ "sdk": "org.gnome.Sdk",
+ "command" : "shotwell",
+ "rename-desktop-file" : "shotwell.desktop",
+ "rename-icon" : "shotwell",
+ "rename-appdata-file" : "shotwell.appdata.xml",
+ "finish-args": [
+ "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+ "--filesystem=~/.config/dconf:ro",
+ "--filesystem=xdg-run/dconf",
+ "--filesystem=/media",
+ "--filesystem=/run/media",
+ "--filesystem=xdg-download",
+ "--filesystem=xdg-pictures",
+ "--share=ipc",
+ "--share=network",
+ "--device=all",
+ "--socket=wayland",
+ "--socket=x11",
+ "--talk-name=ca.desrt.dconf",
+ "--talk-name=org.freedesktop.FileManager1",
+ "--talk-name=org.gnome.SettingsDaemon",
+ "--talk-name=org.gtk.vfs",
+ "--talk-name=org.gtk.vfs.*",
+ "--env=GSETTINGS_BACKEND=dconf"
+ ],
+ "cleanup" : [
+ "/include",
+ "/lib/pkconfig",
+ "/share/pkgconfig",
+ "/share/gtk-doc",
+ "/share/man",
+ "/share/vala",
+ "/lib/girepository",
+ "*.la",
+ "*.a"
+ ],
+ "modules" : [
+ {
+ "name": "libusb",
+ "sources" : [
+ {
+ "type" : "archive",
+ "url" : "https://github.com/libusb/libusb/archive/v1.0.24.tar.gz",
+ "sha256" : "b7724c272dfc5713dce88ff717efd60f021ca5b7c8e30f08ebb2c42d2eea08ae"
+ }
+ ],
+ "config-opts" : ["--disable-udev"]
+ },
+ {
+ "name": "libghoto2",
+ "cleanup" : ["/bin", "/lib/udev", "/share/doc"],
+ "sources" : [
+ {
+ "type" : "archive",
+ "url" :
"https://github.com/gphoto/libgphoto2/releases/download/v2.5.27/libgphoto2-2.5.27.tar.xz",
+ "sha256" : "a7253bd18c6ef65352150ac36a668f883a5ad2634eb6455b3ca9aa6ac98d0073",
+ "dest-filename" : "libgphoto2-2.5.27.tar.xz"
+ }
+ ],
+ "config-opts" : ["--disable-introspection", "--disable-docs"]
+ },
+ {
+ "name": "liboauth",
+ "config-opts": [ "--enable-nss" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url" : "https://sourceforge.net/projects/liboauth/files/liboauth-1.0.3.tar.gz/download",
+ "sha256" : "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f",
+ "dest-filename" : "liboauth-1.0.3.tar.gz"
+ }
+ ]
+ },
+ {
+ "name": "libgdata",
+ "buildsystem" : "meson",
+ "cleanup": ["/share/gtk-doc"],
+ "config-opts": [ "-Dintrospection=false", "-Dalways_build_tests=false", "-Dgoa=disabled",
"-Dgtk_doc=false"],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/libgdata/0.17/libgdata-0.17.13.tar.xz",
+ "sha256": "eab9ef792c3c2b9ece19d45aea15225aba8df2521bc12785b1b2d3318d8c472e"
+ }
+ ]
+ },
+ {
+ "name": "exiv2",
+ "cleanup": [ "/bin" ],
+ "buildsystem": "cmake-ninja",
+ "config-opts" : [
+ "-DCMAKE_BUILD_TYPE=Release",
+ "-DEXIV2_BUILD_EXIV2_COMMAND=OFF",
+ "-DEXIV2_BUILD_SAMPLES=OFF"
+ ],
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://github.com/Exiv2/exiv2/",
+ "commit" : "d3f7e92240a5e8bb827846c6094f46f9c7b53585"
+ }
+ ]
+ },
+ {
+ "name": "gexiv2",
+ "buildsystem" : "meson",
+ "cleanup" : ["/lib/girepository-1.0", "/share/gir-1.0"],
+ "config-opts" : ["-Dpython2_girdir=no", "-Dpython3_girdir=no"],
+ "build-options" : {
+ "env": {
+ "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR": "/app/share/gir-1.0",
+ "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR": "/app/lib/girepository-1.0"
+ }
+ },
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://gitlab.gnome.org/GNOME/gexiv2.git/",
+ "commit" : "e4d65b31cd77f28ef248117e161de9d8cc31d712"
+ }
+ ]
+ },
+ {
+ "name": "libraw",
+ "config-opts": [ "--disable-examples", "--disable-static" ],
+ "cleanup": [ "/share/doc" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url" : "https://www.libraw.org/data/LibRaw-0.20.0.tar.gz",
+ "sha256" : "1f0a383da2ce9f409087facd28261decbf6be72cc90c78cd003b0766e4d694a3"
+ },
+ {
+ "type": "patch",
+ "path": "libraw-pkgconfig.patch"
+ }
+ ]
+ },
+ {
+ "name": "shotwell",
+ "buildsystem": "meson",
+ "config-opts" : ["-Dudev=false", "-Dinstall-apport-hook=false", "-Dface-detection=false",
"-Dfatal_warnings=false"],
+ "sources" : [
+ {
+ "type": "git",
+ "url" : "https://gitlab.gnome.org/GNOME/shotwell.git/",
+ "commit" : "382ac43b6b5fb688bf43a03601e48abd05925b89"
+ }
+ ],
+ "post-install" : [
+ "mv /app/share/applications/shotwell-viewer.desktop
/app/share/applications/org.gnome.Shotwell.Viewer.desktop",
+ "sed --in-place -e '/^Icon=/c Icon=org.gnome.Shotwell'
/app/share/applications/org.gnome.Shotwell.Viewer.desktop"
+ ]
+ }
+ ]
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]