diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2018-11-25 02:27:32 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2018-11-25 02:27:32 +0000 |
| commit | f686d3a0df2c6209afd5045f04a5dab20075ebf5 (patch) | |
| tree | b44181a978e3cbd3444c314873b135999b96ccdd | |
| parent | EgeAdjustmentAction: Replace deprecated g_type_class_add_private and adhere t... (diff) | |
| parent | Update snapcraft to build based on bionic (diff) | |
| download | inkscape-f686d3a0df2c6209afd5045f04a5dab20075ebf5.tar.gz inkscape-f686d3a0df2c6209afd5045f04a5dab20075ebf5.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape
| -rw-r--r-- | snap/snapcraft.yaml | 18 | ||||
| -rw-r--r-- | src/io/resource.cpp | 4 | ||||
| -rw-r--r-- | src/io/resource.h | 2 |
3 files changed, 5 insertions, 19 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: 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 { |