Merge pull request #4597 from Rmys/master

colord-1.4.1:ver.bump

x11/misc/colord/actions.py

@@ -7,26 +7,29 @@
 from pisi.actionsapi import autotools
 from pisi.actionsapi import get
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
 
 def setup():
-    autotools.configure("--enable-print-profiles \
+    shelltools.makedirs("build")
-                         --disable-examples \
+    shelltools.cd("build")
-                         --disable-static \
+    shelltools.system("meson .. --prefix=/usr \
-                         --disable-rpath \
+                                --sysconfdir=/etc \
-                         --disable-silent-rules \
+                                -Dwith-daemon-user=colord \
-                         --enable-polkit \
+                                -Denable-systemd=false \
-                         --enable-systemd-login=no \
+                                -Denable-docs=false \
-                         --with-daemon-user=colord \
+                                -Denable-man=false")
-                         --with-systemdsystemunitdir=no \
-                         --enable-introspection \
-                         --enable-vala ")
-
-    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
+    
 def build():
-    autotools.make()
+    shelltools.cd("build")
+    shelltools.system("ninja")
 
 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    shelltools.cd("build")
+    shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
+    
+    pisitools.insinto("/etc/dbus-1/system.d/","%s/usr/share/dbus-1/system.d/org.freedesktop.ColorManager.conf" % get.installDIR())
+    pisitools.removeDir("/usr/share/dbus-1/system.d")
 
-    pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "TODO", "README.md")
+    shelltools.cd("..")
+    pisitools.dodoc("AUTHORS", "MAINTAINERS", "COPYING", "RELEASE", "NEWS", "README.md")

x11/misc/colord/pspec.xml

@@ -12,8 +12,10 @@
         <IsA>library</IsA>
         <Summary>Colord is a system activated daemon that maps devices to color profiles</Summary>
         <Description>Colord is a system activated daemon that maps devices to color profiles. It is used by GNOME Color Manager for system integration and use when there are no users logged in.</Description>
-        <Archive sha1sum="e92cebb017840410d204c80494ae96ba323ba80b" type="tarxz">https://www.freedesktop.org/software/colord/releases/colord-1.3.4.tar.xz</Archive>
+        <Archive sha1sum="e75a29b6721e96c05bcc5466e7d4a1de912c9b87" type="tarxz">https://www.freedesktop.org/software/colord/releases/colord-1.4.1.tar.xz</Archive>
         <BuildDependencies>
+            <Dependency>meson</Dependency>
+            <Dependency>valgrind</Dependency>
             <Dependency>intltool</Dependency>
             <Dependency>argyllcms</Dependency>
             <Dependency>vala-devel</Dependency>
@@ -36,6 +38,9 @@
             <Dependency>polkit-devel</Dependency>
             <Dependency>gobject-introspection-devel</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch>0001-Make-cd_color_get_blackbody_rgb_full-safer.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
@@ -102,6 +107,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2018-03-02</Date>
+            <Version>1.4.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="2">
             <Date>2017-02-16</Date>
             <Version>1.3.4</Version>