Commit Graph

224 Commits

Author SHA1 Message Date
Jehan edb0928e53 build: 2.9.8 dev build must now use a higher lcms2 dep version. 2017-12-14 02:20:41 +01:00
Jehan b9260266ab build: arrrgh! Also the commit for GIMP repo! 2017-12-13 22:57:11 +01:00
Jehan f112fbe734 build: forgot to update the flatpak commit hashes.
Oups!
2017-12-13 22:51:32 +01:00
Jehan e922671223 build: update flatpak manifest for the development release.
Even though we don't have an official build yet (flatpak only does
stable builds), let's keep up with the releases. :-)
2017-12-12 23:49:06 +01:00
Jehan 3023227ffe Bug 781020 - GIMP UI vector icons are drawn way too small.
Though the bug was mostly fixed, it seems to still happen on Windows XP,
where apparently no content type had been registered for SVG.
GTK+ developers don't seem too keen to patch GTK+ 2.24 for a platform
which they don't support anymore.

Also if not mistaken, GIMP does not officially support Windows XP
anymore either. A patch though has already been provided by Edward E.
and it really doesn't look like it could break anything since it just
adds a last "else if" when everything else failed (and inside a #ifdef
affecting only WIN32 builds).
So let's just add it in our builds at least. We still don't have support
for it, but I see no reason to just refuse a minor patch which won't
break anything else.
2017-12-08 21:21:35 +01:00
Jehan 63f830be4c build: remove flatpak files duplicated in the flathub repository.
The BaseApp json used for all 3 builds (stable, dev and nightly) is
common so just keep the one made available in the flathub upstream
repository. The patch also applies to the BaseApp only.
2017-12-06 22:45:43 +01:00
Jehan 580782dc65 build: add the flathub stable repository as a submodule.
This will only be used for our development/nightly flatpak builds and
this submodule does not have to be pulled for normal GIMP development.
2017-12-06 22:34:45 +01:00
Ell fb5354c9e5 Bug 780979 - Fullscreen windows with WS_EX_NOACTIVATE | WS_EX_TRANSPARENT ...
... interfere with GIMP UI events

Add a GTK+ patch to ignore top-level transparent windows when
looking for the top-level GDK window at a certain pointer location,
in the Win32 GDK backend.
2017-10-29 15:15:34 -04:00
Jordi Mas 20ab06a119 Fixes to Catalan installer 2017-10-23 22:13:45 +02:00
Jehan 59ea5ba298 build: sync with flathub manifest.
The BaseApp manifest got a bunch of fixes, mostly to have all the
dependencies successfully build for aarch64. The current manifest should
therefore correctly build GIMP for i386, x86-64, arm and aarch64.
See: https://github.com/flathub/flathub/pull/124
2017-10-23 21:51:26 +02:00
Jehan dd924bb33a build: stable flatpak manifest is now hosted at flathub. 2017-10-23 21:16:05 +02:00
Ell eada4a3ef8 build: update 2.9 Windows installer graphics
The existing graphics are still from 2.8 (specifically, the have a
"2.8" caption, so we can't use them for 2.9); these are the
graphics used for the 2.9.6 installer.
2017-10-23 08:56:53 -04:00
Ell a44ef8e866 Bug 786840 - Selecting last option in file association list ...
... makes the list scroll down and select the next item

Adjust the file association list height to be a multiple of the
item height, to avoid this issue.
2017-10-23 08:46:36 -04:00
Jehan 6a9f4588c9 build: fix previous commit and add xdg-config/gtk-3.0 access.
I had an error in the previous commit (2 args in 1). Also adding access
so that the file `bookmarks` is visible from the contained GIMP
(otherwise bookmarked folders are lost in flatpak and that's bad
experience).
2017-10-07 23:31:20 +02:00
Jehan 925a77e205 build: only grant access to needed services in flatpak.
No full bus access, as proposed by flatpak upstream.
2017-10-07 23:11:09 +02:00
Jehan 34ac56e770 build: using cmake-ninja for jasper build system in flatpak.
As asked by upstream at: https://github.com/flathub/flathub/pull/124
2017-10-07 18:27:57 +02:00
Jehan e75ea3c2af build: add a stable flatpak manifest.
Yeah for the BaseApp! It took me no time to make a new manifest for the
stable branch (current 2.8).
2017-10-07 03:43:34 +02:00
Jehan 789cb3ce6e build: workaround for broken cleanup of flatpak.
For some reason, the "cleanup" tag won't delete the files produced by
the BaseApp inside the main GIMP manifest (I still need them for build,
but want to delete them for runtime).
This is a workaround to delete them with a few command lines for now.
See: https://github.com/flatpak/flatpak/issues/1082
2017-10-06 16:40:26 +02:00
Jehan 1e7bb051b5 build: delete gimptool and gimp-console from the finale flatpak. 2017-10-05 04:49:49 +02:00
Jehan 54f4f4457f build: base both the dev and nightly builds off a BaseApp.
Keeping all dependencies inside the main manifest is very annoying
because flatpak-builder will check them every time the package is
rebuilt. Worse, sometimes the cache won't be hit (even though it should
have), resulting into a rebuild of many dependencies. I create a BaseApp
build which is the recommended process (and not creating our own runtime
based on GNOME one's, as I first thought) which won't need to be built
as often as the main manifests. The other advantage is obviously that
this BaseApp can be shared between the dev and nightly (and likely even
the stable later) builds. I will only keep differences inside the main
manifests (for instance lcms2 which requires a higher version on master
than on the GNOME runtime and the last dev release).
I also move webkitgtk as the first dependencies since it takes too long
and flatpak uses a sequential dependency graph (so any change to a
previously listed dependency, even when actually unrelated, was
triggering a rebuild of webkitgtk!).
Only remaining issue is that I don't manage yet to run the cleanup of
the BaseApp at the end of the main manifests (for files needed for
building, but not at runtime).
2017-10-05 03:14:13 +02:00
Jehan e545116b89 build: run flatpak-builder with --ccache option for faster builds.
So I discover today that there is an option --ccache to request
flatpak-builder to compile using ccache, which is obviously a great idea
when rebuilding the same deps too often. Update the howto with the info.
2017-10-05 00:16:34 +02:00
Jehan 96673794d9 build: make a new Flatpak manifest for the 2.9.6 release.
And rename the current manifest as being a nightly manifest.
2017-09-23 14:00:46 +02:00
Jehan a35d46d5a6 build: update the howto. 2017-09-23 13:37:56 +02:00
Jehan 40fe08b8c1 build: update webkit patch for flatpak build.
Not sure why, because flatpak-builder used to compile webkitgtk just
fine, but not anymore. I get now a "call of overloaded ‘abs(gdouble)’ is
ambiguous" error. It looks like some header may have been updated in the
flatpak environment and causing multiple abs definitions. Using fabs()
instead works around the issue.
2017-09-23 03:28:36 +02:00
Jehan 4b12467d4e build: gexiv2 also was bumped. 2017-09-20 20:31:25 +02:00
Jehan 411e550fb7 build: libwebp required version was bumped. 2017-09-20 17:02:50 +02:00
Michael Schumacher 743b303b19 build: skip Recommends for docker image
manpages, docs, utilities are not needed for a pure build image
2017-09-05 22:37:49 +02:00
Michael Schumacher b5865a1ba6 build: Add more dependencies to the build image Dockerfile 2017-09-05 21:42:10 +02:00
Michael Schumacher 613d3b0893 Dockerfile for building GIMP 2.9.x
This is a first try at creating a docker-based build environment for GIMP.

The file has grown alongside building babl, GEGL, libmypaint and GIMP on a RHEL host running Docker. The main purpose of this image will be to serve as a base for building packages like Flatpak, AppImage and others, and serving them from download.gimp.org

it is not optimized at all, pulls in some extra packages, misses some optional dependencies, builds as root, ...
2017-09-04 22:55:36 +02:00
Jehan 8e329d25fb build: replace `flatpak build-export` by `flatpak-builder --export-only`
build-export is actually a low-level tool used by flatpak-builder. When
using it directly, debug and locale extensions were not extracted as
separate extensions (unless tweaking complicated command lines), ending
up with a huge GIMP flatpak with the current procedure.
Since flatpak 0.9.5, the option --export-only has been added to
`flatpak-builder` so that the build and the export can be made in 2
separate steps while using the high level procedure.
See: https://github.com/flatpak/flatpak/issues/824
2017-06-20 16:51:03 +02:00
Jehan 8b3f5e87d8 build: updates to the flatpak howto. 2017-06-07 16:53:00 +02:00
Jehan fcc52da986 build: no need to embed lcms2 in our flatpak anymore.
With the bump of our runtime dependency, lcms 2.7 is now available from
the runtime environment.
2017-06-02 02:08:30 +02:00
Jehan 639e69c627 build: bumping flatpak dependency to GNOME 3.24 runtime. 2017-06-01 22:34:04 +02:00
Jehan 9391a0ae6b build: make the flatpak remote-add call clearer. 2017-06-01 01:01:34 +02:00
Jehan 590924f856 build: update the flatpak-howto.
In particular, I didn't have the correct metadata because I was missing
appstream-compose. This should be a dependency of flatpak. But for the
time being, let's just have a note in our howto.
2017-05-12 21:44:41 +02:00
Jehan 6265282115 build: update flatpak-howto.txt to build both 32 and 64-bit from...
...same manifest.
2017-05-03 22:48:53 +02:00
Jehan 81a44d5fb0 build: remove workaround for a flatpak bug.
The GNOME sdk runtime used to be built which flags not appreciated by
older CPUs. This has now been fixed. Let's get rid of our workaround.
See https://github.com/flatpak/flatpak/issues/143
2017-04-13 16:22:24 +02:00
Marco Ciampa a774b24270 Small fix in the Windows Installer Italian translation 2017-02-14 12:08:15 +01:00
Jehan c8ebd043aa build: workaround python2 crashes in Flatpak.
See the upstream issue where python2 would crash on some platforms, yet
not others: https://github.com/flatpak/flatpak/issues/143
For this, I disable introspection on GEGL (which is anyway not useful
in the Flatpak build, I believe), and wrap gdbus-codegen in a temporary
build script for GIMP to force it to use Python 3 (I can't force
globally the $PYTHON environment variable like on Webkit because GIMP
needs Python 2 as dependency).
2017-02-13 15:38:05 +01:00
Jehan afc69f83ae build: fix Webkit build in Flatpak package.
For some reason, Webkit would not build with Python 2 on a different
machine though it did on mine. Let's just force Python 3 usage (for
build only, not as a runtime dependency) by setting the $PYTHON
environment variable during this build. Anyway Python 3 is available
from the base build so it's not a new dependency.
2017-02-13 15:36:51 +01:00
Michael Henning 6c983eb149 build/win: Upgrade dependencies. 2017-02-04 16:29:36 -05:00
Michael Henning e00b0db8bf build/win: Upgrade a few dependencies to fix build 2017-02-04 15:17:21 -05:00
Jehan d33d80a518 build: poppler-data added as a submodule of poppler. 2017-02-02 21:41:15 +01:00
Jehan 4c33008f5d build: factorize a bit the flatpak manifest.
We can actually group modules together to mark their relationship,
and easily deactivate them together if needed.
I grouped all Python modules, Exiv2 under GEXiv2, ilmbase under
openEXR, and finally libpng and lcms2 under a "duplicate-dependencies"
module to indicate that these modules are available in the runtime
(under a lower version, below our requirements) so we should check
whether to remove them, upon runtime update.
2017-02-01 14:13:32 +01:00
Jehan c09b54d316 build: enable WebKit dependency and get a full-feature Flatpak build!
The build has been fixed by a patch from Upstream:
https://bugs.webkit.org/show_bug.cgi?id=156510
Note that WebKit takes hours to build, so if you just want to test
Flatpak, you may prefer disable this module again.

We now have a full-feature Flatpak build, except for libgudev, which
means that special input devices probably won't work in the GIMP
Flatpak. It is to be noted that Flatpak developers told me that
libudev won't work inside the sandbox anyway. A portal will have
to be implemented. See:
https://github.com/flatpak/flatpak/issues/12#issuecomment-276016074
2017-01-31 19:35:01 +01:00
Jehan 4ff7f23da3 build: last dependency for a full flatpak build, temporarily disabled.
The last stable WebkitGTK is 2.14.3 but that apparently corresponds to
WebkitGTK4 (which is already in the GNOME runtime). We need an older
version, and the last available would be 2.4.11.
I disable it though because the build failed in my test but let's save
my work-in-progress.
2017-01-31 00:17:32 +01:00
Jehan 2bef3445de build: adding Ghostscript dependency to flatpak build.
This is a special case build, since make must be run with "so",
and install is `make soinstall` to get a shared library.
See: https://ghostscript.com/doc/9.20/Make.htm#Unix_build
2017-01-31 00:17:32 +01:00
Jehan c99800b104 build: update flatpak howto. 2017-01-31 00:17:32 +01:00
Jehan b8e7907a63 build: update the flatpak howto with information on runtime module list. 2017-01-30 16:41:51 +01:00
Jehan 7ffba0314f build: adding network and dbus unlimited access.
This is necessary for opening files from the network.
It is actually possible to allow only some named service bus which
would be much more in line with proper sandboxing. But I can't find
exactly what is the service name used for gvfs (which is the virtual
filesystem apparently used internally for remote file access in GIO).
Also I'm pretty sure we must use other buses for various services. We
should make a list of what service bus are necessary for normal usage.
For the time being though, let's just have a flatpak build with as many
features as possible.
2017-01-29 23:51:47 +01:00