From 577f3d6d591042787d5d101ead4f26b9cb4c8aca Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 19 Dec 2016 11:01:11 +0100 Subject: [PATCH] python-tkinter: update to 2.7.13 --- srcpkgs/python-tkinter/files/idle2.7.desktop | 9 --------- srcpkgs/python-tkinter/files/idle2.desktop | 9 +++++++++ .../files/{idle2.7.xpm => idle2.xpm} | 0 srcpkgs/python-tkinter/template | 20 +++++++++++-------- 4 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/python-tkinter/files/idle2.7.desktop create mode 100644 srcpkgs/python-tkinter/files/idle2.desktop rename srcpkgs/python-tkinter/files/{idle2.7.xpm => idle2.xpm} (100%) diff --git a/srcpkgs/python-tkinter/files/idle2.7.desktop b/srcpkgs/python-tkinter/files/idle2.7.desktop deleted file mode 100644 index 26ac7818826..00000000000 --- a/srcpkgs/python-tkinter/files/idle2.7.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=IDLE (using Python2.7) -Comment=IDE for Python (using Python2.7) -Exec=idle2.7 -Icon=idle2.7 -Terminal=false -Type=Application -Categories=Development; -StartupNotify=true diff --git a/srcpkgs/python-tkinter/files/idle2.desktop b/srcpkgs/python-tkinter/files/idle2.desktop new file mode 100644 index 00000000000..ee6fad11773 --- /dev/null +++ b/srcpkgs/python-tkinter/files/idle2.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=IDLE (using Python2) +Comment=IDE for Python (using Python2) +Exec=idle2 +Icon=idle2 +Terminal=false +Type=Application +Categories=Development; +StartupNotify=true diff --git a/srcpkgs/python-tkinter/files/idle2.7.xpm b/srcpkgs/python-tkinter/files/idle2.xpm similarity index 100% rename from srcpkgs/python-tkinter/files/idle2.7.xpm rename to srcpkgs/python-tkinter/files/idle2.xpm diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template index 069d3b602c3..6cf21d18cde 100644 --- a/srcpkgs/python-tkinter/template +++ b/srcpkgs/python-tkinter/template @@ -3,21 +3,24 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python"; IT IS SPLITTED TO AVOID # A CYCLIC DEPENDENCY: python -> tk -> libX11 -> libxcb -> xcb-proto -> python # + +_desc="Interpreted, interactive, object-oriented programming language" + pkgname=python-tkinter -version=2.7.12 -revision=2 +version=2.7.13 +revision=1 wrksrc="Python-${version}" hostmakedepends="pkg-config" makedepends=" libffi-devel readline-devel gdbm-devel libressl-devel expat-devel sqlite-devel bzip2-devel zlib-devel tk-devel" pycompile_module="lib-tk" -short_desc="Interpreted, interactive, object-oriented programming language - GUI toolkit for Python2" +short_desc="${_desc} - GUI toolkit for Python2" maintainer="Juan RP " homepage="http://www.python.org" license="PSF" distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.xz" -checksum=d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978 +checksum=35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731 pre_configure() { # Ensure that internal copies of expat, libffi and zlib are not used. @@ -68,17 +71,18 @@ do_install() { ${DESTDIR}/usr/lib/python2.7/ mv ${wrksrc}/${pkgname}-${version}-install/usr/${_libdir}/python2.7/lib-dynload/_tkinter.so \ ${DESTDIR}/usr/lib/python2.7/lib-dynload/ + ln -sf idle2.7 ${DESTDIR}/usr/bin/idle2 } idle-python_package() { noarch=yes depends="python-tkinter>=${version}_${revision}" pycompile_module="idlelib" - short_desc+=" - IDE for Python2 using Tkinter" + short_desc="${_desc} - IDE for Python2 using Tkinter" pkg_install() { - vmove usr/bin/idle${version%.*} + vmove usr/bin/idle2* vmove usr/lib/python${version%.*}/idlelib - vinstall ${FILESDIR}/idle${version%.*}.xpm 644 usr/share/pixmaps - vinstall ${FILESDIR}/idle${version%.*}.desktop 644 usr/share/applications + vinstall ${FILESDIR}/idle2.xpm 644 usr/share/pixmaps + vinstall ${FILESDIR}/idle2.desktop 644 usr/share/applications } }