Commit Graph

34 Commits

Author SHA1 Message Date
Niels De Graef f663d26ab5 Migrate from intltool to gettext
intltool has long been dead upstream. Let's not poke the dead corpse,
please.

This commit is quite large, but that's mostly since trying to support a
hybrid of both gettext and intltool with both Meson and Autotools was
really hard, so I stopped trying.

Due to gettext relying on quite some things being at the exactly right
place in the autotools build (like `ABOUT-NLS` and `config.rpath`) we
really needed to cleanup the `autogen.sh` to only call `aclocal` and
`autoreconf`. No more strange magic; I tried to do it without changing
too much in the file, and things just broke. If people want to do
something more custom, they can just change the script directly. This
change also uncovered some problems in our `configure.ac`, like using
deprecated macros.

The following major changes happened:

* meson: Changed `custom_target()` to `i18n.merge_file()` for all
  supported file types
* Added `.its` and `.loc`  files for the GIMP-specific XML formats, so
  that gettext understands them
* For the `.isl` (Window installer stuff) file, there's no easy way to
  do this in gettext, so instead we start from an XML file (again with
  its own ITS rules etc), translate that with gettext, and then use
  `xsltproc` with a bit of magic to output the .isl file for each
  language
* the `po*/Makefile.in.in` files are migrated to `Makevars` files,
  which gettext natively understands.

Fixes: https://gitlab.gnome.org/GNOME/gimp/-/issues/8028
2022-06-25 10:25:49 +02:00
Jehan 920041c3a0 desktop: gimp-data-extras AppStream was moved to the appropriate repo.
See the commit 28467cb on the gimp-data-extras repo where I moved this
data in. Not sure why this metadata file was ever pushed to the main
repo as it is obviously for the data-extras package (or else I am
missing some information!).

The old 2017 report where it was originally added:
https://bugzilla.gnome.org/show_bug.cgi?id=763398
2022-05-04 23:00:00 +02:00
Jehan 1691d9b8bc desktop: fix the data-extras AppStream file.
appstreamcli was returning the error:

> E: gimp-data-extras:3: cid-is-not-rdns gimp-data-extras

Apparently non-desktop component must absolutely follow the schema with
a unique identifier with 3 parts or more.

As advised in the spec, let's use the main desktop component ID, adding
a specific subpart.

Also use underscore rather than hyphen for maximum compatibility.
See: https://freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-id-generic

Finally for addons, share/metainfo/ is the recommended install path.
See: https://freedesktop.org/software/appstream/docs/sect-Metadata-Addon.html
2022-05-03 22:33:27 +02:00
Jehan 2d801596be desktop: add scalable/gimp.svg to distributed tarball.
This is part of fixing the distcheck.
2021-07-06 18:51:16 +02:00
Jehan b7c2fbe6a8 desktop: install 64x64 app icon.
For some reason, this size was installed in the meson build, not the
autotools one.
2021-07-06 11:38:33 +02:00
Jehan 36f103c95f desktop: install a scalable GIMP icon too.
The source is still desktop/src/gimp.svg.
2021-07-06 11:21:37 +02:00
Jehan c0fed5afd6 desktop: check that no remaining TODOs are in appdata file.
Before each release, we prepare now a <release> tag. Unfortunately some
details are not always well known for sure in advance, in particular the
date of release (plans are made to be broken!), and also the release
news URL (since the date is in the URL). So I usually leave them as TODO
and until now, I never forgot to update them just before release. But
there is always the risk of forgetting.
Now the test for the appdata files will also look for remaining "TODO"
in the file if and only if the micro version is even (which means it's a
release). So we won't ever forget to update the file as long as we run
`make check` on the last commit (which we always do obviously).
2019-01-23 23:48:02 +01:00
Jehan cadde8fbff desktop: adding test-desktop.sh in EXTRA_DIST.
Otherwise make check would fail from distributed packages (e.g. make
distcheck)!
2018-05-20 19:20:46 +02:00
Jehan 7a27d81eba configure, desktop: fix desktop-file-validate test.
Double copy-paste error! Must have been sleep-coding.
2018-05-20 18:10:00 +02:00
Jehan 660926eb3d desktop: add a desktop file test with `desktop-file-validate` utils. 2018-05-13 15:57:28 +02:00
Jeremy Bicha f242bf4d92 appdata: Install appstream metadata to non-deprecated directory
https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location

https://bugzilla.gnome.org/show_bug.cgi?id=794884
2018-04-02 01:09:21 +02:00
Michael Natterer 347acb16d3 desktop: add gimp-data-extras.metainfo.xml to .gitignore
and some cosmetic cleanup in Makefile.am
2018-03-30 15:53:19 +02:00
Jehan 5fc91e92e1 desktop: fix the appstream unit tests.
The first validation command was actually failing but the test was not,
because only the last return value is taken into account, obviously. Add
a '&&' between the commands.
Also test against the built files, not the templates (in particular
because `appstream-util` doesn't like .in.in templates, and anyway it's
always better to test against the finale file).
Finally move to "validate-relax" test for the time being.
"validate-strict" actually makes a bunch of errors, but I can't make the
time to look at these now. Let's just settle with basic validation at
least.
2018-02-01 17:45:05 +01: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
Jehan 60f09c3482 desktop: make the appstream metainfo file translatable.
To have the name and summary translatable, rename as .in file, add
underscore on localizable tags and add to POTFILES.in.
Also clean out trailing whitespace and weird characters, add indentation
and fix tag s/updatecontact/update_contact/.
Finally add an appstream-util validation so that the file syntax is
checked during a `make check`.
2017-06-17 04:31:22 +02:00
Jiri Eischmann 46843c840b Bug 763398 - Shipping AppStream metadata file for gimp-data-extras 2017-06-17 03:33:16 +03:00
Michael Natterer f3d827d082 desktop: add test-appdata.sh to EXTRA_DIST 2017-06-02 19:40:17 +02:00
Jehan 7e25248f3c desktop: add a test for strict validation of appdata file.
This way we can be warned quickly about any AppStream issue (cf. bug
782759). This test requires web access for screenshot verification.
Packagers are invited to use --without-appdata-test option if they want
to skip the test (for instance if build environment has restricted
network access).
2017-05-23 17:43:01 +02:00
Jehan 8a37c928eb app, plug-ins, libgimp*: clean out all remaining trailing spaces/tabs.
Rather than just discovering them by chance, a simple grep and some
search and replace are much more efficient! :-)
Cleaning only done on C and automake files.
2016-06-02 02:04:26 +02:00
Michael Henning fe3b80d617 desktop: Install the appdata file and also make it translatable. 2013-11-16 10:33:29 -05:00
Richard Hughes 5e37536d77 Add an AppData file for GIMP 2013-09-05 15:47:57 +01:00
Martin Nordholts 7127675510 desktop: Don't forget to dist 64x64 version of gimp.png 2011-04-10 12:12:15 +02:00
Jakub Steiner fb65cc197d Get rid of a backslash I forgot. 2010-02-16 11:14:03 +01:00
Jakub Steiner 7f2a0b2bd7 update launcher icon. Replace the scalable with a high resolution bitmap (256x256px). Source SVG includes all sizes. 2010-02-16 10:53:40 +01:00
Sven Neumann b95be71ca5 compile a list of MIME types that GIMP can read.
2008-01-06  Sven Neumann  <sven@gimp.org>

	* configure.in: compile a list of MIME types that GIMP can read.

	* desktop/gimp.desktop.in.in: use the list of MIME types as
	compiled by the configure script. Fixes bug #507318.

	* desktop/Makefile.am
	* desktop/gimp.applications.in
	* desktop/gimp.keys.in: removed, the gimp.application and
	gimp.keys files are obsolete.

	* plug-ins/psd/psd.c (MAIN): corrected MIME type in unused code.


svn path=/trunk/; revision=24550
2008-01-06 13:53:14 +00:00
Michael Natterer 5622fa28ff data/tips/Makefile.am s/.intltool-merge-cachemake/.intltool-merge-cache/
2007-09-03  Michael Natterer  <mitch@gimp.org>

	* data/tips/Makefile.am
	* desktop/Makefile.am:
	s/.intltool-merge-cachemake/.intltool-merge-cache/ to fix
	distcheck, probably a "make" was entered in the wrong window.


svn path=/trunk/; revision=23450
2007-09-03 13:20:42 +00:00
Manish Singh 5dc5ab0d57 honor $(DESTDIR). Fixes bug #338147. Also some minor cleanups.
2006-04-11  Manish Singh  <yosh@gimp.org>

        * desktop/Makefile.am: honor $(DESTDIR). Fixes bug #338147. Also
        some minor cleanups.
2006-04-11 22:47:15 +00:00
Sven Neumann 5666cd6bcc moved the new install hook into the conditional 2006-04-03 07:08:15 +00:00
Sven Neumann 15118a6835 added an install hook that touches the toplevel icon theme directory as
2006-04-03  Sven Neumann  <sven@gimp.org>

	* desktop/Makefile.am: added an install hook that touches the
	toplevel icon theme directory as required by the spec.
2006-04-03 07:05:11 +00:00
Sven Neumann ca8ef2e312 desktop/Makefile.am removed.
2006-03-29  Sven Neumann  <sven@gimp.org>

        * desktop/Makefile.am
        * desktop/gimp.png: removed.

        * desktop/16x16/gimp.png
        * desktop/22x22/gimp.png
        * desktop/24x24/gimp.png
        * desktop/32x32/gimp.png
        * desktop/48x48/gimp.png
        * desktop/64x64/gimp.png
        * desktop/scalable/gimp.svg: new application icons in different
        sizes, contributed by Jakub Steiner.

        * themes/Default/images/Makefile.am
        * themes/Default/images/stock-wilber-32.png
        * themes/Default/images/stock-wilber-48.png: removed.

        * libgimpwidgets/Makefile.am
        * libgimpwidgets/wilber-16.png
        * libgimpwidgets/wilber-32.png
        * libgimpwidgets/wilber-48.png
        * libgimpwidgets/wilber-64.png: new window icons, identical to the
        new application icons.

        * libgimpwidgets/gimpwidgets-private.c: use the new window icons.
2006-03-29 11:59:51 +00:00
Sven Neumann bf5331aa28 for consistency 2005-06-16 15:49:56 +00:00
Sven Neumann 077bba00bc expand the GIMP acronym.
2005-06-16  Sven Neumann  <sven@gimp.org>

	* desktop/gimp.applications.in: expand the GIMP acronym.

	* desktop/gimp.keys.in: removed some cruft.
2005-06-16 15:47:15 +00:00
Sven Neumann 0e3631ec33 INSTALL configure.in allow to skip installation of desktop files by
2005-06-16  Sven Neumann  <sven@gimp.org>

	* INSTALL
	* configure.in
	* desktop/Makefile.am: allow to skip installation of desktop files
	by passing --without-desktop-dir.
2005-06-16 15:31:30 +00:00
Sven Neumann 925a163597 Redid the framework that deals with installing desktop files. Fixes bug
2005-06-16  Sven Neumann  <sven@gimp.org>

	Redid the framework that deals with installing desktop files.
	Fixes bug #307705:

	* data/misc/*: removed.

	* desktop/*: readded the desktop files in a new directory.

	* Makefile.am
	* configure.in
	* data/Makefile.am: changed accordingly.
2005-06-16 14:50:43 +00:00