From: Danny Milosavljevic <dannym@scratchpost.org>
To: 42958@debbugs.gnu.org
Cc: Raghav Gururajan <raghavgururajan@disroot.org>,
Danny Milosavljevic <dannym@scratchpost.org>
Subject: [bug#42958] [PATCH core-updates 11/29] gnu: pango: Update package definition.
Date: Thu, 20 Aug 2020 17:10:32 +0200 [thread overview]
Message-ID: <20200820151050.9529-11-dannym@scratchpost.org> (raw)
In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org>
From: Raghav Gururajan <raghavgururajan@disroot.org>
* gnu/packages/gtk.scm (pango): Update package definition.
[arguments]<#:glib-or-gtk?>: New argument.
[native-inputs]: Add help2man, perl and python-wrapper.
[propagated-inputs]: Add libthai and libxrender.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
* gnu/packages/patches/pango-skip-libthai-test.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/local.mk | 1 -
gnu/packages/gtk.scm | 99 ++++++++++---------
.../patches/pango-skip-libthai-test.patch | 23 -----
3 files changed, 51 insertions(+), 72 deletions(-)
delete mode 100644 gnu/packages/patches/pango-skip-libthai-test.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index ae708248e8..3732e56acc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1378,7 +1378,6 @@ dist_patch_DATA = \
%D%/packages/patches/p7zip-remove-unused-code.patch \
%D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
%D%/packages/patches/pam-mount-luks2-support.patch \
- %D%/packages/patches/pango-skip-libthai-test.patch \
%D%/packages/patches/pciutils-hurd-configure.patch \
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
%D%/packages/patches/sdl-pango-api_additions.patch \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 2f939ff0bd..c7bc9cf1a4 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -74,6 +74,7 @@
#:use-module (gnu packages image)
#:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages man)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -240,54 +241,56 @@ output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
(define-public pango
(package
- (name "pango")
- (version "1.44.7")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/pango/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (patches (search-patches "pango-skip-libthai-test.patch"))
- (sha256
- (base32
- "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))
- (build-system meson-build-system)
- (arguments
- '(#:phases (modify-phases %standard-phases
- (add-after 'unpack 'disable-cantarell-tests
- (lambda _
- (substitute* "tests/meson.build"
- ;; XXX FIXME: These tests require "font-cantarell", but
- ;; adding it here would introduce a circular dependency.
- (("\\[ 'test-harfbuzz'.*") "")
- (("\\[ 'test-itemize'.*") "")
- (("\\[ 'test-layout'.*") ""))
- #t)))))
- (propagated-inputs
- ;; These are all in Requires or Requires.private of the '.pc' files.
- `(("cairo" ,cairo)
- ("fribidi" ,fribidi)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("glib" ,glib)
- ("harfbuzz" ,harfbuzz)
-
- ;; Some packages, such as Openbox, expect Pango to be built with the
- ;; optional libxft support.
- ("libxft" ,libxft)))
- (inputs
- `(("zlib" ,zlib)))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("glib" ,glib "bin") ; glib-mkenums, etc.
- ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
- (synopsis "GNOME text and font handling library")
- (description
- "Pango is the core text and font handling library used in GNOME
-applications. It has extensive support for the different writing systems
-used throughout the world.")
- (license license:lgpl2.0+)
- (home-page "https://developer.gnome.org/pango/")))
+ (name "pango")
+ (version "1.44.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/pango/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32 "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ (substitute* "tests/meson.build"
+ (("\\[ 'test-harfbuzz'.*") "")
+ (("\\[ 'test-itemize'.*") "")
+ (("\\[ 'test-layout'.*") ""))
+ #t)))))
+ (native-inputs
+ `(("glib" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("help2man" ,help2man)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)))
+ (inputs
+ `(("zlib" ,zlib)))
+ (propagated-inputs
+ `(("cairo" ,cairo)
+ ("fontconfig" ,fontconfig)
+ ("freetype" ,freetype)
+ ("fribidi" ,fribidi)
+ ("glib" ,glib)
+ ("harfbuzz" ,harfbuzz)
+ ("libthai" ,libthai)
+ ("libxft" ,libxft)
+ ("libxrender" ,libxrender)))
+ (synopsis "Text and font handling library")
+ (description "Pango is a library for laying out and rendering of text, with
+an emphasis on internationalization. Pango can be used anywhere that text
+layout is needed, though most of the work on Pango so far has been done in the
+context of the GTK+ widget toolkit. Pango forms the core of text and font
+handling for GTK+-2.x.")
+ (home-page "https://pango.gnome.org/")
+ (license license:lgpl2.0+)))
(define-public pango-1.42
(package
diff --git a/gnu/packages/patches/pango-skip-libthai-test.patch b/gnu/packages/patches/pango-skip-libthai-test.patch
deleted file mode 100644
index 98732b5391..0000000000
--- a/gnu/packages/patches/pango-skip-libthai-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Skip Thai character test when libthai is unavailable.
-
-Taken from upstream bug tracker:
-https://gitlab.gnome.org/GNOME/pango/merge_requests/161
-https://gitlab.gnome.org/GNOME/pango/commit/b73284747ac937e31dc9191f84ed6e24284c88ee
-
-diff --git a/tests/test-break.c b/tests/test-break.c
-index 8549b678bba69360d07dce3af21d915412f20d51..47fa3009165e19a331aa04a0df4351ae2323933b 100644
---- a/tests/test-break.c
-+++ b/tests/test-break.c
-@@ -305,6 +305,12 @@ main (int argc, char *argv[])
- if (!strstr (name, "break"))
- continue;
-
-+#ifndef HAVE_LIBTHAI
-+ /* four.break involves Thai, so only test it when we have libthai */
-+ if (strstr (name, "four.break"))
-+ continue;
-+#endif
-+
- path = g_strdup_printf ("/break/%s", name);
- g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, "breaks", name, NULL),
- test_break, g_free);
next prev parent reply other threads:[~2020-08-20 15:24 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 15:09 [bug#42958] [PATCH core-updates 00/29] Big changes from wip-desktop Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 01/29] gnu: yelp-xsl: Update package definition Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 02/29] gnu: yelp-tools: " Danny Milosavljevic
2020-08-30 20:54 ` Ludovic Courtès
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 03/29] gnu: glib: " Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 04/29] gnu: glib-with-documentation: " Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 05/29] gnu: gobject-introspection: " Danny Milosavljevic
2020-09-23 13:40 ` Danny Milosavljevic
2020-09-23 13:45 ` Danny Milosavljevic
2020-09-24 11:36 ` Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 06/29] gnu: gobject-introspection: Propagate glib Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 07/29] gnu: gobject-introspection: Add patches back Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 08/29] gnu: pixman: Update package definition Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 09/29] gnu: openjpeg: " Danny Milosavljevic
2020-08-20 16:45 ` Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 10/29] gnu: cairo: " Danny Milosavljevic
2020-08-20 15:10 ` Danny Milosavljevic [this message]
2020-08-20 16:27 ` [bug#42958] [PATCH core-updates 11/29] gnu: pango: " Danny Milosavljevic
2020-08-20 16:29 ` Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 12/29] gnu: gdk-pixbuf: " Danny Milosavljevic
2020-08-24 0:19 ` Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 13/29] gnu: gdk-pixbuf: Disable failing tests Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 14/29] gnu: gdk-pixbuf+svg: Update package definition Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 15/29] gnu: vala: " Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 16/29] gnu: libgsf: " Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 17/29] gnu: librsvg@2.40.21: " Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 18/29] gnu: atk: Update to 2.36.0 Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 19/29] gnu: gtk+-2: Update package definition Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 20/29] gnu: wayland: " Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 21/29] gnu: wayland-protocols: " Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 22/29] gnu: atkmm: " Danny Milosavljevic
2020-08-20 16:45 ` Danny Milosavljevic
2020-08-20 16:48 ` Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 23/29] gnu: gtk-doc: " Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 24/29] gnu: json-glib: " Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 25/29] gnu: at-spi2-core: " Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 26/29] gnu: at-spi2-atk: Update to 2.34.2 Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 27/29] gnu: gtk+: Update package definition Danny Milosavljevic
2020-08-20 16:44 ` Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 28/29] gnu: gtk+: Propagate libcloudproviders Danny Milosavljevic
2020-08-20 15:10 ` [bug#42958] [PATCH core-updates 29/29] gnu: gtk+: Add missing input Danny Milosavljevic
2020-09-24 12:26 ` [bug#42958] [PATCH core-updates 01/29] gnu: yelp-xsl: Update package definition Raghav Gururajan
2020-09-24 12:27 ` [bug#42958] [PATCH core-updates 02/29] gnu: yelp-tools: " Raghav Gururajan
2020-09-24 12:28 ` [bug#42958] [PATCH core-updates 03/29] gnu: glib: " Raghav Gururajan
2020-09-24 12:55 ` Efraim Flashner
2020-11-29 12:21 ` Danny Milosavljevic
2020-12-04 6:08 ` [bug#42958] Raghav Gururajan via Guix-patches via
2020-09-27 10:12 ` [bug#42958] [PATCH core-updates 03/29] gnu: glib: Update package definition Danny Milosavljevic
2020-09-24 12:41 ` [bug#42958] [PATCH core-updates 04/29] gnu: glib-with-documentation: Update, " Raghav Gururajan
2020-09-24 12:50 ` Efraim Flashner
2020-09-24 13:14 ` [bug#42958] [PATCH core-updates 05/29] gnu: gobject-introspection: Update package, definition Raghav Gururajan
2020-09-24 13:32 ` Raghav Gururajan
2020-09-24 13:52 ` Danny Milosavljevic
2020-09-24 14:17 ` Raghav Gururajan
2020-09-24 13:20 ` [bug#42958] [PATCH core-updates 06/29] gnu: gobject-introspection: Propagate glib Raghav Gururajan
2020-09-24 13:33 ` [bug#42958] [PATCH core-updates 07/29] gnu: gobject-introspection: Add patches, back Raghav Gururajan
2020-09-24 14:33 ` [bug#42958] [PATCH core-updates 08/29] gnu: pixman: Update package definition Raghav Gururajan
2020-09-24 15:03 ` [bug#42958] [PATCH core-updates 09/29] gnu: openjpeg: " Raghav Gururajan
2020-09-24 15:35 ` [bug#42958] [PATCH core-updates 10/29] gnu: cairo: " Raghav Gururajan
[not found] ` <handler.42958.B.159793618623098.ack@debbugs.gnu.org>
2020-12-01 21:07 ` [bug#42958] ([PATCH core-updates 00/29] Big changes from wip-desktop.) Danny Milosavljevic
2021-03-11 14:45 ` [bug#42958] Raghav Gururajan via Guix-patches via
2021-03-12 16:37 ` [bug#42958] Big changes from wip-desktop Raghav Gururajan via Guix-patches via
2021-03-12 17:19 ` Raghav Gururajan via Guix-patches via
2021-03-25 12:08 ` Raghav Gururajan via Guix-patches via
2021-03-26 1:00 ` Raghav Gururajan via Guix-patches via
2021-03-26 20:12 ` Raghav Gururajan via Guix-patches via
2021-03-26 20:38 ` Raghav Gururajan via Guix-patches via
2021-03-26 21:22 ` bug#42958: " Léo Le Bouter via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200820151050.9529-11-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=42958@debbugs.gnu.org \
--cc=raghavgururajan@disroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.