[PATCH] gnu: Add Xft support to FLTK.

[PATCH] gnu: Add Xft support to FLTK.

[Kei Yamashita]

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

This patch is in preparation for the Dillo browser package.

[-- Attachment #2: 0001-gnu-Add-Xft-support-to-FLTK.patch --]
[-- Type: application/octet-stream, Size: 1005 bytes --]

From 7755ae6d7afd46daed5fac1e626d1785b9875975 Mon Sep 17 00:00:00 2001
From: Kei Yamashita <kei@openmailbox.org>
Date: Sat, 16 Apr 2016 22:45:21 -0400
Subject: [PATCH] gnu: Add Xft support to FLTK.

* gnu/packages/fltk.scm (fltk)[inputs]: Add libxft.
---
 gnu/packages/fltk.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm
index 4dec9bc..a0180c0 100644
--- a/gnu/packages/fltk.scm
+++ b/gnu/packages/fltk.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016 Kei Yamashita <kei@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -52,6 +53,7 @@
     `(("libjpeg" ,libjpeg-8)     ;jpeg_read_header argument error in libjpeg-9
       ("libpng" ,libpng)
       ("libx11" ,libx11)
+      ("libxft" ,libxft)
       ("mesa" ,mesa)
       ("zlib" ,zlib)))
     (arguments
-- 
2.7.3

Re: [PATCH] gnu: Add Xft support to FLTK.

[Leo Famulari]

On Sat, Apr 16, 2016 at 10:50:41PM -0400, Kei Yamashita wrote:
> This patch is in preparation for the Dillo browser package.

Looks good!

Re: [PATCH] gnu: Add Xft support to FLTK.

[Ludovic Courtès]

Kei Yamashita <kei@openmailbox.org> skribis:

> This patch is in preparation for the Dillo browser package.
>
> From 7755ae6d7afd46daed5fac1e626d1785b9875975 Mon Sep 17 00:00:00 2001
> From: Kei Yamashita <kei@openmailbox.org>
> Date: Sat, 16 Apr 2016 22:45:21 -0400
> Subject: [PATCH] gnu: Add Xft support to FLTK.
>
> * gnu/packages/fltk.scm (fltk)[inputs]: Add libxft.

This appears to break Octave (see
<https://hydra.gnu.org/log/gx7z8zd3x113605gpnjp6adx98qwy9fy-octave-4.0.0>):

--8<---------------cut here---------------start------------->8---
../run-octave  --norc --silent --no-history ./fntests.m .
error: /tmp/guix-build-octave-4.0.0.drv-0/octave-4.0.0/libinterp/dldfcn/PKG_ADD: /tmp/guix-build-octave-4.0.0.drv-0/octave-4.0.0/libinterp/dldfcn/__init_fltk__.oct: failed to load: /gnu/store/nfi0na44lk0fy0m6bpsa7q458wpyd5w5-fltk-1.3.3/lib/libfltk_gl.so.1.3: undefined symbol: _ZN18Fl_XFont_On_Demand5valueEv
--8<---------------cut here---------------end--------------->8---

The undefined symbol (demangled: ‘Fl_XFont_On_Demand::value’) is defined
in Fltk’s ‘fl_font_xft.cxx’.  However, looking at the build log of Fltk,
this file is apparently not compiled, which sounds like a bug in Fltk’s
build system.

Could you look into it?

Thanks in advance.  :-)

Ludo’.

Re: [PATCH] gnu: Add Xft support to FLTK.

[Kei Yamashita]

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

On Wed, 27 Apr 2016 14:52:36 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Kei Yamashita <kei@openmailbox.org> skribis:
> 
> > This patch is in preparation for the Dillo browser package.
> >
> > From 7755ae6d7afd46daed5fac1e626d1785b9875975 Mon Sep 17 00:00:00
> > 2001 From: Kei Yamashita <kei@openmailbox.org>
> > Date: Sat, 16 Apr 2016 22:45:21 -0400
> > Subject: [PATCH] gnu: Add Xft support to FLTK.
> >
> > * gnu/packages/fltk.scm (fltk)[inputs]: Add libxft.  
> 
> This appears to break Octave (see
> <https://hydra.gnu.org/log/gx7z8zd3x113605gpnjp6adx98qwy9fy-octave-4.0.0>):
> 
> --8<---------------cut here---------------start------------->8---
> ../run-octave  --norc --silent --no-history ./fntests.m .
> error: /tmp/guix-build-octave-4.0.0.drv-0/octave-4.0.0/libinterp/dldfcn/PKG_ADD: /tmp/guix-build-octave-4.0.0.drv-0/octave-4.0.0/libinterp/dldfcn/__init_fltk__.oct:
> failed to
> load: /gnu/store/nfi0na44lk0fy0m6bpsa7q458wpyd5w5-fltk-1.3.3/lib/libfltk_gl.so.1.3:
> undefined symbol: _ZN18Fl_XFont_On_Demand5valueEv
> --8<---------------cut here---------------end--------------->8---
> 
> The undefined symbol (demangled: ‘Fl_XFont_On_Demand::value’) is
> defined in Fltk’s ‘fl_font_xft.cxx’.  However, looking at the build
> log of Fltk, this file is apparently not compiled, which sounds like
> a bug in Fltk’s build system.
> 
> Could you look into it?
> 
> Thanks in advance.  :-)
> 
> Ludo’.

You could try this patch. I switched on a configure flag that
supposedly enables Xft support. I tried rebuilding Octave locally with
the new FLTK, but my machine wasn't powerful enough so it started
heavily swapping memory to disk.

[-- Attachment #2: 0001-gnu-Enable-Xft-support-in-configure-script-for-FLTK.patch --]
[-- Type: application/octet-stream, Size: 794 bytes --]

From acb5353d7f5c81070ed3725204d8da5071dd1c73 Mon Sep 17 00:00:00 2001
From: Kei Yamashita <kei@openmailbox.org>
Date: Wed, 27 Apr 2016 18:34:15 -0400
Subject: [PATCH] gnu: Enable Xft support in configure script for FLTK.

* gnu/packages/fltk.scm (fltk): Add configure flag.
---
 gnu/packages/fltk.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm
index a0180c0..349dd2e 100644
--- a/gnu/packages/fltk.scm
+++ b/gnu/packages/fltk.scm
@@ -60,6 +60,7 @@
      `(#:tests? #f                      ;TODO: compile programs in "test" dir
        #:configure-flags
        (list "--enable-shared"
+             "--enable-xft"
              (string-append "DSOFLAGS=-Wl,-rpath=" %output "/lib"))
        #:phases
        (alist-cons-before
-- 
2.7.4

Re: [PATCH] gnu: Add Xft support to FLTK.

[宋文武]

Kei Yamashita <kei@openmailbox.org> writes:

> On Wed, 27 Apr 2016 14:52:36 +0200
> ludo@gnu.org (Ludovic Courtès) wrote:
>
>> Kei Yamashita <kei@openmailbox.org> skribis:
>> 
>> > This patch is in preparation for the Dillo browser package.
>> >
>> > From 7755ae6d7afd46daed5fac1e626d1785b9875975 Mon Sep 17 00:00:00
>> > 2001 From: Kei Yamashita <kei@openmailbox.org>
>> > Date: Sat, 16 Apr 2016 22:45:21 -0400
>> > Subject: [PATCH] gnu: Add Xft support to FLTK.
>> >
>> > * gnu/packages/fltk.scm (fltk)[inputs]: Add libxft.  
>> 
>> This appears to break Octave (see
>> <https://hydra.gnu.org/log/gx7z8zd3x113605gpnjp6adx98qwy9fy-octave-4.0.0>):
>> 
>> --8<---------------cut here---------------start------------->8---
>> ../run-octave  --norc --silent --no-history ./fntests.m .
>> error:
>> /tmp/guix-build-octave-4.0.0.drv-0/octave-4.0.0/libinterp/dldfcn/PKG_ADD:
>> /tmp/guix-build-octave-4.0.0.drv-0/octave-4.0.0/libinterp/dldfcn/__init_fltk__.oct:
>> failed to
>> load: /gnu/store/nfi0na44lk0fy0m6bpsa7q458wpyd5w5-fltk-1.3.3/lib/libfltk_gl.so.1.3:
>> undefined symbol: _ZN18Fl_XFont_On_Demand5valueEv
>> --8<---------------cut here---------------end--------------->8---
>> 
>> The undefined symbol (demangled: ‘Fl_XFont_On_Demand::value’) is
>> defined in Fltk’s ‘fl_font_xft.cxx’.  However, looking at the build
>> log of Fltk, this file is apparently not compiled, which sounds like
>> a bug in Fltk’s build system.

Fixed (octave) in commit 6fdc73e by apply patch from:

<http://www.fltk.org/str.php?L3156+P0+S0+C0+I0+E0+V1+QOn_Demand>.

Re: [PATCH] gnu: Add Xft support to FLTK.

[Ludovic Courtès]

iyzsong@member.fsf.org (宋文武) skribis:

> Kei Yamashita <kei@openmailbox.org> writes:
>
>> On Wed, 27 Apr 2016 14:52:36 +0200
>> ludo@gnu.org (Ludovic Courtès) wrote:
>>
>>> Kei Yamashita <kei@openmailbox.org> skribis:
>>> 
>>> > This patch is in preparation for the Dillo browser package.
>>> >
>>> > From 7755ae6d7afd46daed5fac1e626d1785b9875975 Mon Sep 17 00:00:00
>>> > 2001 From: Kei Yamashita <kei@openmailbox.org>
>>> > Date: Sat, 16 Apr 2016 22:45:21 -0400
>>> > Subject: [PATCH] gnu: Add Xft support to FLTK.
>>> >
>>> > * gnu/packages/fltk.scm (fltk)[inputs]: Add libxft.  
>>> 
>>> This appears to break Octave (see
>>> <https://hydra.gnu.org/log/gx7z8zd3x113605gpnjp6adx98qwy9fy-octave-4.0.0>):
>>> 
>>> --8<---------------cut here---------------start------------->8---
>>> ../run-octave  --norc --silent --no-history ./fntests.m .
>>> error:
>>> /tmp/guix-build-octave-4.0.0.drv-0/octave-4.0.0/libinterp/dldfcn/PKG_ADD:
>>> /tmp/guix-build-octave-4.0.0.drv-0/octave-4.0.0/libinterp/dldfcn/__init_fltk__.oct:
>>> failed to
>>> load: /gnu/store/nfi0na44lk0fy0m6bpsa7q458wpyd5w5-fltk-1.3.3/lib/libfltk_gl.so.1.3:
>>> undefined symbol: _ZN18Fl_XFont_On_Demand5valueEv
>>> --8<---------------cut here---------------end--------------->8---
>>> 
>>> The undefined symbol (demangled: ‘Fl_XFont_On_Demand::value’) is
>>> defined in Fltk’s ‘fl_font_xft.cxx’.  However, looking at the build
>>> log of Fltk, this file is apparently not compiled, which sounds like
>>> a bug in Fltk’s build system.
>
> Fixed (octave) in commit 6fdc73e by apply patch from:
>
> <http://www.fltk.org/str.php?L3156+P0+S0+C0+I0+E0+V1+QOn_Demand>.

Thanks!

Ludo’.