diff options
| author | Andreas Enge <andreas@enge.fr> | 2015-07-27 22:54:58 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2015-07-27 22:54:58 +0200 |
| commit | 44a477e1ac8efe166f3f4d2f56e2ec828a3521e1 (patch) | |
| tree | 9bcf025cb24e3d9dee7e167fe4ad82ae866987d6 | |
| parent | 6cef1b9b99bffc0eb0479442b52a43209b5a9957 (diff) | |
| download | guix-44a477e1ac8efe166f3f4d2f56e2ec828a3521e1.tar guix-44a477e1ac8efe166f3f4d2f56e2ec828a3521e1.tar.gz | |
gnu: liblxqt: Fix build with Qt 5.5.
* gnu/packages/patches/liblxqt-include.patch: New file.
* gnu-system.am (dist_patch_DATA): Register patch.
* gnu/packages/lxqt.scm (liblxqt)[source]: Use patch.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/lxqt.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/patches/liblxqt-include.patch | 14 |
3 files changed, 20 insertions, 2 deletions
diff --git a/gnu-system.am b/gnu-system.am index 115437f1e2..723c685e1b 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -494,6 +494,7 @@ dist_patch_DATA = \ gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch \ gnu/packages/patches/libevent-dns-tests.patch \ gnu/packages/patches/liboop-mips64-deplibs-fix.patch \ + gnu/packages/patches/liblxqt-include.patch \ gnu/packages/patches/libmad-armv7-thumb-pt1.patch \ gnu/packages/patches/libmad-armv7-thumb-pt2.patch \ gnu/packages/patches/libmad-frame-length.patch \ diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 01cfeae857..e7ed75c77d 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -23,6 +23,7 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix build-system cmake) + #:use-module (gnu packages) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt)) @@ -67,9 +68,11 @@ in Qt.") (uri (string-append "https://github.com/lxde/" name "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) (sha256 + (file-name (string-append name "-" version ".tar.gz")) + (sha256 (base32 - "0mbl3qc0yfgfsndqrw8vg8k5irsy0pg2wrad8nwv0aphphd4n7rg")))) + "0mbl3qc0yfgfsndqrw8vg8k5irsy0pg2wrad8nwv0aphphd4n7rg")) + (patches (map search-patch '("liblxqt-include.patch"))))) (build-system cmake-build-system) (arguments `(#:tests? #f)) diff --git a/gnu/packages/patches/liblxqt-include.patch b/gnu/packages/patches/liblxqt-include.patch new file mode 100644 index 0000000000..4e8cf04789 --- /dev/null +++ b/gnu/packages/patches/liblxqt-include.patch @@ -0,0 +1,14 @@ +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" + |