diff --git a/mingw-w64-libgphoto2/PKGBUILD b/mingw-w64-libgphoto2/PKGBUILD index 6df68b2fe1..d213a386cd 100644 --- a/mingw-w64-libgphoto2/PKGBUILD +++ b/mingw-w64-libgphoto2/PKGBUILD @@ -4,7 +4,7 @@ _realname=libgphoto2 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.5.23 -pkgrel=1 +pkgrel=2 pkgdesc="libgphoto2 is a free, redistributable, ready to use set of digital camera software applications for Unix-like system (mingw-w64)" arch=('any') url="http://gphoto.org/proj/libgphoto2/" @@ -16,22 +16,20 @@ depends=("${MINGW_PACKAGE_PREFIX}-libsystre" "${MINGW_PACKAGE_PREFIX}-libexif" "${MINGW_PACKAGE_PREFIX}-libusb" "${MINGW_PACKAGE_PREFIX}-libtool") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-doxygen") source=(https://sourceforge.net/projects/gphoto/files/libgphoto/${pkgver}/${_realname}-${pkgver}.tar.gz libgphoto2-gp_system_filename-fix.patch - libgphoto2-use-pkg-config-for-gd.patch - disable-build-docs-as-doxygen-crash.patch) + libgphoto2-use-pkg-config-for-gd.patch) sha256sums=('58bdb621f58e95775103bca8d530c3e63d11e42bfde3d2447bf5e9fad8144da2' '27c558cdf88bee6ce1f3f564d6dfbc0b78809c33b98d20c9e58e40e335d7b0dd' - '16036711f9c656e3988bc3c7b3e5209db3ad1163048cc7a0139e3e882d52f7c2' - 'ec52e765f7a3da2c969082b83e0d56d8d5e8eaf728b110d69e12c58cef4e4102') + '16036711f9c656e3988bc3c7b3e5209db3ad1163048cc7a0139e3e882d52f7c2') validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -Np1 -i "${srcdir}/libgphoto2-gp_system_filename-fix.patch" patch -Np1 -i "${srcdir}/libgphoto2-use-pkg-config-for-gd.patch" - patch -Np1 -i "${srcdir}/disable-build-docs-as-doxygen-crash.patch" autoreconf -fiv } @@ -42,7 +40,6 @@ build() { cp -rf ${_realname}-${pkgver} build-${MINGW_CHOST} cd ${srcdir}/build-${MINGW_CHOST} - DOXYGEN=/dev/null \ ./configure \ --prefix="${MINGW_PREFIX}" \ --build=${MINGW_CHOST} \ diff --git a/mingw-w64-libgphoto2/disable-build-docs-as-doxygen-crash.patch b/mingw-w64-libgphoto2/disable-build-docs-as-doxygen-crash.patch deleted file mode 100644 index 3c6c068554..0000000000 --- a/mingw-w64-libgphoto2/disable-build-docs-as-doxygen-crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libgphoto2-2.5.23/Makefile.am.orig 2019-06-08 16:09:28.920940000 +0300 -+++ libgphoto2-2.5.23/Makefile.am 2019-06-08 16:09:33.928548800 +0300 -@@ -8,7 +8,7 @@ - EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk - - # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() --SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc gphoto-m4 -+SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging gphoto-m4 - - EXTRA_DIST += libgphoto2.pc.in - pkgconfig_DATA = libgphoto2.pc