Age | Commit message (Collapse) | Author |
|
Turns out that Jan found an issue with the latest Kirigami, so let's go back to
the known good one.
This reverts commit 17ec95e70c3ae58d505b8c3cbbaf6815186b93cb.
Suggested-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Turns out that Jan found an issue with the latest Kirigami, so let's go back to
the known good one.
This reverts commit 40766db459b219ef6a9b861593ac6e7b71519ec6.
Suggested-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Update to the master of today, and no issues detected on mobile-on-desktop
and Android.
Only, the ugly border is back as the magic hack of 0b16b547ae2aefb1 failed
due to the patch file that errored. So that is fixed too.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
Build systems that run from tar balls and not git fail to create valid
.appdata.xml This solves the problem for tar balls that we create for
OBS via our own make-package script. It doesn't solve the problem for
Arch or Gentoo who I believe take our tar files created via git archive.
One way to fix this would be to change the process by which I create
those tar files, I guess.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Instead of editing appdata/subsurface.appdata.xml in place, switch to our usual
pattern of modifying a .in file and add the resulting file to .gitignore.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This should never be wrong, and should avoid the warnings on Travis.
Fixes #1654
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Use correct format, create script to update the version and release date in the
appdata.
[Dirk Hohndel: call said script during the build process]
Signed-off-by: Alexander Wilms <f.alexander.wilms@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This is libgit2 0.24 which is new enough for our purposes.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
And improve the message if we do indeed not find it.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This seems very strange - but it appears that we are missing the 'which'
command.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Small hacks needed, but otherwise this seems to work.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Switching to GitHub as source for libzip means that we need to encode
the version number differently. Newer versions of libzip don't compile
cleanly on Android and this one seems new enough.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This also switches us to libzip's new official home on GitHub, and takes into
account that libzip no longer supports autotools and instead now is cmake
based.
Building against that, on my Mac build system, Subsurface once again correctly
opens DLD files downloaded from divelogs.de.
Fixes #1534
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This makes sure we don't end up indenting macro invocations.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
The http:// version is down an makes Travis fail.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
|
|
Add a comment so we remember to change the version number in versions.sh also.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
This is done via Fedora 27 which seemed the easiest way to get a 5.9 based
distro.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This is done via Fedora 26 which seemed the easiest way to get a 5.7 based
distro.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This is done via OpenSUSE Leap/42.3 which seemed the easiest way to
get a 5.6 based distro.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Clearly something has changed here. When I first tried to use Homebrew on
Travis the update would take often so long that the build would time out. Now
it is nice and fast. So instead of wasting time with the cache let's just use
Homebrew directly.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
So far we did a rather odd mix by default.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Doing that confuses the build setup and as a result the library isn't found at
runtime without some fixups.
Fixes #1469
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
For some reason we only tried to fix libgit2 but not the libssh2 that it depend
on. Weird.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
The existing test was backwards and never worked.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
But simply ignore when building outside of Travis.
Of course since we are building Android in a container, we need to first pass
the environment variable to the container...
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
These come originally from https://github.com/travis-ci/travis-build and are
available when running on Travis, but not when running inside a Docker
container on Travis as we do in order to build for Android.
The goal is to provide a quasi heart-beat on STDOUT during very long running
commands - without this the wget to download Qt often times out, so that's
where we are going to use this.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
The library name is actually libftdi1 , not libftdi.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
There are actually more datatypes in bash than just strings. One can for
example hold a list of strings in a list, and use that to keep track of
what we're expected to do.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
The previous code assumed everything was good to go if just the tar ball
was there, but if it wasn't unpacked, it all went sideways.
This makes it more robust and to actually handle that the tarball might
just be there.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
We want to be able to roll our own banner image, logo, title, and other
information in the GlobalDrawer - but Kirigami adds an ugly margin
around that. This attempts to remove that margin (but for some reason
there is still a margin on the left side).
This requires the patch command to be installed, but because of the
context sensitivity of the changes, I couldn't figure out how to do
this with sed or perl (which we already require).
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This seems equally stable to what we have and doesn't appear to
introduce any new breakage.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Murillo Bernardes <mfbernardes@gmail.com>
|
|
Checkout only if current checked out version differs from
expected.
Signed-off-by: Murillo Bernardes <mfbernardes@gmail.com>
|
|
git clone/checkout code was mostly the same copied over and over.
Move code to a single common function
Signed-off-by: Murillo Bernardes <mfbernardes@gmail.com>
|
|
The libzip.org server often times out and causes build failures.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
For unknown reasons cloning from github is slower to start if .git
is omitted.
Add .git to all "git clone" statements
Signed-off-by: Jan Iversen <jani@apache.org>
|
|
Only mobilecomponents.sh download breeze-icons and kirigami.
This patch is merely to avoid confusion.
Before get-dep-lib in ios/download would download those, and
mobilecomponents would see that they were already downloaded.
Signed-off-by: Jan Iversen <jani@apache.org>
|
|
use get-dep-lib in mobilecomponents to do git clone of
kirigami and breeze-icons.
Remove -no-pull option
Signed-off-by: Jan Iversen <jani@apache.org>
|
|
mobilecomponents.sh do git clone of kirigami and breeze-icons.
should be centralized with get-dep-lib
Signed-off-by: Jan Iversen <jani@apache.org>
|
|
It seems that sometimes the AppImage tooling gets confused and doesn't
create a .zsync file. That should cause Travis to fail.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|