diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-03 17:45:52 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-03 17:45:52 +0200 |
| commit | 513c776d74c56a49781a09a5a772f4ea6d6bb401 (patch) | |
| tree | 161509e3271db459f14f8c69de7c52d4902ba107 /extra/colord | |
| parent | 8183144fe6e064d80985ac810f6178a3cf289d0d (diff) | |
| parent | e191a289464c21aafe7478065ea7ed3ddda0766f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arm-elf-binutils/PKGBUILD
community/bird/PKGBUILD
community/cantata/PKGBUILD
community/dbmail/PKGBUILD
community/ekg2/PKGBUILD
community/ffmpeg-compat/PKGBUILD
community/gigedit/PKGBUILD
community/gimp-refocus/PKGBUILD
community/gmime24/PKGBUILD
community/gmpc/PKGBUILD
community/gnash/PKGBUILD
community/id3lib-rcc/PKGBUILD
community/linuxsampler/PKGBUILD
community/lwm/PKGBUILD
community/midori/PKGBUILD
community/mplayer2/PKGBUILD
community/mtpaint/PKGBUILD
community/nestopia/PKGBUILD
community/preload/PKGBUILD
community/projectm/PKGBUILD
community/rusxmms/PKGBUILD
community/taglib-rcc/PKGBUILD
community/the_silver_searcher/PKGBUILD
community/xnee/PKGBUILD
core/libgcrypt/PKGBUILD
core/libusbx/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
extra/a2ps/PKGBUILD
extra/a52dec/PKGBUILD
extra/abook/PKGBUILD
extra/avidemux/PKGBUILD
extra/bzflag/PKGBUILD
extra/cln/PKGBUILD
extra/exempi/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/fluxter/PKGBUILD
extra/fontforge/PKGBUILD
extra/glib/PKGBUILD
extra/gnet/PKGBUILD
extra/gnome-vfs/PKGBUILD
extra/gnutls/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk/PKGBUILD
extra/idnkit/PKGBUILD
extra/ilmbase/PKGBUILD
extra/imake/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/libdatrie/PKGBUILD
extra/libmbim/PKGBUILD
extra/libmp3splt/PKGBUILD
extra/libqmi/PKGBUILD
extra/libtxc_dxtn/PKGBUILD
extra/libxfont/PKGBUILD
extra/mesa/PKGBUILD
extra/modemmanager/PKGBUILD
extra/nedit/PKGBUILD
extra/nmap/PKGBUILD
extra/openexr/PKGBUILD
extra/purple-plugin-pack/PKGBUILD
extra/qemu/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/subversion/PKGBUILD
extra/transmission/PKGBUILD
extra/truecrypt/PKGBUILD
extra/vigra/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/wireshark/PKGBUILD
extra/wxmaxima/PKGBUILD
extra/x264/PKGBUILD
extra/xorg-iceauth/PKGBUILD
extra/xorg-mkfontscale/PKGBUILD
extra/xorg-xfd/PKGBUILD
libre/abuse-libre/PKGBUILD
libre/clementine-libre/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'extra/colord')
| -rw-r--r-- | extra/colord/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/colord/udev-systemd.patch | 17 |
2 files changed, 29 insertions, 5 deletions
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 3998489f2..af55ab055 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188955 2013-06-27 04:04:12Z heftig $ +# $Id: PKGBUILD 191316 2013-07-23 14:05:15Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=1.0.1 -pkgrel=1 +pkgver=1.0.2 +pkgrel=2 pkgdesc="System daemon for managing color devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/software/colord" @@ -15,8 +15,15 @@ optdepends=('sane: UseSANE support [/etc/colord.conf]') options=('!libtool') install=colord.install backup=(etc/colord.conf) -source=($url/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('d480eb23a3de67cab090c810c894cc68069a278d') +source=($url/releases/$pkgname-$pkgver.tar.xz + udev-systemd.patch) +sha1sums=('081ce4457e9752c726e68820b1b079ab314093a0' + '3b467b9674f767c804943d191beaf6bd1ba3a606') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../udev-systemd.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/colord/udev-systemd.patch b/extra/colord/udev-systemd.patch new file mode 100644 index 000000000..311a92437 --- /dev/null +++ b/extra/colord/udev-systemd.patch @@ -0,0 +1,17 @@ +Description: Migrate from usb_id and usb_db to udev builtins usb_id and hwdb. +Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1200185 + +--- colord-1.0.1.orig/rules/69-cd-sensors.rules.in ++++ colord-1.0.1/rules/69-cd-sensors.rules.in +@@ -86,8 +86,8 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct + + # color calibration device + ENV{COLORD_SENSOR_KIND}=="*?", ENV{COLOR_MEASUREMENT_DEVICE}="1" +-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p" +-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{program}="usb-db %p" ++ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id" ++ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{builtin}="hwdb --subsystem=usb" + + # Allow the daemon to access the color devices + ENV{COLORD_SENSOR_KIND}=="*?", GROUP="@daemon_user@" |