From d835c81e9b360e480514f11e77a45f73159c3d66 Mon Sep 17 00:00:00 2001
From: Galileo Sartor <galileo.sartor@gmail.com>
Date: Sun, 27 Jan 2019 15:00:28 +0100
Subject: [PATCH 1/4] snap: disable tests build, add removable media and
 specify architectures

---
 snap/snapcraft.yaml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index cdc75820ea6..a37b1e54b6d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,18 +1,22 @@
 name: jabref
 version: "git"
 version-script: cat build.gradle | grep "^version =" | cut -d'"' -f2
-#icon: snap/gui/icon.png
+icon: snap/gui/jabref.png
 summary: Bibliography manager
 description: JabRef is an open source bibliography reference manager. The native file format used by JabRef is BibTeX, the standard LaTeX bibliography format.
 
 grade: devel
 confinement: strict
 
+architectures:
+  - build-on: amd64
+  - build-on: i386
+
 apps:
   jabref:
     command: desktop-launch java -jar $SNAP/jar/JabRef-$SNAP_VERSION.jar
     environment:
-      _JAVA_OPTIONS: "-Djava.util.prefs.systemRoot=$SNAP_USER_DATA/.java/etc/.java -Djava.util.prefs.userRoot=$SNAP_USER_DATA/.java/.userPrefs"
+      _JAVA_OPTIONS: "-Duser.home=$SNAP_USER_DATA"
     plugs:
       - desktop
       - desktop-legacy
@@ -21,6 +25,7 @@ apps:
       - home
       - opengl
       - network-bind
+      - removable-media
 
 parts:
   jabref:
@@ -30,6 +35,6 @@ parts:
       - openjdk-8-jre
       - openjfx
       - x11-utils
-    gradle-options: [snapJar]
+    gradle-options: [snapJar, -xtest]
     gradle-output-dir: 'build/releases'
     after: [desktop-gtk3]

From d9cc808c0f17723e06293687fc8e84e53b181941 Mon Sep 17 00:00:00 2001
From: Galileo Sartor <galileo.sartor@gmail.com>
Date: Sun, 27 Jan 2019 16:06:28 +0100
Subject: [PATCH 2/4] Move to gtk2 fixes the dialogs

---
 snap/snapcraft.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a37b1e54b6d..38827a1cd88 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,7 +1,7 @@
 name: jabref
 version: "git"
 version-script: cat build.gradle | grep "^version =" | cut -d'"' -f2
-icon: snap/gui/jabref.png
+#icon: snap/gui/jabref.png
 summary: Bibliography manager
 description: JabRef is an open source bibliography reference manager. The native file format used by JabRef is BibTeX, the standard LaTeX bibliography format.
 
@@ -37,4 +37,4 @@ parts:
       - x11-utils
     gradle-options: [snapJar, -xtest]
     gradle-output-dir: 'build/releases'
-    after: [desktop-gtk3]
+    after: [desktop-gtk2]

From c3a6374768ca1992f2babaa9f235b5cc2011a01e Mon Sep 17 00:00:00 2001
From: Galileo Sartor <galileo.sartor@gmail.com>
Date: Sun, 27 Jan 2019 17:20:39 +0100
Subject: [PATCH 3/4] Add snap ignores to .gitignore

---
 .gitignore | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7c7850841ea..39f4c1f4ac2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,14 @@ status.md
 # Install4J
 install4j6/
 
+# Snap
+parts/
+stage/
+prime/
+*.snap
+jabref_source.tar.bz2
+snap/.snapcraft/
+
 # Gradle
 # generated when `gradlew --gui` is called
 ui/

From 26618847af2d8c11531be39a5d4e4dcea832c75c Mon Sep 17 00:00:00 2001
From: Galileo Sartor <galileo.sartor@gmail.com>
Date: Mon, 28 Jan 2019 09:12:55 +0100
Subject: [PATCH 4/4] Add source-type: git to enable submodules

---
 snap/snapcraft.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 38827a1cd88..b26f84fef0d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -31,6 +31,7 @@ parts:
   jabref:
     plugin: gradle
     source: .
+    source-type: git
     stage-packages:
       - openjdk-8-jre
       - openjfx