Merge gitlab.com:inkscape/inkscape

3 files changed, 8 insertions, 10 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29f301bfd..0e574fb84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,12 +24,12 @@ inkscape:
     - mkdir -p build
     - cd build
     - cmake .. -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug
-    - make
+    - make -j3
     - cd ..
-    - tar vfcz inkscape-build.tgz build/
   artifacts:
+    expire_in: 1 year
     paths:
-      - inkscape-build.tgz
+      - build/
 
 # This job is a static analysis build by clang.
 # It takes MORE THAN 3 HOURS, and depending on worker sometimes 4 hours.
@@ -51,7 +51,6 @@ clang:
 test:
   stage: test
   script:
-    - tar xvfz inkscape-build.tgz
     - cd build
     - make test
 
diff --git a/README b/README.md
index ca27d6775..2446e94c3 100644
--- a/README
+++ b/README.md
@@ -1,4 +1,3 @@
-
 Inkscape. Draw Freely.
 ======================
 
@@ -33,12 +32,12 @@ Inkscape version 0.92 and newer can be build using cmake:
   make install
 
 Other platforms such as Windows and Mac require a lot more and are considered
-a developer and packager task. These instructions are kept on the inkscape wiki
+a developer and packager task. These instructions are kept on the Inkscape wiki.
 
 Required Dependencies
 =====================
 The Inkscape core depends on several other libraries that you will need
-install, if they're not already present on your system.  The most
+install, if they are not already present on your system.  The most
 typical libraries you may need to install are:
 
    * Boehm-GC 
@@ -59,10 +58,10 @@ installed and working.  Unfortunately, there is a great deal of
 variability in how you can get these functioning properly.  Here are
 some recommendations:
 
-First, make sure you have Perl and Python.  If you're on Windows you
+First, make sure you have Perl and Python.  If you are on Windows you
 should also install Cygwin.
 
-Next, you'll need to ensure the dependencies for each extension is
+Next, you will need to ensure the dependencies for each extension is
 present.  Depending on which extensions you need, the dependencies are
 going to vary, but here are some you may need to install:
 
diff --git a/src/live_effects/lpe-bool.h b/src/live_effects/lpe-bool.h
index 1c0aa0243..ce46f14d1 100644
--- a/src/live_effects/lpe-bool.h
+++ b/src/live_effects/lpe-bool.h
@@ -42,7 +42,7 @@ public:
     inline friend bool_op to_bool_op(bool_op_ex val)
     {
         assert(val <= bool_op_ex_slice);
-        (bool_op) val;
+        return (bool_op) val;
     }
 
 private: