[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#42958] [PATCH core-updates 10/29] gnu: cairo: Update package defini
From: |
Danny Milosavljevic |
Subject: |
[bug#42958] [PATCH core-updates 10/29] gnu: cairo: Update package definition. |
Date: |
Thu, 20 Aug 2020 17:10:31 +0200 |
From: Raghav Gururajan <raghavgururajan@disroot.org>
* gnu/packages/gtk.scm (cairo): Update package definition.
[build-system]: Change from gnu to glib-or-gtk.
[outputs]: New output "doc".
[arguments]<#:configure-flags>[--with-html-dir]: New flag.
[native-inputs]: Add gobject-introspection.
[inputs]: Add libdrm. Remove xorgproto and zlib.
[propagated-inputs]: Add libxcb.
[synopsis]: Modify.
[description]: Modify.
[license]: Modify.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/packages/gtk.scm | 114 ++++++++++++++++++++++++-------------------
1 file changed, 64 insertions(+), 50 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index e3c097943f..2f939ff0bd 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -119,57 +119,71 @@ tools have full access to view and control running
applications.")
(define-public cairo
(package
- (name "cairo")
- (version "1.16.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://cairographics.org/releases/cairo-"
- version ".tar.xz"))
- (sha256
- (base32
- "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))
- (build-system gnu-build-system)
- (propagated-inputs
- `(("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("glib" ,glib)
- ("libpng" ,libpng)
- ("libx11" ,libx11)
- ("libxext" ,libxext)
- ("libxrender" ,libxrender)
- ("pixman" ,pixman)))
- (inputs
- `(("ghostscript" ,ghostscript)
- ("libspectre" ,libspectre)
- ("poppler" ,poppler)
- ("xorgproto" ,xorgproto)
- ("zlib" ,zlib)))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)))
+ (name "cairo")
+ (version "1.16.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://cairographics.org/releases/cairo-"
+ version ".tar.xz"))
+ (sha256
+ (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))
+ (build-system glib-or-gtk-build-system)
+ (outputs '("out" "doc"))
(arguments
- `(#:tests? #f ; see
http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
- #:configure-flags '("--enable-tee" ;needed for GNU Icecat
- "--enable-xml" ;for cairo-xml support
- "--disable-static")))
- (synopsis "2D graphics library")
- (description
- "Cairo is a 2D graphics library with support for multiple output devices.
-Currently supported output targets include the X Window System (via both
-Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file
-output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
-
-Cairo is designed to produce consistent output on all output media while
-taking advantage of display hardware acceleration when available
-eg. through the X Render Extension).
-
-The cairo API provides operations similar to the drawing operators of
-PostScript and PDF. Operations in cairo including stroking and filling cubic
-Bézier splines, transforming and compositing translucent images, and
-antialiased text rendering. All drawing operations can be transformed by any
-affine transformation (scale, rotation, shear, etc.).")
- (license license:lgpl2.1) ; or Mozilla Public License 1.1
- (home-page "https://cairographics.org/")))
+ `(#:tests? #f ; See
http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
+ #:configure-flags
+ (list
+ "--disable-static"
+ ;; XXX: To be enabled.
+ ;; "--enable-gallium=yes"
+ ;; "--enable-gl=yes"
+ ;; " --enable-glesv2=yes"
+ ;; "--enable-glesv3=yes"
+ ;; "--enable-cogl=yes"
+ ;; "--enable-directfb=yes"
+ ;; "--enable-vg=yes"
+ "--enable-tee=yes"
+ "--enable-xml=yes"
+ (string-append "--with-html-dir="
+ (assoc-ref %outputs "doc")
+ "/share/gtk-doc/html"))))
+ (native-inputs
+ `(("gobject-introspection" ,gobject-introspection)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)))
+ (inputs
+ `(("drm" ,libdrm)
+ ("ghostscript" ,ghostscript)
+ ("libspectre" ,libspectre)
+ ("poppler" ,poppler)))
+ (propagated-inputs
+ `(;; ("cogl" ,cogl)
+ ;; ("directfb" ,directfb)
+ ("fontconfig" ,fontconfig)
+ ("freetype" ,freetype)
+ ("glib" ,glib)
+ ;; ("gtk+" ,gtk+)
+ ("libpng" ,libpng)
+ ;; ("librsvg" ,librsvg)
+ ;; ("opengl" ,mesa)
+ ("pixman" ,pixman)
+ ("x11" ,libx11)
+ ("xcb" ,libxcb)
+ ("xext" ,libxext)
+ ("xrender" ,libxrender)))
+ (synopsis "Multi-platform 2D graphics library")
+ (description "Cairo is a 2D graphics library with support for multiple
output
+devices. Currently supported output targets include the X Window System (via
+both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file
+output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
+ (home-page "https://cairographics.org/")
+ (license
+ ;; This project is dual-licensed.
+ (list
+ license:lgpl2.1+
+ license:mpl1.1))))
(define-public cairo-xcb
(package
- [bug#42958] [PATCH core-updates 00/29] Big changes from wip-desktop., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 01/29] gnu: yelp-xsl: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 02/29] gnu: yelp-tools: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 04/29] gnu: glib-with-documentation: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 09/29] gnu: openjpeg: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 03/29] gnu: glib: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 10/29] gnu: cairo: Update package definition.,
Danny Milosavljevic <=
- [bug#42958] [PATCH core-updates 06/29] gnu: gobject-introspection: Propagate glib., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 05/29] gnu: gobject-introspection: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 16/29] gnu: libgsf: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 18/29] gnu: atk: Update to 2.36.0., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 22/29] gnu: atkmm: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 08/29] gnu: pixman: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 24/29] gnu: json-glib: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 25/29] gnu: at-spi2-core: Update package definition., Danny Milosavljevic, 2020/08/20