Hi Danny! >> Also, please do not make libsigc++ public twice. It's already in the >> module's #:export list. >> >> Same for glibmm and maybe others. > > Hmm. Without that, I get "package not found" while doing `./pre-inst-env > guix build foo`.
It was for `./etc/indent-code.el`, not for `./pre-inst-env guix build`. Please find the revised patched for libsigc++ and glibmm, attached with this email. Regards, RG.
From 8a1cee7387722427cfa78b5272ab591df8c3953a Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
Date: Fri, 17 Jul 2020 16:07:56 -0400
Subject: [PATCH 04/18] gnu: libsigc++: Update package definition.
* gnu/packages/glib.scm (libsigc++) [version]: Update to 3.0.3.
[source]<origin>[sha256]: Modify base32.
[outputs]: New output "doc".
[arguments]<#:configure-flags>[--enable-benchmark]: New flag.
[--with-boost]: New flag.
[--with-boost-libdir]: New flag.
<#:phases>['move-doc]: New phase.
[native-inputs]: Add graphviz, doxygen, perl, python-wrapper and
libxslt.
[inputs]: Add boost.
[synopsis]: Modify.
[description]: Modify.
---
gnu/packages/glib.scm | 70 ++++++++++++++++++++++++++++++-------------
1 file changed, 50 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 603f0306df..5d19dacc10 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -34,6 +34,7 @@
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages docbook)
@@ -46,6 +47,7 @@
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gperf)
+ #:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
#:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
@@ -502,28 +504,56 @@ by GDBus included in Glib.")
(define libsigc++
(package
(name "libsigc++")
- (version "2.10.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/libsigc++/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "11j7j1jv4z58d9s7jvl42fnqa1dzl4idgil9r45cjv1w673dys0b"))))
+ (version "3.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/libsigc++/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32 "1dpdqs3nxkxj43fnyx5467ym2s2bpk3cq8pvwi9y1nsbi5m8dx74"))))
(build-system gnu-build-system)
- (native-inputs `(("pkg-config" ,pkg-config)
- ("m4" ,m4)))
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:configure-flags
+ (list
+ "--enable-benchmark=yes"
+ (string-append "--with-boost="
+ (assoc-ref %build-inputs "boost"))
+ (string-append "--with-boost-libdir="
+ (assoc-ref %build-inputs "boost")
+ "/lib"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'move-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (rename-file
+ (string-append out "/share/doc")
+ (string-append doc "/share/doc"))
+ #t))))))
+ (native-inputs
+ `(("dot" ,graphviz)
+ ("doxygen" ,doxygen)
+ ("m4" ,m4)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("xsltproc" ,libxslt)))
+ (inputs
+ `(("boost" ,boost)))
+ (synopsis "Callback Framework for C++")
+ (description "Libsigc++ implements a typesafe callback system for standard
+C++. It allows you to define signals and to connect those signals to any
+callback function, either global or a member function, regardless of whether it
+is static or virtual. It also contains adaptor classes for connection of
+dissimilar callbacks and has an ease of use unmatched by other C++ callback
+libraries.")
(home-page "https://libsigcplusplus.github.io/libsigcplusplus/";)
- (synopsis "Type-safe callback system for standard C++")
- (description
- "Libsigc++ implements a type-safe callback system for standard C++. It
-allows you to define signals and to connect those signals to any callback
-function, either global or a member function, regardless of whether it is
-static or virtual.
-
-It also contains adaptor classes for connection of dissimilar callbacks and
-has an ease of use unmatched by other C++ callback libraries.")
(license license:lgpl2.1+)))
(define glibmm
--
2.27.0
From c0c11f757848cf14904ad3eef24ae51fa72b0a86 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
Date: Sat, 18 Jul 2020 04:08:05 -0400
Subject: [PATCH 08/18] gnu: glibmm: Update package definition.
* gnu/packages/glib.scm (glibmm) [version]: Update to 2.65.3.
[source]<origin>[sha256]: Modify base32.
[build-system]: Change from gnu to glib-or-gtk.
[outputs]: New output "doc".
[arguments]<#:tests?>: New argument.
<#:phases>['move-doc]: New phase.
[native-inputs]: Add graphviz, doxygen, gobject-introspection, m4,
mm-common, perl, python-wrapper and libxslt.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Add gpl2+.
---
gnu/packages/glib.scm | 102 +++++++++++++++++++++++++-----------------
1 file changed, 60 insertions(+), 42 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index d4ceba681c..8aaf48e04e 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -64,6 +64,7 @@
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
+ #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl)
@@ -558,7 +559,7 @@ libraries.")
(define-public libsigc++-2
(package
- (inherit libsigc++)
+ (inherit libsigc++)
(name "libsigc++")
(version "2.10.3")
(source
@@ -571,48 +572,65 @@ libraries.")
(sha256
(base32 "11j7j1jv4z58d9s7jvl42fnqa1dzl4idgil9r45cjv1w673dys0b"))))))
-(define glibmm
- (package
+ (define glibmm
+ (package
(name "glibmm")
- (version "2.62.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/glibmm/"
- (version-major+minor version)
- "/glibmm-" version ".tar.xz"))
- (sha256
- (base32
- "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n"))))
- (build-system gnu-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'build 'pre-build
- (lambda _
- ;; This test uses /etc/fstab as an example file to read
- ;; from; choose a better example.
- (substitute* "tests/giomm_simple/main.cc"
- (("/etc/fstab")
- (string-append (getcwd)
- "/tests/giomm_simple/main.cc")))
-
- ;; This test does a DNS lookup, and then expects to be able
- ;; to open a TLS session; just skip it.
- (substitute* "tests/giomm_tls_client/main.cc"
- (("Gio::init.*$")
- "return 77;\n"))
- #t)))))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("glib" ,glib "bin")))
- (propagated-inputs
- `(("libsigc++" ,libsigc++)
- ("glib" ,glib)))
- (home-page "https://gtkmm.org/";)
- (synopsis "C++ interface to the GLib library")
- (description
- "Glibmm provides a C++ programming interface to the part of GLib that are
-useful for C++.")
- (license license:lgpl2.1+)))
+ (version "2.65.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/glibmm/"
+ (version-major+minor version)
+ "/glibmm-" version ".tar.xz"))
+ (sha256
+ (base32 "1qk7kkr1xa6n3fdvf3f3p2wmj2haycb7mwhzqmdcrwplnz4qd3rz"))))
+ (build-system glib-or-gtk-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:tests? #f ; XXX: Fix-me
+ #:phases
+ (modify-phases %standard-phases
+ ;; (add-after 'unpack 'disable-failing-tests
+ ;; (lambda _
+ ;; (substitute* "tests/Makefile.in"
+ ;; (("giomm_simple/test\$\\(EXEEXT\\) giomm_stream_vfuncs/test\$\\(EXEEXT\\) \\\\")
+ ;; "")
+ ;; (("giomm_tls_client/test\$\\(EXEEXT\\) giomm_listmodel/test\$\\(EXEEXT\\) \\\\")
+ ;; ""))
+ ;; #t))
+ (add-after 'install 'move-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (rename-file
+ (string-append out "/share/doc")
+ (string-append doc "/share/doc"))
+ #t))))))
+ (native-inputs
+ `(("dot" ,graphviz)
+ ("doxygen" ,doxygen)
+ ("glib" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("m4" ,m4)
+ ("mm-common" ,mm-common)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("xsltproc" ,libxslt)))
+ (propagated-inputs
+ `(("libsigc++" ,libsigc++)
+ ("glib" ,glib)))
+ (synopsis "C++ interface to the GLib")
+ (description "Glibmm is a C++ API for parts of glib that are useful for C++.")
+ (home-page "https://wiki.gnome.org/Projects/GLib";)
+ (license
+ (list
+ ;; Libraries
+ license:lgpl2.1+
+ ;; Tools
+ license:gpl2+))))
(define-public python2-pygobject-2
(package
--
2.27.0
signature.asc
Description: OpenPGP digital signature
