Date: Tuesday, April 10, 2018 @ 11:42:43
  Author: heftig
Revision: 321466

archrelease: copy trunk to extra-x86_64

Added:
  
colord/repos/extra-x86_64/0001-Make-cd_color_get_blackbody_rgb_full-safer.patch
    (from rev 321465, 
colord/trunk/0001-Make-cd_color_get_blackbody_rgb_full-safer.patch)
  colord/repos/extra-x86_64/PKGBUILD
    (from rev 321465, colord/trunk/PKGBUILD)
Deleted:
  
colord/repos/extra-x86_64/0001-Make-cd_color_get_blackbody_rgb_full-safer.patch
  colord/repos/extra-x86_64/PKGBUILD

-------------------------------------------------------+
 0001-Make-cd_color_get_blackbody_rgb_full-safer.patch |  136 +++++++--------
 PKGBUILD                                              |  141 ++++++++--------
 2 files changed, 139 insertions(+), 138 deletions(-)

Deleted: 0001-Make-cd_color_get_blackbody_rgb_full-safer.patch
===================================================================
--- 0001-Make-cd_color_get_blackbody_rgb_full-safer.patch       2018-04-10 
11:42:08 UTC (rev 321465)
+++ 0001-Make-cd_color_get_blackbody_rgb_full-safer.patch       2018-04-10 
11:42:43 UTC (rev 321466)
@@ -1,68 +0,0 @@
-From 6d7a6ae89bd12640e863a10fc88b6678f9dc9477 Mon Sep 17 00:00:00 2001
-Message-Id: 
<6d7a6ae89bd12640e863a10fc88b6678f9dc9477.1513518702.git.jan.steff...@gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
-Date: Sat, 16 Dec 2017 04:18:01 +0100
-Subject: [PATCH] Make cd_color_get_blackbody_rgb_full safer
-
-Validate arguments. If temp is divisible by 100, avoid interpolation
-because it accesses beyond the data for temp == 10000.
----
- lib/colord/cd-color.c | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/lib/colord/cd-color.c b/lib/colord/cd-color.c
-index 6062595187616846..9960e7ecd247a289 100644
---- a/lib/colord/cd-color.c
-+++ b/lib/colord/cd-color.c
-@@ -1444,33 +1444,40 @@ cd_color_get_blackbody_rgb_full (gdouble temp,
-                                CdColorBlackbodyFlags flags)
- {
-       gboolean ret = TRUE;
--      gdouble alpha;
--      gint temp_index;
-+      guint temp_quot, temp_rem;
-       const CdColorRGB *blackbody_func = blackbody_data_d65modified;
- 
-+      g_return_val_if_fail (!isnan (temp), FALSE);
-+      g_return_val_if_fail (result != NULL, FALSE);
-+
-       /* use modified curve */
-       if (flags & CD_COLOR_BLACKBODY_FLAG_USE_PLANCKIAN)
-               blackbody_func = blackbody_data_d65plankian;
- 
-       /* check lower bound */
-       if (temp < 1000) {
-               ret = FALSE;
-               temp = 1000;
-       }
- 
-       /* check upper bound */
-       if (temp > 10000) {
-               ret = FALSE;
-               temp = 10000;
-       }
- 
-       /* bilinear interpolate the blackbody data */
--      alpha = ((guint) temp % 100) / 100.0;
--      temp_index = ((guint) temp - 1000) / 100;
--      cd_color_rgb_interpolate (&blackbody_func[temp_index],
--                                &blackbody_func[temp_index + 1],
--                                alpha,
--                                result);
-+      temp_quot = (guint) temp / 100;
-+      temp_rem = (guint) temp % 100;
-+
-+      if (temp_rem == 0)
-+              *result = blackbody_func[temp_quot - 10];
-+      else
-+              cd_color_rgb_interpolate (&blackbody_func[temp_quot - 10],
-+                                        &blackbody_func[temp_quot - 9],
-+                                        temp_rem / 100.0,
-+                                        result);
-+
-       return ret;
- }
- 
--- 
-2.15.1
-

Copied: 
colord/repos/extra-x86_64/0001-Make-cd_color_get_blackbody_rgb_full-safer.patch 
(from rev 321465, 
colord/trunk/0001-Make-cd_color_get_blackbody_rgb_full-safer.patch)
===================================================================
--- 0001-Make-cd_color_get_blackbody_rgb_full-safer.patch                       
        (rev 0)
+++ 0001-Make-cd_color_get_blackbody_rgb_full-safer.patch       2018-04-10 
11:42:43 UTC (rev 321466)
@@ -0,0 +1,68 @@
+From 6d7a6ae89bd12640e863a10fc88b6678f9dc9477 Mon Sep 17 00:00:00 2001
+Message-Id: 
<6d7a6ae89bd12640e863a10fc88b6678f9dc9477.1513518702.git.jan.steff...@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
+Date: Sat, 16 Dec 2017 04:18:01 +0100
+Subject: [PATCH] Make cd_color_get_blackbody_rgb_full safer
+
+Validate arguments. If temp is divisible by 100, avoid interpolation
+because it accesses beyond the data for temp == 10000.
+---
+ lib/colord/cd-color.c | 23 +++++++++++++++--------
+ 1 file changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/lib/colord/cd-color.c b/lib/colord/cd-color.c
+index 6062595187616846..9960e7ecd247a289 100644
+--- a/lib/colord/cd-color.c
++++ b/lib/colord/cd-color.c
+@@ -1444,33 +1444,40 @@ cd_color_get_blackbody_rgb_full (gdouble temp,
+                                CdColorBlackbodyFlags flags)
+ {
+       gboolean ret = TRUE;
+-      gdouble alpha;
+-      gint temp_index;
++      guint temp_quot, temp_rem;
+       const CdColorRGB *blackbody_func = blackbody_data_d65modified;
+ 
++      g_return_val_if_fail (!isnan (temp), FALSE);
++      g_return_val_if_fail (result != NULL, FALSE);
++
+       /* use modified curve */
+       if (flags & CD_COLOR_BLACKBODY_FLAG_USE_PLANCKIAN)
+               blackbody_func = blackbody_data_d65plankian;
+ 
+       /* check lower bound */
+       if (temp < 1000) {
+               ret = FALSE;
+               temp = 1000;
+       }
+ 
+       /* check upper bound */
+       if (temp > 10000) {
+               ret = FALSE;
+               temp = 10000;
+       }
+ 
+       /* bilinear interpolate the blackbody data */
+-      alpha = ((guint) temp % 100) / 100.0;
+-      temp_index = ((guint) temp - 1000) / 100;
+-      cd_color_rgb_interpolate (&blackbody_func[temp_index],
+-                                &blackbody_func[temp_index + 1],
+-                                alpha,
+-                                result);
++      temp_quot = (guint) temp / 100;
++      temp_rem = (guint) temp % 100;
++
++      if (temp_rem == 0)
++              *result = blackbody_func[temp_quot - 10];
++      else
++              cd_color_rgb_interpolate (&blackbody_func[temp_quot - 10],
++                                        &blackbody_func[temp_quot - 9],
++                                        temp_rem / 100.0,
++                                        result);
++
+       return ret;
+ }
+ 
+-- 
+2.15.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2018-04-10 11:42:08 UTC (rev 321465)
+++ PKGBUILD    2018-04-10 11:42:43 UTC (rev 321466)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-# Contributor: Ionut Biru <ib...@archlinux.org>
-
-pkgbase=colord
-pkgname=(colord colord-sane)
-pkgver=1.4.2
-pkgrel=2
-pkgdesc="System daemon for managing color devices"
-url="https://www.freedesktop.org/software/colord";
-arch=(x86_64)
-license=(GPL2)
-depends=(lcms2 libgusb polkit sqlite systemd dconf dbus libgudev 
shared-mime-info)
-makedepends=(gobject-introspection vala sane bash-completion argyllcms git 
docbook-utils
-             docbook-sgml perl-sgmls meson gtk-doc)
-options=(!emptydirs)
-_commit=5b9aa8de432579a2636f13ad6895928f42511081  # tags/1.4.2^0
-source=("git+https://github.com/hughsie/colord#commit=$_commit";
-        0001-Make-cd_color_get_blackbody_rgb_full-safer.patch)
-sha256sums=('SKIP'
-            '73689805d46705c8680d9ae979a2f5203f661741e56aa07dc627b36059ab404b')
-validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17')  # Richard Hughes
-
-pkgver() {
-  cd colord
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd colord
-  patch -Np1 -i ../0001-Make-cd_color_get_blackbody_rgb_full-safer.patch
-}
-
-build() {
-  arch-meson colord build \
-    -Denable-libcolordcompat=true \
-    -Denable-sane=true \
-    -Denable-vala=true \
-    -Denable-print-profiles=true \
-    -Dwith-daemon-user=colord
-  ninja -C build
-}
-
-check() {
-  cd build
-  meson test
-}
-
-package_colord() {
-  optdepends=('argyllcms: color profiling')
-  replaces=(shared-color-profiles)
-
-  DESTDIR="$pkgdir" ninja -C build install
-
-  echo 'u colord - "Color management daemon" /var/lib/colord' |
-    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/colord.conf"
-
-### Split colord-sane
-  mkdir -p colord-sane/usr/lib/colord-plugins
-  mv {"$pkgdir",colord-sane}/usr/lib/colord-sane
-  mv {"$pkgdir",colord-sane}/usr/lib/colord-plugins/libcolord_sensor_sane.so
-}
-
-package_colord-sane() {
-  pkgdesc+=" (SANE support)"
-  depends=("colord=$pkgver-$pkgrel" sane)
-  mv colord-sane/* "$pkgdir"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: colord/repos/extra-x86_64/PKGBUILD (from rev 321465, 
colord/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2018-04-10 11:42:43 UTC (rev 321466)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Contributor: Ionut Biru <ib...@archlinux.org>
+
+pkgbase=colord
+pkgname=(colord colord-sane)
+pkgver=1.4.2
+pkgrel=3
+pkgdesc="System daemon for managing color devices"
+url="https://www.freedesktop.org/software/colord";
+arch=(x86_64)
+license=(GPL2)
+depends=(lcms2 libgusb polkit sqlite systemd dconf dbus libgudev 
shared-mime-info)
+makedepends=(gobject-introspection vala sane bash-completion argyllcms git 
docbook-utils
+             docbook-sgml perl-sgmls meson gtk-doc)
+options=(!emptydirs)
+_commit=5b9aa8de432579a2636f13ad6895928f42511081  # tags/1.4.2^0
+source=("git+https://github.com/hughsie/colord#commit=$_commit";
+        0001-Make-cd_color_get_blackbody_rgb_full-safer.patch)
+sha256sums=('SKIP'
+            '73689805d46705c8680d9ae979a2f5203f661741e56aa07dc627b36059ab404b')
+validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17')  # Richard Hughes
+
+pkgver() {
+  cd colord
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd colord
+  patch -Np1 -i ../0001-Make-cd_color_get_blackbody_rgb_full-safer.patch
+}
+
+build() {
+  arch-meson colord build \
+    -Denable-libcolordcompat=true \
+    -Denable-sane=true \
+    -Denable-vala=true \
+    -Denable-print-profiles=true \
+    -Dwith-daemon-user=colord
+  ninja -C build
+}
+
+check() {
+  cd build
+  meson test
+}
+
+package_colord() {
+  optdepends=('argyllcms: color profiling'
+              'colord-sane: SANE support')
+  replaces=(shared-color-profiles)
+
+  DESTDIR="$pkgdir" ninja -C build install
+
+  echo 'u colord - "Color management daemon" /var/lib/colord' |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/colord.conf"
+
+### Split colord-sane
+  mkdir -p colord-sane/usr/lib/colord-plugins
+  mv {"$pkgdir",colord-sane}/usr/lib/colord-sane
+  mv {"$pkgdir",colord-sane}/usr/lib/colord-plugins/libcolord_sensor_sane.so
+}
+
+package_colord-sane() {
+  pkgdesc+=" (SANE support)"
+  depends=("colord=$pkgver-$pkgrel" sane)
+  mv colord-sane/* "$pkgdir"
+}
+
+# vim:set ts=2 sw=2 et:

Reply via email to