emf2svg 1.8.2.2 → 1.8.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de3d80eff20c4ad3b510a3147dbf55f2b142c12b3932b8f72d1ec8437f421cb1
-  data.tar.gz: eecc6a586eb66fd3457da151141c1f962ee04b2b3de14a94c8ea007a0fde6f3e
+  metadata.gz: 19c3fdd0a05e010deec1fd9a81c7a4a50975bd7aa7825e2a786e6c26bb6aa7b7
+  data.tar.gz: b813a36aa0144ac7bce9c04e24fd2c552fe71406f0c4b43cc8c8541184962be5
 SHA512:
-  metadata.gz: d535e8c3b76eb0179e15fac723f74bc7740dc8cc716d4f94a8a065a15f645308349ccf5ff46928c619d52cc13ab1fba1132fe0cb75a20777912ddf30907be46c
-  data.tar.gz: 259fd34017a62b849799de36e2f43d24e8791a05522ef0251ca0d9da49f6ea25cb421310e8cfb16eb34089d11fc0a3edfc53335803450b830f7151cdac3c3346
+  metadata.gz: 5128fcb2a6231aa98a628b3e311f3fce40c166fdea817167064f0d047090055db7068379331ee20786eeff7d3b7e10e096f2377d400515877e1bcb6c3893c3a8
+  data.tar.gz: 7458d9fac36d80421280ed1947690dfc09bc7d03533e4c3ba20b53c86f96012de1f212c9e2ef551269f5875de84aa28590b87c3a934d83703600ca62d99c63e4

data/.github/workflows/build.yml

@@ -124,20 +124,16 @@ jobs:
         path: pkg/*.gem
 
   # Musl builds run inside an Alpine container so the resulting libs
-  # link against musl libc, not the runner's glibc.
+  # link against musl libc, not the runner's glibc. They link against
+  # the distro's own -dev packages (freetype/fontconfig/libxml2/libpng)
+  # via pkg-config -- vcpkg has no public binary cache for musl
+  # triplets, so building deps from source would exceed CI timeouts.
   #
   # GitHub Actions does not allow JS-based actions (checkout, upload-
   # artifact, etc.) inside an Alpine container on ARM64 runners
   # (limitation noted at actions/runner#2006). We therefore do the
   # checkout and artifact upload on the host, and run the actual build
   # via `docker run` with the workspace mounted.
-  #
-  # NOTE: aarch64-linux-musl is intentionally absent. vcpkg has no
-  # binary cache for arm64-linux-musl, so first-time builds compile
-  # freetype/fontconfig/libxml2/etc. from source on native arm64-musl,
-  # which consistently exceeds the 6h job timeout. Re-add once vcpkg
-  # publishes arm64-linux-musl binaries or we ship a pre-built Alpine
-  # arm64 image with the deps already compiled.
   build-musl:
     name: build-musl ${{ matrix.os }}, ${{ matrix.platform }}
     runs-on: ${{ matrix.os }}
@@ -148,6 +144,8 @@ jobs:
         include:
           - os: ubuntu-latest
             platform: x86_64-linux-musl
+          - os: ubuntu-24.04-arm
+            platform: aarch64-linux-musl
     steps:
     - uses: actions/checkout@v4
 
@@ -161,11 +159,12 @@ jobs:
           -e target_platform="${TARGET_PLATFORM}" \
           alpine:3.20 sh -c '
             set -eux
-            export VCPKG_FORCE_SYSTEM_BINARIES=1
             apk add --no-cache \
               build-base bash curl git cmake make ninja gcc g++ gperf \
               automake autoconf autoconf-archive libtool linux-headers \
-              perl zip unzip tar python3 pkgconfig gcompat argp-standalone \
+              perl zip unzip tar python3 pkgconfig \
+              freetype-dev fontconfig-dev libpng-dev libxml2-dev \
+              gettext-dev zlib-dev \
               ruby ruby-dev ruby-bundler ruby-rake file
             git config --global --add safe.directory /work
             bundle config set --local path vendor/bundle

data/.github/workflows/release.yml

@@ -184,15 +184,14 @@ jobs:
           ruby -remf2svg -e "puts File.write('output.svg', Emf2svg.from_file('spec/examples/image1.emf'), mode: 'wb')"
 
   # Musl builds run inside an Alpine container so the resulting libs
-  # link against musl libc, not the runner's glibc.
+  # link against musl libc, not the runner's glibc. They link against
+  # the distro's own -dev packages (freetype/fontconfig/libxml2/libpng)
+  # via pkg-config -- vcpkg has no public binary cache for musl
+  # triplets, so building deps from source would exceed CI timeouts.
   #
   # GitHub Actions does not allow JS-based actions inside an Alpine
   # container on ARM64 runners. We do checkout + artifact on the host
   # and run the build via `docker run` with the workspace mounted.
-  #
-  # NOTE: aarch64-linux-musl intentionally omitted -- vcpkg compiles
-  # all deps from source on arm64-musl and exceeds the 6h job limit.
-  # See build.yml for details.
   build-musl:
     needs: bump
     if: always() && !cancelled() && !failure() && (needs.bump.result == 'success' || needs.bump.result == 'skipped')
@@ -203,6 +202,8 @@ jobs:
         include:
           - os: ubuntu-latest
             platform: x86_64-linux-musl
+          - os: ubuntu-24.04-arm
+            platform: aarch64-linux-musl
     steps:
       - uses: actions/checkout@v4
         with:
@@ -218,11 +219,12 @@ jobs:
             -e target_platform="${TARGET_PLATFORM}" \
             alpine:3.20 sh -c '
               set -eux
-              export VCPKG_FORCE_SYSTEM_BINARIES=1
               apk add --no-cache \
                 build-base bash curl git cmake make ninja gcc g++ gperf \
                 automake autoconf autoconf-archive libtool linux-headers \
-                perl zip unzip tar python3 pkgconfig gcompat argp-standalone \
+                perl zip unzip tar python3 pkgconfig \
+                freetype-dev fontconfig-dev libpng-dev libxml2-dev \
+                gettext-dev zlib-dev \
                 ruby ruby-dev ruby-bundler ruby-rake file
               git config --global --add safe.directory /work
               bundle config set --local path vendor/bundle

data/README.adoc

@@ -152,17 +152,13 @@ The pre-compiled platforms are:
 * `x86_64-linux` (glibc)
 * `x86_64-linux-musl` (Alpine and other musl-based distros)
 * `aarch64-linux` (glibc)
+* `aarch64-linux-musl` (Alpine and other musl-based distros)
 * `x86_64-darwin`
 * `arm64-darwin`
 * `x64-mingw32` (legacy RubyInstaller < 3.0)
 * `x64-mingw-ucrt` (RubyInstaller >= 3.1)
 * `aarch64-mingw-ucrt` (Windows on ARM)
 
-NOTE: `aarch64-linux-musl` is not currently shipped. vcpkg has no
-binary cache for that triplet, so first-time builds compile all deps
-from source on native arm64-musl and exceed CI time limits. Track
-re-adding it in a follow-up.
-
 When installing the gem, Ruby will automatically select a pre-compiled version
 suitable for your platform, or opt to install from source if the platform
 is not supported.

data/Rakefile

@@ -38,6 +38,7 @@ platforms = [
   "x86_64-linux",
   "x86_64-linux-musl",
   "aarch64-linux",
+  "aarch64-linux-musl",
   "x86_64-darwin",
   "arm64-darwin",
 ]

data/lib/emf2svg/recipe.rb

@@ -38,9 +38,14 @@ module Emf2svg
 
     # Since libemf2svg v1.8.2 the source tarball no longer bundles the
     # vcpkg tool (it moved too fast to ship as a snapshot). We bootstrap
-    # vcpkg into the work path before CMake configure runs.
+    # vcpkg into the work path before CMake configure runs -- unless
+    # we're targeting musl, in which case vcpkg has no public binary
+    # cache for arm64-linux-musl / x64-linux-musl and would compile
+    # every dependency from source (hours). For musl we use the
+    # distribution's own -dev packages (freetype, fontconfig, etc.)
+    # via pkg-config instead.
     def configure
-      bootstrap_vcpkg
+      bootstrap_vcpkg unless use_system_libs?
       export_toolchain_to_env
       super
     end
@@ -110,15 +115,25 @@ module Emf2svg
       opts << "-DCMAKE_BUILD_TYPE=Release"
       opts << "-DLONLY=ON"
 
-      unless target_triplet.nil? || drop_target_triplet?
-        opts << "-DVCPKG_TARGET_TRIPLET=#{target_triplet}"
+      unless use_system_libs?
+        unless target_triplet.nil? || drop_target_triplet?
+          opts << "-DVCPKG_TARGET_TRIPLET=#{target_triplet}"
+        end
+        opts << "-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
       end
 
-      opts << "-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
-
       opts
     end
 
+    # Musl builds link against the distro's own -dev packages
+    # (freetype, fontconfig, libxml2, libpng) via pkg-config. This
+    # sidesteps vcpkg's lack of a public binary cache for musl
+    # triplets, which otherwise forces from-source compiles that
+    # exceed CI timeouts.
+    def use_system_libs?
+      target_platform.end_with?("-linux-musl")
+    end
+
     def compile
       execute("compile", "#{make_cmd} --target emf2svg")
     end

data/lib/emf2svg/version.rb

@@ -13,6 +13,6 @@ module Emf2svg
   #
   # See README.adoc -> "Versioning" for the rationale and examples.
   LIBEMF2SVG_VERSION = "1.8.2"
-  LIBEMF2SVG_RUBY_ITERATION = 2
+  LIBEMF2SVG_RUBY_ITERATION = 3
   VERSION = "#{LIBEMF2SVG_VERSION}.#{LIBEMF2SVG_RUBY_ITERATION}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emf2svg
 version: !ruby/object:Gem::Version
-  version: 1.8.2.2
+  version: 1.8.2.3
 platform: ruby
 authors:
 - Ribose