archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

lirc: update to 0.9.4d, use upstream patches

Browse Source 
Use upstream configuration settings where possible and
replace downstream patches with upstream fixes.

Rename downstream patches to start with 0100
This commit is contained in:
Matthias Reichl
2017-04-07 15:27:13 +02:00
parent f3caa55492
commit 7b54db2df0
6 changed files with 144 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
packages/sysutils/lirc/patches/lirc-0100-disable-python3.patch Normal file
View File

@@ -0,0 +1,43 @@
diff -Naur a/configure.ac b/configure.ac
--- a/configure.ac 2016-06-08 13:06:09.757102470 -0700
+++ b/configure.ac 2016-06-08 13:07:04.620705345 -0700
@@ -40,9 +40,9 @@
AM_CONDITIONAL(HAVE_DOXYGEN, test x$DOXYGEN = xyes)
AC_PROG_LN_S
LT_INIT([disable-static])
-AM_PATH_PYTHON([3.1],,)
-AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
-AC_CHECK_PROG([HAVE_PYTHON3],[python3],[yes],[no])
+AM_PATH_PYTHON([3.1],,[:])
+AM_CONDITIONAL([HAVE_PYTHON], [false])
+AC_CHECK_PROG([HAVE_PYTHON3],[python3],[no],[no])
LIBUSB_CONFIG="pkg-config libusb"
dnl Checks for header files.
diff -Naur a/tools/Makefile.am b/tools/Makefile.am
--- a/tools/Makefile.am 2016-05-23 10:18:48.000000000 -0700
+++ b/tools/Makefile.am 2016-06-08 13:15:25.711341537 -0700
@@ -114,22 +114,7 @@
install-exec-hook:
$(SED) -i -e 's/@version@/$(VERSION)/' \
- $(DESTDIR)$(bindir)/lirc-config-tool \
- $(DESTDIR)$(bindir)/irdb-get
- rm -f $(DESTDIR)/$(bindir)/lirc-setup
- $(srcdir)/make_rel_symlink.py \
- $(DESTDIR)/$(pkgpythondir)/lirc-setup \
- $(DESTDIR)/$(bindir)/lirc-setup
-
-install-data-hook:
- rm -f $(DESTDIR)/$(pkgpythondir)/configs
- $(srcdir)/make_rel_symlink.py \
- $(DESTDIR)$(pkgdatadir)/configs \
- $(DESTDIR)$(pkgpythondir)/configs
-
-uninstall-hook:
- rm -f $(DESTDIR)/$(bindir)/lirc-setup \
- $(DESTDIR)/$(pkgpythondir)/configs
+ $(DESTDIR)$(bindir)/lirc-config-tool
clean-local:
-find . -name __pycache__ -exec rm -r {} \;