Merge commit '3f3c81b28468dd1646c0a8e44370b186a35d7dfd'

mingw-w64-SDL2_mixer/PKGBUILD

@@ -1,9 +1,10 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=SDL2_mixer
+pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.0.0
-pkgrel=5
+pkgrel=6
 pkgdesc="A simple multi-channel audio mixer (Version 2) (mingw-w64)"
 arch=('any')
 url="http://www.libsdl.org/projects/SDL_mixer"

mingw-w64-SDL_mixer/PKGBUILD

@@ -4,7 +4,7 @@ _realname=SDL_mixer
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=1.2.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple multi-channel audio mixer (mingw-w64)"
 arch=('any')
 url="http://www.libsdl.org/projects/SDL_mixer/"

mingw-w64-glpk/PKGBUILD

@@ -1,9 +1,10 @@
 # Maintainer: Ray Donnelly <mingw.android@gmail.com>
 
 _realname=glpk
+pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=4.55
-pkgrel=3
+pkgver=4.57
+pkgrel=1
 pkgdesc="GNU Linear Programming Kit: solve LP, MIP and other problems (mingw-w64)"
 arch=('any')
 url="http://www.gnu.org/software/glpk/glpk.html"
@@ -12,7 +13,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gmp")
 options=('staticlibs' !strip debug)
 source=("http://ftp.gnu.org/gnu/glpk/glpk-${pkgver}.tar.gz"
         'timeval-64bit.patch')
-sha1sums=('893058aada022a8dfc63c675ebcd7e7e86a3a363'
+sha1sums=('d2df2de59798c35024df8d140a53453e29a095be'
           'b496de484eb3df16dd91c253cd8230b4e42fb902')
 
 prepare () {

mingw-w64-graphicsmagick/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=graphicsmagick
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.3.22
+pkgver=1.3.23
 pkgrel=1
 pkgdesc="An image viewing/manipulation program (mingw-w64)"
 arch=('any')
@@ -36,7 +36,7 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-ghostscript: for Ghostscript support"
 options=('staticlibs' 'strip' 'libtool')
 source=(http://sourceforge.net/projects/graphicsmagick/files/${_realname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz
         001-relocate.patch)
-md5sums=('32e6ae274aa9318d2879978dd1e417a0'
+md5sums=('9885ff5d91bc215a0adb3be1185e9777'
          '7ff566f64baa2f2e198717aab2d937b5')
 
 prepare() {

mingw-w64-hub/PKGBUILD

@@ -12,7 +12,7 @@ options=('!strip')
 #TODO: change this when git-for-windows is upstreamed
 #depends=('${MINGW_PACKAGE_PREFIX}-git')
 depends=('git')
-makedepends=("git ${MINGW_PACKAGE_PREFIX}-go")
+makedepends=("git" "${MINGW_PACKAGE_PREFIX}-go")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/github/${_realname}/archive/v${pkgver}.tar.gz)
 md5sums=('889a31ee9d10ae9cb333480d8dbe881f')
 

mingw-w64-libcdr/PKGBUILD

@@ -1,9 +1,10 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=libcdr
+pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="CorelDraw file format importer library for LibreOffice (mingw-w64)"
 arch=('any')
 license=('GPL2' 'LGPL2.1' 'MPL')
@@ -17,16 +18,20 @@ depends=("${MINGW_PACKAGE_PREFIX}-icu"
          "${MINGW_PACKAGE_PREFIX}-lcms2"
          "${MINGW_PACKAGE_PREFIX}-librevenge"
          "${MINGW_PACKAGE_PREFIX}-libwpd")
-source=(http://dev-www.libreoffice.org/src/${_realname}/${_realname}-${pkgver}.tar.xz)
-md5sums=('72ed4d2f900eac95061207d026d5324c')
+source=(http://dev-www.libreoffice.org/src/${_realname}/${_realname}-${pkgver}.tar.xz
+        libcdr-boost-1.59.patch)
+md5sums=('72ed4d2f900eac95061207d026d5324c'
+         '72cbbdaeb95d9e5680944d3ac43f117f')
 
 prepare() {
   cd ${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/libcdr-boost-1.59.patch
+  
+  autoreconf -fiv
 }
 
 build() {
   [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  #cp -r ${srcdir}/${_realname}-${pkgver} "${srcdir}/build-${MINGW_CHOST}"
   mkdir -p ${srcdir}/build-${MINGW_CHOST}
   cd "${srcdir}/build-${MINGW_CHOST}"
   ../${_realname}-${pkgver}/configure \

mingw-w64-libcdr/libcdr-boost-1.59.patch

@@ -0,0 +1,22 @@
+From f862293ad576d5f35a3c9e90fba762abeccaa1f0 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sun, 30 Aug 2015 08:42:29 +0200
+Subject: [PATCH] rhbz#1258127 fix build with boost 1.59
+
+Change-Id: I3c9be843d8fcc17650022f4189b68fde28ee3d42
+---
+ src/lib/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index f8065a8..3f00cc5 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -14,6 +14,7 @@ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \
+ 
+ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(LCMS2_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBCDR_BUILD=1
+ 
++libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_DEPENDENCIES = @LIBCDR_WIN32_RESOURCE@
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined

mingw-w64-webkitgtk3/PKGBUILD

@@ -1,9 +1,10 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=webkitgtk
+pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}2" "${MINGW_PACKAGE_PREFIX}-${_realname}3")
 pkgver=2.4.9
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ Web content engine library (mingw-w64)"
 arch=('any')
 url="http://webkitgtk.org/"