* [bug#28516] Cinnamon-Desktop (a package, not the full desktop!)
@ 2017-09-19 16:23 ng0
2017-10-13 6:17 ` Christopher Baines
0 siblings, 1 reply; 5+ messages in thread
From: ng0 @ 2017-09-19 16:23 UTC (permalink / raw)
To: 28516
[-- Attachment #1.1: Type: text/plain, Size: 884 bytes --]
This adds 'cinnamon-desktop', the start for Cinnamon.
I ran into problems building muffin afterwards, not related to
this package.
+ (and (system* "glib-gettextize" "--force" "--copy")
+ (system* "intltoolize" "--force" "--copy" "--automake")
+ (system* "autoreconf" "--verbose" "--force" "--install"))))))))
As far as I remember I tried to work around with this
on the PYTHON=python2 ./automake.sh --some --configure --parameters; make
system Cinnamon uses.
It could probably be shortened to:
+ (and (system* "glib-gettextize")
+ (system* "intltoolize")
+ (system* "autoreconf" "-vfi"))…
What do you think?
--
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://krosos.org/dist/keys/
https://www.infotropique.org https://www.krosos.org
[-- Attachment #1.2: 0001-gnu-Add-cinnamon-desktop.patch --]
[-- Type: text/plain, Size: 4623 bytes --]
From e3e8a7e2377aa7c26c8b5618888e12c47c60488e Mon Sep 17 00:00:00 2001
From: ng0 <ng0@infotropique.org>
Date: Sat, 9 Sep 2017 16:19:38 +0000
Subject: [PATCH 1/2] gnu: Add cinnamon-desktop.
* gnu/packages/cinnamon.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
gnu/local.mk | 1 +
gnu/packages/cinnamon.scm | 87 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 88 insertions(+)
create mode 100644 gnu/packages/cinnamon.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 0b84a72fa..b0b5532cb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -87,6 +87,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/check.scm \
%D%/packages/chez.scm \
%D%/packages/ci.scm \
+ %D%/packages/cinnamon.scm \
%D%/packages/cmake.scm \
%D%/packages/cobol.scm \
%D%/packages/code.scm \
diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm
new file mode 100644
index 000000000..f0f28b4c5
--- /dev/null
+++ b/gnu/packages/cinnamon.scm
@@ -0,0 +1,87 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017 ng0 <ng0@infotropique.org>
+;;;
+;;; 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 cinnamon)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix utils)
+ #:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages autotools)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages gettext)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages gnome)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages pulseaudio)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages xorg))
+
+(define-public cinnamon-desktop
+ (package
+ (name "cinnamon-desktop")
+ (version "3.4.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/linuxmint/cinnamon-desktop/"
+ "archive/" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1jf24csrbfi9aiza1g70jpvsbjiqwphk0i5wilxq9kpjjsl99maq"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'autoconf
+ (lambda _
+ (mkdir-p "m4")
+ (zero?
+ (and (system* "glib-gettextize" "--force" "--copy")
+ (system* "intltoolize" "--force" "--copy" "--automake")
+ (system* "autoreconf" "--verbose" "--force" "--install"))))))))
+
+ (inputs
+ `(("accountsservice" ,accountsservice)
+ ("gtk+" ,gtk+)
+ ("glib" ,glib)
+ ("glib" ,glib "bin") ; glib-gettextize
+ ("gobject-introspection" ,gobject-introspection)
+ ("gnome-common" ,gnome-common)
+ ("libxkbfile" ,libxkbfile)
+ ("libxrandr" ,libxrandr)
+ ("python-2" ,python-2)
+ ;;libgsystem
+ ("pulseaudio" ,pulseaudio)
+ ("xkeyboard-config" ,xkeyboard-config)))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("gettext" ,gettext-minimal)
+ ("intltool" ,intltool)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
+ (home-page "https://github.com/linuxmint/cinnamon-desktop/")
+ (synopsis "Cinnamon-desktop library")
+ (description
+ "Cinnamon-desktop contains the libcinnamon-desktop library,
+the cinnamon-about program as well as some desktop-wide documents.")
+ (license (list license:gpl2+ license:lgpl2.0+
+ license:expat)))) ;display-name.c , edid-parse.c
--
2.14.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread* [bug#28516] Cinnamon-Desktop (a package, not the full desktop!)
2017-09-19 16:23 [bug#28516] Cinnamon-Desktop (a package, not the full desktop!) ng0
@ 2017-10-13 6:17 ` Christopher Baines
2017-10-13 6:44 ` ng0
0 siblings, 1 reply; 5+ messages in thread
From: Christopher Baines @ 2017-10-13 6:17 UTC (permalink / raw)
To: ng0; +Cc: 28516
[-- Attachment #1: Type: text/plain, Size: 648 bytes --]
On Tue, 19 Sep 2017 16:23:14 +0000
ng0 <ng0@infotropique.org> wrote:
> This adds 'cinnamon-desktop', the start for Cinnamon.
Hey ng0,
I don't know much about Cinnamon, is there a way I could test this
package, or is it not much use until more cinnamon related packages
are added?
guix lint resports some issues:
gnu/packages/cinnamon.scm:38:2: cinnamon-desktop@3.4.2: 'glib:bin' should probably be a native input
gnu/packages/cinnamon.scm:82:14: cinnamon-desktop@3.4.2: synopsis should not start with the package name
gnu/packages/cinnamon.scm:38:2: cinnamon-desktop@3.4.2: trailing white space on line 60
Thanks,
Chris
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 963 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#28516] Cinnamon-Desktop (a package, not the full desktop!)
2017-10-13 6:17 ` Christopher Baines
@ 2017-10-13 6:44 ` ng0
2017-10-14 21:08 ` ng0
0 siblings, 1 reply; 5+ messages in thread
From: ng0 @ 2017-10-13 6:44 UTC (permalink / raw)
To: Christopher Baines; +Cc: 28516
[-- Attachment #1: Type: text/plain, Size: 1501 bytes --]
Christopher Baines transcribed 1.8K bytes:
> On Tue, 19 Sep 2017 16:23:14 +0000
> ng0 <ng0@infotropique.org> wrote:
>
> > This adds 'cinnamon-desktop', the start for Cinnamon.
>
> Hey ng0,
>
> I don't know much about Cinnamon, is there a way I could test this
> package, or is it not much use until more cinnamon related packages
> are added?
As far as I know it's not much use until more of Cinnamon is added.
Why I didn't include more is a bug report I filed at upstream. As I got
no response it's up to myself to do some more reading into Cinnamon itself
to understand the way they build it. The first obvious attempts failed,
but lots of things I work on have a long history already.
We can only start to correct things at the foundation when we have the
architecture to realize it doesn't fit. Right now I believe that building
without errors is the best we can do.
> guix lint resports some issues:
>
> gnu/packages/cinnamon.scm:38:2: cinnamon-desktop@3.4.2: 'glib:bin' should probably be a native input
> gnu/packages/cinnamon.scm:82:14: cinnamon-desktop@3.4.2: synopsis should not start with the package name
> gnu/packages/cinnamon.scm:38:2: cinnamon-desktop@3.4.2: trailing white space on line 60
Okay, thanks I'll send fixes within the next 7 days.
> Thanks,
>
> Chris
--
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://dist.ng0.infotropique.org/dist/keys/
https://www.infotropique.org https://ng0.infotropique.org
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#28516] Cinnamon-Desktop (a package, not the full desktop!)
2017-10-13 6:44 ` ng0
@ 2017-10-14 21:08 ` ng0
2017-10-15 19:40 ` bug#28516: " Christopher Baines
0 siblings, 1 reply; 5+ messages in thread
From: ng0 @ 2017-10-14 21:08 UTC (permalink / raw)
To: Christopher Baines; +Cc: 28516
[-- Attachment #1.1: Type: text/plain, Size: 1814 bytes --]
ng0 transcribed 2.5K bytes:
> Christopher Baines transcribed 1.8K bytes:
> > On Tue, 19 Sep 2017 16:23:14 +0000
> > ng0 <ng0@infotropique.org> wrote:
> >
> > > This adds 'cinnamon-desktop', the start for Cinnamon.
> >
> > Hey ng0,
> >
> > I don't know much about Cinnamon, is there a way I could test this
> > package, or is it not much use until more cinnamon related packages
> > are added?
>
> As far as I know it's not much use until more of Cinnamon is added.
> Why I didn't include more is a bug report I filed at upstream. As I got
> no response it's up to myself to do some more reading into Cinnamon itself
> to understand the way they build it. The first obvious attempts failed,
> but lots of things I work on have a long history already.
>
> We can only start to correct things at the foundation when we have the
> architecture to realize it doesn't fit. Right now I believe that building
> without errors is the best we can do.
>
> > guix lint resports some issues:
> >
> > gnu/packages/cinnamon.scm:38:2: cinnamon-desktop@3.4.2: 'glib:bin' should probably be a native input
> > gnu/packages/cinnamon.scm:82:14: cinnamon-desktop@3.4.2: synopsis should not start with the package name
> > gnu/packages/cinnamon.scm:38:2: cinnamon-desktop@3.4.2: trailing white space on line 60
>
> Okay, thanks I'll send fixes within the next 7 days.
Updated patch appended.
> > Thanks,
> >
> > Chris
>
>
>
> --
> ng0
> GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
> GnuPG: https://dist.ng0.infotropique.org/dist/keys/
> https://www.infotropique.org https://ng0.infotropique.org
--
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://dist.ng0.infotropique.org/dist/keys/
https://www.infotropique.org https://ng0.infotropique.org
[-- Attachment #1.2: 0001-gnu-Add-cinnamon-desktop.patch --]
[-- Type: text/plain, Size: 4630 bytes --]
From e9776789c38ac9c6895f8d58dfb1d5e64ed4a049 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@infotropique.org>
Date: Sat, 9 Sep 2017 16:19:38 +0000
Subject: [PATCH 1/2] gnu: Add cinnamon-desktop.
* gnu/packages/cinnamon.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
gnu/local.mk | 1 +
gnu/packages/cinnamon.scm | 86 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 87 insertions(+)
create mode 100644 gnu/packages/cinnamon.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 5919d1bdd..9defe9d58 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -87,6 +87,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/check.scm \
%D%/packages/chez.scm \
%D%/packages/ci.scm \
+ %D%/packages/cinnamon.scm \
%D%/packages/cmake.scm \
%D%/packages/cobol.scm \
%D%/packages/code.scm \
diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm
new file mode 100644
index 000000000..3249b81de
--- /dev/null
+++ b/gnu/packages/cinnamon.scm
@@ -0,0 +1,86 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017 ng0 <ng0@infotropique.org>
+;;;
+;;; 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 cinnamon)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix utils)
+ #:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages autotools)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages gettext)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages gnome)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages pulseaudio)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages xorg))
+
+(define-public cinnamon-desktop
+ (package
+ (name "cinnamon-desktop")
+ (version "3.4.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/linuxmint/cinnamon-desktop/"
+ "archive/" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1jf24csrbfi9aiza1g70jpvsbjiqwphk0i5wilxq9kpjjsl99maq"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'autoconf
+ (lambda _
+ (mkdir-p "m4")
+ (zero?
+ (and (system* "glib-gettextize" "--force" "--copy")
+ (system* "intltoolize" "--force" "--copy" "--automake")
+ (system* "autoreconf" "--verbose" "--force" "--install"))))))))
+ ;; TODO: package 'libgsystem'.
+ (inputs
+ `(("accountsservice" ,accountsservice)
+ ("gtk+" ,gtk+)
+ ("glib" ,glib)
+ ("gobject-introspection" ,gobject-introspection)
+ ("gnome-common" ,gnome-common)
+ ("libxkbfile" ,libxkbfile)
+ ("libxrandr" ,libxrandr)
+ ("python-2" ,python-2)
+ ("pulseaudio" ,pulseaudio)
+ ("xkeyboard-config" ,xkeyboard-config)))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("gettext" ,gettext-minimal)
+ ("glib" ,glib "bin") ; glib-gettextize
+ ("intltool" ,intltool)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
+ (home-page "https://github.com/linuxmint/cinnamon-desktop/")
+ (synopsis "Library for the Cinnamon Desktop")
+ (description
+ "Cinnamon-desktop contains the libcinnamon-desktop library,
+the cinnamon-about program as well as some desktop-wide documents.")
+ (license (list license:gpl2+ license:lgpl2.0+
+ license:expat)))) ;display-name.c , edid-parse.c
--
2.14.2
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread* bug#28516: Cinnamon-Desktop (a package, not the full desktop!)
2017-10-14 21:08 ` ng0
@ 2017-10-15 19:40 ` Christopher Baines
0 siblings, 0 replies; 5+ messages in thread
From: Christopher Baines @ 2017-10-15 19:40 UTC (permalink / raw)
To: ng0; +Cc: 28516-done
[-- Attachment #1: Type: text/plain, Size: 600 bytes --]
On Sat, 14 Oct 2017 21:08:13 +0000
ng0 <ng0@infotropique.org> wrote:
> Updated patch appended.
Great :) I've tweaked the description a bit, I hope you don't mind, and
pushed this now.
I put "The" at the start of the description, as this looked neater to
me than capitalising cinnamon. I also removed the bit about
cinnamon-about, as I think this is an error in the upstream README. The
package doesn't look to contain any such program, and ooking at the git
history, I think it came across from Gnome and was simply renamed,
even though it probably didn't exist in the repository...
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 963 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-10-15 19:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-19 16:23 [bug#28516] Cinnamon-Desktop (a package, not the full desktop!) ng0
2017-10-13 6:17 ` Christopher Baines
2017-10-13 6:44 ` ng0
2017-10-14 21:08 ` ng0
2017-10-15 19:40 ` bug#28516: " Christopher Baines
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).