From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkEpP-0006ho-5M for guix-patches@gnu.org; Tue, 22 Aug 2017 15:27:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkEpL-0004g6-69 for guix-patches@gnu.org; Tue, 22 Aug 2017 15:27:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:41199) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dkEpL-0004g2-2B for guix-patches@gnu.org; Tue, 22 Aug 2017 15:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dkEpK-0005mB-SS for guix-patches@gnu.org; Tue, 22 Aug 2017 15:27:02 -0400 Subject: [bug#28188] [PATCH] gnu: libreoffice: Fix icons, enable liblangtag. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkEom-0006Qk-2q for guix-patches@gnu.org; Tue, 22 Aug 2017 15:26:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkEoi-0004Vg-2p for guix-patches@gnu.org; Tue, 22 Aug 2017 15:26:28 -0400 Received: from s02-out2.spamexperts.axc.nl ([185.182.59.57]:42361) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkEoh-0004T9-ON for guix-patches@gnu.org; Tue, 22 Aug 2017 15:26:24 -0400 Received: from vserver42.axc.nl ([185.182.56.92]) by s02.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1dkEoQ-0000PF-MM for guix-patches@gnu.org; Tue, 22 Aug 2017 21:26:12 +0200 Received: from mail.axc.nl ([185.182.56.42]:44812) by vserver42.axc.nl with esmtp (Exim 4.89) (envelope-from ) id 1dkEoP-0008W8-TW for guix-patches@gnu.org; Tue, 22 Aug 2017 21:26:06 +0200 Date: Tue, 22 Aug 2017 21:26:00 +0200 (CEST) Message-Id: <20170822.212600.1649623557673317619.post@thomasdanckaert.be> From: Thomas Danckaert Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Tue_Aug_22_21_26_00_2017_291)--" Content-Transfer-Encoding: 7bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28188@debbugs.gnu.org ----Next_Part(Tue_Aug_22_21_26_00_2017_291)-- Content-Type: Text/Plain; charset=utf-8; format=flowed Content-Transfer-Encoding: base64 SGksDQoNCnRoaXMgcGF0Y2ggZml4ZXMgdGhlIG5hbWVzIG9mIHRoZSBpY29ucyBpbiB0aGUgbGli cmVvZmZpY2UgZGVza3RvcCANCmZpbGVzLCBpbnN0YWxscyBhZGRpdGlvbmFsIGRlc2t0b3AgZmls ZXMgZm9yIOKAnG1hdGjigJ0gYW5kIHRoZSANCuKAnHN0YXJ0Y2VudGVy4oCdLCBhbmQgdHVuZXMg dGhlIGJ1aWxkIGNvbmZpZ3VyYXRpb24gKGVuYWJsZSBsaWJsYW5ndGFnLCANCmVuYWJsZSBwYXJh bGxlbCBidWlsZCAtLSBzZWVtcyB0byB3b3JrIGZpbmUgb24gbXkgbWFjaGluZSkuDQoNCkl0J3Mg YSBiaXQgb2YgZXZlcnl0aGluZywgbm90IHN1cmUgaWYgaXQgc2hvdWxkIGJlIHNwbGl0IGludG8g MiANCmNvbW1pdHMgKG9uZSBmb3IgdGhlIGRlc2t0b3AgZmlsZXMgJiBpY29ucywgb25lIGZvciB0 aGUgYnVpbGQgDQpvcHRpb25zKT8NCg0KY2hlZXJzLA0KDQpUaG9tYXMNCg== ----Next_Part(Tue_Aug_22_21_26_00_2017_291)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-gnu-libreoffice-Fix-icons-enable-liblangtag.patch" >From d2384b4dbe8ac91226153f021039df0aa38bab27 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Tue, 22 Aug 2017 19:25:11 +0200 Subject: [PATCH] gnu: libreoffice: Fix icons, enable liblangtag. * gnu/packages/libreoffice.scm (libreoffice) [inputs]: Add liblangtag. [arguments]: Correct icon names in .desktop files; copy desktop files & icons for libreoffice-math and libreoffice-startcenter; enable parallel build; enable liblangtag. --- gnu/packages/libreoffice.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 16a8d257d..cca222b1f 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -837,6 +837,7 @@ and to return information on pronunciations, meanings and synonyms.") ("libetonyek" ,libetonyek) ("libexttextcat" ,libexttextcat) ("libfreehand" ,libfreehand) + ("liblangtag" ,liblangtag) ("libmspub" ,libmspub) ("libmwaw" ,libmwaw) ("libodfgen" ,libodfgen) @@ -919,15 +920,16 @@ and to return information on pronunciations, meanings and synonyms.") (substitute* (string-append out src) (("Exec=libreoffice[0-9]+\\.[0-9]+ ") (string-append "Exec=" out "/bin/libreoffice ")) - (("Icon=libreoffice[0-9]+\\.[0-9]+") - "Icon=libreoffice") + (("Icon=libreoffice.*") + (string-append "Icon=" app "\n")) (("LibreOffice [0-9]+\\.[0-9]+") "LibreOffice")) - (symlink-output src dst) - (install-file (string-append + (symlink-output src dst))) + (define (install-appdata app) + (install-file (string-append "sysui/desktop/appstream-appdata/" "libreoffice-" app ".appdata.xml") - (string-append out "/share/appdata")))) + (string-append out "/share/appdata"))) (symlink-output "/lib/libreoffice/program/soffice" "/bin/soffice") (symlink-output "/lib/libreoffice/program/soffice" @@ -940,16 +942,18 @@ and to return information on pronunciations, meanings and synonyms.") "workdir/CustomTarget/sysui/share/libreoffice/openoffice.org.xml" "/share/mime/packages/libreoffice.xml") (for-each install-desktop-file + '("base" "calc" "draw" "impress" "writer" + "math" "startcenter")) + (for-each install-appdata '("base" "calc" "draw" "impress" "writer")) - (mkdir-p (string-append out "/share/icons")) + (mkdir-p (string-append out "/share/icons/hicolor")) (copy-recursively "sysui/desktop/icons/hicolor" - (string-append out "/share/icons/"))) + (string-append out "/share/icons/hicolor"))) #t))) #:configure-flags (list "--enable-release-build" "--enable-verbose" - "--without-parallelism" ; otherwise the build fails "--disable-fetch-external" ; disable downloads "--with-system-libs" ; enable all --with-system-* flags (string-append "--with-boost-libdir=" @@ -969,8 +973,7 @@ and to return information on pronunciations, meanings and synonyms.") "--disable-firebird-sdbc" ; embedded firebird "--disable-gltf" "--without-doxygen" - "--disable-gtk3" - "--disable-liblangtag"))) + "--disable-gtk3"))) (home-page "https://www.libreoffice.org/") (synopsis "Office suite") (description "LibreOffice is a comprehensive office suite. It contains -- 2.14.1 ----Next_Part(Tue_Aug_22_21_26_00_2017_291)----