Commit Graph

329 Commits

Author SHA1 Message Date
Jehan b748dea801 build: add my cron script to build dev flatpak regularly.
This is the script I have been personally using for some time now to
build the devel and nightly flatpak on my server regularly through cron
files.
It is not the best script, arguably, and we can most likely do better.
But for now, it worked for me and is a first step toward maybe making
official nightly flatpak builds soon.
2018-05-13 22:42:54 +02:00
Jehan 0d26d00ca3 build: replace some survivor s/2.9/2.10/. 2018-05-11 03:01:00 +02:00
Jernej Simončič 5427d82d21 Installer: better error message about unsupported OS 2018-05-10 17:18:34 +02:00
Jehan 324873c7b8 build: no need for the splash screen patch anymore (was for 2.10.0 RC2). 2018-05-05 18:30:38 +02:00
Jehan 1ef0f50698 build: update nightly and dev flatpak.
In particular a bunch of dependencies were moved to the BaseApp.
Dev flatpak is actually a bit useless now (since last dev release is
older than stable). But I keep the dev manifest around to make it easier
to update for the future when we'll have a new dev release.
2018-05-05 16:12:11 +02:00
Jernej Simončič 2d3b8f67a8 Installer: optional GIMP debug symbols inclusion 2018-05-05 00:32:46 +02:00
Jernej Simončič 7376f9ce29 Installer: update URLs 2018-05-02 17:34:26 +02:00
Jernej Simončič c5bde2559e Installer: require Windows 7 or newer 2018-05-02 17:18:46 +02:00
Jernej Simončič 8bc219b2c3 Installer: require Windows 7 or newer 2018-05-02 17:18:46 +02:00
Jernej Simončič 2f28ddf62b Installer: include less cruft 2018-05-02 17:18:46 +02:00
Jernej Simončič fc34accf4c Installer: another leftover library to clean up 2018-05-02 17:18:46 +02:00
Jernej Simončič 68b4938830 Installer: fixes for upgrading from 2.8 2018-05-02 14:04:13 +02:00
Jernej Simončič 69cbd89694 Installer: use mingw Python 2018-05-02 13:02:17 +02:00
Jernej Simončič 074b337d43 Installer: don't attempt signing when not compressing the installer 2018-05-02 11:40:06 +02:00
Jernej Simončič 449e7b4961 Installer: NOCOMPRESSION fix 2 (installer name) 2018-05-02 11:36:50 +02:00
Jernej Simončič e8947d2ac4 Installer: oops, NOCOMPRESSION should only affect installer compression 2018-05-02 11:35:16 +02:00
Jernej Simončič 634b0e68c3 Installer: add missing files 2018-05-02 11:34:29 +02:00
Jernej Simončič e7c50755f9 Installer: more fixes for split GIMP/deps directories 2018-05-02 02:17:48 +02:00
Jernej Simončič d981c930c5 Installer: forgot a few things for GIMP/deps split 2018-05-02 02:17:48 +02:00
Jernej Simončič 770f596c6e Installer: fix mode 2018-05-02 02:17:48 +02:00
Jernej Simončič b6813cfe3c Installer: split GIMP and dependencies again (makes it easier to digitally sign
binaries I built myself)
2018-05-02 02:17:48 +02:00
Jernej Simončič 68f4c8a5ed Revert "build: fix removal of old GIMP versions during installation on Windows"
This reverts commit d8ae5481ac.

The original code was meant to remove old (pre-2.8) installers, which used WinGimp AppId.
2018-05-02 02:17:48 +02:00
Ell d8ae5481ac build: fix removal of old GIMP versions during installation on Windows
Fix the registry path where uninstaller information is searched for
during installation, so that old GIMP versions are properly
uninstalled before installing a new version.

This fix has already been included in the 2.10.0 installer.
2018-05-01 01:12:10 -04:00
Ell 25db980d01 build: add MyPaint brushes component to the Windows installer
In order to bundle the MyPaint brushes, GIMP needs to be configured
with --enable-bundled-mypaint-brushes, and the brushes need to be
present at $GIMP_DIR32\share\mypaint-data.
2018-05-01 01:12:10 -04:00
Ell de508da0e9 build: add 2.10 splash to the Windows installer 2018-05-01 01:11:56 -04:00
Ell bf7bbdba2e build: add Chinese (Taiwan) translation to the Windows installer 2018-05-01 01:11:56 -04:00
Jehan 6463e80c71 build: update my howto for flatpak releases.
After a small fiasco of 5 consecutive builds, add some newly learned
ways to test the builds beforehand on flathub infrastructure, for the
next time.
2018-04-27 18:35:33 +02:00
Jehan da2430deaa build: fix the forgotten splash screen for dev flatpak. 2018-04-21 18:09:21 +02:00
luz.paz 147c09f19e Bug 795161 - Misc. typo fixes in source comments and doxygen
Found via `codespell`
Follow-up to  commit 7fdb963e01
2018-04-18 21:06:57 +02:00
Jehan 12b9d7a4e7 build: update dev flatpak to 2.10.0 RC2. 2018-04-18 12:34:07 +02:00
Ell 65c7ce5e7d build: add Chinese (China) translation to the Windows installer 2018-04-13 08:16:50 -04:00
Jehan 9dfd35be05 build: update base dependencies to fix flatpak. 2018-04-09 04:03:18 +02:00
Jehan d907898c65 build: update dev and nightly flatpak manifests.
Dev flatpak now builds the 2.10.0 RC1.
Both manifest tested and working.
2018-04-07 01:17:09 +02:00
Jehan d2c4db1984 build: upstream flathub build and base modules updated too. 2018-04-06 21:09:50 +02:00
Jehan 494f68418a build: do not bundle glib anymore.
We now use the GNOME 3.28 runtime and glib 2.56.0 is bundled with it.
2018-04-06 21:01:15 +02:00
Ell e931d354ab build: update Windows installer splash for 2.10 RC 2018-03-25 13:31:26 -04:00
Jehan 8f71aeda3d build: update flatpak builds with latest changes.
Untested. Hopefully should build.
Also bump the GNOME runtime to the latest version.
2018-03-19 17:42:49 +01:00
Ell c0c6856190 build: add Latvian translation to the Windows installer
... but keep it disabled for now, since some of the characters may
not render correctly.
2018-03-10 18:23:18 -05:00
Jehan 5b58cc4b7c build: fix header search paths for windres calls (Win32 build).
The Win32 build was not taking the new path of git-version.h into
account and was outputting these errors:
> ../build/windows/gimp.rc:2:10: fatal error: git-version.h: No such file or directory
>  #include "git-version.h"
>           ^~~~~~~~~~~~~~~
2018-02-12 18:55:50 +01:00
Ell 26e90bfd1f build: add Indonesian translation to the Windows installer 2018-02-09 09:49:53 -05:00
Ell b40a64aab3 build: add Greek translation to the Windows installer 2018-01-28 17:11:22 -05:00
Ell 8f441befb6 build: add Basque translation to the Windows installer 2018-01-19 15:46:16 -05:00
Jehan 458e313000 Rename gimp.appdata.xml.in to org.gimp.GIMP.appdata.xml.in.in.
I completely forgot to rename the appstream file according to the new
ID. While doing so, I also make it a .in.in file, with initial
processing by the autotools. Indeed I need @GIMP_COMMAND@ to be replaced
by AC_CONFIG_FILES().
Finally I fix a badly closed XML tag (which reminds me I should always
test a commit, even when it's a simple non-C 1-liner change!).
2018-01-14 03:54:17 +01:00
Ell bc8c79e95a build: add Icelandic translation to the Windows installer 2018-01-06 12:31:51 -05:00
Jehan e875ec3fc6 build: when bumping glib, also bump glib-networking.
Tested and successful flatpak build!
2018-01-05 03:59:00 +01:00
Jehan 49e60ae72b build: bump glib dependency in flatpak nightly manifest.
We now need glib 2.54.2 which is not available in org.gnome.Sdk,
neither 3.24 nor 3.26.
2018-01-04 22:53:12 +01:00
Sebastian Rasmussen 9b9daba7a4 Bug 792028 - Bug reporting hint in installer should not mention...
...the installer component

The warning is actually not only about the installer, but also covers
the installed version of GIMP. The warning was resurrected from commit
6f0bb88e43 and slightly reworded.
2018-01-03 01:39:54 +01:00
Jehan fe22500e9b build: update nightly flatpak manifest with mypaint-brushes.
Untested, but that should work!
2018-01-02 23:43:52 +01:00
Ell cf065a37eb build: add Swedish translation to the Windows installer 2017-12-31 10:47:10 -05:00
Ell bc16d34604 build: add Turkish translation to the Windows installer 2017-12-27 10:12:13 -05:00
Ell 3837cccb48 build: add Esperanto translation to the Windows installer
... but disable it for now, since some of the characters are not
displayed correctly.
2017-12-25 07:45:00 -05:00
Ell 1f27ee6219 build, configure.ac: misc Windows installer translations build improvements
In configure.ac, add --enable-windows-installer option (off by
default), which should be set to generate the necessary files for
the installer translations during the build.  Using this option is
only supported when building from git, since the installer files
are not included in source tarballs.

Rename setup.isl.desktop.in to setup.isl.in, and instruct intltool
to treat it as an .ini file explicitly.

Delete generated message files during make clean.
2017-12-25 07:42:20 -05:00
Ell 7df863602a build: small fix to the Windows installer translations makefile 2017-12-24 17:14:09 -05:00
Ell ac059b9499 build: add/update Windows installer strings
Remove the installer graphics credits, since we use a different set
of graphics in master, and will probably use yet different set of
graphics for 2.10.

Add strings for the MyPaint brushes component.  The setup script in
git doesn't use those yet, but this lets translators start
translating them.
2017-12-24 16:45:32 -05:00
Ell f1070f4c80 build: use intltool for Windows installer translations
Use intltool for managing the translations for the Windows
installer, instead of manually maintaining the translated message
files.

The message files are generated in the source directory, under
build/windows/installer/lang, as part of the build, and can be
subsequently used to build the installer, as before.
2017-12-24 16:45:32 -05:00
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