diff --git a/mingw-w64-igraph/0001-igraph-0.8.2_foreign.c-fix-newline-on-Windows.patch b/mingw-w64-igraph/0001-igraph-0.8.2_foreign.c-fix-newline-on-Windows.patch deleted file mode 100644 index 0f6360acdb..0000000000 --- a/mingw-w64-igraph/0001-igraph-0.8.2_foreign.c-fix-newline-on-Windows.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3bc29a941f235f432e583a7533b4ac1d97597e05 Mon Sep 17 00:00:00 2001 -From: Jannick -Date: Sun, 7 Jun 2020 11:30:00 +0200 -Subject: [PATCH] foreign.c: fix newline on Windows - -Windows specifics: '\n' is printed as '\r\n' to a stream, unless the -stream is opened in binary mode. Thus '\r\n' is converted to '\r\r\n' -which causes additional newlines. This needs to be amended and appears -in igraph's pajek tests. - -See commits 73e66786, 8b14a2571. - -* src/foreign.c: replace '\x0d\0a' ('\r\n') by '\x0a' ('\n'). ---- - src/foreign.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/foreign.c b/src/foreign.c -index 6019b93..282d0db 100644 ---- a/src/foreign.c -+++ b/src/foreign.c -@@ -2091,7 +2091,7 @@ int igraph_write_graph_pajek(const igraph_t *graph, FILE *outstream) { - }; - const char *estrnames2[] = { "a", "p", "l", "lc", "c" }; - -- const char *newline = "\x0d\x0a"; -+ const char *newline = "\x0a"; - - igraph_es_t es; - igraph_eit_t eit; --- -2.27.0.windows.1 - diff --git a/mingw-w64-igraph/0001-igraph-0.8.4-propagate-XML2_CFLAGS-to-Makefile.am.patch b/mingw-w64-igraph/0001-igraph-0.8.4-propagate-XML2_CFLAGS-to-Makefile.am.patch deleted file mode 100644 index 4c20e10aed..0000000000 --- a/mingw-w64-igraph/0001-igraph-0.8.4-propagate-XML2_CFLAGS-to-Makefile.am.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2f46e97e2c28954c518dd3d5ea8fa0b929e3a05e Mon Sep 17 00:00:00 2001 -From: Jannick -Date: Wed, 25 Nov 2020 17:52:52 +0100 -Subject: [PATCH 1/2] igraph-0.8.4: propagate XML2_CFLAGS to Makefile - -* src/Makefile.am: define AM_CPPFLAGS to XML2_CFALGS derived by configure.ac ---- - src/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 1e491d472..b04c79765 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -7,6 +7,8 @@ BUILT_SOURCES = foreign-ncol-parser.h foreign-lgl-parser.h \ - # Unfortunately this is not the default behaviour in MinGW/MSYS - AM_YFLAGS = -d - -+AM_CPPFLAGS = $(XML2_CFLAGS) -+ - lib_LTLIBRARIES = libigraph.la - - include lapack/blas.inc --- -2.29.2.windows.2 - diff --git a/mingw-w64-igraph/0002-igraph-0.8.4-define-DECLDIR-to-void-string-for-GNUC.patch b/mingw-w64-igraph/0002-igraph-0.8.4-define-DECLDIR-to-void-string-for-GNUC.patch deleted file mode 100644 index afeb874108..0000000000 --- a/mingw-w64-igraph/0002-igraph-0.8.4-define-DECLDIR-to-void-string-for-GNUC.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 40102b33e1c4ab80fb710f7b91595cce6a0943a0 Mon Sep 17 00:00:00 2001 -From: Jannick -Date: Wed, 25 Nov 2020 17:55:01 +0100 -Subject: [PATCH 2/2] igraph-0.8.4: define DECLDIR to void string for GNUC - compilers. - -NB: DECLDIR appears to be required by MSVC, so this #define block could -cover #ifdef _MSC_VER only. ---- - include/igraph_decls.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/igraph_decls.h b/include/igraph_decls.h -index 38108bc22..af5d36d35 100644 ---- a/include/igraph_decls.h -+++ b/include/igraph_decls.h -@@ -13,7 +13,7 @@ - * Reference: https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros */ - #undef DECLDIR - #if defined (_WIN32) -- #if defined (__CYGWIN__) -+ #if defined (__GNUC__) - #define DECLDIR /**/ - #else - #ifdef IGRAPH_EXPORTS --- -2.29.2.windows.2 - diff --git a/mingw-w64-igraph/PKGBUILD b/mingw-w64-igraph/PKGBUILD index f3220485b6..45f65d2962 100644 --- a/mingw-w64-igraph/PKGBUILD +++ b/mingw-w64-igraph/PKGBUILD @@ -2,20 +2,14 @@ _realname=igraph pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.8.4 +pkgver=0.8.5 pkgrel=1 pkgdesc="Library for the analysis of networks (mingw-w64)" arch=('any') url="https://igraph.org" license=('GPL') -source=(https://github.com/igraph/igraph/releases/download/${pkgver}/igraph-${pkgver}.tar.gz - 0001-igraph-0.8.2_foreign.c-fix-newline-on-Windows.patch - 0001-igraph-0.8.4-propagate-XML2_CFLAGS-to-Makefile.am.patch - 0002-igraph-0.8.4-define-DECLDIR-to-void-string-for-GNUC.patch) -sha256sums=('ceef4e169777bdfb94673a068d128e189c311d6de62fe88569bbae090836f888' - '1bf512fb6002355b5a0082110095700f386eb9abd1779e0b89822f367bef9c7c' - 'dd63c28a4b5c3149eafd2d7d05ed842f37a93f44749f8ccfcecc93d1506c1189' - '014cf4ea5ce37ef4b3100ade818e1a7c55b30dd8cfa7746918e77f664791b2f0') +source=(https://github.com/igraph/igraph/releases/download/${pkgver}/igraph-${pkgver}.tar.gz) +sha256sums=('2e5da63a2b8e9bb497893a17cf77c691df1739c298664f8adb1310a01218f95b') depends=("${MINGW_PACKAGE_PREFIX}-glpk" "${MINGW_PACKAGE_PREFIX}-gmp" "${MINGW_PACKAGE_PREFIX}-zlib" @@ -29,10 +23,6 @@ _builddir=build-${pkgver}-${MINGW_PACKAGE_PREFIX} prepare() { cd ${_srcdir} - patch -p1 -i ${srcdir}/0001-igraph-0.8.2_foreign.c-fix-newline-on-Windows.patch - patch -p1 -i ${srcdir}/0001-igraph-0.8.4-propagate-XML2_CFLAGS-to-Makefile.am.patch - patch -p1 -i ${srcdir}/0002-igraph-0.8.4-define-DECLDIR-to-void-string-for-GNUC.patch - autoreconf -vfi # remove the file testsuite in source tree to force 'make check' @@ -45,22 +35,13 @@ build() { cd ${_builddir} ../${_srcdir}/configure -C \ --enable-tls \ - --with-external-glpk \ - YFLAGS=-Wall \ - igraph_cv_stdout_LF2CRLF=no + YFLAGS=-Wall make V=0 || make } check() { - # Redefine function DIFF such that any EOL issues are ignored - # in tests (by essentially adding the flag '--strip-trailing-cr'). - set -a - diff_cmd="$(command -v diff)" - function diff () { "$diff_cmd" --strip-trailing-cr $@ ; } - set +a - - # igraph 0.8.4: all tests succeeded + # igraph 0.8.5: all tests succeeded make V=0 -C ${_builddir} check TESTSUITEFLAGS=-j }