[niepce] flatpak: Fix flatpak build
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce] flatpak: Fix flatpak build
- Date: Sun, 5 Jun 2022 02:59:40 +0000 (UTC)
commit bdaf7f375130b5095dfad9cefbd1b581a8210681
Author: Hubert Figuière <hub figuiere net>
Date: Tue May 31 18:21:24 2022 -0400
flatpak: Fix flatpak build
- Install missing app icon
- Fix appstream
- Update manifest for new dependencies
- Added patch for libopenraw 0.3.1
- Use libopenraw-rs from git
Offline build is not yet handled.
Cargo.lock | 2 +
README | 12 +-
crates/npc-fwk/Cargo.toml | 3 +-
data/Makefile.am | 5 +-
data/org.gnome.Niepce.appdata.xml.in | 50 +++---
flatpak/libopenraw-buildfix.patch | 26 +++
flatpak/org.gnome.Niepce.json | 304 ++++++++++++++++++-----------------
src/niepce/Makefile.am | 1 -
8 files changed, 226 insertions(+), 177 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index 5155a37..0cea146 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -636,6 +636,7 @@ checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
[[package]]
name = "libopenraw-rs"
version = "0.1.0"
+source =
"git+https://gitlab.freedesktop.org/libopenraw/libopenraw-rs.git?rev=5461070992e14716dcd83430c11d7baa4262b071#5461070992e14716dcd83430c11d7baa4262b071";
dependencies = [
"libopenraw-rs-sys",
]
@@ -643,6 +644,7 @@ dependencies = [
[[package]]
name = "libopenraw-rs-sys"
version = "0.1.0"
+source =
"git+https://gitlab.freedesktop.org/libopenraw/libopenraw-rs.git?rev=5461070992e14716dcd83430c11d7baa4262b071#5461070992e14716dcd83430c11d7baa4262b071";
dependencies = [
"pkg-config",
]
diff --git a/README b/README
index d839a46..cad3d27 100644
--- a/README
+++ b/README
@@ -45,7 +45,17 @@ gexiv2 >= 0.10 (as required by rexiv2)
Niepce is being developed on Linux. It should build and work on other
UNIX systems.
-If you want to build using flatpak-builder, use flatpak/org.gnome.Niepce.json.
+### Building as a flatpak
+
+If you want to build using flatpak-builder, use the manifest in
+`flatpak/org.gnome.Niepce.json`. The following will build and install
+it in the user installation of flatpak. It requires the GNOME SDK to
+be installed.
+
+```shell
+$ cd flatpak
+$ flatpak-builder --force-clean --ccache --install --user build-dir org.gnome.Niepce.json
+```
Getting the code
----------------
diff --git a/crates/npc-fwk/Cargo.toml b/crates/npc-fwk/Cargo.toml
index f605d55..ff25ede 100644
--- a/crates/npc-fwk/Cargo.toml
+++ b/crates/npc-fwk/Cargo.toml
@@ -24,8 +24,7 @@ graphene-rs = "0.15.1"
gtk4 = "^0.4.6"
lazy_static = "^1.2.0"
libc = "0.2.39"
-libopenraw-rs = { path = "../../../libopenraw-rs/libopenraw-rs" }
-# { git = "https://gitlab.freedesktop.org/libopenraw/libopenraw-rs.git";, rev =
"edae9f8771fa4f4b577ef2e56d9dbd6f68d97105" }
+libopenraw-rs = { git = "https://gitlab.freedesktop.org/libopenraw/libopenraw-rs.git";, rev =
"5461070992e14716dcd83430c11d7baa4262b071" }
multimap = "0.4.0"
once_cell = "^1.12.0"
rexiv2 = "^0.9.1"
diff --git a/data/Makefile.am b/data/Makefile.am
index 0933405..13d7d1d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,6 +14,9 @@ appdata_in_files = org.gnome.Niepce.appdata.xml.in
appdata_files = $(appdata_in_files:.xml.in=.xml)
appdata_DATA = $(appdata_files)
+icondir = $(datarootdir)/icons/hicolor/scalable/apps
+icon_DATA = org.gnome.Niepce.svg
+
%.appdata.xml: %.appdata.xml.in
$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
@@ -36,7 +39,7 @@ pixmap_files = icons/niepce-jpg-fmt.png \
$(null)
EXTRA_DIST = \
- $(desktop_in_files) \
+ $(desktop_in_files) \
$(appdata_in_files) \
$(pixmap_files) \
$(null)
diff --git a/data/org.gnome.Niepce.appdata.xml.in b/data/org.gnome.Niepce.appdata.xml.in
index 431e6f2..6695303 100644
--- a/data/org.gnome.Niepce.appdata.xml.in
+++ b/data/org.gnome.Niepce.appdata.xml.in
@@ -1,32 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
- <id>net.figuiere.Niepce</id>
- <!-- this is the licence of the appdata file, not the project. Permitted values are 'CC0', 'CC BY' and 'CC
BY-SA' -->
- <licence>CC0</licence>
- <project_license>GPL-3.0+</project_license>
- <!-- Only include 'name' if you want the software center name to be different to the 'Name' in the .desktop
file -->
- <name>Niepce Digital</name>
- <!-- Only include 'summary' if you want the software center name to be different to the 'Comment' in the
.desktop file -->
- <summary>Advanced Photo Editing</summary>
- <description>
- <p>
- Niepce Digital is an application used to manage and edit photos.
- </p>
- <p>Features:</p>
- <!-- try not to use lists unless you have to. Paragraphs look a lot better in nearly all cases -->
- <ul>
- <li>Photo library management</li>
- <li>Non destructive image editing</li>
- <li>RAW processing</li>
- </ul>
- </description>
- <screenshots>
- <!-- the width and height are optional, but suggested -->
- <screenshot type="default" width="1366" height="741"></screenshot>
- </screenshots>
- <url type="homepage">https://wiki.gnome.org/Apps/Niepce</url>
- <!-- this is someone that wants to be notified when we add to the appdata specification -->
- <updatecontact>hub figuiere net</updatecontact>
+ <id>org.gnome.Niepce</id>
+ <licence>CC0-1.0</licence>
+ <project_license>GPL-3.0-or-later</project_license>
+ <name>Niepce Digital</name>
+ <summary>Advanced Photo Editing</summary>
+ <description>
+ <p>
+ Niepce Digital is an application used to manage and edit photos.
+ </p>
+ <p>Features:</p>
+ <ul>
+ <li>Photo library management</li>
+ <li>Non destructive image editing</li>
+ <li>RAW processing</li>
+ </ul>
+ </description>
+ <screenshots>
+ <screenshot type="default"></screenshot>
+ </screenshots>
+ <url type="homepage">https://wiki.gnome.org/Apps/Niepce</url>
+ <updatecontact>hub figuiere net</updatecontact>
- <translation type="gettext">niepce</translation>
+ <translation type="gettext">niepce</translation>
</component>
diff --git a/flatpak/libopenraw-buildfix.patch b/flatpak/libopenraw-buildfix.patch
new file mode 100644
index 0000000..049eb8a
--- /dev/null
+++ b/flatpak/libopenraw-buildfix.patch
@@ -0,0 +1,26 @@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 4895901..36f7968 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -96,7 +96,6 @@ endif
+ CARGO_TARGET_DIR=@abs_top_builddir@/lib/mp4/target
+ RUST_PATH=$(CARGO_TARGET_DIR)/@CARGO_TARGET_SUBDIR@
+ RUST_LIB=$(RUST_PATH)/libmp4.a
+-RUST_LIBADD=-L$(RUST_PATH) -lmp4
+
+ mp4/mp4parse.h: $(RUST_LIB)
+
+@@ -109,10 +108,12 @@ clean-local:
+ CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo clean $(CARGO_VERBOSE) $(CARGO_RELEASE_ARGS)
+ rm -f $(CARGO_TARGET_DIR)/.rustc_info.json
+
++# The use of --all-static is necesary for the RUST_LIB
+ libopenraw_la_LDFLAGS = \
+ -version-info @LIBOPENRAW_VERSION_INFO@ \
++ --all-static \
+ -lpthread -ldl
+-libopenraw_la_LIBADD = -ljpeg $(RUST_LIBADD) libopenraw_internals.la
++libopenraw_la_LIBADD = -ljpeg $(RUST_LIB) libopenraw_internals.la
+ libopenraw_la_SOURCES = \
+ capi/capi.h \
+ capi/capi.cpp \
diff --git a/flatpak/org.gnome.Niepce.json b/flatpak/org.gnome.Niepce.json
index 7fe281f..3d15da6 100644
--- a/flatpak/org.gnome.Niepce.json
+++ b/flatpak/org.gnome.Niepce.json
@@ -1,6 +1,5 @@
{
"app-id" : "org.gnome.Niepce",
- "branch" : "master",
"runtime" : "org.gnome.Platform",
"runtime-version" : "42",
"sdk" : "org.gnome.Sdk",
@@ -8,14 +7,10 @@
"org.freedesktop.Sdk.Extension.rust-stable"
],
"command" : "niepce",
- "tags" : [
- "master"
- ],
"finish-args" : [
"--allow=devel",
- "--talk-name=org.freedesktop.Flatpak",
"--share=ipc",
- "--socket=x11",
+ "--socket=fallback-x11",
"--socket=wayland",
"--filesystem=host",
"--share=network",
@@ -24,48 +19,53 @@
],
"build-options" : {
"build-args": ["--share=network"],
- "env" : {
- "V" : "1",
- "CARGO_HOME" : "/run/build/niepce/cargo"
+ "env": {
+ "CARGO_HOME": "/run/build/niepce/cargo"
},
- "append-path" : "/usr/lib/sdk/rust-stable/bin"
+ "append-path": "/usr/lib/sdk/rust-stable/bin"
},
- "cleanup" : [
+ "cleanup": [
+ "/include",
+ "/lib/pkgconfig",
+ "/share/devhelp",
+ "/share/doc",
"*.la",
"*.a"
],
- "modules" : [
+ "modules": [
{
"name": "libusb",
- "sources" : [
+ "config-opts": [
+ "--disable-udev"
+ ],
+ "sources": [
{
- "type" : "archive",
- "url" : "https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.tar.bz2";,
- "sha256" : "75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157"
+ "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" : "libgphoto2",
- "sources" : [
+ "name": "libgphoto2",
+ "sources": [
{
- "type" : "archive",
- "url" :
"https://download.sourceforge.net/project/gphoto/libgphoto/2.5.23/libgphoto2-2.5.23.tar.bz2";,
- "sha256" : "d8af23364aa40fd8607f7e073df74e7ace05582f4ba13f1724d12d3c97e8852d"
+ "type": "archive",
+ "url":
"https://download.sourceforge.net/project/gphoto/libgphoto/2.5.29/libgphoto2-2.5.29.tar.bz2";,
+ "sha256": "dbe3cefad8c634fc134d93467a33e242cb1030f0b9829deb9f1703f368ac027e"
}
]
},
{
- "name" : "libraw",
- "config-opts" : [
+ "name": "libraw",
+ "config-opts": [
"--disable-static"
],
- "cleanup" : [
+ "cleanup": [
"/bin",
"/share/doc"
],
- "sources" : [
+ "sources": [
{
"type" : "archive",
"url" : "http://www.libraw.org/data/LibRaw-0.19.5.tar.gz";,
@@ -79,13 +79,17 @@
{
"name": "exiv2",
"buildsystem": "cmake-ninja",
- "config-opts": ["-DCMAKE_BUILD_TYPE=Release"],
- "cleanup": [ "/bin" ],
+ "config-opts": [
+ "-DCMAKE_BUILD_TYPE=Release"
+ ],
+ "cleanup": [
+ "/bin"
+ ],
"sources": [
{
"type": "archive",
- "url": "https://exiv2.org/builds/exiv2-0.27.2-Source.tar.gz";,
- "sha256": "2652f56b912711327baff6dc0c90960818211cf7ab79bb5e1eb59320b78d153f"
+ "url":
"https://github.com/Exiv2/exiv2/releases/download/v0.27.5/exiv2-0.27.5-Source.tar.gz";,
+ "sha256": "35a58618ab236a901ca4928b0ad8b31007ebdc0386d904409d825024e45ea6e2"
}
]
}
@@ -105,210 +109,222 @@
{
"name" : "babl",
"buildsystem": "meson",
- "build-options" : {
- "arch" : {
- "i386" : {
- "config-opts" : [
- ]
- },
- "arm" : {
- "config-opts" : [
- ]
- }
- }
- },
+ "config-opts": [
+ "-Dwith-docs=false",
+ "-Denable-vapi=false",
+ "-Denable-gir=false"
+ ],
"sources" : [
{
"type" : "archive",
- "url" : "https://download.gimp.org/pub/babl/0.1/babl-0.1.72.tar.xz";,
- "sha256" : "64e111097b1fa22f6c9bf044e341a9cd9ee1372c5acfa0b452e7a86fb37c6a42"
+ "url" : "https://download.gimp.org/pub/babl/0.1/babl-0.1.92.tar.xz";,
+ "sha256" : "f667735028944b6375ad18f160a64ceb93f5c7dccaa9d8751de359777488a2c1"
}
]
},
{
- "name" : "gegl",
- "cleanup" : [
+ "name": "gegl",
+ "buildsystem": "meson",
+ "cleanup": [
"/bin"
],
- "config-opts" : [
- "--without-libavformat",
- "--disable-docs",
- "--disable-introspection"
+ "config-opts": [
+ "-Dgtk-doc=false",
+ "-Dvapigen=disabled",
+ "-Dlibav=disabled",
+ "-Dintrospection=false"
],
- "sources" : [
+ "sources": [
{
- "type" : "archive",
- "url" : "https://download.gimp.org/pub/gegl/0.4/gegl-0.4.16.tar.bz2";,
- "sha256" : "0112df690301d9eb993cc48965fc71b7751c9021a4f4ee08fcae366c326b5e5a"
+ "type": "archive",
+ "url": "https://download.gimp.org/pub/gegl/0.4/gegl-0.4.36.tar.xz";,
+ "sha256": "6fd58a0cdcc7702258adaeffb573a389228ae8f0eff47578efda2309b61b2ca6"
}
]
},
{
- "name" : "mm-common",
- "cleanup" : [
- "/"
+ "name": "mm-common",
+ "cleanup": [
+ "*"
],
- "sources" : [
+ "sources": [
{
- "type" : "archive",
- "url" : "https://download.gnome.org/sources/mm-common/0.9/mm-common-0.9.12.tar.xz";,
- "sha256" : "ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b"
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/mm-common/0.9/mm-common-0.9.12.tar.xz";,
+ "sha256": "ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b"
}
]
},
{
- "name" : "sigc++",
- "config-opts" : [
+ "name": "sigc++",
+ "config-opts": [
"--disable-documentation"
],
- "sources" : [
+ "sources": [
{
- "type" : "archive",
- "url" : "https://download.gnome.org/sources/libsigc++/2.10/libsigc++-2.10.2.tar.xz";,
- "sha256" : "b1ca0253379596f9c19f070c83d362b12dfd39c0a3ea1dd813e8e21c1a097a98"
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/libsigc++/3.2/libsigc++-3.2.0.tar.xz";,
+ "sha256": "8cdcb986e3f0a7c5b4474aa3c833d676e62469509f4899110ddf118f04082651"
}
]
},
{
- "name" : "glibmm",
- "config-opts" : [
- "--disable-documentation"
+ "name": "glibmm",
+ "buildsystem": "meson",
+ "config-opts": [
+ "-Dbuild-deprecated-api=false",
+ "-Dbuild-examples=false",
+ "-Dbuild-documentation=false"
],
- "sources" : [
+ "sources": [
{
- "type" : "archive",
- "url" : "https://download.gnome.org/sources/glibmm/2.62/glibmm-2.62.0.tar.xz";,
- "sha256" : "36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe"
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/glibmm/2.68/glibmm-2.68.2.tar.xz";,
+ "sha256": "91e0a8618f7b82db4aaf2648932ea2bcfe626ad030068c18fa2d106fd838d8ad"
}
]
},
{
- "name" : "cairomm",
- "config-opts" : [
+ "name": "cairomm",
+ "config-opts": [
"--disable-documentation"
],
- "sources" : [
+ "sources": [
{
- "type" : "archive",
- "url" : "http://cairographics.org/releases/cairomm-1.12.0.tar.gz";,
- "sha256" : "50435aec6fdd976934b791e808993160113ad19ca53a5634a9b64ccbe55874cc"
+ "type": "archive",
+ "url": "http://cairographics.org/releases/cairomm-1.16.1.tar.xz";,
+ "sha256": "6f6060d8e98dd4b8acfee2295fddbdd38cf487c07c26aad8d1a83bb9bff4a2c6"
}
]
},
{
- "name" : "pangomm",
- "config-opts" : [
- "--disable-documentation"
+ "name": "pangomm",
+ "buildsystem": "meson",
+ "config-opts": [
+ "-Dbuild-deprecated-api=false",
+ "-Dbuild-documentation=false"
],
- "sources" : [
+ "sources": [
{
- "type" : "archive",
- "url": "https://download.gnome.org/sources/pangomm/2.42/pangomm-2.42.0.tar.xz";,
- "sha256": "ca6da067ff93a6445780c0b4b226eb84f484ab104b8391fb744a45cbc7edbf56"
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/pangomm/2.50/pangomm-2.50.0.tar.xz";,
+ "sha256": "a27aa77e017b9afce9e751d85bd1cf890abbb3a58bf59d0fac917eef82db3b5b"
}
]
},
{
- "name" : "atkmm",
- "config-opts" : [
- "--disable-documentation"
+ "name": "atkmm",
+ "buildsystem": "meson",
+ "config-opts": [
+ "-Dbuild-deprecated-api=false",
+ "-Dbuild-documentation=false"
],
- "sources" : [
+ "sources": [
{
- "type" : "archive",
- "url" : "http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz";,
- "sha256" : "ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd"
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.1.tar.xz";,
+ "sha256": "e11324bfed1b6e330a02db25cecc145dca03fb0dff47f0710c85e317687da458"
}
]
},
{
- "name" : "gtkmm",
- "config-opts" : [
- "--disable-documentation"
+ "name": "gtkmm",
+ "buildsystem": "meson",
+ "config-opts": [
+ "-Dbuild-deprecated-api=false",
+ "-Dbuild-demos=false",
+ "-Dbuild-tests=false",
+ "-Dbuild-documentation=false"
],
- "build-options" : {
- "cxxflags" : "-O2 -g -std=c++11"
- },
- "sources" : [
+ "sources": [
{
- "type" : "archive",
- "url" : "http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.24/gtkmm-3.24.0.tar.xz";,
- "sha256" : "cf5fc92805e581c8303e08d54519457ba07f15b766e9b1edde4862993ac1aa43"
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/gtkmm/4.6/gtkmm-4.6.1.tar.xz";,
+ "sha256": "0d5efeca9ec64fdd530bb8226c6310ac99549b3dd9604d6e367639791af3d1e0"
}
]
},
{
- "name" : "libchamplain",
- "config-opts" : [
- "--disable-documentation"
+ "name": "libshumate",
+ "buildsystem": "meson",
+ "config-opts": [
+ "-Dgtk_doc=false",
+ "-Dvapi=false",
+ "-Dgir=false"
],
- "build-options" : {
- "cxxflags" : "-O2 -g -std=c++11"
- },
- "sources" : [
+ "sources": [
{
- "type" : "archive",
- "url" :
"http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.12/libchamplain-0.12.14.tar.xz";,
- "sha256" : "f1621ddec1ffe64ca01c3216db8663f60ae0bb107521195fc6856119d4b4568f"
+ "type": "git",
+ "url": "https://gitlab.gnome.org/GNOME/libshumate/";,
+ "tag": "1.0.0.alpha.1",
+ "commit": "36163e4809e31632b7e387b90396ff8b9a461eed"
}
]
},
{
- "name" : "boost",
- "buildsystem" : "simple",
- "cleanup" : [
+ "name": "boost",
+ "buildsystem": "simple",
+ "cleanup": [
"/include",
"/lib/libboost_*.so*",
- "/lib/libboost_*.a"
+ "*.a"
],
- "build-commands" : [
- "./bootstrap.sh",
- "./b2 install variant=release link=shared runtime-link=shared --prefix=/app --without-math
--without-thread --without-container --without-log --without-system --without-filesystem --without-chrono
--without-random --without-python -j $FLATPAK_BUILDER_N_JOBS"
+ "build-commands": [
+ "./bootstrap.sh --prefix=/app --with-libraries=test",
+ "./b2 install -j $FLATPAK_BUILDER_N_JOBS"
],
- "sources" : [
+ "sources": [
{
- "type" : "archive",
- "url" :
"https://downloads.sourceforge.net/project/boost/boost/1.60.0/boost_1_60_0.tar.bz2";,
- "sha256" : "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b"
+ "type": "archive",
+ "url":
"https://downloads.sourceforge.net/project/boost/boost/1.60.0/boost_1_60_0.tar.bz2";,
+ "sha256": "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b"
}
]
},
{
- "name" : "exempi",
- "sources" : [
+ "name": "exempi",
+ "sources": [
{
- "type" : "archive",
- "url" : "https://libopenraw.freedesktop.org/download/exempi-2.5.1.tar.bz2";,
- "sha256" : "100b3d5b1b3370bc2e31c0978991716c4a4478246a2ac2df6382054a0ae89bc8"
+ "type": "archive",
+ "url": "https://libopenraw.freedesktop.org/download/exempi-2.6.1.tar.bz2";,
+ "sha256": "072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd"
}
]
},
{
- "name" : "libopenraw",
- "sources" : [
+ "name": "libopenraw",
+ "config-opts": [
+ "--disable-static"
+ ],
+ "sources": [
{
- "type" : "archive",
- "url" : "https://libopenraw.freedesktop.org/download/libopenraw-0.1.3.tar.xz";,
- "sha256" : "8ef35df5158ccd831bfc781577c79a62054d1a40eadd1697535f76e126d06220"
+ "type": "archive",
+ "url": "https://libopenraw.freedesktop.org/download/libopenraw-0.3.1.tar.xz";,
+ "sha256": "c8acaae1bb43c3461b54d4b106bfc985dff859d43bcd0475bfda35bdf296fc0e"
+ },
+ {
+ "type": "patch",
+ "path": "libopenraw-pixbuf-disable.diff"
},
{
- "type" : "patch",
- "path" : "libopenraw-pixbuf-disable.diff"
+ "type": "patch",
+ "path": "libopenraw-buildfix.patch"
},
{
- "type" : "shell",
- "commands" : [
+ "type": "shell",
+ "commands": [
"autoreconf -si"
]
}
]
},
{
- "name" : "niepce",
- "sources" : [
+ "name": "niepce",
+ "builddir": true,
+ "sources": [
{
- "type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/niepce.git";
+ "type": "dir",
+ "path": ".."
}
]
}
diff --git a/src/niepce/Makefile.am b/src/niepce/Makefile.am
index 1541e82..67188a5 100644
--- a/src/niepce/Makefile.am
+++ b/src/niepce/Makefile.am
@@ -19,7 +19,6 @@ niepce_LDADD = \
$(top_builddir)/src/fwk/toolkit/libniepceframework.a \
$(top_builddir)/src/fwk/base/libfwkbase.a \
$(top_builddir)/src/ncr/libncr.a \
- $(top_builddir)/src/ext/libview/libview.a \
$(top_builddir)/target/@CARGO_TARGET_SUBDIR@/libniepce_rust.a \
$(top_builddir)/src/engine/libniepceengine.a \
$(top_builddir)/src/fwk/utils/libniepceutils.a \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
