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

[Maxime Gauduin]

    Date: Sunday, October 13, 2013 @ 12:52:39
  Author: alucryd
Revision: 98551

upgpkg: cairo-dock-plugins 3.3.1-1

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

--------------+
 PKGBUILD     |   18 +++++-------------
 python.patch |   49 -------------------------------------------------
 2 files changed, 5 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-13 10:48:27 UTC (rev 98550)
+++ PKGBUILD	2013-10-13 10:52:39 UTC (rev 98551)
@@ -6,8 +6,8 @@
 # Contributor: snoopy33 <snoopy33 at no-log.org>
 
 pkgname=cairo-dock-plugins
-pkgver=3.2.1
-pkgrel=4
+pkgver=3.3.1
+pkgrel=1
 pkgdesc="Plugins for Cairo-Dock"
 url="https://launchpad.net/cairo-dock"
 license=('GPL')
@@ -34,17 +34,9 @@
             'vte3: Terminal applet'
             'webkitgtk3: Weblets applet')
 options=('!libtool')
-source=("http://launchpad.net/cairo-dock-plug-ins/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"
-        'python.patch')
-sha256sums=('11b4433e40bbb1507757b23e167c521d620827576c2f30bb1a9642e0bff57e01'
-            'f33ff6f2b93936c5050ae369d1b08c41bd17f5a2fb4ce46da5436d78d0b3fa8e')
+source=("http://launchpad.net/cairo-dock-plug-ins/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('21d41ffeac6848dced05280641d764709445cad4c4e19082404b74ecd6436fd4')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  patch -Np1 -i ../python.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
 
@@ -53,7 +45,7 @@
   fi
   mkdir build && cd build
 
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr'
   make
 }
 

Deleted: python.patch
===================================================================
--- python.patch	2013-10-13 10:48:27 UTC (rev 98550)
+++ python.patch	2013-10-13 10:52:39 UTC (rev 98551)
@@ -1,49 +0,0 @@
-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()