[arch-commits] Commit in cmake/trunk (PKGBUILD imagemagick.patch)

2013-10-08 Thread Andrea Scarpino 
Date: Tuesday, October 8, 2013 @ 21:06:23
  Author: andrea
Revision: 196219

upgpkg: cmake 2.8.12-1

Upstream release

Modified:
  cmake/trunk/PKGBUILD
Deleted:
  cmake/trunk/imagemagick.patch

---+
 PKGBUILD  |   18 --
 imagemagick.patch |   27 ---
 2 files changed, 4 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-08 17:51:00 UTC (rev 196218)
+++ PKGBUILD2013-10-08 19:06:23 UTC (rev 196219)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=cmake
-pkgver=2.8.11.2
-pkgrel=2
+pkgver=2.8.12
+pkgrel=1
 pkgdesc=A cross-platform open-source make system
 arch=('i686' 'x86_64')
 url=http://www.cmake.org/;
@@ -13,19 +13,9 @@
 makedepends=('qt4' 'emacs')
 optdepends=('qt4: cmake-gui')
 install=${pkgname}.install
-source=(http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz;
-'imagemagick.patch')
-md5sums=('6f5d7b8e7534a5d9e1a7664ba63cf882'
- '19c4cf0e6e9c9a890f3698c9df8062f1')
+source=(http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('105bc6d21cc2e9b6aff901e43c53afea')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/imagemagick.patch
-  sed -i 's/Magick++-6.Q16/Magick++-6.Q16 Magick++-6.Q16HDRI/' 
Modules/FindImageMagick.cmake
-  sed -i 's/MagickWand-6.Q16/MagickWand-6.Q16 MagickWand-6.Q16HDRI/' 
Modules/FindImageMagick.cmake
-  sed -i 's/MagickCore-6.Q16/MagickCore-6.Q16 MagickCore-6.Q16HDRI/' 
Modules/FindImageMagick.cmake
-}
-
 build() {
   cd ${pkgname}-${pkgver}
 

Deleted: imagemagick.patch
===
--- imagemagick.patch   2013-10-08 17:51:00 UTC (rev 196218)
+++ imagemagick.patch   2013-10-08 19:06:23 UTC (rev 196219)
@@ -1,27 +0,0 @@
-From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001
-From: Funda Wang fundaw...@gmail.com
-Date: Tue, 28 May 2013 06:17:49 +
-Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174)
-
-The header files of ImageMagick are now located at
-prefix/include/ImageMagick-6 instead of prefix/include/ImageMagick.

- Modules/FindImageMagick.cmake |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
-index cd97b38..02a5777 100644
 a/Modules/FindImageMagick.cmake
-+++ b/Modules/FindImageMagick.cmake
-@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header)
-   ${ImageMagick_INCLUDE_DIRS}
-   [HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include
- PATH_SUFFIXES
--  ImageMagick
-+  ImageMagick ImageMagick-6
- DOC Path to the ImageMagick include dir.
- )
-   find_library(ImageMagick_${component}_LIBRARY
--- 
-1.7.0
-

[arch-commits] Commit in cmake/trunk (PKGBUILD imagemagick.patch)

2013-06-08 Thread Andrea Scarpino 
Date: Saturday, June 8, 2013 @ 08:49:28
  Author: andrea
Revision: 187914

upgpkg: cmake 2.8.11.1-1

Upstream release

Modified:
  cmake/trunk/PKGBUILD
Deleted:
  cmake/trunk/imagemagick.patch

---+
 PKGBUILD  |   15 ---
 imagemagick.patch |   27 ---
 2 files changed, 4 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-08 06:38:38 UTC (rev 187913)
+++ PKGBUILD2013-06-08 06:49:28 UTC (rev 187914)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=cmake
-pkgver=2.8.11
-pkgrel=2
+pkgver=2.8.11.1
+pkgrel=1
 pkgdesc=A cross-platform open-source make system
 arch=('i686' 'x86_64')
 url=http://www.cmake.org/;
@@ -13,16 +13,9 @@
 makedepends=('qt4' 'emacs')
 optdepends=('qt4: cmake-gui')
 install=${pkgname}.install
-source=(http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz;
-'imagemagick.patch')
-md5sums=('be6008f2299613d23fe82ab53ef7472e'
- '19c4cf0e6e9c9a890f3698c9df8062f1')
+source=(http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('df5324a3b203373a9e0a04b924281a43')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/imagemagick.patch 
-}
-
 build() {
   cd ${pkgname}-${pkgver}
 

Deleted: imagemagick.patch
===
--- imagemagick.patch   2013-06-08 06:38:38 UTC (rev 187913)
+++ imagemagick.patch   2013-06-08 06:49:28 UTC (rev 187914)
@@ -1,27 +0,0 @@
-From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001
-From: Funda Wang fundaw...@gmail.com
-Date: Tue, 28 May 2013 06:17:49 +
-Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174)
-
-The header files of ImageMagick are now located at
-prefix/include/ImageMagick-6 instead of prefix/include/ImageMagick.

- Modules/FindImageMagick.cmake |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
-index cd97b38..02a5777 100644
 a/Modules/FindImageMagick.cmake
-+++ b/Modules/FindImageMagick.cmake
-@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header)
-   ${ImageMagick_INCLUDE_DIRS}
-   [HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include
- PATH_SUFFIXES
--  ImageMagick
-+  ImageMagick ImageMagick-6
- DOC Path to the ImageMagick include dir.
- )
-   find_library(ImageMagick_${component}_LIBRARY
--- 
-1.7.0
-

[arch-commits] Commit in cmake/trunk (PKGBUILD imagemagick.patch)

2013-06-08 Thread Andrea Scarpino 
Date: Saturday, June 8, 2013 @ 09:00:43
  Author: andrea
Revision: 187916

upgpkg: cmake 2.8.11.1-1

patch is still needed

Added:
  cmake/trunk/imagemagick.patch
Modified:
  cmake/trunk/PKGBUILD

---+
 PKGBUILD  |   11 +--
 imagemagick.patch |   27 +++
 2 files changed, 36 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-08 06:49:37 UTC (rev 187915)
+++ PKGBUILD2013-06-08 07:00:43 UTC (rev 187916)
@@ -13,9 +13,16 @@
 makedepends=('qt4' 'emacs')
 optdepends=('qt4: cmake-gui')
 install=${pkgname}.install
-source=(http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('df5324a3b203373a9e0a04b924281a43')
+source=(http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz;
+'imagemagick.patch')
+md5sums=('df5324a3b203373a9e0a04b924281a43'
+ '19c4cf0e6e9c9a890f3698c9df8062f1')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i ${srcdir}/imagemagick.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
 

Added: imagemagick.patch
===
--- imagemagick.patch   (rev 0)
+++ imagemagick.patch   2013-06-08 07:00:43 UTC (rev 187916)
@@ -0,0 +1,27 @@
+From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001
+From: Funda Wang fundaw...@gmail.com
+Date: Tue, 28 May 2013 06:17:49 +
+Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174)
+
+The header files of ImageMagick are now located at
+prefix/include/ImageMagick-6 instead of prefix/include/ImageMagick.
+---
+ Modules/FindImageMagick.cmake |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
+index cd97b38..02a5777 100644
+--- a/Modules/FindImageMagick.cmake
 b/Modules/FindImageMagick.cmake
+@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header)
+   ${ImageMagick_INCLUDE_DIRS}
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include
+ PATH_SUFFIXES
+-  ImageMagick
++  ImageMagick ImageMagick-6
+ DOC Path to the ImageMagick include dir.
+ )
+   find_library(ImageMagick_${component}_LIBRARY
+-- 
+1.7.0
+

[arch-commits] Commit in cmake/trunk (PKGBUILD imagemagick.patch qt4.patch)

2013-06-03 Thread Andrea Scarpino 
Date: Monday, June 3, 2013 @ 13:20:05
  Author: andrea
Revision: 187082

Fix ImageMagick detection (FS#35280)

Added:
  cmake/trunk/imagemagick.patch
Modified:
  cmake/trunk/PKGBUILD
Deleted:
  cmake/trunk/qt4.patch

---+
 PKGBUILD  |   13 ++---
 imagemagick.patch |   27 +++
 qt4.patch |   11 ---
 3 files changed, 37 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-03 11:17:17 UTC (rev 187081)
+++ PKGBUILD2013-06-03 11:20:05 UTC (rev 187082)
@@ -4,7 +4,7 @@
 
 pkgname=cmake
 pkgver=2.8.11
-pkgrel=1
+pkgrel=2
 pkgdesc=A cross-platform open-source make system
 arch=('i686' 'x86_64')
 url=http://www.cmake.org/;
@@ -13,9 +13,16 @@
 makedepends=('qt4' 'emacs')
 optdepends=('qt4: cmake-gui')
 install=${pkgname}.install
-source=(http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('be6008f2299613d23fe82ab53ef7472e')
+source=(http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz;
+'imagemagick.patch')
+md5sums=('be6008f2299613d23fe82ab53ef7472e'
+ '19c4cf0e6e9c9a890f3698c9df8062f1')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i ${srcdir}/imagemagick.patch 
+}
+
 build() {
   cd ${pkgname}-${pkgver}
 

Added: imagemagick.patch
===
--- imagemagick.patch   (rev 0)
+++ imagemagick.patch   2013-06-03 11:20:05 UTC (rev 187082)
@@ -0,0 +1,27 @@
+From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001
+From: Funda Wang fundaw...@gmail.com
+Date: Tue, 28 May 2013 06:17:49 +
+Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174)
+
+The header files of ImageMagick are now located at
+prefix/include/ImageMagick-6 instead of prefix/include/ImageMagick.
+---
+ Modules/FindImageMagick.cmake |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
+index cd97b38..02a5777 100644
+--- a/Modules/FindImageMagick.cmake
 b/Modules/FindImageMagick.cmake
+@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header)
+   ${ImageMagick_INCLUDE_DIRS}
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include
+ PATH_SUFFIXES
+-  ImageMagick
++  ImageMagick ImageMagick-6
+ DOC Path to the ImageMagick include dir.
+ )
+   find_library(ImageMagick_${component}_LIBRARY
+-- 
+1.7.0
+

Deleted: qt4.patch
===
--- qt4.patch   2013-06-03 11:17:17 UTC (rev 187081)
+++ qt4.patch   2013-06-03 11:20:05 UTC (rev 187082)
@@ -1,11 +0,0 @@
 cmake-2.8.10.2/Modules/FindQt4.cmake~  2013-03-07 16:50:35.388399689 
+
-+++ cmake-2.8.10.2/Modules/FindQt4.cmake   2013-03-07 16:51:35.017991029 
+
-@@ -497,7 +497,7 @@
- # check for qmake
- # Debian uses qmake-qt4
- # macports' Qt uses qmake-mac
--find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
-+find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac
-   PATHS
- ENV QTDIR
- 
[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]