[PATCH] gnu: Add wxwidgets.

[PATCH] gnu: Add wxwidgets.

[Taylan Ulrich Bayırlı/Kammer]

[-- Attachment #1: patch --]
[-- Type: text/x-diff, Size: 5152 bytes --]

From 827cf2811acc435464598c4ac5f96517aafc17f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Fri, 20 Feb 2015 15:15:12 +0100
Subject: [PATCH 3/9] gnu: Add wxwidgets.

* gnu/packages/wxwidgets.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am              |   1 +
 gnu/packages/wxwidgets.scm | 105 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 gnu/packages/wxwidgets.scm

diff --git a/gnu-system.am b/gnu-system.am
index 24c5dc1..3eb7893 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -294,6 +294,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/wine.scm				\
   gnu/packages/wordnet.scm			\
   gnu/packages/wv.scm				\
+  gnu/packages/wxwidgets.scm			\
   gnu/packages/xfig.scm				\
   gnu/packages/xiph.scm				\
   gnu/packages/xml.scm				\
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
new file mode 100644
index 0000000..2b56122
--- /dev/null
+++ b/gnu/packages/wxwidgets.scm
@@ -0,0 +1,105 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages wxwidgets)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix l:)
+  #:use-module (guix build-system glib-or-gtk)
+  #:use-module (guix build utils)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages sdl)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages databases))
+
+(define-public wxwidgets
+  (package
+    (name "wxwidgets")
+    (version "3.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://sourceforge/wxwindows/" version
+                           "/wxWidgets-" version ".tar.bz2"))
+       (sha256
+        (base32 "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l"))))
+    (build-system glib-or-gtk-build-system)
+    ;; TODO: add WebKit
+    (inputs
+     `(("gtk" ,gtk+)
+       ("libjpeg" ,libjpeg)
+       ("libtiff" ,libtiff)
+       ("libmspack" ,libmspack)
+       ("sdl" ,sdl)
+       ("libsm" ,libsm)
+       ("mesa" ,mesa)
+       ("glu" ,glu)
+       ;; XXX gstreamer-0.10 builds fail
+       ;; ("gstreamer" ,gstreamer-0.10)
+       ))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     '(#:configure-flags
+       '("--with-regex=sys" "--with-libmspack" "--with-sdl")
+       ;; No 'check' target.
+       #:tests? #f))
+    (home-page "https://www.wxwidgets.org/")
+    (synopsis "Widget toolkit for creating graphical user interfaces")
+    (description
+     "wxWidgets is a C++ library that lets developers create applications with
+a graphical user interface.  It has language bindings for Python, Perl, Ruby
+and many other languages.")
+    (license (list l:lgpl2.0+ (l:fsf-free "file://doc/license.txt")))))
+
+(define-public wxwidgets-2
+  (package
+    (inherit wxwidgets)
+    (version "2.8.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://sourceforge.net/projects/wxwindows/files/"
+                           version "/wxGTK-" version ".tar.gz"))
+       (sha256
+        (base32 "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"))))
+    (inputs
+     `(("gtk" ,gtk+-2)
+       ("libjpeg" ,libjpeg)
+       ("libtiff" ,libtiff)
+       ("libmspack" ,libmspack)
+       ("sdl" ,sdl)
+       ("unixodbc" ,unixodbc)))
+    (arguments
+     `(#:configure-flags
+       '("--enable-unicode" "--with-regex=sys" "--with-sdl")
+       ;; No 'check' target.
+       #:tests? #f))
+    (home-page "https://www.wxwidgets.org/")
+    (synopsis "Widget toolkit for creating graphical user interfaces")
+    (description
+     "wxWidgets is a C++ library that lets developers create applications with
+a graphical user interface.  It has language bindings for Python, Perl, Ruby
+and many other languages.")
+    (license (list l:lgpl2.0+ (l:fsf-free "file://doc/license.txt")))))
-- 
2.2.1

Re: [PATCH] gnu: Add wxwidgets.

[Andreas Enge]

Hello,

I am surprised we did not have it yet!

I would use alphabetical ordering here:

On Sun, Feb 22, 2015 at 12:18:49AM +0100, Taylan Ulrich Bayırlı/Kammer wrote:
> +  #:use-module (gnu packages)
> +  #:use-module (gnu packages gtk)
> +  #:use-module (gnu packages image)
> +  #:use-module (gnu packages pkg-config)
> +  #:use-module (gnu packages compression)
> +  #:use-module (gnu packages sdl)
> +  #:use-module (gnu packages xorg)
> +  #:use-module (gnu packages gl)
> +  #:use-module (gnu packages gstreamer)
> +  #:use-module (gnu packages databases))

and here:

> +     `(("gtk" ,gtk+)
> +       ("libjpeg" ,libjpeg)
> +       ("libtiff" ,libtiff)
> +       ("libmspack" ,libmspack)
> +       ("sdl" ,sdl)
> +       ("libsm" ,libsm)
> +       ("mesa" ,mesa)
> +       ("glu" ,glu)
> +       ;; XXX gstreamer-0.10 builds fail
> +       ;; ("gstreamer" ,gstreamer-0.10)
> +       ))

> +  (package
> +    (inherit wxwidgets)
> +    (version "2.8.12")
> +    (home-page "https://www.wxwidgets.org/")
> +    (synopsis "Widget toolkit for creating graphical user interfaces")
> +    (description
> +     "wxWidgets is a C++ library that lets developers create applications with
> +a graphical user interface.  It has language bindings for Python, Perl, Ruby
> +and many other languages.")
> +    (license (list l:lgpl2.0+ (l:fsf-free "file://doc/license.txt")))))

All these are inherited, there is no need to add them again.

Andreas

Re: [PATCH] gnu: Add wxwidgets.

[Taylan Ulrich Bayırlı/Kammer]

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

Thanks for the feedback!  Here's the updated patch.


[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 4740 bytes --]

From 09f4144de6137c1fe9f9a2bc4697ed9b3b03f253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Fri, 20 Feb 2015 15:15:12 +0100
Subject: [PATCH 1/9] gnu: Add wxwidgets.

* gnu/packages/wxwidgets.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am              |  1 +
 gnu/packages/wxwidgets.scm | 97 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 gnu/packages/wxwidgets.scm

diff --git a/gnu-system.am b/gnu-system.am
index 24c5dc1..3eb7893 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -294,6 +294,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/wine.scm				\
   gnu/packages/wordnet.scm			\
   gnu/packages/wv.scm				\
+  gnu/packages/wxwidgets.scm			\
   gnu/packages/xfig.scm				\
   gnu/packages/xiph.scm				\
   gnu/packages/xml.scm				\
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
new file mode 100644
index 0000000..5406aed
--- /dev/null
+++ b/gnu/packages/wxwidgets.scm
@@ -0,0 +1,97 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages wxwidgets)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix l:)
+  #:use-module (guix build-system glib-or-gtk)
+  #:use-module (guix build utils)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages sdl)
+  #:use-module (gnu packages xorg))
+
+(define-public wxwidgets
+  (package
+    (name "wxwidgets")
+    (version "3.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://sourceforge/wxwindows/" version
+                           "/wxWidgets-" version ".tar.bz2"))
+       (sha256
+        (base32 "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l"))))
+    (build-system glib-or-gtk-build-system)
+    ;; TODO: add WebKit
+    (inputs
+     `(("glu" ,glu)
+       ;; XXX gstreamer-0.10 builds fail
+       ;; ("gstreamer" ,gstreamer-0.10)
+       ("gtk" ,gtk+)
+       ("libjpeg" ,libjpeg)
+       ("libmspack" ,libmspack)
+       ("libsm" ,libsm)
+       ("libtiff" ,libtiff)
+       ("mesa" ,mesa)
+       ("sdl" ,sdl)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     '(#:configure-flags
+       '("--with-regex=sys" "--with-libmspack" "--with-sdl")
+       ;; No 'check' target.
+       #:tests? #f))
+    (home-page "https://www.wxwidgets.org/")
+    (synopsis "Widget toolkit for creating graphical user interfaces")
+    (description
+     "wxWidgets is a C++ library that lets developers create applications with
+a graphical user interface.  It has language bindings for Python, Perl, Ruby
+and many other languages.")
+    (license (list l:lgpl2.0+ (l:fsf-free "file://doc/license.txt")))))
+
+(define-public wxwidgets-2
+  (package
+    (inherit wxwidgets)
+    (version "2.8.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://sourceforge.net/projects/wxwindows/files/"
+                           version "/wxGTK-" version ".tar.gz"))
+       (sha256
+        (base32 "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"))))
+    (inputs
+     `(("gtk" ,gtk+-2)
+       ("libjpeg" ,libjpeg)
+       ("libtiff" ,libtiff)
+       ("libmspack" ,libmspack)
+       ("sdl" ,sdl)
+       ("unixodbc" ,unixodbc)))
+    (arguments
+     `(#:configure-flags
+       '("--enable-unicode" "--with-regex=sys" "--with-sdl")
+       ;; No 'check' target.
+       #:tests? #f))))
-- 
2.2.1

Re: [PATCH] gnu: Add wxwidgets.

[Andreas Enge]

On Mon, Feb 23, 2015 at 09:17:46PM +0100, Taylan Ulrich Bayırlı/Kammer wrote:
> Thanks for the feedback!  Here's the updated patch.

Looks good to me, please push! The real test will come once you compile
something with it :-)

Andreas