Subject: bug#28516: closed (Re: [bug#28516] Cinnamon-Desktop (a package, not the full desktop!))

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 15 Oct 2017 19:41:02 +0000

Your bug report

#28516: Cinnamon-Desktop (a package, not the full desktop!)

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
28516: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=28516
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#28516] Cinnamon-Desktop (a package, not the full desktop!)
From: Christopher Baines <[email-masked]>
To: ng0 <[email-masked]>
Cc: [email-masked]
Date: Sun, 15 Oct 2017 20:40:01 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

On Sat, 14 Oct 2017 21:08:13 +0000
ng0 <[email-masked]> 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...

Subject: Cinnamon-Desktop (a package, not the full desktop!)
From: ng0 <[email-masked]>
To: [email-masked]
Date: Tue, 19 Sep 2017 16:23:14 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

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
From e3e8a7e2377aa7c26c8b5618888e12c47c60488e Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
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 <[email-masked]>
+;;;
+;;; 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