diff --git a/mingw-w64-postgresql/PKGBUILD b/mingw-w64-postgresql/PKGBUILD index 338a5c2084..1091e7d875 100644 --- a/mingw-w64-postgresql/PKGBUILD +++ b/mingw-w64-postgresql/PKGBUILD @@ -3,8 +3,8 @@ _realname=postgresql pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=9.4.4 -pkgrel=2 +pkgver=9.5.1 +pkgrel=1 pkgdesc="Libraries for use with PostgreSQL (mingw-w64)" arch=('any') url="https://www.postgresql.org/" @@ -22,26 +22,26 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" #"${MINGW_PACKAGE_PREFIX}-readline" #"${MINGW_PACKAGE_PREFIX}-wineditline" "${MINGW_PACKAGE_PREFIX}-zlib" - "winpty-git") + "winpty") options=('staticlibs' 'strip') source=("https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2" postgresql-9.4.1-mingw-link.patch - postgresql-9.4.1-pl-perl.patch - postgresql-9.4.1-pl-python.patch + postgresql-9.5.1-pl-perl.patch + postgresql-9.5.1-pl-python.patch postgresql-9.4.1-pl-tcl.patch postgresql-9.4.1-mingw-enable-readline.patch) -sha256sums=('538ed99688d6fdbec6fd166d1779cf4588bf2f16c52304e5ef29f904c43b0013' +sha256sums=('6b309d8506a39773a752ff074f47656e5424576ea090b04a24fe1725958c5bd2' '0f2b5c7edb48dd106900854c9323ca2d483054595c4cf8a5b796a1d536d22aad' - '86a12775cdf66cb174def103d6c7add095b473fd7f9038858e09564046d2b091' - '0aa6c34fa7a34c99ef9135dcee8d3f6de45ee14dd29b6a09106834e32dc6c883' + '57c1e9b75c042af591b05b9dda60e6327b5c364bb5adc2675da8a48b47e11b81' + 'f219a21a9a3376d04594fb03098d521745c909089204e9a806f23294e0a3c8be' 'a57b6e7500d2d3daa89162ef98f5e5cb9a082a2123b53f31b4060e774fd1a0c0' '51c72fbd380d23cf944165405221912a277b9be99e285479772b39cacbbf384f') prepare() { - cd ${srcdir}/postgresql-$pkgver + cd ${srcdir}/postgresql-${pkgver} patch -p1 -i ${srcdir}/postgresql-9.4.1-mingw-link.patch - patch -p1 -i ${srcdir}/postgresql-9.4.1-pl-perl.patch - patch -p1 -i ${srcdir}/postgresql-9.4.1-pl-python.patch + patch -p1 -i ${srcdir}/postgresql-9.5.1-pl-perl.patch + patch -p1 -i ${srcdir}/postgresql-9.5.1-pl-python.patch patch -p1 -i ${srcdir}/postgresql-9.4.1-pl-tcl.patch #patch -p1 -i ${srcdir}/postgresql-9.4.1-mingw-enable-readline.patch @@ -52,7 +52,7 @@ build() { [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}" mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}" export PYTHON=${MINGW_PREFIX}/bin/python2 - ../postgresql-$pkgver/configure \ + ../postgresql-${pkgver}/configure \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ @@ -71,10 +71,10 @@ build() { #--with-libedit-preferred # Make DLL definition file visible during each arch build - ln -s "${srcdir}/postgresql-$pkgver/src/interfaces/libpq/libpqdll.def" src/interfaces/libpq/ - ln -s "${srcdir}/postgresql-$pkgver/src/interfaces/ecpg/ecpglib/libecpgdll.def" src/interfaces/ecpg/ecpglib/ - ln -s "${srcdir}/postgresql-$pkgver/src/interfaces/ecpg/pgtypeslib/libpgtypesdll.def" src/interfaces/ecpg/pgtypeslib/ - ln -s "${srcdir}/postgresql-$pkgver/src/interfaces/ecpg/compatlib/libecpg_compatdll.def" src/interfaces/ecpg/compatlib/ + ln -s "${srcdir}/postgresql-${pkgver}/src/interfaces/libpq/libpqdll.def" src/interfaces/libpq/ + ln -s "${srcdir}/postgresql-${pkgver}/src/interfaces/ecpg/ecpglib/libecpgdll.def" src/interfaces/ecpg/ecpglib/ + ln -s "${srcdir}/postgresql-${pkgver}/src/interfaces/ecpg/pgtypeslib/libpgtypesdll.def" src/interfaces/ecpg/pgtypeslib/ + ln -s "${srcdir}/postgresql-${pkgver}/src/interfaces/ecpg/compatlib/libecpg_compatdll.def" src/interfaces/ecpg/compatlib/ #for dir in src/interfaces src/bin/pg_config src/bin/psql src/bin/pg_dump; do # make -C ${dir} diff --git a/mingw-w64-postgresql/postgresql-9.4.1-pl-perl.patch b/mingw-w64-postgresql/postgresql-9.5.1-pl-perl.patch similarity index 86% rename from mingw-w64-postgresql/postgresql-9.4.1-pl-perl.patch rename to mingw-w64-postgresql/postgresql-9.5.1-pl-perl.patch index dd8c2314f4..f78ef55777 100644 --- a/mingw-w64-postgresql/postgresql-9.4.1-pl-perl.patch +++ b/mingw-w64-postgresql/postgresql-9.5.1-pl-perl.patch @@ -1,5 +1,5 @@ ---- postgresql-9.4.1/src/pl/plperl/GNUmakefile.orig 2015-02-10 21:34:31.287600000 +0300 -+++ postgresql-9.4.1/src/pl/plperl/GNUmakefile 2015-02-10 21:35:06.732800000 +0300 +--- postgresql-9.5.1/src/pl/plperl/GNUmakefile.orig 2015-02-10 21:34:31.287600000 +0300 ++++ postgresql-9.5.1/src/pl/plperl/GNUmakefile 2015-02-10 21:35:06.732800000 +0300 @@ -36,27 +36,6 @@ PERLCHUNKS = plc_perlboot.pl plc_trusted.pl @@ -28,13 +28,10 @@ SHLIB_LINK = $(perl_embed_ldflags) REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=plperl --load-extension=plperlu -@@ -126,9 +105,6 @@ +@@ -117,6 +117,3 @@ clean distclean maintainer-clean: clean-lib rm -f SPI.c Util.c $(OBJS) perlchunks.h plperl_opmask.h rm -rf $(pg_regress_clean_files) -ifeq ($(PORTNAME), win32) - rm -f $(perlwithver).def -endif - - else # can't build - diff --git a/mingw-w64-postgresql/postgresql-9.4.1-pl-python.patch b/mingw-w64-postgresql/postgresql-9.5.1-pl-python.patch similarity index 73% rename from mingw-w64-postgresql/postgresql-9.4.1-pl-python.patch rename to mingw-w64-postgresql/postgresql-9.5.1-pl-python.patch index aa2aabda39..f7953b12c6 100644 --- a/mingw-w64-postgresql/postgresql-9.4.1-pl-python.patch +++ b/mingw-w64-postgresql/postgresql-9.5.1-pl-python.patch @@ -1,14 +1,17 @@ ---- postgresql-9.4.1/src/pl/plpython/Makefile.orig 2015-02-02 23:42:55.000000000 +0300 -+++ postgresql-9.4.1/src/pl/plpython/Makefile 2015-02-10 21:33:26.353400000 +0300 -@@ -27,8 +27,6 @@ - # and we have to remove -lpython from the link since we are building our own - ifeq ($(PORTNAME), win32) - shared_libpython = yes --python_includespec := $(subst \,/,$(python_includespec)) --override python_libspec = - endif +--- postgresql-9.5.1/src/pl/plpython/Makefile.orig 2015-02-02 23:42:55.000000000 +0300 ++++ postgresql-9.5.1/src/pl/plpython/Makefile 2015-02-10 21:33:26.353400000 +0300 +@@ -5,11 +5,6 @@ + include $(top_builddir)/src/Makefile.global + + +-# On Windows we have to remove -lpython from the link since we are +-# building our own +-ifeq ($(PORTNAME), win32) +-override python_libspec = +-endif + + override CPPFLAGS := -I. -I$(srcdir) $(python_includespec) $(CPPFLAGS) - # If we don't have a shared library, we have to skip it. @@ -59,26 +57,6 @@ DATA += plpythonu.control plpythonu--1.0.sql plpythonu--unpackaged--1.0.sql endif