From 74bbf0973bb755dd058867dee6fc59ab3cc88974 Mon Sep 17 00:00:00 2001 From: Michael Soegtrop Date: Sun, 11 Jun 2017 16:14:52 +0000 Subject: Lpe bool fix --- src/live_effects/lpe-bool.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- cgit v1.2.3 From 83894b1d009cb82e4317d1ec6745d3316f1ca9d2 Mon Sep 17 00:00:00 2001 From: KAMiKAZOW Date: Mon, 12 Jun 2017 00:38:02 +0000 Subject: Small fixes to README --- README | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README b/README index ca27d6775..2446e94c3 100644 --- a/README +++ b/README @@ -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: -- cgit v1.2.3 From ddce5d04e06c9fddcded7c8e5364b8afa9fffc8c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 12 Jun 2017 01:03:15 -0400 Subject: ci: Remove tarballing of build artifacts. GitLab supports specifying directories as artifacts, so hopefully letting GitLab archive it will be a bit faster. --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34db594a4..fd61174bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,14 +25,12 @@ inkscape: - cmake .. -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug - make - cd .. - - tar vfcz inkscape-build.tgz build/ artifacts: paths: - - inkscape-build.tgz + - build/ test: stage: test script: - - tar xvfz inkscape-build.tgz - cd build - make test -- cgit v1.2.3 From d1879130a4f00d90a52723c12bf4dfac11437729 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 12 Jun 2017 01:08:11 -0400 Subject: ci: Expire artifacts after a year. These are mostly needed to pass between stages, but they might perhaps be used for a bisection if necessary. --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd61174bf..31d1ff7f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,7 @@ inkscape: - make - cd .. artifacts: + expire_in: 1 year paths: - build/ -- cgit v1.2.3 From d724383313e79ce5f8575e2673e0bc7dfead931d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 12 Jun 2017 01:31:46 -0400 Subject: ci: Build in parallel. GitLab's shared runners are on DO 4GB instances, which should have 2 core processors. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31d1ff7f5..29d090da7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ 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 .. artifacts: expire_in: 1 year -- cgit v1.2.3 From 21c9bc7b2cf2fbda2ed1dd5841eb9333bb274023 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Tue, 13 Jun 2017 00:40:46 +0200 Subject: Use markdown for README --- README | 76 --------------------------------------------------------------- README.md | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index 2446e94c3..000000000 --- a/README +++ /dev/null @@ -1,76 +0,0 @@ -Inkscape. Draw Freely. -====================== - -http://www.inkscape.org/ - -Inkscape is an open source drawing tool with capabilities similar to -Illustrator, Freehand, and CorelDraw that uses the W3C standard scalable -vector graphics format (SVG). Some supported SVG features include -basic shapes, paths, text, markers, clones, alpha blending, transforms, -gradients, and grouping. In addition, Inkscape supports Creative Commons -meta-data, node-editing, layers, complex path operations, text-on-path, -and SVG XML editing. It also imports several formats like EPS, Postscript, -JPEG, PNG, BMP, and TIFF and exports PNG as well as multiple vector-based -formats. - -Inkscape's main motivations are to provide the Open Source community -with a fully W3C compliant XML, SVG, and CSS2 drawing tool emphasizing a -lightweight core with powerful features added as extensions, and the -establishment of a friendly, open, community-oriented development -processes. - - -Basic Installation -================== - -Inkscape version 0.92 and newer can be build using cmake: - - mkdir build - cd build - cmake .. - make - 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. - -Required Dependencies -===================== -The Inkscape core depends on several other libraries that you will need -install, if they are not already present on your system. The most -typical libraries you may need to install are: - - * Boehm-GC - * libsigc++ - * glibmm - * gtkmm - -Please see http://wiki.inkscape.org/wiki/index.php/CompilingInkscape for the -most current dependencies, including links to the source tarballs. - - -Extension Dependencies -====================== -Inkscape also has a number of extensions for implementing various -features such as support for non-SVG file formats, etc. In theory, all -extensions are optional, however in practice you will want to have these -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 are on Windows you -should also install Cygwin. - -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: - - * XML::Parser - * XML::XQL - -If you install dependencies to non-standard locations, such as -installing XML::Parser someplace in your home directory, you may need to -take some extra steps to indicate where those dependencies are to be -found. For instance, with Perl modules, set the PERLLIB or PERL5LIB -variable (see `man perlrun`) - diff --git a/README.md b/README.md new file mode 100644 index 000000000..2446e94c3 --- /dev/null +++ b/README.md @@ -0,0 +1,76 @@ +Inkscape. Draw Freely. +====================== + +http://www.inkscape.org/ + +Inkscape is an open source drawing tool with capabilities similar to +Illustrator, Freehand, and CorelDraw that uses the W3C standard scalable +vector graphics format (SVG). Some supported SVG features include +basic shapes, paths, text, markers, clones, alpha blending, transforms, +gradients, and grouping. In addition, Inkscape supports Creative Commons +meta-data, node-editing, layers, complex path operations, text-on-path, +and SVG XML editing. It also imports several formats like EPS, Postscript, +JPEG, PNG, BMP, and TIFF and exports PNG as well as multiple vector-based +formats. + +Inkscape's main motivations are to provide the Open Source community +with a fully W3C compliant XML, SVG, and CSS2 drawing tool emphasizing a +lightweight core with powerful features added as extensions, and the +establishment of a friendly, open, community-oriented development +processes. + + +Basic Installation +================== + +Inkscape version 0.92 and newer can be build using cmake: + + mkdir build + cd build + cmake .. + make + 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. + +Required Dependencies +===================== +The Inkscape core depends on several other libraries that you will need +install, if they are not already present on your system. The most +typical libraries you may need to install are: + + * Boehm-GC + * libsigc++ + * glibmm + * gtkmm + +Please see http://wiki.inkscape.org/wiki/index.php/CompilingInkscape for the +most current dependencies, including links to the source tarballs. + + +Extension Dependencies +====================== +Inkscape also has a number of extensions for implementing various +features such as support for non-SVG file formats, etc. In theory, all +extensions are optional, however in practice you will want to have these +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 are on Windows you +should also install Cygwin. + +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: + + * XML::Parser + * XML::XQL + +If you install dependencies to non-standard locations, such as +installing XML::Parser someplace in your home directory, you may need to +take some extra steps to indicate where those dependencies are to be +found. For instance, with Perl modules, set the PERLLIB or PERL5LIB +variable (see `man perlrun`) + -- cgit v1.2.3