From 90f9fc42e00b5cc0cd9777fd9393d079883c52fd Mon Sep 17 00:00:00 2001
Message-ID: <90f9fc42e00b5cc0cd9777fd9393d079883c52fd.1735762381.git.rovanion.luckey@gmail.com>
In-Reply-To: <8eb6ab38d47f373b6a1b6a7c043b7ea7f8b8f2cf.1735762381.git.rovanion.luckey@gmail.com>
References: <8eb6ab38d47f373b6a1b6a7c043b7ea7f8b8f2cf.1735762381.git.rovanion.luckey@gmail.com>
From: Rovanion Luckey <rovanion.luckey@gmail.com>
Date: Wed, 1 Jan 2025 21:08:05 +0100
Subject: [PATCH 3/3] gnu: harfbuzz: Switch build system to meson.

* gnu/packages/gtk.scm (harfbuzz): Switch build system to meson.
* gnu/packages/gtk.scm (harfbuzz-meson): Remove temporary package.

Change-Id: I0041beab3bd596f58547351071edb49ebb5077af
---
 gnu/packages/gtk.scm   | 42 +-----------------------------------------
 gnu/packages/music.scm |  2 +-
 2 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 984645f847..83e2b3cd67 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -279,7 +279,7 @@ (define-public cairo-xcb
         #~(cons "-Dxlib-xcb=enabled" #$flags))))
     (synopsis "2D graphics library (with X11 support)")))
 
-(define-public harfbuzz-meson
+(define-public harfbuzz
   (package
     (name "harfbuzz")
     (version "8.3.0")
@@ -318,46 +318,6 @@ (define-public harfbuzz-meson
                                 "See 'COPYING' in the distribution."))
     (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/")))
 
-(define-public harfbuzz
-  (package
-    (name "harfbuzz")
-    (version "8.3.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/harfbuzz/harfbuzz"
-                                  "/releases/download/" version "/harfbuzz-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "0izq2lpqxrf1l755nxrxkkiarywkx5j43asznankxplbxgm0358h"))))
-    (build-system gnu-build-system)
-    (outputs '("out"
-               "bin"))                  ;160K, only hb-view depend on cairo
-    (inputs
-     (list cairo))
-    (propagated-inputs
-     ;; There are all in the Requires or Requires.private field of '.pc'.
-     (list glib graphite2 icu4c))
-    (native-inputs
-     (append (list `(,glib "bin"))      ;for glib-mkenums
-             (if (target-hurd?)
-                 '()
-                 (list gobject-introspection))
-             (list pkg-config
-                   python-wrapper
-                   which)))
-    (arguments
-     (list #:configure-flags
-           #~(list "--with-graphite2"
-                   "--with-gobject"
-                   (string-append "--bindir=" #$output:bin "/bin"))))
-    (synopsis "OpenType text shaping engine")
-    (description
-     "HarfBuzz is an OpenType text shaping engine.")
-    (license (license:x11-style "file://COPYING"
-                                "See 'COPYING' in the distribution."))
-    (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/")))
-
 (define-public libdatrie
   (package
     (name "libdatrie")
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index afdec7c775..f69aa637fb 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5419,7 +5419,7 @@ (define-public musescore
      (list alsa-lib
            freetype
            `(,gtk+ "bin")               ;for gtk-update-icon-cache
-           harfbuzz-meson
+           harfbuzz
            jack-1
            lame
            libogg
-- 
2.46.0