From 5e9f4eea451a77ba3b93db3747841ed2bd969e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 14:09:20 +0200 Subject: New upstream version 0.30.1 --- flatpak/org.gnome.Shotwell.json | 170 +++++++++++++++++++++++++ flatpak/org.gnome.Shotwell.nightly.flatpakref | 8 ++ flatpak/org.gnome.Shotwell.unstable.flatpakref | 8 ++ flatpak/patches/exiv2-no-builddir.patch | 25 ++++ flatpak/patches/libraw-pkgconfig.patch | 43 +++++++ 5 files changed, 254 insertions(+) create mode 100644 flatpak/org.gnome.Shotwell.json create mode 100644 flatpak/org.gnome.Shotwell.nightly.flatpakref create mode 100644 flatpak/org.gnome.Shotwell.unstable.flatpakref create mode 100644 flatpak/patches/exiv2-no-builddir.patch create mode 100644 flatpak/patches/libraw-pkgconfig.patch (limited to 'flatpak') diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json new file mode 100644 index 0000000..e6492f3 --- /dev/null +++ b/flatpak/org.gnome.Shotwell.json @@ -0,0 +1,170 @@ +{ + "app-id": "org.gnome.Shotwell", + "runtime": "org.gnome.Platform", + "runtime-version": "3.28", + "sdk": "org.gnome.Sdk", + "command" : "shotwell", + "rename-desktop-file" : "shotwell.desktop", + "rename-icon" : "shotwell", + "rename-appdata-file" : "shotwell.appdata.xml", + "tags": [ "nightly" ], + "desktop-file-name-prefix": "(Nightly) ", + "finish-args": [ + "--env=DCONF_USER_CONFIG_DIR=.config/dconf", + "--filesystem=~/.config/dconf:ro", + "--filesystem=xdg-download", + "--filesystem=xdg-pictures", + "--filesystem=xdg-run/dconf", + "--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.*" + ], + + "cleanup" : ["/include", "/lib/pkconfig", "/share/pkgconfig", "/share/gtk-doc", "/share/man", "/share/vala", "/lib/girepository", "*.la", "*.a"], + + "modules" : [ + { + "name": "libgee", + "sources" : [ + { + "type" : "archive", + "url" : "https://download.gnome.org/sources/libgee/0.20/libgee-0.20.1.tar.xz", + "sha256" : "bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630" + } + ], + "config-opts" : ["--disable-introspection", "--disable-docs"] + }, + { + "name": "libusb", + "sources" : [ + { + "type" : "archive", + "url" : "https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.tar.bz2", + "sha256" : "75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157" + } + ], + "config-opts" : ["--disable-udev"] + }, + { + "name": "libghoto2", + "cleanup" : ["/bin", "/lib/udev", "/share/doc"], + "sources" : [ + { + "type" : "archive", + "url" : "https://datapacket.dl.sourceforge.net/project/gphoto/libgphoto/2.5.18/libgphoto2-2.5.18.tar.bz2", + "sha256" : "5b17b89d7ca0ec35c72c94ac3701e87d49e52371f9509b8e5c08c913ae57a7ec" + } + ], + "config-opts" : ["--disable-introspection", "--disable-docs"] + }, + + { + "name": "liboauth", + "sources": [ + { + "type": "archive", + "url": "http://netix.dl.sourceforge.net/project/liboauth/liboauth-1.0.3.tar.gz", + "sha256": "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f" + } + ] + }, + { + "name": "libgdata", + "cleanup": ["/share/gtk-doc"], + "config-opts": [ "--disable-always-build-tests", + "--disable-introspection", + "--disable-Werror", + "--disable-static", + "--disable-goa" ], + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/libgdata/0.17/libgdata-0.17.9.tar.xz", + "sha256": "85c4f7674c0098ffaf060ae01b6b832cb277b3673d54ace3bdedaad6b127453a" + } + ] + }, + + + { + "name": "exiv2", + "cleanup": [ "/bin" ], + "buildsystem": "cmake", + "sources": [ + { + "type": "git", + "url": "https://github.com/Exiv2/exiv2/", + "commit" : "e7ffd83af29187190da7f98dcbca8a4d70e19582" + } + ] + }, + { + "name": "gexiv2", + "cleanup" : ["/lib/girepository-1.0", "/share/gir-1.0"], + "config-opts" : ["--without-python2-girdir", "--without-python3-girdir"], + "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/" + } + ] + }, + + { + "name": "libraw", + "config-opts": [ "--disable-examples", "--disable-static" ], + "cleanup": [ "/share/doc" ], + "sources": [ + { + "type": "archive", + "url": "https://www.libraw.org/data/LibRaw-0.18.13.tar.gz", + "sha256": "cb1f9d0d1fabc8967d501d95c05d2b53d97a2b917345c66553b1abbea06757ca" + }, + { + "type": "patch", + "path": "patches/libraw-pkgconfig.patch" + } + ] + }, + { + "name": "opencv", + "buildsystem": "cmake", + "builddir": true, + "cleanup" : ["/share/OpenCV/*.cmake", "/share/OpenCV/*.supp"], + "config-opts" : ["-DBUILD_TESTS=OFF", "-DBUILD_EXAMPLES=OFF", "-DBUILD_PERF_TESTS=OFF", "-DWITH_FFMPEG=OFF", "-DWITH_GTK=OFF", "-DWITH_GSTREAMER=OFF", "-DBUILD_opencv_apps=OFF"], + "sources": [ + { + "type": "git", + "tag": "3.4.1", + "commit" : "6ffc48769ac60d53c4bd1913eac15117c9b1c9f7", + "url": "https://github.com/opencv/opencv" + } + ] + }, + { + "name": "shotwell", + "buildsystem": "meson", + "config-opts" : ["-Dudev=false", "-Dinstall-apport-hook=false", "-Dface-detection=true"], + "sources" : [ + { + "type": "git", + "url" : "https://gitlab.gnome.org/GNOME/shotwell", + "branch" : "master" + } + ] + } + ] +} diff --git a/flatpak/org.gnome.Shotwell.nightly.flatpakref b/flatpak/org.gnome.Shotwell.nightly.flatpakref new file mode 100644 index 0000000..a589642 --- /dev/null +++ b/flatpak/org.gnome.Shotwell.nightly.flatpakref @@ -0,0 +1,8 @@ +[Flatpak Ref] +Name=org.gnome.Shotwell +Branch=master +Title=org.gnome.Shotwell from Shotwell nightly +Url=https://shotwell-project.org/flatpak/nightly +RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo +IsRuntime=false +GPGKey=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 diff --git a/flatpak/org.gnome.Shotwell.unstable.flatpakref b/flatpak/org.gnome.Shotwell.unstable.flatpakref new file mode 100644 index 0000000..6ae8621 --- /dev/null +++ b/flatpak/org.gnome.Shotwell.unstable.flatpakref @@ -0,0 +1,8 @@ +[Flatpak Ref] +Name=org.gnome.Shotwell +Branch=unstable +Title=org.gnome.Shotwell from Shotwell unstable +Url=https://shotwell-project.org/flatpak/nightly +RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo +IsRuntime=false +GPGKey=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 diff --git a/flatpak/patches/exiv2-no-builddir.patch b/flatpak/patches/exiv2-no-builddir.patch new file mode 100644 index 0000000..939a6d1 --- /dev/null +++ b/flatpak/patches/exiv2-no-builddir.patch @@ -0,0 +1,25 @@ +From ba7a8cfe30342592e277ad41837f0eb5c6e88648 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +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/patches/libraw-pkgconfig.patch b/flatpak/patches/libraw-pkgconfig.patch new file mode 100644 index 0000000..8ef671a --- /dev/null +++ b/flatpak/patches/libraw-pkgconfig.patch @@ -0,0 +1,43 @@ +From bf4b0b6a3ec1579916475295ac42a5f98559a04b Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +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 -- cgit v1.2.3