unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] Add rapicorn.
@ 2016-04-13 19:34 Ricardo Wurmus
  2016-04-13 20:09 ` Mathieu Lirzin
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Ricardo Wurmus @ 2016-04-13 19:34 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

Hi Guix,

this patch adds Rapicorn, the graphics library used by Beast.  A new
version of Rapicorn has just been released that removed a bundled and
modified version of librsvg, so it’s finally possible to add it to Guix
upstream.

Note that it depends on libpng 1.2.x, which is added by the first patch.

~~ Ricardo


[-- Attachment #2: 0001-gnu-Add-libpng12.patch --]
[-- Type: text/x-patch, Size: 1864 bytes --]

From d50f2dfbe0e7156009b02415f5e46caac515c135 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 13 Apr 2016 21:30:28 +0200
Subject: [PATCH 1/2] gnu: Add libpng12.

* gnu/packages/image.scm (libpng12): New variable.
---
 gnu/packages/image.scm | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 0343e45..104b8e9 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2015, 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
-;;; Copyright © 2014 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2014, 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Amirouche Boubekki <amirouche@hypermove.net>
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
@@ -76,6 +76,22 @@ library.  It supports almost all PNG features and is extensible.")
    (license license:zlib)
    (home-page "http://www.libpng.org/pub/png/libpng.html")))
 
+(define-public libpng12
+  (package
+    (inherit libpng)
+    (version "1.2.56")
+    (source
+     (origin
+       (method url-fetch)
+       ;; Note: upstream removes older tarballs.
+       (uri (list (string-append "mirror://sourceforge/libpng/libpng12/"
+                                 version "/libpng-" version ".tar.xz")
+                  (string-append
+                   "ftp://ftp.simplesystems.org/pub/libpng/png/src"
+                   "/libpng12/libpng-" version ".tar.xz")))
+       (sha256
+        (base32 "1ghd03p353x0vi4dk83n1nlldg11w7vqdk3f99rkgfb82ic59ki4"))))))
+
 (define-public libjpeg
   (package
    (name "libjpeg")
-- 
2.7.3


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-rapicorn.patch --]
[-- Type: text/x-patch, Size: 4598 bytes --]

From f50b4c419437b4213a27ad52bd43cefe00e55d84 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 13 Apr 2016 08:56:16 +0200
Subject: [PATCH 2/2] gnu: Add rapicorn.

* gnu/packages/graphics.scm (rapicorn): New variable.
---
 gnu/packages/graphics.scm | 78 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index da0fa54..ef1f0fd 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -31,22 +31,32 @@
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bash)
+  #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages doxygen)
+  #:use-module (gnu packages haskell)
   #:use-module (gnu packages image)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)  ;libsndfile, libsamplerate
   #:use-module (gnu packages compression)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages image)
   #:use-module (gnu packages jemalloc)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages readline)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
 (define-public blender
@@ -271,6 +281,74 @@ visual effects work for film.")
     (home-page "http://www.openimageio.org")
     (license license:bsd-3)))
 
+(define-public rapicorn
+  (package
+    (name "rapicorn")
+    (version "16.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://testbit.eu/pub/dists/rapicorn/"
+                                  "rapicorn-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1y51yjrpsihas1jy905m9p3r8iiyhq6bwi2690c564i5dnix1f9d"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(;; FIXME: At least "testrcore1" fails.
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'replace-/bin/ls
+           (lambda _
+             (substitute* '("Makefile.decl"
+                            "tools/Makefile.in"
+                            "tests/Makefile.in"
+                            "aidacc/tests/Makefile.in"
+                            "aidacc/Makefile.in"
+                            "cython/Makefile.in"
+                            "res/Makefile.in"
+                            "ui/tests/Makefile.in"
+                            "ui/Makefile.in"
+                            "docs/tutorial/Makefile.in"
+                            "docs/mans/Makefile.in"
+                            "docs/Makefile.in"
+                            "docs/examples/Makefile.in"
+                            "docs/imports/Makefile.in"
+                            "Makefile.in"
+                            "pytests/Makefile.in"
+                            "examples/Makefile.in"
+                            "data/Makefile.in"
+                            "rcore/tests/Makefile.in"
+                            "rcore/Makefile.in")
+               (("/bin/ls") (which "ls")))
+             #t)))))
+    (inputs
+     `(("cairo" ,cairo)
+       ("pango" ,pango)
+       ("gdk-pixbuf" ,gdk-pixbuf)
+       ("libpng" ,libpng12)
+       ("readline" ,readline)
+       ("libxml2" ,libxml2)
+       ("libcroco" ,libcroco)
+       ("librsvg" ,librsvg)
+       ("python" ,python-2)
+       ("cython" ,python2-cython)))
+    (native-inputs
+     `(("pandoc" ,ghc-pandoc)
+       ("bison" ,bison)
+       ("flex" ,flex)
+       ("doxygen" ,doxygen)
+       ("graphviz" ,graphviz)
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (home-page "http://rapicorn.org")
+    (synopsis "Toolkit for rapid development of user interfaces")
+    (description
+     "Rapicorn is a toolkit for rapid development of user interfaces in C++
+and Python.  The user interface is designed in a declarative markup language
+and is connected to the programming logic using data bindings and commands.")
+    (license license:mpl2.0)))
+
 (define-public ctl
   (package
     (name "ctl")
-- 
2.7.3


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-04-17 19:04 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-13 19:34 [PATCH] Add rapicorn Ricardo Wurmus
2016-04-13 20:09 ` Mathieu Lirzin
2016-04-14  8:32   ` Ricardo Wurmus
2016-04-14 18:29     ` Ricardo Wurmus
2016-04-17 19:04       ` Ludovic Courtès
2016-04-14  6:55 ` Florian Paul Schmidt
2016-04-14  8:30   ` Ricardo Wurmus
2016-04-14 20:58 ` Andreas Enge

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).