[arch-commits] Commit in cairo-dock-plugins/trunk (PKGBUILD python.patch)

[Maxime Gauduin]

    Date: Thursday, July 11, 2013 @ 17:30:05
  Author: alucryd
Revision: 93866

FS#36079: cairo-dock-plugins 3.2.1-4

Added:
  cairo-dock-plugins/trunk/python.patch
Modified:
  cairo-dock-plugins/trunk/PKGBUILD

--------------+
 PKGBUILD     |   29 +++++++++++++++++++----------
 python.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-11 15:20:01 UTC (rev 93865)
+++ PKGBUILD	2013-07-11 15:30:05 UTC (rev 93866)
@@ -7,16 +7,16 @@
 
 pkgname=cairo-dock-plugins
 pkgver=3.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Plugins for Cairo-Dock"
 url="https://launchpad.net/cairo-dock"
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('cairo-dock')
-makedepends=('cmake' 'alsa-lib' 'fftw' 'gnome-menus' 'gtk-sharp-2' 'gvfs' 'libetpan' 'libexif' 'libical' 'libpulse' 'libxklavier' 'libzeitgeist' 'lm_sensors' 'ndesk-dbus-glib' 'python' 'ruby' 'upower' 'vala' 'vte3' 'webkitgtk3')
-optdepends=('alsa-lib: AlsaMixer, Sound Effects applets'
+makedepends=('cmake' 'alsa-lib' 'fftw' 'gnome-menus' 'gtk-sharp-2' 'gvfs' 'libetpan' 'libexif' 'libical' 'libpulse' 'libxklavier' 'libzeitgeist' 'lm_sensors' 'ndesk-dbus-glib' 'python' 'python2' 'ruby' 'upower' 'vala' 'vte3' 'webkitgtk3')
+optdepends=('alsa-lib: Sound Control, Sound Effects applets'
             'fftw: Impulse applet'
-            'gnome-menus: GMenu applet'
+            'gnome-menus: Applications Menu applet'
             'gtk-sharp-2: Mono API'
             'gvfs: GVFS integration'
             'libetpan: Mail applet'
@@ -27,17 +27,26 @@
             'libzeitgeist: Recent Events applet'
             'lm_sensors: System Monitor applet'
             'ndesk-dbus-glib: Mono API'
-            'python: Python API'
+            'python: Python 3 API'
+            'python2: Python 2 API'
             'ruby: Ruby API'
             'upower: Logout, PowerManager applets'
             'vte3: Terminal applet'
             'webkitgtk3: Weblets applet')
 options=('!libtool')
-source=("http://launchpad.net/cairo-dock-plug-ins/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('11b4433e40bbb1507757b23e167c521d620827576c2f30bb1a9642e0bff57e01')
+source=("http://launchpad.net/cairo-dock-plug-ins/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"
+        'python.patch')
+sha256sums=('11b4433e40bbb1507757b23e167c521d620827576c2f30bb1a9642e0bff57e01'
+            'f33ff6f2b93936c5050ae369d1b08c41bd17f5a2fb4ce46da5436d78d0b3fa8e')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  patch -Np1 -i ../python.patch
+}
+
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   if [[ -d build ]]; then
     rm -rf build
@@ -49,9 +58,9 @@
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}/build
+  cd ${pkgname}-${pkgver}/build
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
 
 # vim: ts=2 sw=2 et:

Added: python.patch
===================================================================
--- python.patch	                        (rev 0)
+++ python.patch	2013-07-11 15:30:05 UTC (rev 93866)
@@ -0,0 +1,49 @@
+diff -rupN cairo-dock-plugins-3.2.1.orig/Dbus/interfaces/bash/BashInstall.cmake.in cairo-dock-plugins-3.2.1/Dbus/interfaces/bash/BashInstall.cmake.in
+--- cairo-dock-plugins-3.2.1.orig/Dbus/interfaces/bash/BashInstall.cmake.in	2013-07-11 17:09:45.165345967 +0200
++++ cairo-dock-plugins-3.2.1/Dbus/interfaces/bash/BashInstall.cmake.in	2013-07-11 17:10:22.238469121 +0200
+@@ -2,7 +2,7 @@ IF ("@PYTHON2_FOUND@" STREQUAL "TRUE")
+ 	IF("@ROOT_PREFIX@" STREQUAL "")
+ 		EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+ 						"setup.py" "install"
+-						"--prefix=${CMAKE_INSTALL_PREFIX}"
++						"--prefix=$DESTDIR${CMAKE_INSTALL_PREFIX}"
+ 						"@DEBIAN_INSTALL_LAYOUT@")
+ 	ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "")
+ 		EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+@@ -20,7 +20,7 @@ IF ("@PYTHON3_FOUND@" STREQUAL "TRUE")
+ 	IF("@ROOT_PREFIX@" STREQUAL "")
+ 		EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+ 						"setup.py" "install"
+-						"--prefix=${CMAKE_INSTALL_PREFIX}"
++						"--prefix=$DESTDIR${CMAKE_INSTALL_PREFIX}"
+ 						"@DEBIAN_INSTALL_LAYOUT@")
+ 	ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "")
+ 		EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+diff -rupN cairo-dock-plugins-3.2.1.orig/Dbus/interfaces/python/PythonInstall.cmake.in cairo-dock-plugins-3.2.1/Dbus/interfaces/python/PythonInstall.cmake.in
+--- cairo-dock-plugins-3.2.1.orig/Dbus/interfaces/python/PythonInstall.cmake.in	2013-07-11 17:09:45.162012653 +0200
++++ cairo-dock-plugins-3.2.1/Dbus/interfaces/python/PythonInstall.cmake.in	2013-07-11 17:10:56.581607933 +0200
+@@ -2,7 +2,7 @@ if ("@PYTHON2_FOUND@" STREQUAL "TRUE")
+ 	IF("@ROOT_PREFIX@" STREQUAL "")
+ 		EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+ 						"setup.py" "install"
+-						"--prefix=${CMAKE_INSTALL_PREFIX}"
++						"--prefix=$DESTDIR${CMAKE_INSTALL_PREFIX}"
+ 						"@DEBIAN_INSTALL_LAYOUT@")
+ 	ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "")
+ 		EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+@@ -20,7 +20,7 @@ if ("@PYTHON3_FOUND@" STREQUAL "TRUE")
+ 	IF("@ROOT_PREFIX@" STREQUAL "")
+ 		EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+ 						"setup.py" "install"
+-						"--prefix=${CMAKE_INSTALL_PREFIX}"
++						"--prefix=$DESTDIR${CMAKE_INSTALL_PREFIX}"
+ 						"@DEBIAN_INSTALL_LAYOUT@")
+ 	ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "")
+ 		EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+@@ -32,4 +32,4 @@ if ("@PYTHON3_FOUND@" STREQUAL "TRUE")
+ 						"setup.py" "install"
+ 						"--root=@ROOT_PREFIX@")
+ 	ENDIF()
+-ENDIF()
+\ No newline at end of file
++ENDIF()