Re: [OUTREACHY]: Integration of desktop environments into GNU Guix
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
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][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.
Re: New Signing Key
Guix, Brett Gilio 写道： As per my email a few days ago, I have lost control of my signing key. I have, as per instructions, refreshed the key on Savannah and am signing this email. I've authorised Brett in commit ba1d9680d61d3b06d9b81a81863448f494d654a7. Kind regards, T G-R signature.asc Description: PGP signature
Re: [OUTREACHY]: Integration of desktop environments into GNU Guix
Hi Danny!
> since cairo is meant to be a portable and backend-agnostic vector graphics
> library, I find it hard to believe it needs to propagate fontconfig, freetype,
> glib, libpng, pixman, x11, xcb, xext and xrender.
>
> Are you sure that cairo actually exposes those libraries' interfaces to its
> users?
I took a brief look at the manual
(https://cairographics.org/manual/cairo-surfaces.html), it appears it
does exposes them.
> The cairo.pc file also suggests otherwise:
>
> Requires.private: gobject-2.0 glib-2.0 >= 2.14 pixman-1 >= 0.30.0
> fontconfig >= 2.2.95 freetype2 >= 9.7.3 libpng xcb-shm xcb >= 1.6
> xcb-render >= 1.6 xrender >= 0.6 x11 xext
> Libs: -L${libdir} -lcairo
> Libs.private:-lz -lz -lz
>
> "Requires.private" means that those are implementation details and not to be
> exposed to the users of the library.
The other reason I left them in propagated inputs is because, the
packages that depend on cairo doesn't build without them. If I
de-propagate them in cairo, then I have to replicate them as inputs on
other packages.
> 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`.
> Pushed the pixman and hplip patches to wip-desktop.
Thanks!
Regards,
RG.
signature.asc
Description: OpenPGP digital signature
Re: [OUTREACHY]: Integration of desktop environments into GNU Guix
Hi RG,
since cairo is meant to be a portable and backend-agnostic vector graphics
library, I find it hard to believe it needs to propagate fontconfig, freetype,
glib, libpng, pixman, x11, xcb, xext and xrender.
Are you sure that cairo actually exposes those libraries' interfaces to its
users?
The cairo.pc file also suggests otherwise:
Requires.private: gobject-2.0 glib-2.0 >= 2.14 pixman-1 >= 0.30.0
fontconfig >= 2.2.95 freetype2 >= 9.7.3 libpng xcb-shm xcb >= 1.6 xcb-render
>= 1.6 xrender >= 0.6 x11 xext
Libs: -L${libdir} -lcairo
Libs.private:-lz -lz -lz
"Requires.private" means that those are implementation details and not to be
exposed to the users of the library.
Also, please do not make libsigc++ public twice. It's already in the
module's #:export list.
Same for glibmm and maybe others.
Pushed the pixman and hplip patches to wip-desktop.
pgpVmbjMtJeJ3.pgp
Description: OpenPGP digital signature
Re: [OUTREACHY]: Integration of desktop environments into GNU Guix
Hi Danny! > Pushed to wip-desktop. Thank you! > Comments: > > * Why is libcamera in (gnu packages networking)? It sounds like it has > digital camera libraries. OOPS! It should have been in image.scm. I will move it. > * libcamera:doc is not reproducible. Ah! As you mentioned in XMPP Chat, it is probably caused by ".doctrees". I will try to exclude them. > * building zentiy has webkitgtk as dependencies. Yeah, it was annoying. But zenity get some things from webkitgtk. May be I will try to create webkitgtk-minimal, if time permits. :-) @Danny Please find attached patches. @Others Please find the following git log. *** START *** commit 3d97b5d2e1e836d3c2fc20241f84cf0f2e2bd6b8 Author: Raghav Gururajan Date: Sat Jul 18 08:13:48 2020 -0400 gnu: gtksourceviewmm: Update package definition. * gnu/packages/gtk.scm (gtksourceviewmm) [version]: Update to 3.21.3. [source][sha256]: Modify base32. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:phases>['move-doc]: New phase. [native-inputs]: Add graphviz, doxygen, m4, mm-common, perl and libxslt. [propagated-inputs]: Change glibmm to glibmm-2.64. [synopsis]: Modify. [description]: Modify. [home-page]: Mofify. commit 604e2adf2b4ebb2a015539bb38077ce9964803cc Author: Raghav Gururajan Date: Sat Jul 18 08:24:21 2020 -0400 gnu: java-jakarta-oro: Update hash. commit 5d3720a7a2b35b7864e8c88ee597030b249fa40c Author: Raghav Gururajan Date: Sat Jul 18 06:18:38 2020 -0400 gnu: gtkmm-2: Update package definition. * gnu/packages/gtk.scm (gtkmm-2): Update package definition. [arguments]: Remove field. [native-inputs]: Remove field. [propagated-inputs]: Change; pangomm to pangomm-2.42, cairomm to cairomm-1.13 and glibmm to glibmm-2.64. commit 5c9e355598d7b54763e0d7ee740cde2a4d80c11b Author: Raghav Gururajan Date: Sat Jul 18 06:12:32 2020 -0400 gnu: gtkmm: Update package definition. * gnu/packages/gtk.scm (gtkmm): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:phases>['start-xvfb]: Remove phase. ['pre-check]: New phase. ['move-doc]: New phase. [native-inputs]: Add graphviz, doxygen, m4, mm-common, perl and libxslt. [propagated-inputs]: Change; pangomm to pangomm-2.42, cairomm to cairomm-1.13 and glibmm to glibmm-2.64. [synopsis]: Modify. [description]: Modify. [license]: Add gpl2+. commit c8bff53d223af7c4fb2d90376879f971791e8f83 Author: Raghav Gururajan Date: Sat Jul 18 04:42:20 2020 -0400 gnu: Add pangomm-2.42. * gnu/packages/gtk.scm (pangomm-2.42): New variable. commit 7ab0bd0bba2ba723f47dc699316fc8da127a5a81 Author: Raghav Gururajan Date: Sat Jul 18 04:33:51 2020 -0400 gnu: pangomm: Update package definition. * gnu/packages/gtk.scm (pangomm) [version]: Update to 2.43.2. [source][sha256]: Modify base32. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:phases>['move-doc]: New phase. [native-inputs]: Add graphviz, doxygen, m4, mm-common, perl, python-wrapper and libxslt. [synopsis]: Modify. [description]: Modify. [license]: Add gpl2+. commit e119693dc2ab384ac81155564ca1ef806beeccf9 Author: Raghav Gururajan Date: Sat Jul 18 04:15:21 2020 -0400 gnu: atkmm: Update package definition. * gnu/packages/gtk.scm (atkmm): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: Add new output "doc". [arguments]<#:phases>['move-doc]: New phase. [native-inputs]: Add graphviz, doxygen, m4, mm-common, perl and libxslt. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add gpl2+. commit eb5d57fb3e84ac057fcd47f13e794d5756e01d0a Author: Raghav Gururajan Date: Sat Jul 18 04:10:22 2020 -0400 gnu: Add glibmm-2.64. *gnu/packages/glib.scm (glibmm-2.64): New variable. commit 14bea287b96739498538bf4eaf838bca77a41901 Author: Raghav Gururajan Date: Sat Jul 18 04:08:05 2020 -0400 gnu: glibmm: Update package definition. * gnu/packages/glib.scm (glibmm) [version]: Update to 2.65.3. [source][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+. commit fd1f18145c9fdcd652b77d75d0c653c7d93ad352 Author: Raghav Gururajan Date: Sat Jul 18 04:01:18 2020 -0400 gnu: Add cairomm-1.13. * gnu/packages/gtk.scm (cairomm-1.13): New variable. commit 611fc3418926e777d1572a192527ec6b22f24379 Author: Raghav Gururajan Date: Sat Jul 18 03:49:41 2020 -0
New French PO file for 'guix' (version 1.1.0-pre2)
Hello, gentle maintainer. This is a message from the Translation Project robot. A revised PO file for textual domain 'guix' has been submitted by the French team of translators. The file is available at: https://translationproject.org/latest/guix/fr.po (We can arrange things so that in the future such files are automatically e-mailed to you when they arrive. Ask at the address below if you want this.) All other PO files for your package are available in: https://translationproject.org/latest/guix/ Please consider including all of these in your next release, whether official or a pretest. Whenever you have a new distribution with a new version number ready, containing a newer POT file, please send the URL of that distribution tarball to the address below. The tarball may be just a pretest or a snapshot, it does not even have to compile. It is just used by the translators when they need some extra translation context. The following HTML page has been updated: https://translationproject.org/domain/guix.html If any question arises, please contact the translation coordinator. Thank you for all your work, The Translation Project robot, in the name of your translation coordinator.
