[bug#29253] [PATCH] gnu: libreoffice: Update to 5.3.7.2 and enable GTK3.

[bug#29253] [PATCH] gnu: libreoffice: Update to 5.3.7.2 and enable GTK3.

[Rutger Helling]

[-- Attachment #1.1: Type: text/plain, Size: 203 bytes --]

Hey Guix, 

this patch updates Libreoffice to 5.3.7.2 and enables the GTK3 version.
Note that you can still use the GTK2 version if you prefer by setting
the environment variable "SAL_USE_VCLPLUGIN=gtk".

[-- Attachment #1.2: Type: text/html, Size: 396 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-libreoffice-Update-to-5.3.7.2-and-enable-GTK3.patch --]
[-- Type: text/x-diff; name=0001-gnu-libreoffice-Update-to-5.3.7.2-and-enable-GTK3.patch, Size: 2610 bytes --]

From 17a64c37b5243a149f05d63f1a53cbc913d68419 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Fri, 10 Nov 2017 19:38:50 +0100
Subject: [PATCH] gnu: libreoffice: Update to 5.3.7.2 and enable GTK3.

* gnu/packages/libreoffice.scm (libreoffice): Update to 5.3.7.2, change URL to HTTPS. [inputs]: Add gtk+, rename gtk+ to gtk+-2. [configure-flags]: Remove "--disable-gtk3".
---
 gnu/packages/libreoffice.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 9980837c8..f5a6ee4f7 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
 ;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -871,16 +872,16 @@ and to return information on pronunciations, meanings and synonyms.")
 (define-public libreoffice
   (package
     (name "libreoffice")
-    (version "5.3.6.1")
+    (version "5.3.7.2")
     (source
      (origin
       (method url-fetch)
       (uri
         (string-append
-          "http://download.documentfoundation.org/libreoffice/src/"
+          "https://download.documentfoundation.org/libreoffice/src/"
           (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
       (sha256 (base32
-               "023a7hr7v5cf0ipga4ijhyl58ncgbjrp500qq5fwf65j8g2c3apz"))))
+               "0z7fssp0jcj09wxad1wmhy69n71a2mwl933lxp9dz5sdvzncxmy3"))))
     (build-system gnu-build-system)
     (native-inputs
      `(;; autoreconf is run by the LibreOffice build system, since after
@@ -907,7 +908,8 @@ and to return information on pronunciations, meanings and synonyms.")
        ("gperf" ,gperf)
        ("graphite2" ,graphite2)
        ("gst-plugins-base" ,gst-plugins-base)
-       ("gtk+" ,gtk+-2)
+       ("gtk+" ,gtk+)
+       ("gtk+-2" ,gtk+-2)
        ("harfbuzz" ,harfbuzz)
        ("hunspell" ,hunspell)
        ("hyphen" ,hyphen)
@@ -1054,8 +1056,7 @@ and to return information on pronunciations, meanings and synonyms.")
           "--disable-coinmp"
           "--disable-firebird-sdbc" ; embedded firebird
           "--disable-gltf"
-          "--without-doxygen"
-          "--disable-gtk3")))
+          "--without-doxygen")))
     (home-page "https://www.libreoffice.org/")
     (synopsis "Office suite")
     (description "LibreOffice is a comprehensive office suite.  It contains
-- 
2.15.0

bug#29253: [PATCH] gnu: libreoffice: Update to 5.3.7.2 and enable GTK3.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 409 bytes --]

Rutger Helling <rhelling@mykolab.com> writes:

> Hey Guix, 
>
> this patch updates Libreoffice to 5.3.7.2 and enables the GTK3 version.
> Note that you can still use the GTK2 version if you prefer by setting
> the environment variable "SAL_USE_VCLPLUGIN=gtk".

Applied after adding line endings to the commit message, thanks!  Do you
know if we can build libreoffice without GTK2 now to save space?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#29253] [PATCH] gnu: libreoffice: Update to 5.3.7.2 and enable GTK3.

[Rutger Helling]

[-- Attachment #1.1: Type: text/plain, Size: 559 bytes --]

Hey Marius, 

GTK2 can be removed entirely if that's preferred. Here's a small patch
that does that. 

On 2017-11-11 08:57, Marius Bakke wrote:

> Rutger Helling <rhelling@mykolab.com> writes:
> 
>> Hey Guix, 
>> 
>> this patch updates Libreoffice to 5.3.7.2 and enables the GTK3 version.
>> Note that you can still use the GTK2 version if you prefer by setting
>> the environment variable "SAL_USE_VCLPLUGIN=gtk".
> 
> Applied after adding line endings to the commit message, thanks!  Do you
> know if we can build libreoffice without GTK2 now to save space?

[-- Attachment #1.2: Type: text/html, Size: 1205 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-libreoffice-Remove-GTK2.patch --]
[-- Type: text/x-diff; name=0001-gnu-libreoffice-Remove-GTK2.patch, Size: 1245 bytes --]

From 4d2a4edf24f71716d68a6fafbe1ff172ab615ba4 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Sat, 11 Nov 2017 09:23:51 +0100
Subject: [PATCH] gnu: libreoffice: Remove GTK2.

* gnu/packages/libreoffice.scm (libreoffice)[inputs]: Remove gtk+-2.
[configure-flags]: Add "--disable-gtk".
---
 gnu/packages/libreoffice.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 6750d840a..736947d69 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -890,7 +890,6 @@ and to return information on pronunciations, meanings and synonyms.")
        ("graphite2" ,graphite2)
        ("gst-plugins-base" ,gst-plugins-base)
        ("gtk+" ,gtk+)
-       ("gtk+-2" ,gtk+-2)
        ("harfbuzz" ,harfbuzz)
        ("hunspell" ,hunspell)
        ("hyphen" ,hyphen)
@@ -1037,6 +1036,7 @@ and to return information on pronunciations, meanings and synonyms.")
           "--disable-coinmp"
           "--disable-firebird-sdbc" ; embedded firebird
           "--disable-gltf"
+          "--disable-gtk"
           "--without-doxygen")))
     (home-page "https://www.libreoffice.org/")
     (synopsis "Office suite")
-- 
2.15.0

[bug#29253] [PATCH] gnu: libreoffice: Update to 5.3.7.2 and enable GTK3.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

On Sat, Nov 11, 2017 at 10:23:00AM +0100, Rutger Helling wrote:
> Hey Marius, 
> 
> GTK2 can be removed entirely if that's preferred. Here's a small patch
> that does that. 

Is there any benefit to using both versions of GTK? Or should we just
pick one?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#29253] [PATCH] gnu: libreoffice: Update to 5.3.7.2 and enable GTK3.

[Rutger Helling]

[-- Attachment #1: Type: text/plain, Size: 569 bytes --]

Hey Leo, 

The only benefit would be that you'd give someone the option of picking
GTK2 if someone preferred the GTK2 look-and-feel. Then again it would be
trivial to restore this, or write a libreoffice-gtk2 package. So it's
probably better to remove it. 

On 2017-11-14 06:41, Leo Famulari wrote:

> On Sat, Nov 11, 2017 at 10:23:00AM +0100, Rutger Helling wrote: 
> 
>> Hey Marius, 
>> 
>> GTK2 can be removed entirely if that's preferred. Here's a small patch
>> that does that.
> 
> Is there any benefit to using both versions of GTK? Or should we just
> pick one?

[-- Attachment #2: Type: text/html, Size: 1145 bytes --]

[bug#29253] [PATCH] gnu: libreoffice: Update to 5.3.7.2 and enable GTK3.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 414 bytes --]

On Tue, Nov 14, 2017 at 08:16:06AM +0100, Rutger Helling wrote:
> Hey Leo, 
> 
> The only benefit would be that you'd give someone the option of picking
> GTK2 if someone preferred the GTK2 look-and-feel. Then again it would be
> trivial to restore this, or write a libreoffice-gtk2 package. So it's
> probably better to remove it. 

Okay, I pushed the change as 42ca84be9260d6a1ce12847b89545882b112a2cd.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]