diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-10-08 19:13:26 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-10-08 19:13:26 -0200 |
| commit | 70c10e2335091040600f9808f8f23efa5610492b (patch) | |
| tree | beac8057e85fc1503b923089b454790d65df2b80 | |
| parent | 1f70b0c9db89bbf195901d2b9e1c6d224d2b30ae (diff) | |
lirc-libre-1:0.9.0-63: fix #31890 #30912 #33956 from https://bugs.archlinux.org
| -rw-r--r-- | libre/lirc-libre/PKGBUILD | 18 | ||||
| -rw-r--r-- | libre/lirc-libre/lirc.service | 5 | ||||
| -rw-r--r-- | libre/lirc-libre/lircm.service | 7 |
3 files changed, 20 insertions, 10 deletions
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 374a7662b..8b896d031 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195936 2013-10-05 19:51:37Z tpowa $ +# $Id: PKGBUILD 196212 2013-10-08 14:19:09Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=62 +pkgrel=63 epoch=1 _extramodules=extramodules-3.11-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,9 @@ source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar kernel-2.6.39.patch linux-3.8.patch lirc.logrotate - lirc.service lircm.service irexec.service + lirc.service + lircm.service + irexec.service lirc.tmpfiles) build() { @@ -34,6 +36,12 @@ build() { patch -Np1 -i "${srcdir}/kernel-2.6.39.patch" patch -Np1 -i "${srcdir}/linux-3.8.patch" + # use fixed instead of Courier w/xmode2, should be more prevalent on linux boxen + sed -i -e 's|char.*font1_name.*Courier.*$|char font1_name[]="-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";|g' tools/xmode2.c + + # use /dev/lirc0 by default instead of /dev/lirc + sed -i -e 's|#define DEV_LIRC "lirc"|#define DEV_LIRC "lirc0"|' config.h.in + sed -i '/AC_PATH_XTRA/d' configure.ac sed -e 's/@X_CFLAGS@//g' \ -e 's/@X_LIBS@//g' \ @@ -108,7 +116,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '087a7d102e1c96bf1179f38db2b0b237' '9ee196bd03ea44af5a752fb0cc6ca96a' '3deb02604b37811d41816e9b4385fcc3' - '1c7ceace42da44f41e5a42b4dd3b3d76' - '121283a6de274e52ed86522aecd0f6e5' + 'a9ab637e7207472e61e55a2fa75dc555' + '1847b9997685bc3ad2cf11bea4590a92' '07131d117fcfe9dcd50c453c3a5e9531' 'febf25c154a7d36f01159e84f26c2d9a') diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service index 2123348fd..a797d1661 100644 --- a/libre/lirc-libre/lirc.service +++ b/libre/lirc-libre/lirc.service @@ -1,11 +1,12 @@ [Unit] Description=Linux Infrared Remote Control +After=network.target [Service] -ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd -ExecStart=/usr/bin/lircd --pidfile=/run/lirc/lircd.pid Type=forking PIDFile=/run/lirc/lircd.pid +ExecStart=/usr/sbin/lircd --driver=default --device=/dev/lirc0 [Install] WantedBy=multi-user.target + diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service index eedcf5d8f..c0b5e36b7 100644 --- a/libre/lirc-libre/lircm.service +++ b/libre/lirc-libre/lircm.service @@ -1,11 +1,12 @@ [Unit] Description=LIRC Mouse -After=lirc.service -Wants=lirc.service +Requires=lirc.service +After=network.target lirc.service [Service] -ExecStart=/usr/bin/lircmd -u Type=forking +ExecStart=/usr/sbin/lircmd [Install] WantedBy=multi-user.target + |