[arch-commits] Commit in python2-caja/repos (6 files)
Martin Wimpress
flexiondotorg at nymeria.archlinux.org
Fri Jul 11 11:54:42 UTC 2014
Date: Friday, July 11, 2014 @ 13:54:42
Author: flexiondotorg
Revision: 115449
archrelease: copy trunk to community-i686, community-x86_64
Added:
python2-caja/repos/community-i686/PKGBUILD
(from rev 115448, python2-caja/trunk/PKGBUILD)
python2-caja/repos/community-i686/use-pkg-config.diff
(from rev 115448, python2-caja/trunk/use-pkg-config.diff)
python2-caja/repos/community-x86_64/PKGBUILD
(from rev 115448, python2-caja/trunk/PKGBUILD)
python2-caja/repos/community-x86_64/use-pkg-config.diff
(from rev 115448, python2-caja/trunk/use-pkg-config.diff)
Deleted:
python2-caja/repos/community-i686/PKGBUILD
python2-caja/repos/community-x86_64/PKGBUILD
--------------------------------------+
/PKGBUILD | 78 +++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 35 --------------
community-i686/use-pkg-config.diff | 39 ++++++++++++++++
community-x86_64/PKGBUILD | 35 --------------
community-x86_64/use-pkg-config.diff | 39 ++++++++++++++++
5 files changed, 156 insertions(+), 70 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-07-11 11:54:30 UTC (rev 115448)
+++ community-i686/PKGBUILD 2014-07-11 11:54:42 UTC (rev 115449)
@@ -1,35 +0,0 @@
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-pkgname=python2-caja
-_pkgname=python-caja
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="Python binding for Caja, to allow Caja property page and menu item extensions to be written in Python."
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('caja' 'python2' 'python2-gobject')
-makedepends=('mate-common')
-options=('!emptydirs')
-replaces=('python-caja')
-provides=('python-caja')
-source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('63cf08e3f711be8eb44c423322962a18f822031e')
-
-prepare() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- sed -i 's/python-config/python2-config/' configure
-}
-
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure \
- --prefix=/usr \
- --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: python2-caja/repos/community-i686/PKGBUILD (from rev 115448, python2-caja/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-07-11 11:54:42 UTC (rev 115449)
@@ -0,0 +1,39 @@
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+pkgname=python2-caja
+_pkgname=python-caja
+pkgver=1.8.0
+pkgrel=2
+pkgdesc="Python binding for Caja, to allow Caja property page and menu item extensions to be written in Python."
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('caja' 'python2' 'python2-gobject')
+makedepends=('mate-common')
+replaces=('python-caja')
+provides=('python-caja')
+source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz"
+ "use-pkg-config.diff")
+sha1sums=('63cf08e3f711be8eb44c423322962a18f822031e'
+ '32c348669868414d98c3a4be0a083b419256200d')
+
+prepare() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ # Use pkg-config for python detection and variables
+ # - https://github.com/mate-desktop/python-caja/issues/17
+ patch -Np1 -i "${srcdir}/use-pkg-config.diff"
+ autoreconf -fi
+}
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ PYTHON=/usr/bin/python2 ./configure \
+ --prefix=/usr \
+ --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: python2-caja/repos/community-i686/use-pkg-config.diff (from rev 115448, python2-caja/trunk/use-pkg-config.diff)
===================================================================
--- community-i686/use-pkg-config.diff (rev 0)
+++ community-i686/use-pkg-config.diff 2014-07-11 11:54:42 UTC (rev 115449)
@@ -0,0 +1,39 @@
+diff --git a/configure.ac b/configure.ac
+index f4059e3..a8345ae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,8 +30,12 @@ GTK_DOC_CHECK(1.9)
+ dnl **************************************************
+ dnl * Check for Python
+ dnl **************************************************
+-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR([could not find Python headers])])
+-AM_CHECK_PYTHON_LIBS(,[AC_MSG_ERROR([could not find Python lib])])
++AM_PATH_PYTHON([2.6])
++PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
++PYTHON_LIB_LOC="`pkg-config python-${PYTHON_VERSION} --variable=libdir`"
++AC_SUBST(PYTHON_LIBS)
++AC_SUBST(PYTHON_CFLAGS)
++AC_SUBST(PYTHON_LIB_LOC)
+
+ if test "`pkg-config --variable=datadir pygobject-3.0`" != "" ; then
+ PYGOBJECT_VERSION=pygobject-3.0
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e3d7c3f..dd37d15 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -16,12 +16,13 @@ libcaja_python_la_CPPFLAGS = \
+ -DLIBDIR=\"$(libdir)\" \
+ -DPYTHON_VERSION=\"$(PYTHON_VERSION)\" \
+ -DPY_LIB_LOC="\"$(PYTHON_LIB_LOC)\"" \
+- $(PYTHON_INCLUDES) \
++ $(CAJA_PYTHON_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+ libcaja_python_la_CFLAGS = \
++ $(PYTHON_CFLAGS)
+ $(CAJA_PYTHON_CFLAGS) \
+ $(AM_CFLAGS)
+
+ libcaja_python_la_LDFLAGS = -module -avoid-version
+-libcaja_python_la_LIBADD = $(CAJA_PYTHON_LIBS) $(PYTHON_LIBS)
++libcaja_python_la_LIBADD = $(PYTHON_LIBS) $(CAJA_PYTHON_LIBS)
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-07-11 11:54:30 UTC (rev 115448)
+++ community-x86_64/PKGBUILD 2014-07-11 11:54:42 UTC (rev 115449)
@@ -1,35 +0,0 @@
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-pkgname=python2-caja
-_pkgname=python-caja
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="Python binding for Caja, to allow Caja property page and menu item extensions to be written in Python."
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('caja' 'python2' 'python2-gobject')
-makedepends=('mate-common')
-options=('!emptydirs')
-replaces=('python-caja')
-provides=('python-caja')
-source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('63cf08e3f711be8eb44c423322962a18f822031e')
-
-prepare() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- sed -i 's/python-config/python2-config/' configure
-}
-
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure \
- --prefix=/usr \
- --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: python2-caja/repos/community-x86_64/PKGBUILD (from rev 115448, python2-caja/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-07-11 11:54:42 UTC (rev 115449)
@@ -0,0 +1,39 @@
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+pkgname=python2-caja
+_pkgname=python-caja
+pkgver=1.8.0
+pkgrel=2
+pkgdesc="Python binding for Caja, to allow Caja property page and menu item extensions to be written in Python."
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('caja' 'python2' 'python2-gobject')
+makedepends=('mate-common')
+replaces=('python-caja')
+provides=('python-caja')
+source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz"
+ "use-pkg-config.diff")
+sha1sums=('63cf08e3f711be8eb44c423322962a18f822031e'
+ '32c348669868414d98c3a4be0a083b419256200d')
+
+prepare() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ # Use pkg-config for python detection and variables
+ # - https://github.com/mate-desktop/python-caja/issues/17
+ patch -Np1 -i "${srcdir}/use-pkg-config.diff"
+ autoreconf -fi
+}
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ PYTHON=/usr/bin/python2 ./configure \
+ --prefix=/usr \
+ --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: python2-caja/repos/community-x86_64/use-pkg-config.diff (from rev 115448, python2-caja/trunk/use-pkg-config.diff)
===================================================================
--- community-x86_64/use-pkg-config.diff (rev 0)
+++ community-x86_64/use-pkg-config.diff 2014-07-11 11:54:42 UTC (rev 115449)
@@ -0,0 +1,39 @@
+diff --git a/configure.ac b/configure.ac
+index f4059e3..a8345ae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,8 +30,12 @@ GTK_DOC_CHECK(1.9)
+ dnl **************************************************
+ dnl * Check for Python
+ dnl **************************************************
+-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR([could not find Python headers])])
+-AM_CHECK_PYTHON_LIBS(,[AC_MSG_ERROR([could not find Python lib])])
++AM_PATH_PYTHON([2.6])
++PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
++PYTHON_LIB_LOC="`pkg-config python-${PYTHON_VERSION} --variable=libdir`"
++AC_SUBST(PYTHON_LIBS)
++AC_SUBST(PYTHON_CFLAGS)
++AC_SUBST(PYTHON_LIB_LOC)
+
+ if test "`pkg-config --variable=datadir pygobject-3.0`" != "" ; then
+ PYGOBJECT_VERSION=pygobject-3.0
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e3d7c3f..dd37d15 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -16,12 +16,13 @@ libcaja_python_la_CPPFLAGS = \
+ -DLIBDIR=\"$(libdir)\" \
+ -DPYTHON_VERSION=\"$(PYTHON_VERSION)\" \
+ -DPY_LIB_LOC="\"$(PYTHON_LIB_LOC)\"" \
+- $(PYTHON_INCLUDES) \
++ $(CAJA_PYTHON_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+ libcaja_python_la_CFLAGS = \
++ $(PYTHON_CFLAGS)
+ $(CAJA_PYTHON_CFLAGS) \
+ $(AM_CFLAGS)
+
+ libcaja_python_la_LDFLAGS = -module -avoid-version
+-libcaja_python_la_LIBADD = $(CAJA_PYTHON_LIBS) $(PYTHON_LIBS)
++libcaja_python_la_LIBADD = $(PYTHON_LIBS) $(CAJA_PYTHON_LIBS)
More information about the arch-commits
mailing list