From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] Update glade. Date: Thu, 14 Jan 2016 11:08:08 +0100 Message-ID: <87lh7s3247.fsf@elephly.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJepG-0000WY-QV for guix-devel@gnu.org; Thu, 14 Jan 2016 05:08:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJepD-0003z6-IH for guix-devel@gnu.org; Thu, 14 Jan 2016 05:08:18 -0500 Received: from sender163-mail.zoho.com ([74.201.84.163]:25094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJepD-0003z0-8T for guix-devel@gnu.org; Thu, 14 Jan 2016 05:08:15 -0500 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Guix-devel --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit This makes it possible to build “gnunet-gtk” with the latest version of GTK+. I chose to disable the three tests, because they require an X server with libGL support for software rendering. I couldn’t get this to work even after adding “xorg-server” and “mesa”, and starting Xvfb before tests. Patches for “gnunet-gtk” follow later (they also require changes to our “gnunet” package). ~~ Ricardo --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-glade-Update-to-3.18.5.patch >From 48a7ac38ee0f5554c844a503d5ed232a5816eb07 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 Jan 2016 11:03:49 +0100 Subject: [PATCH] gnu: glade: Update to 3.18.5. * gnu/packages/gnome.scm (glade): Update to 3.18.5. [arguments]: Disable tests; add "fix-docbook" phase. [inputs]: Replace "gtk+-2" with "gtk+". [native-inputs]: Add "itstool", "libxslt", "docbook-xml", "docbook-xsl"; replace "python" with "python-2". --- gnu/packages/gnome.scm | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e88ee8d..ff08189 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -751,22 +751,42 @@ API add-ons to make GTK+ widgets OpenGL-capable.") (define-public glade3 (package (name "glade") - (version "3.8.5") + (version "3.18.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" - name "3-" version ".tar.xz")) + name "-" version ".tar.xz")) (sha256 (base32 - "0d97df5pfkrh5670a98r3d3w8zlbh1jcax6cvq6j6a20vzjgd9aq")))) + "0lk4nvd5s8px9i0pbq7bncikgn2lpx7vjh787d3cvzpvwx3cxnzc")))) (build-system gnu-build-system) + (arguments + `(#:tests? #f ; needs X, GL, and software rendering + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-docbook + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "man/Makefile.in" + (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/manpages/docbook.xsl"))) + (setenv "XML_CATALOG_FILES" + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/catalog.xml")) + #t))))) (inputs - `(("gtk+" ,gtk+-2) + `(("gtk+" ,gtk+) ("libxml2" ,libxml2))) (native-inputs `(("intltool" ,intltool) - ("python" ,python) + ("itstool" ,itstool) + ("libxslt" ,libxslt) ;for xsltproc + ("docbook-xml" ,docbook-xml-4.2) + ("docbook-xsl" ,docbook-xsl) + ("python" ,python-2) ("pkg-config" ,pkg-config))) (home-page "https://glade.gnome.org") (synopsis "GTK+ rapid application development tool") -- 2.5.0 --=-=-=--