[PATCH 0/4] Add gobby 0.4

[PATCH 0/4] Add gobby 0.4

[Andy Wingo]

These patches add a collaborative editor that we use at work.

Andy Wingo (4):
  gnu: Add libxml++-2.
  gnu: Add libnet6.
  gnu: Add obby.
  gnu: Add obby.

 gnu/local.mk           |   1 +
 gnu/packages/gnome.scm |  14 ++++++
 gnu/packages/gobby.scm | 132 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 147 insertions(+)
 create mode 100644 gnu/packages/gobby.scm

-- 
2.9.3

[PATCH 1/4] gnu: Add libxml++-2.

[Andy Wingo]

* gnu/packages/gnome.scm (libxml++-2): New variable.
---
 gnu/packages/gnome.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e47e435..e33f744 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4531,6 +4531,20 @@ the available networks and allows users to easily switch between them.")
 libxml2.")
     (license license:lgpl2.1+)))
 
+(define-public libxml++-2
+  (package
+    (inherit libxml++)
+    (name "libxml++")
+    (version "2.40.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/" name "/"
+                                  (version-major+minor version) "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a"))))))
+
 (define-public gdm
   (package
     (name "gdm")
-- 
2.9.3

[PATCH 2/4] gnu: Add libnet6.

[Andy Wingo]

* gnu/packages/gobby.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add new file.
---
 gnu/local.mk           |  1 +
 gnu/packages/gobby.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 gnu/packages/gobby.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index c2cdf8b..a690b6e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -156,6 +156,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/gnustep.scm			\
   %D%/packages/gnuzilla.scm			\
   %D%/packages/gnu-pw-mgr.scm			\
+  %D%/packages/gobby.scm			\
   %D%/packages/golang.scm			\
   %D%/packages/gperf.scm			\
   %D%/packages/gprolog.scm			\
diff --git a/gnu/packages/gobby.scm b/gnu/packages/gobby.scm
new file mode 100644
index 0000000..7e90453
--- /dev/null
+++ b/gnu/packages/gobby.scm
@@ -0,0 +1,69 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Andy Wingo <wingo@igalia.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 gobby)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix utils)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages xml))
+
+(define-public libnet6
+  (package
+    (name "libnet6")
+    (version "1.3.14")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://releases.0x539.de/net6/net6-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "088yqq60wjx3jqjlhl12893p15gl9asjpavrbhh590qzpqndhp8m"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     `(#:configure-flags
+       '("CXXFLAGS=-std=c++11")         ; required by libsigc++
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'update-gnutls-api
+           (lambda _
+             (substitute* "src/encrypt.cpp"
+               ;; The GnuTLS API to set authentication and other parameters
+               ;; and priorities changed in 3.4; update to allow ANON_DH via
+               ;; the new API.
+               (("gnutls_kx_set_priority\\(session, kx_prio\\)")
+                (string-append "gnutls_priority_set_direct"
+                               "(session, \"NORMAL:+ANON-DH\", NULL)"))))))))
+    (inputs
+     `(("libsigc++" ,libsigc++)
+       ("gnutls" ,gnutls)))
+    (home-page "https://gobby.github.io/")
+    (synopsis "Network access framework for IPv4/IPv6")
+    (description
+     "net6 is a library which eases the development of network-based
+applications as it provides a TCP protocol abstraction for C++.")
+    (license license:lgpl2.1)))
-- 
2.9.3

[PATCH 3/4] gnu: Add obby.

[Andy Wingo]

* gnu/packages/gobby.scm (obby): New variable.
---
 gnu/packages/gobby.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/gobby.scm b/gnu/packages/gobby.scm
index 7e90453..eac088a 100644
--- a/gnu/packages/gobby.scm
+++ b/gnu/packages/gobby.scm
@@ -67,3 +67,32 @@
      "net6 is a library which eases the development of network-based
 applications as it provides a TCP protocol abstraction for C++.")
     (license license:lgpl2.1)))
+
+(define-public obby
+  (package
+    (name "obby")
+    (version "0.4.8")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://releases.0x539.de/obby/obby-"
+                                  version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0rwvp0kzsb8y6mq73rzb8yk4kvsrz64i2zf4lfqs3kh0x2k7n7bx"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libsigc++" ,libsigc++)
+       ("gnutls" ,gnutls)
+       ("libnet6" ,libnet6)))
+    (arguments
+     ;; Required by libsigc++.
+     `(#:configure-flags '("CXXFLAGS=-std=c++11")))
+    (home-page "https://gobby.github.io/")
+    (synopsis "Library for building collaborative editors")
+    (description
+     "libobby is a library which provides synced document buffers. It supports
+multiple documents in one session.")
+    (license license:gpl2+)))
-- 
2.9.3

[PATCH 4/4] gnu: Add obby.

[Andy Wingo]

* gnu/packages/gobby.scm (gobby): New variable.
---
 gnu/packages/gobby.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/gobby.scm b/gnu/packages/gobby.scm
index eac088a..c14e40e 100644
--- a/gnu/packages/gobby.scm
+++ b/gnu/packages/gobby.scm
@@ -96,3 +96,37 @@ applications as it provides a TCP protocol abstraction for C++.")
      "libobby is a library which provides synced document buffers. It supports
 multiple documents in one session.")
     (license license:gpl2+)))
+
+(define-public gobby
+  (package
+    (name "gobby")
+    (version "0.4.13")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://releases.0x539.de/gobby/gobby-"
+                                  version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0w8q01lf6bcdz537b29m7rwlbc7k87b12vnpm1h6219ypvzqkgcc"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("libxml++-2" ,libxml++-2)
+       ("gnutls" ,gnutls)
+       ("gtkmm-2" ,gtkmm-2)
+       ("gtksourceview-2" ,gtksourceview-2)
+       ("libnet6" ,libnet6)
+       ("obby" ,obby)))
+    (arguments
+     ;; Required by libsigc++.
+     `(#:configure-flags '("CXXFLAGS=-std=c++11")))
+    (home-page "https://gobby.github.io/")
+    (synopsis "Collaborative editor")
+    (description
+     "Gobby is a collaborative editor supporting multiple documents in one
+session and a multi-user chat.  It allows multiple users to edit the same
+document together over the internet in real-time.")
+    (license license:gpl2+)))
-- 
2.9.3

Re: [PATCH 0/4] Add gobby 0.4

[Andy Wingo]

On Tue 27 Sep 2016 14:31, Andy Wingo <wingo@igalia.com> writes:

> These patches add a collaborative editor that we use at work.
>
> Andy Wingo (4):
>   gnu: Add libxml++-2.
>   gnu: Add libnet6.
>   gnu: Add obby.
>   gnu: Add obby.
>
>  gnu/local.mk           |   1 +
>  gnu/packages/gnome.scm |  14 ++++++
>  gnu/packages/gobby.scm | 132 +++++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 147 insertions(+)
>  create mode 100644 gnu/packages/gobby.scm

Clearly I am an idiot.  I was trying the technique where you can
git format-patch to a directory and then git send-email from those
files.  Never more!  Anyway I pushed the above after fixing the lint
errors for the `description' fields.

Apologies for the spam!

Andy

Re: [PATCH 0/4] Add gobby 0.4

[Ludovic Courtès]

Andy Wingo <wingo@igalia.com> skribis:

> On Tue 27 Sep 2016 14:31, Andy Wingo <wingo@igalia.com> writes:
>
>> These patches add a collaborative editor that we use at work.
>>
>> Andy Wingo (4):
>>   gnu: Add libxml++-2.
>>   gnu: Add libnet6.
>>   gnu: Add obby.
>>   gnu: Add obby.
>>
>>  gnu/local.mk           |   1 +
>>  gnu/packages/gnome.scm |  14 ++++++
>>  gnu/packages/gobby.scm | 132 +++++++++++++++++++++++++++++++++++++++++++++++++
>>  3 files changed, 147 insertions(+)
>>  create mode 100644 gnu/packages/gobby.scm
>
> Clearly I am an idiot.  I was trying the technique where you can
> git format-patch to a directory and then git send-email from those
> files.  Never more!  Anyway I pushed the above after fixing the lint
> errors for the `description' fields.

Heh.  :-)  Thanks for adding Gobby!

Ludo’.