Merge pull request #20 from fonttools/update-skia

Update to latest skia library

.travis.yml

@@ -1,5 +1,6 @@
 env:
   global:
+    - DOCKER_IMAGE=tstenner/manylinux:gcc9.1.0
     # directory containing the project source
     - REPO_DIR=.
     # pip dependencies to _test_ project
@@ -25,46 +26,28 @@ matrix:
     - os: linux
       env:
         - MB_PYTHON_VERSION=2.7
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - UNICODE_WIDTH=16
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - PLAT=i686
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - PLAT=i686
-        - UNICODE_WIDTH=16
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.6
         - BUILD_SDIST=true
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - PLAT=i686
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.7
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.7
-        - PLAT=i686
     - os: osx
       language: generic
       env:
         - MB_PYTHON_VERSION=2.7
+        - MB_PYTHON_OSX_VER=10.9
     - os: osx
       language: generic
       env:
         - MB_PYTHON_VERSION=3.6
+        - MB_PYTHON_OSX_VER=10.9
     - os: osx
       language: generic
       env:
         - MB_PYTHON_VERSION=3.7
+        - MB_PYTHON_OSX_VER=10.9
 
 before_install:
   - source multibuild/common_utils.sh

appveyor.yml

@@ -1,14 +1,13 @@
+image: Visual Studio 2017
+platform: x64
+configuration: Release
+
 environment:
   TOXENV: "py"
   TWINE_USERNAME: "anthrotype"
   TWINE_PASSWORD:
     secure: 9L/DdqoIILlN7qCh0lotvA==
   matrix:
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
-      DISTUTILS_COMPILER: "mingw32"
-
     - PYTHON: "C:\\Python36-x64"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
@@ -25,11 +24,6 @@ environment:
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "32"
 
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      DISTUTILS_COMPILER: "mingw32"
-
 
 init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
@@ -60,13 +54,13 @@ install:
   - pip --version
 
   # upgrade setuptools and virtualenv
-  - pip install --upgrade setuptools virtualenv
+  - pip install --upgrade setuptools wheel virtualenv
 
   # install tox to run test suite in a virtual environment
   - pip install --upgrade tox
 
   # build wheel
-  - tox -e wheel
+  - pip wheel --no-deps --wheel-dir dist .
   # get the full path to the compiled wheel (ugly but works)
   - dir /s /b dist\skia_pathops*.whl > wheel.pth
   - set /p WHEEL_PATH=<wheel.pth

config.sh

@@ -4,7 +4,11 @@
 function pre_build {
     # Any stuff that you need to do before you start building the wheels
     # Runs in the root directory of this repository.
-    :
+    if [ -z "$IS_OSX" ]; then
+        export CFLAGS="-static-libstdc++"
+        export CC=/usr/local/gcc-9.1.0/bin/gcc-9.1.0
+        export CXX=/usr/local/gcc-9.1.0/bin/g++-9.1.0
+    fi
 }
 
 function run_tests {

setup.py

@@ -326,7 +326,6 @@ def build_libraries(self, libraries):
     os.path.join(skia_dir, "src", "pathops", "SkPathOpsDebug.cpp"),
     os.path.join(skia_dir, "src", "pathops", "SkPathOpsLine.cpp"),
     os.path.join(skia_dir, "src", "pathops", "SkPathOpsOp.cpp"),
-    os.path.join(skia_dir, "src", "pathops", "SkPathOpsPoint.cpp"),
     os.path.join(skia_dir, "src", "pathops", "SkPathOpsQuad.cpp"),
     os.path.join(skia_dir, "src", "pathops", "SkPathOpsRect.cpp"),
     os.path.join(skia_dir, "src", "pathops", "SkPathOpsSimplify.cpp"),
@@ -364,15 +363,16 @@ def build_libraries(self, libraries):
     os.path.join(skia_dir, 'src', 'core'),
     os.path.join(skia_dir, 'src', 'opts'),
     os.path.join(skia_dir, 'src', 'shaders'),
+    os.path.join(skia_dir),
 ]
 
 extra_compile_args = {
     '': [
-        '-std=c++0x',
+        '-std=c++14',
     ] + ([
         # extra flags needed on macOS for C++11
         "-stdlib=libc++",
-        "-mmacosx-version-min=10.7",
+        "-mmacosx-version-min=10.9",
     ] if platform.system() == "Darwin" else []),
     "msvc": [
         "/EHsc",

tests/pathops_test.py

@@ -168,19 +168,30 @@ def test_resolve(self):
         result = builder.resolve()
 
         assert list(result.segments) == [
-            ('moveTo', ((5316.0, 4590.0),)),
-            ('lineTo', ((5220.0, 4590.0),)),
-            ('lineTo', ((5220.0, 4866.92333984375),)),
-            ('lineTo', ((5316.0, 4590.0),)),
-            ('closePath', ()),
-            ('moveTo', ((5688.0, 7425.0),)),
-            ('lineTo', ((-225.0, 7425.0),)),
-            ('lineTo', ((-225.0, 7425.0),)),
-            ('lineTo', ((5.0, -225.0),)),
-            ('lineTo', ((7425.0, -225.0),)),
-            ('lineTo', ((7425.0, 7425.0),)),
-            ('lineTo', ((5688.0, 7425.0),)),
-            ('closePath', ())]
+            ("moveTo", ((5316.0, 4590.0),)),
+            ("lineTo", ((5220.0, 4590.0),)),
+            ("lineTo", ((5220.0, 4866.92333984375),)),
+            ("lineTo", ((5316.0, 4590.0),)),
+            ("closePath", ()),
+            ("moveTo", ((5192.18701171875, 4947.15283203125),)),
+            (
+                "curveTo",
+                (
+                    (5171.5654296875, 4973.322265625),
+                    (5160.0, 5005.9443359375),
+                    (5160.0, 5040.00048828125),
+                ),
+            ),
+            ("lineTo", ((5192.18701171875, 4947.15283203125),)),
+            ("closePath", ()),
+            ("moveTo", ((5688.0, 7425.0),)),
+            ("lineTo", ((-225.0, 7425.0),)),
+            ("lineTo", ((5.0, -225.0),)),
+            ("lineTo", ((7425.0, -225.0),)),
+            ("lineTo", ((7425.0, 7425.0),)),
+            ("lineTo", ((5688.0, 7425.0),)),
+            ("closePath", ()),
+        ]
 
 
 TEST_DATA = [