[arch-commits] Commit in eric/trunk (ChangeLog PKGBUILD install_py2.patch)

Evgeniy Alekseev arcanis at archlinux.org
Mon Dec 1 01:08:55 UTC 2014


    Date: Monday, December 1, 2014 @ 02:08:55
  Author: arcanis
Revision: 123304

upgpkg: eric 5.5.1-1

Added:
  eric/trunk/install_py2.patch
Modified:
  eric/trunk/ChangeLog
  eric/trunk/PKGBUILD

-------------------+
 ChangeLog         |    3 +++
 PKGBUILD          |   33 ++++++++-------------------------
 install_py2.patch |   12 ++++++++++++
 3 files changed, 23 insertions(+), 25 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2014-12-01 00:06:37 UTC (rev 123303)
+++ ChangeLog	2014-12-01 01:08:55 UTC (rev 123304)
@@ -1,3 +1,6 @@
+5.5.1-1:
+upstream update
+
 5.5.0-1:
 * upstream update
 * create python2-eric package

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-01 00:06:37 UTC (rev 123303)
+++ PKGBUILD	2014-12-01 01:08:55 UTC (rev 123304)
@@ -6,7 +6,7 @@
 
 pkgbase=eric
 pkgname=('eric-common' 'eric' 'python2-eric')
-pkgver=5.5.0
+pkgver=5.5.1
 pkgrel=1
 pkgdesc="A full-featured Python and Ruby IDE in PyQt4"
 arch=('any')
@@ -14,20 +14,19 @@
 license=('GPL3')
 depends=('python-qscintilla' 'python2-qscintilla')
 install=${pkgbase}.install
-source=("http://downloads.sourceforge.net/eric-ide/eric5-${pkgver}.tar.gz")
-md5sums=('87a7b222269e688418e3f0d51c044508')
+source=("http://downloads.sourceforge.net/eric-ide/eric5-${pkgver}.tar.gz"
+        "install_py2.patch")
+md5sums=('1ffb05964068c41702f445c113565805'
+         '6c870e9ec58b7d9a4cf0a5ed97415b81')
 changelog=ChangeLog
 
 prepare() {
   cp -r "${srcdir}/eric5-${pkgver}"{,_py2}
+  patch -p0 -i install_py2.patch
 
   cd "${srcdir}/eric5-${pkgver}_py2/eric"
   find . -name '*.py' -exec \
     sed -i -r "s:^#!/usr/bin/(env |)python(3|)$:#!/usr/bin/env python2:" {} \;
-  # fix py2 and py3 compatibility
-  sed -i "s/eric5.desktop/eric5_py2.desktop/g" "eric5.appdata.xml"
-  sed -i "s/Exec=eric5/Exec=eric5_py2/g" "eric5.desktop"
-  sed -i "s/Exec=eric5_webbrowser/Exec=eric5_webbrowser_py2/g" "eric5_webbrowser.desktop"
 }
 
 package_eric-common() {
@@ -64,11 +63,6 @@
                  "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.9.1.api"
   install -Dm644 "APIs/Ruby/Ruby-1.9.1.bas" \
                  "${pkgdir}/usr/share/qt4/qsci/api/ruby/Ruby-1.9.1.bas"
-  # pixmaps
-  install -Dm644 "icons/default/eric.png" \
-                 "${pkgdir}/usr/share/pixmaps/eric.png"
-  install -Dm644 "icons/default/ericWeb.png" \
-                 "${pkgdir}/usr/share/pixmaps/ericWeb.png"
 }
 
 package_eric() {
@@ -75,10 +69,7 @@
   depends=('eric-common' 'python-qscintilla')
 
   cd "${srcdir}/eric5-${pkgver}"
-  python install.py -c -b /usr/bin -i "${pkgdir}"
-  # remove common components
-  rm -r "${pkgdir}/usr/share/pixmaps"
-  rm -r "${pkgdir}/usr/share/qt4"
+  python install.py -c -b /usr/bin -i "${pkgdir}" --noapis
 }
 
 package_python2-eric() {
@@ -85,15 +76,7 @@
   depends=('eric-common' 'python2-qscintilla')
 
   cd "${srcdir}/eric5-${pkgver}_py2"
-  python2 install.py -c -b /usr/bin -i "${pkgdir}" -y
-  # remove common components
-  rm -r "${pkgdir}/usr/share/qt4"
-  rm -r "${pkgdir}/usr/share/pixmaps"
-
-  # compatibility with eric
-  mv "${pkgdir}/usr/share/appdata/"{eric5.appdata.xml,eric5_py2.appdata.xml}
-  mv "${pkgdir}/usr/share/applications/"{eric5.desktop,eric5_py2.desktop}
-  mv "${pkgdir}/usr/share/applications/"{eric5_webbrowser.desktop,eric5_webbrowser_py2.desktop}
+  python2 install.py -c -b /usr/bin -i "${pkgdir}" -y --noapis
 }
 
 # vim:set ts=2 sw=2 et:

Added: install_py2.patch
===================================================================
--- install_py2.patch	                        (rev 0)
+++ install_py2.patch	2014-12-01 01:08:55 UTC (rev 123304)
@@ -0,0 +1,12 @@
+diff -ruN eric5-5.5.1_py2.orig/install.py eric5-5.5.1_py2/install.py
+--- eric5-5.5.1_py2.orig/install.py	2014-12-01 03:56:19.000000000 +0300
++++ eric5-5.5.1_py2/install.py	2014-12-01 03:56:46.332570642 +0300
+@@ -237,7 +237,7 @@
+     text = text.replace("@MARKER@", marker)
+     
+     if sys.version_info[0] == 2:
+-        f = codecs.open(src, "w", "utf-8")
++        f = codecs.open(dst, "w", "utf-8")
+     else:
+         f = open(dst, "w")
+     f.write(text)



More information about the arch-commits mailing list