all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Theodoros Foradis <theodoros.for@openmailbox.org>
To: Guix-devel <guix-devel@gnu.org>
Subject: Re: [PATCH v3 2/2] gnu: Add python2-wxpython.
Date: Wed, 02 Nov 2016 15:53:13 +0200	[thread overview]
Message-ID: <8737jat2dp.fsf@openmailbox.org> (raw)
In-Reply-To: <20161102085742.1504352b@scratchpost.org>

Hello,

Danny Milosavljevic writes:

> Hi,
>
> On Tue, 25 Oct 2016 20:00:00 +0300
> Theodoros Foradis <theodoros.for@openmailbox.org> wrote:
>> * gnu/packages/wxwidgets.scm (python2-wxpython): New variable.
>> ---
>>  gnu/packages/wxwidgets.scm | 82 ++++++++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 82 insertions(+)
>> 
>> diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
>> index 4efe7a1..07f0d7b 100644
>> --- a/gnu/packages/wxwidgets.scm
>> +++ b/gnu/packages/wxwidgets.scm
>> @@ -2,6 +2,7 @@
>>  ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
>>  ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
>>  ;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org>
>> +;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
>>  ;;;
>>  ;;; This file is part of GNU Guix.
>>  ;;;
>> @@ -23,6 +24,7 @@
>>    #:use-module (guix download)
>>    #:use-module ((guix licenses) #:prefix l:)
>>    #:use-module (guix build-system glib-or-gtk)
>> +  #:use-module (guix build-system python)
>>    #:use-module (guix build utils)
>>    #:use-module (gnu packages)
>>    #:use-module (gnu packages compression)
>> @@ -32,8 +34,10 @@
>>    #:use-module (gnu packages gtk)
>>    #:use-module (gnu packages image)
>>    #:use-module (gnu packages pkg-config)
>> +  #:use-module (gnu packages python)
>>    #:use-module (gnu packages sdl)
>>    #:use-module (gnu packages webkit)
>> +  #:use-module (gnu packages xml)
>>    #:use-module (gnu packages xorg))
>>  
>>  (define-public wxwidgets
>> @@ -118,3 +122,81 @@ and many other languages.")
>>                          "gtk+"
>>                          (package-inputs wxwidgets))))
>>             (name "wxwidgets-gtk2")))
>> +
>> +(define-public python2-wxpython
>> +  (package
>> +    (name "python2-wxpython")
>> +    (version "3.0.2.0")
>> +    (source (origin
>> +              (method url-fetch)
>> +              (uri (string-append "mirror://sourceforge/wxpython/wxPython/"
>> +                                  version "/wxPython-src-" version ".tar.bz2"))
>> +              (sha256
>> +               (base32
>> +                "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm"))
>> +              (modules '((guix build utils)))
>> +              (snippet
>> +               '(begin
>> +                  (lambda (folder)
>> +                    (delete-file-recursively (string-append "src/" folder))
>> +                    '("expat" "jpeg" "png" "tiff" "zlib" "msw" "osx" "msdos"))
>> +                  (substitute* '("wxPython/setup.py")
>> +                    ;; setup.py tries to keep its own license the same as wxwidget's
>> +                    ;; license (which it expects under $WXWIN/docs).
>> +                    (("'preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt'") "")
>> +                    )))))
>> +    (build-system python-build-system)
>> +    (arguments
>> +     `(#:python ,python-2
>> +       #:tests? #f ; tests fail
>> +       #:configure-flags (list "WXPORT=gtk2"
>> +                               "UNICODE=1")
>> +       #:phases
>> +       (modify-phases %standard-phases
>> +         (add-before 'build 'chdir
>> +           (lambda _
>> +             (chdir "wxPython")
>> +             #t))
>> +         (add-after 'chdir 'set-wx-out-dir
>> +           (lambda* (#:key outputs #:allow-other-keys)
>> +             ;; By default, install phase tries to copy the wxPython headers in
>> +             ;; gnu/store/...-wxwidgets-3.0.2 , which it can't, so they are redirected
>> +             ;; to the output directory by setting WXPREFIX.
>> +             (substitute* "config.py"
>> +               (("= getWxConfigValue\\('--prefix'\\)")
>> +                (string-append "= '" (assoc-ref outputs "out") "'")))
>> +             (substitute* "wx/build/config.py"
>> +               (("= getWxConfigValue\\('--prefix'\\)")
>> +                (string-append "= '" (assoc-ref outputs "out") "'")))
>> +             #t))
>> +         (add-after 'set-wx-out-dir 'setenv
>> +           (lambda* (#:key inputs outputs #:allow-other-keys)
>> +             (setenv "WXWIN" (assoc-ref inputs "wxwidgets"))
>
>
>> +             (setenv "CPPFLAGS" (string-append "-I"
>> +                                               (assoc-ref inputs "wxwidgets")
>> +                                               "/lib/wx/include/gtk2-unicode-release-2.8"
>> +                                               " -I"
>> +                                               (assoc-ref inputs "wxwidgets")
>> +                                               "/include/wx-3.0"
>> +                                               " -D_FILE_OFFSET_BITS=64"
>> +                                               " -DWXUSINGDLL"
>> +                                               " -D__WXGTK__"))
>
> It would be better for future maintainability to call "wx-config --cppflags" there instead:
>
> (use-modules (ice-9 popen) (ice-9 rdelim))
> (let ((port (open-pipe* OPEN_READ (string-append (assoc-ref inputs "wxwidgets") "/bin/wx-config") "--cppflags")))
>   (setenv "CPPFLAGS" (read-string port))
>   (close-pipe port))
>

This works correctly.

>> +             #t)))))
>> +    (native-inputs
>> +     `(("gtk+" ,gtk+-2)
>> +       ("expat" ,expat)
>> +       ("libjpeg" ,libjpeg)
>> +       ("libpng" ,libpng)
>> +       ("libtiff" ,libtiff)
>> +       ("libsm" ,libsm)
>> +       ("libx11" ,libx11)
>> +       ("mesa" ,mesa)
>> +       ("pkg-config" ,pkg-config)
>> +       ("python2-setuptools" ,python2-setuptools)
>> +       ("zlib" ,zlib)))
>> +    (inputs
>> +     `(("wxwidgets" ,wxwidgets-gtk2)))
>
> This can be reduced to:
>
>     (native-inputs
>      `(("mesa" ,mesa) ; for glcanvas
>        ("pkg-config" ,pkg-config)
>        ("python2-setuptools" ,python2-setuptools)))
>     (inputs
>      `(("gtk+" ,gtk+-2) ; for wxPython/src/helpers.cpp
>        ("wxwidgets" ,wxwidgets-gtk2)))
>
> ... without loss of functionality.
>

Correct, and tested to be working, thanks! Kicad builds on top of those
changes as is.

>> +    (synopsis "Python2 Bindings for wxWidgets")
>> +    (description "@code{wxpython} are Python2 bindings for wxWidgets.")
>> +    (home-page "http://wxpython.org/")
>> +    (license (package-license wxwidgets))))


-- 
Theodoros Foradis

  reply	other threads:[~2016-11-02 13:56 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-24 21:16 [PATCH 0/3] gnu: Add kicad Theodoros Foradis
2016-10-24 21:16 ` [PATCH 1/3] gnu: Add wxwidgets-gtk2 Theodoros Foradis
2016-10-24 21:16 ` [PATCH 2/3] gnu: Add python2-wxpython Theodoros Foradis
2016-10-25  8:32   ` Hartmut Goebel
2016-10-25  9:58     ` Theodoros Foradis
2016-10-25 16:20   ` Efraim Flashner
2016-10-24 21:16 ` [PATCH 3/3] gnu: Add kicad Theodoros Foradis
2016-10-25  0:36   ` Leo Famulari
2016-10-25  0:41     ` Leo Famulari
2016-10-25  8:11       ` Theodoros Foradis
2016-10-25 12:48   ` Leo Famulari
2016-10-25 16:09     ` [PATCH v2 0/3] " Theodoros Foradis
2016-10-25 16:09       ` [PATCH v2 1/3] gnu: Add python2-wxpython Theodoros Foradis
2016-10-25 16:32         ` Leo Famulari
2016-10-25 16:09       ` [PATCH v2 2/3] gnu: Add kicad Theodoros Foradis
2016-10-25 16:09       ` [PATCH v2 3/3] gnu: Add python2-wxpython Theodoros Foradis
2016-10-25 16:35         ` Leo Famulari
2016-10-25 17:13           ` Theodoros Foradis
2016-10-30  0:13             ` Leo Famulari
2016-10-30 10:13               ` Hartmut Goebel
2016-10-31 10:42               ` Danny Milosavljevic
2016-10-31 15:38                 ` Danny Milosavljevic
2016-10-25 18:05           ` Theodoros Foradis
2016-10-25 18:28             ` Leo Famulari
2016-10-25 16:59       ` [PATCH v3 0/3] gnu: Add kicad Theodoros Foradis
2016-10-25 16:59         ` [PATCH v3 1/3] gnu: Add wxwidgets-gtk2 Theodoros Foradis
2016-11-02  8:15           ` Danny Milosavljevic
2016-10-25 17:00         ` [PATCH v3 2/2] gnu: Add python2-wxpython Theodoros Foradis
2016-11-02  7:57           ` Danny Milosavljevic
2016-11-02 13:53             ` Theodoros Foradis [this message]
2016-10-25 17:00         ` [PATCH v3 3/3] gnu: Add kicad Theodoros Foradis
2016-10-30  0:18           ` Leo Famulari
2016-11-02 15:42             ` Theodoros Foradis
2016-11-05 18:41               ` Leo Famulari
2016-11-07 18:16                 ` [PATCH v4 1/3] gnu: Add wxwidgets-gtk2 Theodoros Foradis
2016-11-07 18:16                   ` [PATCH v4 2/3] gnu: Add python2-wxpython Theodoros Foradis
2016-11-07 22:38                     ` Danny Milosavljevic
2016-11-07 18:16                   ` [PATCH v4 3/3] gnu: Add kicad Theodoros Foradis
2016-11-07 18:47                     ` Efraim Flashner
2016-11-15 20:53                       ` [PATCH v5 1/4] gnu: Add wxwidgets-gtk2 Theodoros Foradis
2016-11-15 20:53                         ` [PATCH v5 2/4] gnu: Add python2-wxpython Theodoros Foradis
2016-11-15 20:53                         ` [PATCH v5 3/4] gnu: Add kicad Theodoros Foradis
2016-11-15 20:53                         ` [PATCH v5 4/4] gnu: Add kicad-library Theodoros Foradis
2016-11-15 19:26                     ` [PATCH v4 3/3] gnu: Add kicad Leo Famulari
2016-11-22 19:46                       ` Theodoros Foradis
2016-11-25  5:40                         ` Leo Famulari
2016-11-07 21:04                 ` [PATCH v3 " Ricardo Wurmus

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=8737jat2dp.fsf@openmailbox.org \
    --to=theodoros.for@openmailbox.org \
    --cc=guix-devel@gnu.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.