guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: liblxqt: Update to 0.13.0.


From: ???
Subject: 02/02: gnu: liblxqt: Update to 0.13.0.
Date: Mon, 22 Oct 2018 10:10:15 -0400 (EDT)

iyzsong pushed a commit to branch master
in repository guix.

commit 9861bcd182b1ba89a93630a2178b170a088f0a6b
Author: Meiyo Peng <address@hidden>
Date:   Thu Oct 18 10:30:35 2018 +0800

    gnu: liblxqt: Update to 0.13.0.
    
    * gnu/packages/lxqt.scm (liblxqt): Update to 0.13.0.
    [source]: Remove patches.
    [home-page]: Use HTTPS.
    * gnu/packages/patches/liblxqt-include.patch: Remove file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
    
    Signed-off-by: 宋文武 <address@hidden>
---
 gnu/local.mk                               |  1 -
 gnu/packages/lxqt.scm                      | 39 ++++++++++++++++++++----------
 gnu/packages/patches/liblxqt-include.patch | 14 -----------
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index d155b4c..47883f8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -885,7 +885,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/libjxr-fix-function-signature.patch     \
   %D%/packages/patches/libjxr-fix-typos.patch                  \
   %D%/packages/patches/libotr-test-auth-fix.patch              \
-  %D%/packages/patches/liblxqt-include.patch                   \
   %D%/packages/patches/libmad-armv7-thumb-pt1.patch            \
   %D%/packages/patches/libmad-armv7-thumb-pt2.patch            \
   %D%/packages/patches/libmad-frame-length.patch               \
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 57dd5b9..c4d0662 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -32,7 +32,9 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages qt))
+  #:use-module (gnu packages polkit)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages xorg))
 
 (define-public libqtxdg
   (package
@@ -72,29 +74,40 @@ in Qt.")
 (define-public liblxqt
   (package
     (name "liblxqt")
-    (version "0.9.0")
+    (version "0.13.0")
     (source
      (origin
        (method url-fetch)
-       (uri
-         (string-append "https://github.com/lxde/"; name
-                        "/archive/" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (uri (string-append
+             "https://github.com/lxqt/"; name "/releases/download/"
+             version "/" name "-" version ".tar.xz"))
        (sha256
-        (base32
-         "0mbl3qc0yfgfsndqrw8vg8k5irsy0pg2wrad8nwv0aphphd4n7rg"))
-       (patches (search-patches "liblxqt-include.patch"))))
+        (base32 "0fba0nq5b9fvvmklcikcd4nwhzlp5d6k1q1f80r34kncdzfvj7dl"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f))
-    (native-inputs `(("pkg-config" ,pkg-config)))
+     `(#:tests? #f                      ; no tests
+       #:configure-flags
+       ;; TODO: prefetch translations files from 'lxqt-l10n'.
+       '("-DPULL_TRANSLATIONS=NO")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-source
+           (lambda _
+             (substitute* "CMakeLists.txt"
+               (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}")
+                "DESTINATION 
\"${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions"))
+             #t)))))
     (inputs
      `(("kwindowsystem" ,kwindowsystem)
        ("libqtxdg" ,libqtxdg)
-       ("qtbase" ,qtbase)
+       ("libxscrnsaver" ,libxscrnsaver)
+       ("polkit-qt" ,polkit-qt)
+       ("qtsvg" ,qtsvg)
        ("qttools" ,qttools)
        ("qtx11extras" ,qtx11extras)))
-    (home-page "http://lxqt.org/";)
+    (native-inputs
+     `(("lxqt-build-tools" ,lxqt-build-tools)))
+    (home-page "https://lxqt.org/";)
     (synopsis "Core utility library for all LXQt components")
     (description "liblxqt provides the basic libraries shared by the
 components of the LXQt desktop environment.")
diff --git a/gnu/packages/patches/liblxqt-include.patch 
b/gnu/packages/patches/liblxqt-include.patch
deleted file mode 100644
index 4e8cf04..0000000
--- a/gnu/packages/patches/liblxqt-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Patch to fix build with Qt 5.5, taken from upstream:
-   
https://github.com/lxde/liblxqt/commit/7303ea207de0771d6f450a31ec4a1ce69202869b
-
-diff -u -r liblxqt-0.9.0.orig/lxqtnotification.h 
liblxqt-0.9.0/lxqtnotification.h
---- liblxqt-0.9.0.orig/lxqtnotification.h      2015-07-27 22:49:05.365166482 
+0200
-+++ liblxqt-0.9.0/lxqtnotification.h   2015-07-27 22:49:36.897606619 +0200
-@@ -25,6 +25,7 @@
- #ifndef LXQTNOTIFICATION_H
- #define LXQTNOTIFICATION_H
- 
-+#include <QObject>
- #include <QStringList>
- #include "lxqtglobals.h"
- 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]