summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorFlorian Franzmann2019-01-01 15:49:16 +0100
committerFlorian Franzmann2019-01-01 18:18:23 +0100
commitb27a04c0a98f887245ae5618170f9c51f5081254 (patch)
tree2977d59c7641a0870f1fc4d1d798af41e031c63a /x11
parent32018ea018cddf732c1a570388131622a964dcea (diff)
x11/colord: fix dependencies and installation
Diffstat (limited to 'x11')
-rwxr-xr-xx11/colord/BUILD4
-rwxr-xr-xx11/colord/DEPENDS58
-rw-r--r--x11/colord/HISTORY3
-rwxr-xr-xx11/colord/INSTALL3
4 files changed, 34 insertions, 34 deletions
diff --git a/x11/colord/BUILD b/x11/colord/BUILD
index 6d39fae617..09fa6e8eaa 100755
--- a/x11/colord/BUILD
+++ b/x11/colord/BUILD
@@ -1 +1,3 @@
-. "${GRIMOIRE}/MESON_FUNCTIONS"
+OPTS="$OPTS -Dlibcolordcompat=true" &&
+meson build --prefix=$INSTALL_ROOT/usr $OPTS &&
+ninja -C build
diff --git a/x11/colord/DEPENDS b/x11/colord/DEPENDS
index 777059a3d6..7b348ba366 100755
--- a/x11/colord/DEPENDS
+++ b/x11/colord/DEPENDS
@@ -1,41 +1,35 @@
-depends dbus &&
-depends glib2 &&
-depends intltool &&
-depends lcms2 &&
-depends sqlite &&
-depends libgudev &&
-depends meson &&
+depends dbus &&
+depends docbook-utils &&
+depends glib2 &&
+depends intltool &&
+depends lcms2 &&
+depends libgudev &&
+depends libgusb &&
+depends meson &&
+depends policykit &&
+depends sqlite &&
-optional_depends gettext \
- '--enable-nls' \
- '--disable-nls' \
- 'NLS support' &&
+optional_depends bash \
+ '-Dbash=true' \
+ '-Dbash=false' \
+ 'install bash completion' &&
-optional_depends libgusb \
- '--enable-gusb' \
- '--disable-gusb' 'USB support' &&
+optional_depends vala \
+ '-Dvapi=true' \
+ '-Dvapi=false' \
+ 'build vala bindings' &&
optional_depends argyllcms \
- '--enable-argyllcms-sensor' \
- '--disable-argyllcms-sensor' \
- 'ArgllCMS sensor ' &&
+ '-Dargyllcms_sensor=true' \
+ '-Dargyllcms_sensor=false' \
+ 'ArgllCMS sensor' &&
optional_depends systemd \
- '--enable-systemd-login' \
- '--disable-systemd-login' \
+ '-Dsystemd=true' \
+ '-Dsystemd=false' \
'SystemD support' &&
-optional_depends policykit \
- "--enable-polkit" \
- "--disable-polkit" \
- "for policykit support" &&
-
optional_depends sane-backends \
- "--enable-sane" \
- "--disable-sane" \
- "for scanner support" &&
-
-optional_depends gtk-doc \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "to build documentation"
+ "-Dsane=true" \
+ "-Dsane=false" \
+ "for scanner support"
diff --git a/x11/colord/HISTORY b/x11/colord/HISTORY
index 3c67dd8973..377af9e25b 100644
--- a/x11/colord/HISTORY
+++ b/x11/colord/HISTORY
@@ -1,3 +1,6 @@
+2018-01-01 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, INSTALL: fix dependencies and installation
+
2018-07-23 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 1.4.3
* BUILD, CONFIGURE, INSTALL, DEPENDS: use meson
diff --git a/x11/colord/INSTALL b/x11/colord/INSTALL
index 6d39fae617..dce29c4c57 100755
--- a/x11/colord/INSTALL
+++ b/x11/colord/INSTALL
@@ -1 +1,2 @@
-. "${GRIMOIRE}/MESON_FUNCTIONS"
+cd build &&
+ninja install