diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-02-06 06:22:16 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-02-09 01:53:07 -0500 |
| commit | 110afddee8dcf9fffc0d8044f3075b5f198b84c3 (patch) | |
| tree | 0f5c08d3a06c59c8f811506cc0c4d911f0722573 /gnu/packages/gnuzilla.scm | |
| parent | efe2a2833c6d306d0c60127fdfebaff6dc415b4c (diff) | |
| download | guix-110afddee8dcf9fffc0d8044f3075b5f198b84c3.tar.gz | |
gnu: icecat: Use system harfbuzz and graphite2 libraries.
* gnu/packages/patches/icecat-use-system-harfbuzz.patch, gnu/packages/patches/icecat-use-system-graphite2.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/gnuzilla.scm (icecat)[source]: Add patches. Delete "gfx/harfbuzz" and "gfx/graphite2" in the snippet. [inputs]: Add harfbuzz and graphite2. [arguments]: Add "--with-system-harfbuzz" and "--with-system-graphite2" to configure-flags.
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ecb3abd5bd..3a3f5dceca 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -414,6 +414,8 @@ security standards.") (patches (list (search-patch "icecat-avoid-bundled-libraries.patch") + (search-patch "icecat-use-system-harfbuzz.patch") + (search-patch "icecat-use-system-graphite2.patch") (mozilla-patch "icecat-bug-546387.patch" "d13e3fefb76e" "1b760r0bg2ydbl585wlmajljh1nlisrwxvjws5b28a3sgjy01i6k") (mozilla-patch "icecat-bug-1350152.patch" "f822bda79c28" "1wf56169ca874shr6r7qx40s17h2gwj7ngmpyylrpmd1c6hipvsj") (mozilla-patch "icecat-bug-1388166.patch" "fbb0bdb191d5" "1y8wpj38vw1dd6f375s9i0mrk9bd8z8gz5g70p4qynfllpkn072d") @@ -556,11 +558,6 @@ security standards.") ;; * speex ;; * soundtouch (not yet in guix) ;; - ;; TODO: Use system harfbuzz. Waiting for: - ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=847568> - ;; - ;; TODO: Use system graphite2. - ;; "modules/freetype2" "modules/zlib" "modules/libbz2" @@ -569,6 +566,8 @@ security standards.") "media/libvpx" "security/nss" "gfx/cairo" + "gfx/harfbuzz" + "gfx/graphite2" "js/src/ctypes/libffi" "db/sqlite3")) ;; Delete .pyc files, typically present in icecat source tarballs @@ -589,8 +588,10 @@ security standards.") ("glib" ,glib) ("gtk+" ,gtk+) ("gtk+-2" ,gtk+-2) + ("graphite2" ,graphite2) ("pango" ,pango) ("freetype" ,freetype) + ("harfbuzz" ,harfbuzz) ("hunspell" ,hunspell) ("libcanberra" ,libcanberra) ("libgnome" ,libgnome) @@ -660,6 +661,8 @@ security standards.") "--with-system-icu" "--with-system-nspr" "--with-system-nss" + "--with-system-harfbuzz" + "--with-system-graphite2" "--enable-system-pixman" "--enable-system-cairo" "--enable-system-ffi" |