[arch-commits] Commit in lirc/trunk (3 files)

[Lukas Fleischer]

    Date: Friday, January 16, 2015 @ 00:18:24
  Author: lfleischer
Revision: 229105

lirc: Replace custom patch with upstream patch

Added:
  lirc/trunk/0001-tools-Make-make_rel_symlink.py-use-python3.patch
Modified:
  lirc/trunk/PKGBUILD
Deleted:
  lirc/trunk/0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch

-----------------------------------------------------------+
 0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch |   36 ----------
 0001-tools-Make-make_rel_symlink.py-use-python3.patch     |   42 ++++++++++++
 PKGBUILD                                                  |    4 -
 3 files changed, 44 insertions(+), 38 deletions(-)

Deleted: 0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch
===================================================================
--- 0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch	2015-01-15 22:44:04 UTC (rev 229104)
+++ 0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch	2015-01-15 23:18:24 UTC (rev 229105)
@@ -1,36 +0,0 @@
-From 2628ddc723eb8c9209c3d34bed4752fdfbe88115 Mon Sep 17 00:00:00 2001
-From: Lukas Fleischer <archlinux at cryptocrack.de>
-Date: Thu, 15 Jan 2015 21:39:11 +0100
-Subject: [PATCH] make_rel_symlink.py: Fix Python 3 compatibility
-
----
- tools/make_rel_symlink.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py
-index 5c89305..ff0403a 100755
---- a/tools/make_rel_symlink.py
-+++ b/tools/make_rel_symlink.py
-@@ -32,16 +32,16 @@ if sys.argv[1] == "-p":
-     sys.argv = sys.argv[ 1:]
- 
- if len( sys.argv ) != 3:
--    print USAGE
-+    print(USAGE)
-     sys.exit( 1 )
- 
- if  os.path.isdir(  sys.argv[2] ):
--    print "Removing link target dir:" +  sys.argv[2]
-+    print("Removing link target dir:" +  sys.argv[2])
-     shutil.rmtree( sys.argv[2])
- 
- link_path = relative_ln_s( sys.argv[1], sys.argv[2] )
- if just_print:
--    print link_path
-+    print(link_path)
- else:
-     os.chdir( os.path.dirname( sys.argv[2]))
-     target = os.path.basename( sys.argv[2])
--- 
-2.2.2
-

Added: 0001-tools-Make-make_rel_symlink.py-use-python3.patch
===================================================================
--- 0001-tools-Make-make_rel_symlink.py-use-python3.patch	                        (rev 0)
+++ 0001-tools-Make-make_rel_symlink.py-use-python3.patch	2015-01-15 23:18:24 UTC (rev 229105)
@@ -0,0 +1,42 @@
+From 4c30c6f87dda6614978dfab69d417ef3ca83dccf Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at gmail.com>
+Date: Thu, 11 Dec 2014 04:44:49 +0100
+Subject: [PATCH] tools: Make make_rel_symlink.py use python3.
+
+---
+ tools/make_rel_symlink.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py
+index 5c89305..896637f 100755
+--- a/tools/make_rel_symlink.py
++++ b/tools/make_rel_symlink.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ import os
+ import os.path
+@@ -32,16 +32,16 @@ if sys.argv[1] == "-p":
+     sys.argv = sys.argv[ 1:]
+ 
+ if len( sys.argv ) != 3:
+-    print USAGE
++    print(USAGE)
+     sys.exit( 1 )
+ 
+ if  os.path.isdir(  sys.argv[2] ):
+-    print "Removing link target dir:" +  sys.argv[2]
++    print("Removing link target dir:" +  sys.argv[2])
+     shutil.rmtree( sys.argv[2])
+ 
+ link_path = relative_ln_s( sys.argv[1], sys.argv[2] )
+ if just_print:
+-    print link_path
++    print(link_path)
+ else:
+     os.chdir( os.path.dirname( sys.argv[2]))
+     target = os.path.basename( sys.argv[2])
+-- 
+2.2.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-15 22:44:04 UTC (rev 229104)
+++ PKGBUILD	2015-01-15 23:18:24 UTC (rev 229105)
@@ -18,7 +18,7 @@
 backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf')
 install=lirc.install
 source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2"
-        0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch
+        0001-tools-Make-make_rel_symlink.py-use-python3.patch
         lirc.logrotate
         irexec.service
         lirc.tmpfiles)
@@ -30,7 +30,7 @@
 
 prepare() {
   cd "${srcdir}/lirc-${_pkgver}"
-  patch -p1 -i ../0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch
+  patch -p1 -i 0001-tools-Make-make_rel_symlink.py-use-python3.patch
 }
 
 build() {