From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:40284) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qmy-0005O4-Op for guix-patches@gnu.org; Wed, 04 Mar 2020 04:58:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qmw-00082Q-DY for guix-patches@gnu.org; Wed, 04 Mar 2020 04:58:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34438) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qmw-00081m-6n for guix-patches@gnu.org; Wed, 04 Mar 2020 04:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j9Qmw-0000NP-1B for guix-patches@gnu.org; Wed, 04 Mar 2020 04:58:02 -0500 Subject: [bug#39897] [PATCH] Remove package brotli Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:39885) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qlw-00052w-4u for guix-patches@gnu.org; Wed, 04 Mar 2020 04:57:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qls-0004VT-JB for guix-patches@gnu.org; Wed, 04 Mar 2020 04:57:00 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:34641) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qlr-0004PU-Vl for guix-patches@gnu.org; Wed, 04 Mar 2020 04:56:56 -0500 Received: by mail-wm1-x334.google.com with SMTP id i10so4332649wmd.1 for ; Wed, 04 Mar 2020 01:56:55 -0800 (PST) Received: from localhost (zpidlx9.uni-trier.de. [136.199.85.49]) by smtp.gmail.com with ESMTPSA id w1sm3234417wmc.11.2020.03.04.01.56.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 01:56:53 -0800 (PST) Date: Wed, 4 Mar 2020 10:56:54 +0100 From: Lars-Dominik Braun Message-ID: <20200304095654.GB17022@zpidnp36> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="0/kgSOzhNoDC5T3a" Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39897@debbugs.gnu.org --0/kgSOzhNoDC5T3a Content-Type: multipart/mixed; boundary="1ccMZA6j1vT5UqiK" Content-Disposition: inline --1ccMZA6j1vT5UqiK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, this series removes the package brotli, which is parallel to google-brotli. The latter provides version 1.0.7 of the shared libraries, whereas brotli provided an earlier, unknown version. Its only dependent was woff2, which has been upgraded to the proper release 1.0.2 and which in turn is only used by font-fantasque-sanse. Both builds succeed. Cheers, Lars --1ccMZA6j1vT5UqiK Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-woff2-Update-to-1.0.2.patch" Content-Transfer-Encoding: quoted-printable =46rom 3f9ff6a73840d2a094dac730ece4d1d06aea3b79 Mon Sep 17 00:00:00 2001 =46rom: Lars-Dominik Braun Date: Wed, 4 Mar 2020 10:46:36 +0100 Subject: [PATCH 1/2] gnu: woff2: Update to 1.0.2 * gnu/packages/fontutils.scm (woff2): Update to 1.0.2 and switch to cmake * gnu/packages/patches/woff2-libbrotli.patch: Remove * gnu/local.mk (dist_patch_DATA): Remove patch --- gnu/local.mk | 1 - gnu/packages/fontutils.scm | 65 ++++++++--------- gnu/packages/patches/woff2-libbrotli.patch | 84 ---------------------- 3 files changed, 28 insertions(+), 122 deletions(-) delete mode 100644 gnu/packages/patches/woff2-libbrotli.patch diff --git a/gnu/local.mk b/gnu/local.mk index 359ed4bbbc..fd17085585 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1491,7 +1491,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/wicd-wpa2-ttls.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ - %D%/packages/patches/woff2-libbrotli.patch \ %D%/packages/patches/wordnet-CVE-2008-2149.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 42d12fb143..8f168938b8 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -254,44 +254,35 @@ work with most software requiring Type 1 fonts.") (license license:bsd-3))) =20 (define-public woff2 - (let ((commit "4e698b8c6c5e070d53c340db9ddf160e21070ede") - (revision "1")) - (package - (name "woff2") - (version (string-append "20160306-" revision "." - (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/woff2.git") - (commit commit))) - (file-name (string-append name "-" version ".tar.xz")) - (sha256 - (base32 - "0wka0yhf0cjmd4rv2jckxpyv6lb5ckj4nj0k1ajq5hrjy7f30lcp")) - (patches (list (search-patch "woff2-libbrotli.patch"))))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("brotli" ,brotli))) - (arguments - `(#:tests? #f ;no tests - #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "woff2_compress" bin) - (install-file "woff2_decompress" bin) - #t)))))) - (synopsis "Compress TrueType fonts to WOFF2") - (description - "This package provides utilities for compressing/decompressing True= Type + (package + (name "woff2") + (version "1.0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/woff2.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version ".git")) + (sha256 + (base32 + "13l4g536h0pr84ww4wxs2za439s0xp1va55g6l478rfbb1spp44y")))) + (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("google-brotli" ,google-brotli))) + (arguments + ;; package has no tests + `(#:tests? #f + ;; we can=E2=80=99t have both, shared libraries and binaries, so tu= rn off the + ;; former + #:configure-flags (list "-DBUILD_SHARED_LIBS=3DOFF"))) + (synopsis "Compress TrueType fonts to WOFF2") + (description + "This package provides utilities for compressing/decompressing TrueTy= pe fonts to/from the WOFF2 format.") - (license license:asl2.0) - (home-page "https://github.com/google/woff2")))) + (license license:asl2.0) + (home-page "https://github.com/google/woff2"))) =20 (define-public fontconfig (package diff --git a/gnu/packages/patches/woff2-libbrotli.patch b/gnu/packages/patc= hes/woff2-libbrotli.patch deleted file mode 100644 index ffa941cf92..0000000000 --- a/gnu/packages/patches/woff2-libbrotli.patch +++ /dev/null @@ -1,84 +0,0 @@ -From: Eric Bavier -Date: Sat, 2 Apr 2016 01:31:03 -0500 -Subject: [PATCH] Build against external libbrotli. - ---- - Makefile | 20 ++++---------------- - src/woff2_dec.cc | 2 +- - src/woff2_enc.cc | 2 +- - 3 files changed, 6 insertions(+), 18 deletions(-) - -diff --git a/Makefile b/Makefile -index 92b8d54..618a751 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - OS :=3D $(shell uname) -=20 --CPPFLAGS =3D -I./brotli/dec/ -I./brotli/enc/ -I./src -+CPPFLAGS :=3D -I./src $(shell pkg-config --cflags libbrotlienc libbrotlid= ec) -=20 - CC ?=3D gcc - CXX ?=3D g++ -@@ -22,29 +22,17 @@ OUROBJ =3D font.o glyph.o normalize.o table_tags.o tra= nsform.o \ - woff2_dec.o woff2_enc.o woff2_common.o woff2_out.o \ - variable_length.o -=20 --BROTLI =3D brotli --ENCOBJ =3D $(BROTLI)/enc/*.o --DECOBJ =3D $(BROTLI)/dec/*.o -+BROTLI_LIBS :=3D $(shell pkg-config --libs libbrotlienc libbrotlidec) -=20 - OBJS =3D $(patsubst %, $(SRCDIR)/%, $(OUROBJ)) - EXECUTABLES=3Dwoff2_compress woff2_decompress -=20 - EXE_OBJS=3D$(patsubst %, $(SRCDIR)/%.o, $(EXECUTABLES)) -=20 --ifeq (,$(wildcard $(BROTLI)/*)) -- $(error Brotli dependency not found : you must initialize the Git submo= dule) --endif -- - all : $(OBJS) $(EXECUTABLES) -=20 --$(EXECUTABLES) : $(EXE_OBJS) deps -- $(CXX) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@ -- --deps : -- $(MAKE) -C $(BROTLI)/dec -- $(MAKE) -C $(BROTLI)/enc -+$(EXECUTABLES) : $(EXE_OBJS) $(OBJS) -+ $(CXX) $(LDFLAGS) $(OBJS) $(SRCDIR)/$@.o -o $@ $(BROTLI_LIBS) $(LIBS) -=20 - clean : - rm -f $(OBJS) $(EXE_OBJS) $(EXECUTABLES) -- $(MAKE) -C $(BROTLI)/dec clean -- $(MAKE) -C $(BROTLI)/enc clean -diff --git a/src/woff2_dec.cc b/src/woff2_dec.cc -index 837eede..98c01ce 100644 ---- a/src/woff2_dec.cc -+++ b/src/woff2_dec.cc -@@ -27,7 +27,7 @@ - #include - #include -=20 --#include "./decode.h" -+#include "brotli/dec/decode.h" - #include "./buffer.h" - #include "./port.h" - #include "./round.h" -diff --git a/src/woff2_enc.cc b/src/woff2_enc.cc -index 920c614..00d74da 100644 ---- a/src/woff2_enc.cc -+++ b/src/woff2_enc.cc -@@ -23,7 +23,7 @@ - #include - #include -=20 --#include "./encode.h" -+#include "brotli/enc/encode.h" - #include "./buffer.h" - #include "./font.h" - #include "./normalize.h" ---=20 -2.7.3 - --=20 2.20.1 --1ccMZA6j1vT5UqiK Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0002-gnu-brotli-Remove-package.patch" Content-Transfer-Encoding: quoted-printable =46rom d1497d1da6817da78846601b90aa1b3fcfe36cbc Mon Sep 17 00:00:00 2001 =46rom: Lars-Dominik Braun Date: Wed, 4 Mar 2020 10:48:45 +0100 Subject: [PATCH 2/2] gnu: brotli: Remove package Same package is provided by google-brotli. * gnu/packages/compression.scm (brotli): Remove unused variable --- gnu/packages/compression.scm | 43 ------------------------------------ 1 file changed, 43 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ee10bd03ce..bfce15558b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -883,49 +883,6 @@ possible and can compress in parallel. This is especi= ally useful for large tarballs.") (license license:bsd-2))) =20 -(define-public brotli - (let ((commit "e992cce7a174d6e2b3486616499d26bb0bad6448") - (revision "1")) - (package - (name "brotli") - (version (string-append "0.1-" revision "." - (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bagder/libbrotli.git") - (commit commit) - (recursive? #t))) - (file-name (string-append name "-" version ".tar.xz")) - (sha256 - (base32 - "1qxxsasvwbbbh6dl3138y9h3fg0q2v7xdk5jjc690bdg7g1wrj6n")) - (modules '((guix build utils))) - (snippet '(begin - ;; This is a recursive submodule that is - ;; unnecessary for this package, so delete it. - (delete-file-recursively "brotli/terryfy") - #t)))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) - (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (mkdir "m4") - (invoke "autoreconf" "-vfi")))))) - (home-page "https://github.com/bagder/libbrotli/") - (synopsis "Implementation of the Brotli compression algorithm") - (description - "Brotli is a general-purpose lossless compression algorithm. It is -similar in speed to deflate but offers denser compression. This package -provides encoder and a decoder libraries: libbrotlienc and libbrotlidec, -respectively, based on the reference implementation from Google.") - (license license:expat)))) - (define-public bsdiff (package (name "bsdiff") --=20 2.20.1 --1ccMZA6j1vT5UqiK-- --0/kgSOzhNoDC5T3a Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEyk+M9DfXR4/aBV/UQhN3ARo3hEYFAl5fe2MACgkQQhN3ARo3 hEa2hQwAkhVT6hfJy3aquE6cBes6xDHMMPuWKet9XkCKUz2pWkMxeBK6pyLUlx8u mMK2g6r+HtkNw1ynVj/mHhXEMQ/G81cfAUwet7ez7NQ6xvTOs9auVD+oSrtwPHRB nXKPgSwMYuKUsa8EZi2uIeEiIhpCPsAhRJxfczX5k3oqnN6wEmFeiTSjn+/ol07a ldIzZkgTChQ8jnTEcFS+c92FjxxVtGVrC2ypXBszbORZFMFAunFwEusuxe8WoxUp jyZNTNnXrcLmiFe5Vi0VObi85VPcMOU06iWwDT1A89SGwiDuMqwazLSCaMplrCSO mniQGLUbX3vuhJyLEfYz4i5oG8vj8vSlWn78uJwKBvP/GoGJ8h2ZTn43BurzU0nq DWX9XKucdbckYNmyc0m3m4aldfG06NQXJ+Cj1XpgnuBCW7VoRFJQDseSdjMDgQCH EuUVQYLC5dkGrM21OOnDARqNWBuXuPdpuZso1C4MaXkLerD2kEedMW1ox154Bk+W yLZnIcOn =9GTZ -----END PGP SIGNATURE----- --0/kgSOzhNoDC5T3a--