From 99680f49fbefa088dd175b5e14f61b1bed483f9b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 25 Nov 2018 01:47:00 +0000
Subject: Switch DATADIR to DATA_DIR to not conflict with #define

---
 src/io/resource.cpp | 4 ++--
 src/io/resource.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index 7ca9e79c3..90b175dc3 100644
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -62,7 +62,7 @@ gchar *_get_path(Domain domain, Type type, char const *filename)
                 case UIS: temp = INKSCAPE_UIDIR; break;
                 case PIXMAPS: temp = INKSCAPE_PIXMAPSDIR; break;
 #ifdef INKSCAPE_DATADIR
-                case DATADIR: temp = INKSCAPE_DATADIR; break;
+                case DATA_DIR: temp = INKSCAPE_DATADIR; break;
 #endif
                 default: temp = "";
             }
@@ -99,7 +99,7 @@ gchar *_get_path(Domain domain, Type type, char const *filename)
                 case THEMES: name = "themes"; break;
                 case UIS: name = "ui"; break;
                 case PIXMAPS: name = "pixmaps"; break;
-                case DATADIR: name = ""; break;
+                case DATA_DIR: name = ""; break;
                 default: return _get_path(SYSTEM, type, filename);
             }
             path = profile_path(name);
diff --git a/src/io/resource.h b/src/io/resource.h
index 1b409b6ec..c0f8cb226 100644
--- a/src/io/resource.h
+++ b/src/io/resource.h
@@ -45,7 +45,7 @@ enum Type {
     THEMES,
     UIS,
     PIXMAPS,
-    DATADIR
+    DATA_DIR
 };
 
 enum Domain {
-- 
cgit v1.2.3


From 5f64234396f515c58125f54aa0f0b0365e5b7a44 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 25 Nov 2018 01:47:29 +0000
Subject: Update snapcraft to build based on bionic

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 1529a58bf..a938cfa8e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -17,6 +17,7 @@ description: >
  open, community-oriented development.
 confinement: strict
 grade: stable
+base: core18
 
 parts:
   inkscape:
@@ -69,7 +70,7 @@ parts:
       - libgtkmm-2.4-1v5
       - libgtkspell0
       - liblcms2-2
-      - libmagick++-6.q16-5v5
+      - libmagick++-6.q16-7
       - libpangomm-1.4-1v5
       - libpoppler-glib8
       - librevenge-0.0-0
@@ -88,7 +89,6 @@ parts:
       - -lib/inkscape/*.a
     after:
       - desktop-gtk3
-      - gnome-3-26
   snapcraft-wrapper:
     plugin: dump
     source: packaging/snappy/
@@ -101,18 +101,6 @@ parts:
       - scour
     stage-packages:
       - pstoedit
-      - python-uniconvertor
-    after:
-      - gnome-3-26
-  gnome-3-26:
-    plugin: nil
-    build-packages:
-      - software-properties-common
-    prepare: |
-       add-apt-repository -y ppa:ubuntu-desktop/gnome-3-26
-       apt-get -y update
-       apt-get -y dist-upgrade
-       apt-get -y install gtk-update-icon-cache
   desktop-gtk3:
     source: https://github.com/Ubuntu/snapcraft-desktop-helpers.git
     source-type: git
@@ -137,8 +125,6 @@ parts:
       - libappindicator3-1
       - locales-all
       - xdg-user-dirs
-    after:
-      - gnome-3-26
 
 apps:
   inkscape:
-- 
cgit v1.2.3