New release 4.2.1

7 years ago · 9d9bb35d42
8 changed files with 155 additions and 12 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -542,7 +542,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "fractal-gtk"
-version = "4.2.0"
+version = "4.2.1"
 dependencies = [
 "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
@ -550,7 +550,7 @@ dependencies = [
 "comrak 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "fractal-matrix-api 4.2.0",
+ "fractal-matrix-api 4.2.1",
 "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -584,7 +584,7 @@ dependencies = [

 [[package]]
 name = "fractal-matrix-api"
-version = "4.2.0"
+version = "4.2.1"
 dependencies = [
 "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "directories 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/flatpak/org.gnome.Fractal-release.json
+++ b/flatpak/org.gnome.Fractal-release.json
@ -0,0 +1,113 @@
+{
+    "app-id": "org.gnome.Fractal",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "3.34",
+    "sdk": "org.gnome.Sdk",
+    "sdk-extensions" : [
+        "org.freedesktop.Sdk.Extension.rust-stable"
+    ],
+    "command" : "fractal",
+    "finish-args" : [
+        "--share=network",
+        "--share=ipc",
+        "--socket=x11",
+        "--socket=wayland",
+        "--socket=pulseaudio",
+        "--device=dri",
+        "--talk-name=org.freedesktop.secrets",
+        "--talk-name=org.freedesktop.Notifications",
+        "--filesystem=home",
+        "--metadata=X-DConf=migrate-path=/org/gnome/factal/"
+    ],
+    "build-options" : {
+        "append-path": "/usr/lib/sdk/rust-stable/bin",
+        "build-args" : [
+            "--share=network"
+        ],
+        "env" : {
+            "CARGO_HOME" : "/run/build/Fractal/cargo",
+            "RUST_BACKTRACE" : "1"
+        }
+    },
+    "modules" : [
+        {
+            "name" : "libhandy",
+            "buildsystem" : "meson",
+            "config-opts" : [
+                "-Dprofiling=false",
+                "-Dintrospection=enabled",
+                "-Dgtk_doc=false",
+                "-Dtests=false",
+                "-Dexamples=false",
+                "-Dvapi=false",
+                "-Dglade_catalog=disabled"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://source.puri.sm/Librem5/libhandy",
+                    "tag" : "v0.0.11"
+                }
+            ]
+        },
+        {
+            "name" : "gtksourceview",
+            "buildsystem" : "meson",
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/gtksourceview.git",
+                    "tag" : "4.4.0"
+                }
+            ]
+        },
+        {
+            "name": "gspell",
+            "config-opts" : [
+                "--disable-gtk-doc",
+                "--disable-gtk-doc-html"
+            ],
+            "cleanup" : [
+                "/bin",
+                "/include",
+                "/lib/pkgconfig",
+                "*.la",
+                "/share"
+            ],
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.1.tar.xz",
+                    "sha256" : "819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5"
+                }
+            ]
+        },
+        {
+            "name" : "gst-editing-services",
+            "config-opts" : [
+                "--disable-Werror"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.freedesktop.org/gstreamer/gst-editing-services.git",
+                    "tag" : "1.16.0"
+                }
+            ]
+        },
+        {
+            "name" : "Fractal",
+            "buildsystem" : "meson",
+            "config-opts" : [
+                "-Dprofile=default"
+            ],
+            "sources" : [
+               {
+                    "type" : "git",
+                    "branch": "release-4.2.1",
+                    "url" : ".."
+               }
+           ]
+        }
+    ]
+}
--- a/flatpak/org.gnome.Fractal.json
+++ b/flatpak/org.gnome.Fractal.json
@ -14,10 +14,6 @@
    ],
    "desktop-file-name-suffix" : " (Development)",
    "finish-args" : [
-        "--filesystem=xdg-run/dconf",
-        "--filesystem=~/.config/dconf:ro",
-        "--talk-name=ca.desrt.dconf",
-        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
        "--share=network",
        "--share=ipc",
        "--socket=x11",
@ -26,7 +22,8 @@
        "--device=dri",
        "--talk-name=org.freedesktop.secrets",
        "--talk-name=org.freedesktop.Notifications",
-        "--filesystem=home"
+        "--filesystem=home",
+        "--metadata=X-DConf=migrate-path=/org/gnome/factal/"
    ],
    "build-options" : {
        "append-path" : "/usr/lib/sdk/rust-stable/bin",
@ -70,6 +67,17 @@
        },
        {
            "name": "gspell",
+            "config-opts" : [
+                "--disable-gtk-doc",
+                "--disable-gtk-doc-html"
+            ],
+            "cleanup" : [
+                "/bin",
+                "/include",
+                "/lib/pkgconfig",
+                "*.la",
+                "/share"
+            ],
            "sources" : [
                {
                    "type" : "archive",
--- a/fractal-gtk/Cargo.toml
+++ b/fractal-gtk/Cargo.toml
@ -1,7 +1,7 @@
 [package]
 authors = ["Daniel Garcia <danigm@wadobo.com>"]
 name = "fractal-gtk"
-version = "4.2.0"
+version = "4.2.1"
 workspace = "../"
 edition = "2018"

--- a/fractal-gtk/res/org.gnome.Fractal.appdata.xml.in.in
+++ b/fractal-gtk/res/org.gnome.Fractal.appdata.xml.in.in
@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2019 Daniel Garcia Moreno <danigm@gnome.org> -->
 <component type="desktop-application">
  <id>@appid@</id>
  <name>Fractal</name>
@ -17,6 +18,25 @@
    </screenshot>
  </screenshots>
  <releases>
+    <release version="4.2.1" type="stable" date="2019-09-21" urgency="high">
+      <description>
+        <p>This new minor release is the result of 2 months of hard work.</p>
+        <p>New features:</p>
+        <ul>
+          <li>Autocompletion popover position fix</li>
+          <li>Translation string has been updated</li>
+          <li>Disable the textbox when there are no write permissions</li>
+        </ul>
+        <p>Bugfixes:</p>
+        <ul>
+          <li>Fix crash on logout and login with wrong credentials</li>
+        </ul>
+        <p>Under the hood:</p>
+        <ul>
+          <li>Code refactor continues</li>
+        </ul>
+      </description>
+    </release>
    <release version="4.2.0" type="stable" date="2019-07-27" urgency="high">
      <description>
        <p>This new major release is the result of 7 months of hard work by 37 contributors pushing over 200 commits.</p>
--- a/fractal-gtk/src/static_resources.rs.in
+++ b/fractal-gtk/src/static_resources.rs.in
@ -4,7 +4,9 @@ use glib::Bytes;
 pub fn init() -> Result<(), Error> {
    // load the gresource binary at build time and include/link it into the final binary.
    let res_bytes =
-        include_bytes!(@RESOURCEFILE@);
+        include_bytes!(
+            @RESOURCEFILE@
+        );

    // Create Resource, it will live as long the value lives.
    let gbytes = Bytes::from(res_bytes.as_ref());
--- a/fractal-matrix-api/Cargo.toml
+++ b/fractal-matrix-api/Cargo.toml
@ -1,7 +1,7 @@
 [package]
 authors = ["Daniel Garcia <danigm@wadobo.com>"]
 name = "fractal-matrix-api"
-version = "4.2.0"
+version = "4.2.1"
 workspace = "../"
 edition = "2018"

--- a/meson.build
+++ b/meson.build
@ -1,6 +1,6 @@
 project(
  'fractal', 'rust',
-  version: '4.2.0',
+  version: '4.2.1',
  license: 'GPLv3',
 )