[arch-commits] Commit in alacarte/trunk (PKGBUILD py3.patch)
Jan Steffens
heftig at nymeria.archlinux.org
Tue Oct 15 15:53:12 UTC 2013
Date: Tuesday, October 15, 2013 @ 17:53:12
Author: heftig
Revision: 196601
use python2 (FS#37221)
Modified:
alacarte/trunk/PKGBUILD
Deleted:
alacarte/trunk/py3.patch
-----------+
PKGBUILD | 13 ++---
py3.patch | 147 ------------------------------------------------------------
2 files changed, 5 insertions(+), 155 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-10-15 15:41:01 UTC (rev 196600)
+++ PKGBUILD 2013-10-15 15:53:12 UTC (rev 196601)
@@ -4,29 +4,26 @@
pkgname=alacarte
pkgver=3.10.0
-pkgrel=2
+pkgrel=3
pkgdesc="Menu editor for gnome"
arch=(any)
license=('LGPL')
url="http://www.gnome.org"
-depends=('gnome-menus' 'hicolor-icon-theme' 'python-gobject' 'gtk3')
+depends=('gnome-menus' 'hicolor-icon-theme' 'python2-gobject' 'gtk3')
makedepends=('intltool')
install=alacarte.install
options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz
- py3.patch)
-sha256sums=('bdc91981859a5076ae38a213892074e1263629835702920d47f6ee2bb76179f1'
- '19dd62126e4eb6eee2f1175a5e2120ee360e06461d2e275e1b494dadbdf4dfae')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('bdc91981859a5076ae38a213892074e1263629835702920d47f6ee2bb76179f1')
prepare() {
cd $pkgname-$pkgver
- patch -Np1 -i ../py3.patch
}
build() {
cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var PYTHON=/usr/bin/python
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var PYTHON=/usr/bin/python2
make
}
Deleted: py3.patch
===================================================================
--- py3.patch 2013-10-15 15:41:01 UTC (rev 196600)
+++ py3.patch 2013-10-15 15:53:12 UTC (rev 196601)
@@ -1,147 +0,0 @@
-diff -u -r alacarte-3.10.0/configure alacarte-3.10.0-py/configure
---- alacarte-3.10.0/configure 2013-09-24 19:08:36.000000000 +0200
-+++ alacarte-3.10.0-py/configure 2013-09-24 21:05:53.171910263 +0200
-@@ -5853,7 +5853,7 @@
- if ${am_cv_python_version+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
-+ am_cv_python_version=`$PYTHON -c "import sys; print(sys.version[:3])"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-@@ -5872,7 +5872,7 @@
- if ${am_cv_python_platform+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
-+ am_cv_python_platform=`$PYTHON -c "import sys; print(sys.platform)"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
- $as_echo "$am_cv_python_platform" >&6; }
-@@ -5886,7 +5886,7 @@
- if ${am_cv_python_pythondir+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-+ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX'))" 2>/dev/null ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-@@ -5903,7 +5903,7 @@
- if ${am_cv_python_pyexecdir+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-+ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX'))" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
-@@ -5928,7 +5928,7 @@
- if ${am_cv_python_version+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
-+ am_cv_python_version=`$PYTHON -c "import sys; print(sys.version[:3])"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-@@ -5947,7 +5947,7 @@
- if ${am_cv_python_platform+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
-+ am_cv_python_platform=`$PYTHON -c "import sys; print(sys.platform)"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
- $as_echo "$am_cv_python_platform" >&6; }
-@@ -5961,7 +5961,7 @@
- if ${am_cv_python_pythondir+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-+ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX'))" 2>/dev/null ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-@@ -5978,7 +5978,7 @@
- if ${am_cv_python_pyexecdir+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-+ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX'))" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
-@@ -6003,7 +6003,7 @@
- if ${am_cv_python_version+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
-+ am_cv_python_version=`$PYTHON -c "import sys; print(sys.version[:3])"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-@@ -6022,7 +6022,7 @@
- if ${am_cv_python_platform+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
-+ am_cv_python_platform=`$PYTHON -c "import sys; print(sys.platform)"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
- $as_echo "$am_cv_python_platform" >&6; }
-@@ -6036,7 +6036,7 @@
- if ${am_cv_python_pythondir+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-+ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX'))" 2>/dev/null ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-@@ -6053,7 +6053,7 @@
- if ${am_cv_python_pyexecdir+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-+ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX'))" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
-@@ -6078,7 +6078,7 @@
- if ${am_cv_python_version+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
-+ am_cv_python_version=`$PYTHON -c "import sys; print(sys.version[:3])"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-@@ -6097,7 +6097,7 @@
- if ${am_cv_python_platform+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
-+ am_cv_python_platform=`$PYTHON -c "import sys; print(sys.platform)"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
- $as_echo "$am_cv_python_platform" >&6; }
-@@ -6111,7 +6111,7 @@
- if ${am_cv_python_pythondir+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-+ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX'))" 2>/dev/null ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-@@ -6128,7 +6128,7 @@
- if ${am_cv_python_pyexecdir+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-+ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX'))" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
More information about the arch-commits
mailing list