Commit fe558b18 authored by Michael Terry's avatar Michael Terry

flatpak: Ship duplicity inside our flatpak

The resulting flatpak still doesn't actually work well.  It's still
missing the ability to use gvfs-backends.  But it's closer.
parent 37cb14ef
......@@ -79,6 +79,8 @@ copy-po:
flatpak:
mkdir -p builddir
flatpak-builder builddir/flatpak flatpak/org.gnome.DejaDup.json
rm -fr builddir/flatpak
cd builddir && flatpak-builder --repo=$(HOME)/repo ./flatpak ../flatpak/org.gnome.DejaDup.json
flatpak update --user org.gnome.DejaDup
.PHONY: configure clean dist all copy-po check screenshots flatpak
=== modified file 'duplicity/gpg.py'
--- a/duplicity/gpg.py 2017-07-11 14:55:38 +0000
+++ b/duplicity/gpg.py 2017-08-27 17:19:21 +0000
@@ -91,7 +91,7 @@
self.gpg_version = self.get_gpg_version(globals.gpg_binary)
- _version_re = re.compile(r'^gpg.*\(GnuPG(?:/MacGPG2)?\) (?P<maj>[0-9]+)\.(?P<min>[0-9]+)\.(?P<bug>[0-9]+)$')
+ _version_re = re.compile(r'^gpg.*\(GnuPG(?:/MacGPG2)?\) (?P<maj>[0-9]+)\.(?P<min>[0-9]+)\.(?P<bug>[0-9]+)(-.+)?$')
def get_gpg_version(self, binary):
gpg = gpginterface.GnuPG()
......@@ -45,6 +45,7 @@
}
]
},
{
"name": "libpeas",
"sources": [
......@@ -55,6 +56,7 @@
}
]
},
{
"name": "libgpg-error",
"sources": [
......@@ -65,6 +67,146 @@
}
]
},
{
"name": "librsync",
"config-opts": ["--enable-shared", "--disable-static"],
"sources": [
{
"type": "archive",
"url": "https://downloads.sourceforge.net/project/librsync/librsync/0.9.7/librsync-0.9.7.tar.gz",
"sha256": "6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6"
}
]
},
{
"name": "python-six",
"buildsystem": "simple",
"build-commands": [
"python2 setup.py build",
"python2 setup.py install --single-version-externally-managed --root=/ --prefix /app"
],
"sources": [
{
"type": "archive",
"url": "https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-1.10.0.tar.gz",
"sha256": "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a"
}
]
},
{
"name": "python-monotonic",
"buildsystem": "simple",
"build-commands": [
"python2 setup.py build",
"python2 setup.py install --single-version-externally-managed --root=/ --prefix /app"
],
"sources": [
{
"type": "archive",
"url": "https://pypi.python.org/packages/96/b3/3e9fa0bdf132a971571cbf0e3f0c8b38834f4f7af8ca9523794f4f5895e0/monotonic-1.3.tar.gz",
"sha256": "2b469e2d7dd403f7f7f79227fe5ad551ee1e76f8bb300ae935209884b93c7c1b"
}
]
},
{
"name": "python-fasteners",
"buildsystem": "simple",
"build-commands": [
"python2 setup.py build",
"python2 setup.py install --single-version-externally-managed --root=/ --prefix /app"
],
"sources": [
{
"type": "archive",
"url": "https://pypi.python.org/packages/f4/6f/41b835c9bf69b03615630f8a6f6d45dafbec95eb4e2bb816638f043552b2/fasteners-0.14.1.tar.gz",
"sha256": "427c76773fe036ddfa41e57d89086ea03111bbac57c55fc55f3006d027107e18"
}
]
},
{
"name": "duplicity",
"buildsystem": "simple",
"build-commands": [
"python2 setup.py build",
"python2 setup.py install --prefix /app"
],
"sources": [
{
"type": "archive",
"url": "https://launchpad.net/duplicity/0.7-series/0.7.13.1/+download/duplicity-0.7.13.1.tar.gz",
"sha256": "adb8668fb10e0b0f91cb77f758d02c02bf5c02e6c4835904a82cbdab6db4bef2"
},
{
"type": "patch",
"path": "gpg-version.patch"
}
]
},
{
"name": "python-boto",
"buildsystem": "simple",
"build-commands": [
"python2 setup.py build",
"python2 setup.py install --single-version-externally-managed --root=/ --prefix /app"
],
"sources": [
{
"type": "archive",
"url": "https://pypi.python.org/packages/66/e7/fe1db6a5ed53831b53b8a6695a8f134a58833cadb5f2740802bc3730ac15/boto-2.48.0.tar.gz",
"sha256": "deb8925b734b109679e3de65856018996338758f4b916ff4fe7bb62b6d7000d1"
}
]
},
{
"name": "python-cloudfiles",
"buildsystem": "simple",
"build-commands": [
"python2 setup.py build",
"python2 setup.py install --single-version-externally-managed --root=/ --prefix /app"
],
"sources": [
{
"type": "archive",
"url": "https://pypi.python.org/packages/b5/6d/11d1166c0d1a48eb15daf1b6c748e99c057ebac92e38fa0c19bdad2bc6a0/python-cloudfiles-1.7.11.tar.gz",
"sha256": "13039dd639e4686be020847b932e7a921a7a5b018c855c58190f7bfb48091335"
}
]
},
{
"name": "python-pbr",
"buildsystem": "simple",
"build-commands": [
"python2 setup.py build",
"python2 setup.py install --prefix /app"
],
"sources": [
{
"type": "archive",
"url": "https://pypi.python.org/packages/d5/d6/f2bf137d71e4f213b575faa9eb426a8775732432edb67588a8ee836ecb80/pbr-3.1.1.tar.gz",
"sha256": "05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1"
}
]
},
{
"name": "python-swiftclient",
"buildsystem": "simple",
"build-commands": [
"python2 setup.py build",
"python2 setup.py install --prefix /app"
],
"sources": [
{
"type": "archive",
"url": "https://pypi.python.org/packages/9a/a7/fa2e2def232d0c8b32677399f0381e3e6e602ce577e138fff57771a0b9e7/python-swiftclient-3.4.0.tar.gz",
"sha256": "54f7ae339bd076e295dd576ec98e55ba71205ee7e62964b27c8ec80c9351067d"
}
]
},
{
"name": "deja-dup",
"buildsystem": "meson",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment