Update to version 2.5.24

2 files changed, 4 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96867884304a..f47e47434781 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-libgphoto2
 	pkgdesc = The core library of gphoto2, designed to allow access to digital camera by external programs. (32-bit)
-	pkgver = 2.5.23
+	pkgver = 2.5.24
 	pkgrel = 1
 	url = http://www.gphoto.org/
 	arch = x86_64
@@ -13,7 +13,7 @@ pkgbase = lib32-libgphoto2
 	depends = lib32-libusb
 	depends = lib32-libxml2
 	depends = libgphoto2
-	source = git+https://github.com/gphoto/libgphoto2#commit=276c1a403f07aac74224a65079c51ef600c6837b
+	source = git+https://github.com/gphoto/libgphoto2#commit=63f8c5233e73aedbf47f4a65fc30f579307cb4da
 	validpgpkeys = 7C4AFD61D8AAE7570796A5172209D6902F969C95
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index aa0603742151..ad701666b6ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _basename=libgphoto2
 pkgname=lib32-libgphoto2
-pkgver=2.5.23
+pkgver=2.5.24
 pkgrel=1
 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs. (32-bit)"
 url="http://www.gphoto.org/"
@@ -11,7 +11,7 @@ arch=(x86_64)
 license=(LGPL)
 depends=(lib32-libexif lib32-gd lib32-libltdl lib32-libusb lib32-libxml2 libgphoto2)
 makedepends=(autoconf-archive git)
-_commit=276c1a403f07aac74224a65079c51ef600c6837b  # tags/libgphoto2-2_5_23-release
+_commit=63f8c5233e73aedbf47f4a65fc30f579307cb4da  # tags/libgphoto2-2_5_24-release
 source=("git+https://github.com/gphoto/libgphoto2#commit=$_commit")
 sha256sums=('SKIP')
 validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner
@@ -25,8 +25,6 @@ pkgver() {
 prepare() {
     cd $_basename
 
-    git cherry-pick -n 236cd97b617972c38ac8e6780590b3049c0afa2f
-
     autoreconf -fvi
 }