improve exports, fix urls, add appdata from master

.gitignore

@@ -0,0 +1,4 @@
+.flatpak-builder/
+app/
+repo/
+abiword/

com.abisource.AbiWord.json

@@ -1,14 +1,21 @@
 {
   "app-id": "com.abisource.AbiWord",
   "branch": "3.0",
-  "runtime": "org.gnome.Sdk",
-  "runtime-version": "3.20",
+  "runtime": "org.gnome.Platform",
+  "runtime-version": "3.24",
   "sdk": "org.gnome.Sdk",
   "command": "abiword",
+  "copy-icon": true,
+  "rename-icon": "abiword",
+  "rename-desktop-file": "abiword.desktop",
+  "rename-appdata-file": "abiword.appdata.xml",
   "tags": ["stable"],
   "finish-args": [
     /* Allow access to developer tools */
     "--allow=devel",
+    /* dconf */
+    "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
+    "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
     "--talk-name=org.freedesktop.Flatpak",
     /* X11 + XShm access */
     "--share=ipc", "--socket=x11",
@@ -71,7 +78,7 @@
       "sources": [
         {
           "type": "archive",
-          "url": "http://heanet.dl.sourceforge.net/project/wvware/libwmf/0.2.8.4/libwmf-0.2.8.4.tar.gz",
+          "url": "https://downloads.sourceforge.net/project/wvware/libwmf/0.2.8.4/libwmf-0.2.8.4.tar.gz",
           "sha256": "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8"
         }
       ]
@@ -195,7 +202,7 @@
       "sources": [
         {
           "type": "archive",
-          "url": "http://heanet.dl.sourceforge.net/project/libwps/libwps/libwps-0.2.10/libwps-0.2.10.tar.xz",
+          "url": "https://downloads.sourceforge.net/project/libwps/libwps/libwps-0.2.10/libwps-0.2.10.tar.xz",
           "sha256": "2d9771489d2474d483089174e50f57f35785d0a444d390b0dfc7eae1b42b4b12"
         }
       ]
@@ -205,21 +212,9 @@
       "config-opts": [ "--enable-plugins=auto" ],
       "sources": [
         {
-          "type": "archive",
-          "url": "http://www.abisource.com/downloads/abiword/3.0.2/source/abiword-3.0.2.tar.gz",
-          "sha256": "afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522"
-        },
-        {
-          "type": "patch",
-          "path": "patches/nullptr.patch"
-        },
-        {
-          "type": "patch",
-          "path": "patches/gcrypt-pkg-config.diff"
-        },
-        {
-          "type": "shell",
-          "commands": [ "autoreconf -si" ]
+          "type": "git",
+          "url": "https://github.com/AbiWord/abiword.git",
+          "commit": "8c97c3ca2ab06a04cbf9190749dab9c9f2b34fdc"
         }
       ]
     }

com.abisource.AbiWordGit.json

@@ -0,0 +1,222 @@
+{
+  "app-id": "com.abisource.AbiWord",
+  "branch": "3.0",
+  "runtime": "org.gnome.Platform",
+  "runtime-version": "3.24",
+  "sdk": "org.gnome.Sdk",
+  "command": "abiword",
+  "copy-icon": true,
+  "rename-icon": "abiword",
+  "rename-desktop-file": "abiword.desktop",
+  "rename-appdata-file": "abiword.appdata.xml",
+  "tags": ["stable"],
+  "finish-args": [
+    /* Allow access to developer tools */
+    "--allow=devel",
+    /* dconf */
+    "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
+    "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+    "--talk-name=org.freedesktop.Flatpak",
+    /* X11 + XShm access */
+    "--share=ipc", "--socket=x11",
+    /* Wayland access */
+    "--socket=wayland",
+    /* We want full fs access */
+    "--filesystem=host",
+    /* Needs to talk to the network: */
+    "--share=network",
+    "--talk-name=org.gtk.vfs.*"
+  ],
+  "build-options" : {
+    "cflags": "-O2 -g",
+    "cxxflags": "-O2 -g",
+    "env": {
+      "V": "1"
+    }
+  },
+  "cleanup": ["*.la", "*.a"],
+  "modules": [
+    {
+      "name": "boost",
+      "config-opts": [ "--with-toolset=gcc", "--with-icu" ],
+      "cleanup": [ "/lib/libboost_*.a" ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://downloads.sourceforge.net/project/boost/boost/1.60.0/boost_1_60_0.tar.bz2",
+          "sha256": "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b"
+        },
+        {
+          "type": "file",
+          "path": "boost-configure",
+          "dest-filename": "configure"
+        }
+      ]
+    },
+    {
+      "name": "fribidi",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "http://fribidi.org/download/fribidi-0.19.7.tar.bz2",
+          "sha256": "08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e"
+        }
+      ]
+    },
+    {
+      "name": "gsf",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://download.gnome.org/core/3.20/3.20.2/sources/libgsf-1.14.36.tar.xz",
+          "sha256": "71b7507f86c0f7c341bb362bdc7925a2ae286729be0bf5b8fd9581ffbbd62940"
+        }
+      ]
+    },
+    {
+      "name": "libwmf",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://downloads.sourceforge.net/project/wvware/libwmf/0.2.8.4/libwmf-0.2.8.4.tar.gz",
+          "sha256": "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8"
+        }
+      ]
+    },
+    {
+      "name": "wv",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "http://www.abisource.com/downloads/wv/1.2.9/wv-1.2.9.tar.gz",
+          "sha256": "4c730d3b325c0785450dd3a043eeb53e1518598c4f41f155558385dd2635c19d"
+        }
+      ]
+    },
+    {
+      "name": "link-grammar",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "http://www.abisource.com/downloads/link-grammar/5.3.11/link-grammar-5.3.11.tar.gz",
+          "sha256": "73ca3ae82ec7ddbfce827eb7017a2953afea2cea854b4d7517139881e1170cd7"
+        }
+      ]
+    },
+    {
+      "name": "lasem",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://download.gnome.org/sources/lasem/0.5/lasem-0.5.0.tar.xz",
+          "sha256": "d40aa6b82416dd9e17b62c0292aab5b2b00eb1d7c3b93cec85ac1bf1ac25b9b9"
+        }
+      ]
+    },
+    {
+      "name": "goffice",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://download.gnome.org/sources/goffice/0.10/goffice-0.10.32.tar.xz",
+          "sha256": "02b37da9f54fb92725b973875d1d2da49b54f6486eb03648fd1ea58e4a297ac3"
+        }
+      ]
+    },
+    {
+      "name": "libwpd",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "http://pilotfiber.dl.sourceforge.net/project/libwpd/libwpd/libwpd-0.9.9/libwpd-0.9.9.tar.xz",
+          "sha256": "b91df4ca0ef0f456be9531c9ee07cf6a5e50a16b52002abb99e8ebef13fac2b2"
+        }
+      ]
+    },
+    {
+      "name": "libwpg",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "http://excellmedia.dl.sourceforge.net/project/libwpg/libwpg/libwpg-0.2.2/libwpg-0.2.2.tar.xz",
+          "sha256": "b49bfd77b9447534dee0d43bbdc48b4dcb09339605be21c01726243d5069a6cd"
+        }
+      ]
+    },
+    {
+      "name": "psiconv",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-0.9.9.tar.gz",
+          "sha256": "6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0"
+        }
+      ]
+    },
+    {
+      "name": "libgda"
+    },
+    {
+      "name": "libgnomedb"
+    },
+    {
+      "name": "gtkmathview",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-0.8.0.tar.gz",
+          "sha256": "1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43"
+        },
+        {
+          "type": "patch",
+          "path": "patches/gtkmathview/0003-gcc-4.3-build-fixes.patch"
+        },
+        {
+          "type": "patch",
+          "path": "patches/gtkmathview/0004-gcc-4.4-build-fixes.patch"
+        },
+        {
+          "type": "patch",
+          "path": "patches/gtkmathview/0005-gcc-4.7-build-fixes.patch"
+        },
+        {
+          "type": "patch",
+          "path": "patches/gtkmathview/missingLib.diff"
+        },
+        {
+          "type": "patch",
+          "path": "patches/gtkmathview/remove_t1_include.diff"
+        },
+        {
+          "type": "patch",
+          "path": "patches/gtkmathview/fix-cpp-headers.patch"
+        },
+        {
+          "type": "patch",
+          "path": "patches/gtkmathview/gcc-6-build-fixes.patch"
+        }
+      ]
+    },
+    {
+      "name": "libwps",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://downloads.sourceforge.net/project/libwps/libwps/libwps-0.2.10/libwps-0.2.10.tar.xz",
+          "sha256": "2d9771489d2474d483089174e50f57f35785d0a444d390b0dfc7eae1b42b4b12"
+        }
+      ]
+    },
+    {
+      "name": "abiword",
+      "config-opts": [ "--enable-plugins=auto" ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/AbiWord/abiword.git",
+          "commit": "8c97c3ca2ab06a04cbf9190749dab9c9f2b34fdc"
+        }
+      ]
+    }
+  ]
+}

patches/0001-Bug-13672-Add-AppData-file.patch

@@ -0,0 +1,74 @@
+From f9d4fbaaff8fe8ba4d29ab33d05299c1f4c057e5 Mon Sep 17 00:00:00 2001
+From: Hubert Figuiere <[email protected]>
+Date: Tue, 26 Apr 2016 01:08:57 +0000
+Subject: [PATCH] Bug 13672 - Add AppData file.
+
+git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35236 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
+---
+ Makefile.am         |  5 +++++
+ abiword.appdata.xml | 26 ++++++++++++++++++++++++++
+ 2 files changed, 31 insertions(+)
+ create mode 100644 abiword.appdata.xml
+
+diff --git a/Makefile.am b/Makefile.am
+index a4edce277..d18ee70b3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -13,10 +13,14 @@ desktop_DATA = abiword.desktop
+ mimedir = @ABIWORD_DATADIR@/mime-info
+ mime_DATA = abiword.keys
+
++appdatadir = $(datarootdir)/appdata
++appdata_DATA = abiword.appdata.xml
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = abiword-$(ABIWORD_SERIES).pc
+
+ dist_man1_MANS = abiword.1
++
+ endif
+
+ if TOOLKIT_GTK
+@@ -39,6 +43,7 @@ EXTRA_DIST = \
+ 	README \
+ 	ChangeLog \
+ 	abiword.desktop \
++	$(appdata_DATA) \
+ 	abiword.keys \
+ 	abiword.png \
+ 	libabiword.pc.in \
+diff --git a/abiword.appdata.xml b/abiword.appdata.xml
+new file mode 100644
+index 000000000..9c73870a8
+--- /dev/null
++++ b/abiword.appdata.xml
+@@ -0,0 +1,26 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Copyright 2014 Richard Hughes <[email protected]> -->
++<application>
++  <id type="desktop">abiword.desktop</id>
++  <name>AbiWord</name>
++  <summary>A word processor</summary>
++  <metadata_license>CC0-1.0</metadata_license>
++  <description>
++    <p>
++      AbiWord is a free word processing program. It is suitable for a
++      wide variety of word processing tasks but remain focused on word
++      processing.
++    </p>
++    <p>
++      AbiWord is meant to remain relatively lightweight and support
++      many file formats.
++    </p>
++    <!-- FIXME: Probably needs another paragraph -->
++  </description>
++  <url type="homepage">http://www.abisource.com/</url>
++  <screenshots>
++  <!-- FIXME: Needs an official up to date screenshot -->
++    <screenshot type="default">http://www.abisource.com/screenshots/AbiWord-2.0-Gnome.png</screenshot>
++  </screenshots>
++  <updatecontact>[email protected]</updatecontact>
++</application>
+-- 
+2.11.0
+