From 7bdd796223e2a107e19bbac2cb2674972f3843c8 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Sat, 5 Dec 2020 15:04:13 -0500 Subject: [PATCH] Add MetaInfo file Changed app-id to io.github.mightycreak.Diffuse --- CHANGELOG.md | 3 + README.md | 6 +- ...e.yml => io.github.mightycreak.Diffuse.yml | 2 +- src/meson.build | 13 +++ ...io.github.mightycreak.Diffuse.metainfo.xml | 108 ++++++++++++++++++ 5 files changed, 128 insertions(+), 4 deletions(-) rename com.github.mightycreak.Diffuse.yml => io.github.mightycreak.Diffuse.yml (91%) create mode 100644 src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b7210a..49b8071 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added +- Added MetaInfo file ### Changed +- Changed AppID to io.github.mightycreak.Diffuse (as explained in + [Flatpak documentation](https://docs.flatpak.org/en/latest/conventions.html#application-ids)) ### Fixed diff --git a/README.md b/README.md index 4b3a900..27a12c9 100644 --- a/README.md +++ b/README.md @@ -83,15 +83,15 @@ writable directory on the pen drive). To install Diffuse locally: flatpak install flatpak install runtime/org.gnome.Sdk/$(uname -p)/3.38 - flatpak-builder builddir-flatpak --user --install com.github.mightycreak.Diffuse.yml + flatpak-builder builddir-flatpak --user --install io.github.mightycreak.Diffuse.yml To run Diffuse through Flatpak: - flatpak run com.github.mightycreak.Diffuse + flatpak run io.github.mightycreak.Diffuse To uninstall Diffuse: - flatpak remove com.github.mightycreak.Diffuse + flatpak remove io.github.mightycreak.Diffuse ## Help Documentation diff --git a/com.github.mightycreak.Diffuse.yml b/io.github.mightycreak.Diffuse.yml similarity index 91% rename from com.github.mightycreak.Diffuse.yml rename to io.github.mightycreak.Diffuse.yml index 5ea09ad..3613261 100644 --- a/com.github.mightycreak.Diffuse.yml +++ b/io.github.mightycreak.Diffuse.yml @@ -1,4 +1,4 @@ -app-id: com.github.mightycreak.Diffuse +app-id: io.github.mightycreak.Diffuse runtime: org.gnome.Platform runtime-version: '3.38' sdk: org.gnome.Sdk diff --git a/src/meson.build b/src/meson.build index e30b432..72e8f97 100644 --- a/src/meson.build +++ b/src/meson.build @@ -22,5 +22,18 @@ configure_file( install_dir: sysconfdir ) +# Validate MetaInfo file +metainfo_file = join_paths(meson.source_root(), 'src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml') +ascli_exe = find_program('appstreamcli', required: false) +if ascli_exe.found() + test('validate metainfo file', + ascli_exe, + args: ['validate', + '--no-net', + '--pedantic', + metainfo_file] + ) +endif + # Data files install_subdir('usr/share', install_dir: datadir, strip_directory: true) diff --git a/src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml b/src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml new file mode 100644 index 0000000..31d9889 --- /dev/null +++ b/src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml @@ -0,0 +1,108 @@ + + + io.github.mightycreak.Diffuse + + Diffuse + Graphical merge tool + +

+ Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories. +

+ + + FSFAP + GPL-2.0-or-later + + + io.github.mightycreak.Diffuse.desktop + + https://mightycreak.github.io/diffuse/ + https://github.com/MightyCreak/diffuse/issues + + + + https://mightycreak.github.io/diffuse/images/screenshot_v0.5.0.png + Main window: diff between two files + + + + + + +

+ Mainly under the hood changes in this release, so nothing really visible to the users in this version. That + said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse + development to be a bit more active and iterative. +

+

+ Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available + through Flathub! +

+

Added:

+
    +
  • New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse
    • +
+

Changed:

+
    +
  • Replace old install.py with the more standard Meson
    • +
  • Remove u string prefixes since Python 3 is in UTF-8 by default
    • +
  • Replaced some interpolation operators (%) for the f string prefix
    • +
  • Use the window scale factor for the icons generation
    • +
+ + + + +

+ Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release! +

+

+ There is a lot to do on this application, and some features didn't make the release. The main one being the + Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python + scripts should work on Windows, but no executable is produced (yet) with the release. +

+

+ Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the + latest commits from upstream (which were never released). +

+

+ The next version will not take 6 years, I promise you! 😄 +

+

Added:

+
    +
  • Added Pedro Albuquerque's Portuguese translation
    • +
  • Added Ã…ke Engelbrektson's Swedish translation
    • +
  • Added Guillaume Hoffmann's Darcs support improvements
    • +
  • Added Akom Chotiphantawanon's Thai translation
    • +
  • Added support for Git submodules
    • +
  • Added a preference and command line option to specify the version control system search order
    • +
  • Added .editorconfig file
    • +
  • Added .gitignore file
    • +
  • Added message when removing files during uninstallation
    • +
  • Added Python script to update all the translation files at once
    • +
+

Changed:

+
    +
  • Convert to Python 3
    • +
  • Convert to GTK 3
    • +
  • Updated Python highlighting for Python 3 grammar
    • +
  • Updated copyrights years and authors
    • +
  • Improve Spanish translation
    • +
  • Convert translation README to MarkDown
    • +
  • Updated all the translation files
    • +
+

Fixed:

+
    +
  • Fixed wrong icons directory for gtk-update-icon-cache
    • +
  • Fixed missing directories when uninstalling
    • +
  • Fixed bug introduced by r420 with RCS VCS
    • +
  • Fixed broken drag'n'drop since migration to Python3/GTK3
    • +
  • Fixed error when using '-m' in an SVN repo
    • +
+ + + + + Romain Failliot + romain.failliot@foolstep.com +