From 556ff459148d03ebd85fa3db770e8819ad770b2d Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 13 Nov 2017 15:33:07 -0500 Subject: Add a special rule for Ubuntu Linux: IncludePath for the poppler files is different - add it automatically. --- README.md | 3 ++- src-qt5/OS-detect.pri | 7 +++++-- src-qt5/core/README.md | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0547af8b..4a224abf 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Latest Versions ---- Click [HERE](https://github.com/trueos/lumina/releases) to see all the available releases for the Lumina Desktop. -Click [HERE]() to see all the available branches of the Lumina Desktop source tree (includes development versions: *.*.(X > 0)). +Click [HERE]() to see all the available branches of the Lumina Desktop source tree (includes development versions: X.Y.(Z > 0)). The master branch is where all development is performed and tested before the next version is tagged. Additionally, every version (development **and** release) of the project gets branched off of master at the time the version is tagged, so older versions may be fetched/patched/used as desired. Occasionally there may be patches committed for particular versions which are not included in the static "release" archives. On the release page these can be identified by a note stating the release is a number of commits behind it's corresponding branch. In this situation, it may be preferable to fetch/use the corresponding branch of the source tree rather than the static archive if the patch(es) which were committed impact your particular operating system. @@ -109,6 +109,7 @@ The sub-projects are broken down as follows: * [lumina-coreutils](https://github.com/trueos/lumina/tree/master/src-qt5/core-utils): The core utilities for configuring/managing the desktop * [desktop-utilities](https://github.com/trueos/lumina/tree/master/src-qt5/desktop-utils): Various support utilities for desktop systems. Every one of these utilities should be independently packaged. +--- # General TrueOS Information diff --git a/src-qt5/OS-detect.pri b/src-qt5/OS-detect.pri index 8511bd81..3d01ea5f 100644 --- a/src-qt5/OS-detect.pri +++ b/src-qt5/OS-detect.pri @@ -75,12 +75,15 @@ isEmpty(OS){ #Apply any special rules for particular distros equals(LINUX_DISTRO,"Fedora"){ isEmpty(L_ETCDIR){ L_ETCDIR=/etc } - } + } equals(LINUX_DISTRO,"Gentoo"){ isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin } isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/../etc } isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man } - } + } + equals(LINUX_DISTRO,"Ubuntu"){ + INCLUDEPATH *= /usr/include/poppler/qt5 + } }else{ OS="Unknown"; } diff --git a/src-qt5/core/README.md b/src-qt5/core/README.md index 6a17d900..6ed23f78 100644 --- a/src-qt5/core/README.md +++ b/src-qt5/core/README.md @@ -27,6 +27,7 @@ Other Files that get installed if "core" is built directly: * svg * widgets * x11extras + * NOTE: Qt5 platform theme and developer libraries are also required to build the Lumina theme engine plugin ("qtbase5-*" on Ubuntu 17.10) 2. X11 Libraries * libXdamage 3. XCB Libraries -- cgit