From 5e5162241f36294fbbf41701a1e644ca8c0586ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= Date: Fri, 15 Oct 2021 23:25:39 +0200 Subject: [PATCH] tools/MINGW-packages: update harfbuzz/pango also rebuild all packages that depends on freetype, since some might use static libs. --- tools/MINGW-packages/mingw-w64-cairo/PKGBUILD | 2 +- .../mingw-w64-ffmpeg-gpl2/PKGBUILD | 2 +- .../0001-fix-config-linking.all.patch | 14 ++ .../0002-fix-mkdir.mingw.patch | 12 + .../0003-fix-link-libintl.patch | 34 +++ .../0004-fix-mkdtemp.mingw.patch | 216 ++++++++++++++++++ .../0005-fix-setenv.mingw.patch | 27 +++ .../0007-pkgconfig.mingw.patch | 22 ++ .../mingw-w64-fontconfig/PKGBUILD | 84 +++++++ .../fontconfig-i686.install | 35 +++ .../fontconfig-x86_64.install | 35 +++ .../mingw-w64-freetype/PKGBUILD | 74 ++++++ .../freetype-2.2.1-enable-valid.patch | 20 ++ .../freetype-2.5.1-enable-sph.patch | 13 ++ .../freetype-2.5.1-enable-spr.patch | 13 ++ .../freetype-2.7-enable-valid.patch | 20 ++ .../mingw-w64-freetype/mingw-config.patch | 38 +++ .../mingw-w64-harfbuzz/PKGBUILD | 65 +++--- .../mingw-w64-imagemagick/PKGBUILD | 2 +- .../MINGW-packages/mingw-w64-libass/PKGBUILD | 43 ++++ .../mingw-w64-libbluray/PKGBUILD | 46 ++++ ...-win32-is-not-msvc-it-could-be.mingw.patch | 39 ++++ ...002-correct-installation-order.mingw.patch | 11 + .../0004-msc-only-please.all.patch | 40 ++++ .../0005-ruby-paths.mingw.patch | 13 ++ .../0006-no-undefined.all.patch | 11 + .../MINGW-packages/mingw-w64-libcaca/PKGBUILD | 67 ++++++ .../mingw-w64-libcroco/PKGBUILD | 2 +- .../MINGW-packages/mingw-w64-librsvg/PKGBUILD | 2 +- .../mingw-w64-openimageio/PKGBUILD | 2 +- ...e-the-former-rounding-code-as-needed.patch | 41 ++++ tools/MINGW-packages/mingw-w64-pango/PKGBUILD | 79 +++---- .../MINGW-packages/mingw-w64-poppler/PKGBUILD | 2 +- tools/MINGW-packages/mingw-w64-qt4/PKGBUILD | 2 +- 34 files changed, 1049 insertions(+), 79 deletions(-) create mode 100644 tools/MINGW-packages/mingw-w64-fontconfig/0001-fix-config-linking.all.patch create mode 100644 tools/MINGW-packages/mingw-w64-fontconfig/0002-fix-mkdir.mingw.patch create mode 100644 tools/MINGW-packages/mingw-w64-fontconfig/0003-fix-link-libintl.patch create mode 100644 tools/MINGW-packages/mingw-w64-fontconfig/0004-fix-mkdtemp.mingw.patch create mode 100644 tools/MINGW-packages/mingw-w64-fontconfig/0005-fix-setenv.mingw.patch create mode 100644 tools/MINGW-packages/mingw-w64-fontconfig/0007-pkgconfig.mingw.patch create mode 100644 tools/MINGW-packages/mingw-w64-fontconfig/PKGBUILD create mode 100644 tools/MINGW-packages/mingw-w64-fontconfig/fontconfig-i686.install create mode 100644 tools/MINGW-packages/mingw-w64-fontconfig/fontconfig-x86_64.install create mode 100644 tools/MINGW-packages/mingw-w64-freetype/PKGBUILD create mode 100644 tools/MINGW-packages/mingw-w64-freetype/freetype-2.2.1-enable-valid.patch create mode 100644 tools/MINGW-packages/mingw-w64-freetype/freetype-2.5.1-enable-sph.patch create mode 100644 tools/MINGW-packages/mingw-w64-freetype/freetype-2.5.1-enable-spr.patch create mode 100644 tools/MINGW-packages/mingw-w64-freetype/freetype-2.7-enable-valid.patch create mode 100644 tools/MINGW-packages/mingw-w64-freetype/mingw-config.patch create mode 100644 tools/MINGW-packages/mingw-w64-libass/PKGBUILD create mode 100644 tools/MINGW-packages/mingw-w64-libbluray/PKGBUILD create mode 100644 tools/MINGW-packages/mingw-w64-libcaca/0001-win32-is-not-msvc-it-could-be.mingw.patch create mode 100644 tools/MINGW-packages/mingw-w64-libcaca/0002-correct-installation-order.mingw.patch create mode 100644 tools/MINGW-packages/mingw-w64-libcaca/0004-msc-only-please.all.patch create mode 100644 tools/MINGW-packages/mingw-w64-libcaca/0005-ruby-paths.mingw.patch create mode 100644 tools/MINGW-packages/mingw-w64-libcaca/0006-no-undefined.all.patch create mode 100644 tools/MINGW-packages/mingw-w64-libcaca/PKGBUILD create mode 100644 tools/MINGW-packages/mingw-w64-pango/0001-pango-shape.c-Use-the-former-rounding-code-as-needed.patch diff --git a/tools/MINGW-packages/mingw-w64-cairo/PKGBUILD b/tools/MINGW-packages/mingw-w64-cairo/PKGBUILD index 46fb770321..3a31a64432 100644 --- a/tools/MINGW-packages/mingw-w64-cairo/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-cairo/PKGBUILD @@ -5,7 +5,7 @@ _realname=cairo pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.16.0 -pkgrel=3 +pkgrel=6 pkgdesc="Cairo vector graphics library (mingw-w64)" arch=('any') url="https://cairographics.org/" diff --git a/tools/MINGW-packages/mingw-w64-ffmpeg-gpl2/PKGBUILD b/tools/MINGW-packages/mingw-w64-ffmpeg-gpl2/PKGBUILD index fc9b4f0106..2475002755 100644 --- a/tools/MINGW-packages/mingw-w64-ffmpeg-gpl2/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-ffmpeg-gpl2/PKGBUILD @@ -6,7 +6,7 @@ _realname=ffmpeg pkgbase="mingw-w64-${_realname}-gpl2" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-gpl2" pkgver=4.4 -pkgrel=2 +pkgrel=3 pkgdesc="Complete and free Internet live audio and video broadcasting solution (mingw-w64)" arch=('any') url="https://ffmpeg.org/" diff --git a/tools/MINGW-packages/mingw-w64-fontconfig/0001-fix-config-linking.all.patch b/tools/MINGW-packages/mingw-w64-fontconfig/0001-fix-config-linking.all.patch new file mode 100644 index 0000000000..2a8551f7e1 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-fontconfig/0001-fix-config-linking.all.patch @@ -0,0 +1,14 @@ +--- fontconfig-2.10.92/conf.d/Makefile.am.orig 2013-04-13 06:32:27 +0400 ++++ fontconfig-2.10.92/conf.d/Makefile.am 2013-04-13 06:37:08 +0400 +@@ -83,9 +83,9 @@ + @(echo cd $(DESTDIR)$(configdir); \ + cd $(DESTDIR)$(configdir); \ + for i in $(CONF_LINKS); do \ +- echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \ ++ echo $(RM) $$i";" ln -s $(DESTDIR)$(templatedir)/$$i .; \ + $(RM) $$i; \ +- ln -s $(templatedir)/$$i .; \ ++ ln -s $(DESTDIR)$(templatedir)/$$i .; \ + done) + uninstall-local: + @(echo cd $(DESTDIR)$(configdir); \ diff --git a/tools/MINGW-packages/mingw-w64-fontconfig/0002-fix-mkdir.mingw.patch b/tools/MINGW-packages/mingw-w64-fontconfig/0002-fix-mkdir.mingw.patch new file mode 100644 index 0000000000..62682ffb1a --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-fontconfig/0002-fix-mkdir.mingw.patch @@ -0,0 +1,12 @@ +--- fontconfig-2.11.0/test/test-migration.c.orig 2013-10-11 03:10:18.000000000 +0000 ++++ fontconfig-2.11.0/test/test-migration.c 2014-02-06 12:20:57.859195300 +0000 +@@ -4,6 +4,9 @@ + #include + #include + #include ++#ifdef _WIN32 ++#define mkdir(path,mode) _mkdir(path) ++#endif + #ifndef HAVE_STRUCT_DIRENT_D_TYPE + #include + #include diff --git a/tools/MINGW-packages/mingw-w64-fontconfig/0003-fix-link-libintl.patch b/tools/MINGW-packages/mingw-w64-fontconfig/0003-fix-link-libintl.patch new file mode 100644 index 0000000000..6bea02b1fc --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-fontconfig/0003-fix-link-libintl.patch @@ -0,0 +1,34 @@ +From 07bd14c5c7fed103020dc9b630d6a254861ada07 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Fri, 9 Mar 2018 11:55:43 +0900 +Subject: Fix the build issue again on MinGW with enabling nls + +--- + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 1ff065b..2111ce0 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -82,7 +82,7 @@ AM_CPPFLAGS = \ + -DFC_CACHEDIR='"$(FC_CACHEDIR)"' \ + -DFONTCONFIG_PATH='"$(BASECONFIGDIR)"' \ + -DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"' +-LDADD = $(INTLLIBS) ++LDADD = $(LIBINTL) + + EXTRA_DIST += makealias + +@@ -168,7 +168,7 @@ lib_LTLIBRARIES = libfontconfig.la + libfontconfig_la_LDFLAGS = \ + -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols) + +-libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS) ++libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL) + + libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency) + +-- +cgit v1.1 + diff --git a/tools/MINGW-packages/mingw-w64-fontconfig/0004-fix-mkdtemp.mingw.patch b/tools/MINGW-packages/mingw-w64-fontconfig/0004-fix-mkdtemp.mingw.patch new file mode 100644 index 0000000000..d3980a6111 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-fontconfig/0004-fix-mkdtemp.mingw.patch @@ -0,0 +1,216 @@ +--- fontconfig-2.11.0/test/test-migration.c.orig 2014-02-06 12:24:45.529605800 +0000 ++++ fontconfig-2.11.0/test/test-migration.c 2014-02-06 14:43:19.691870300 +0000 +@@ -9,6 +9,213 @@ + #endif + #include + ++#if defined(_WIN32) ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static PSECURITY_DESCRIPTOR ++create_sd (int permissions) ++{ ++ PSECURITY_DESCRIPTOR pSD = NULL; ++ int i; ++ int j; ++ EXPLICIT_ACCESS ea[3]; ++ PSID sids[3] = { NULL, NULL, NULL }; ++ WELL_KNOWN_SID_TYPE sidtypes[3] = { WinCreatorOwnerSid, WinCreatorGroupSid, WinWorldSid }; ++ int ea_len = 0; ++ DWORD dwRes, dwDisposition; ++ PACL pACL = NULL; ++ ++ /* Initialize a security descriptor. */ ++ pSD = (PSECURITY_DESCRIPTOR) LocalAlloc (LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH); ++ if (NULL == pSD) ++ { ++ errno = ENOMEM; ++ return NULL; ++ } ++ ++ if (!InitializeSecurityDescriptor (pSD, SECURITY_DESCRIPTOR_REVISION)) ++ { ++ LocalFree (pSD); ++ errno = EIO; ++ return NULL; ++ } ++ ++ for (i = 0; i < 3; i++) ++ { ++ BOOL b; ++ DWORD bytes; ++ int imasked = permissions & (07 << (2 - i)); ++ if (!imasked) ++ continue; ++ ++ bytes = SECURITY_MAX_SID_SIZE; ++ sids[ea_len] = (PSID) LocalAlloc (LMEM_FIXED, bytes); ++ if (NULL == sids[ea_len]) ++ { ++ errno = ENOMEM; ++ LocalFree (pSD); ++ for (j = 0; j < ea_len; j++) ++ { ++ if (sids[j] != NULL) ++ { ++ LocalFree (sids[j]); ++ sids[j] = NULL; ++ } ++ } ++ return NULL; ++ } ++ ++ b = CreateWellKnownSid (sidtypes[i], NULL, sids[ea_len], &bytes); ++ if (!b) ++ { ++ errno = EINVAL; ++ LocalFree (pSD); ++ for (j = 0; j < ea_len; j++) ++ { ++ if (sids[j] != NULL) ++ { ++ LocalFree (sids[j]); ++ sids[j] = NULL; ++ } ++ } ++ return NULL; ++ } ++ ++ /* Initialize an EXPLICIT_ACCESS structure for an ACE. */ ++ ZeroMemory (&ea[ea_len], sizeof(EXPLICIT_ACCESS)); ++ bytes = 0; ++ if (01 & imasked) ++ bytes = bytes | GENERIC_READ; ++ if (02 & imasked) ++ bytes = bytes | GENERIC_WRITE; ++ if (04 & imasked) ++ bytes = bytes | GENERIC_EXECUTE; ++ ea[ea_len].grfAccessPermissions = bytes; ++ ea[ea_len].grfAccessMode = SET_ACCESS; ++ ea[ea_len].grfInheritance= NO_INHERITANCE; ++ ea[ea_len].Trustee.TrusteeForm = TRUSTEE_IS_SID; ++ ea[ea_len].Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; ++ ea[ea_len].Trustee.ptstrName = (LPTSTR) sids[ea_len]; ++ ea_len = ea_len + 1; ++ } ++ ++ /* Create a new ACL that contains the new ACEs. */ ++ dwRes = SetEntriesInAcl (ea_len, ea, NULL, &pACL); ++ if (ERROR_SUCCESS != dwRes) ++ { ++ errno = EIO; ++ LocalFree (pSD); ++ for (j = 0; j < ea_len; j++) ++ { ++ if (sids[j] != NULL) ++ { ++ LocalFree (sids[j]); ++ sids[j] = NULL; ++ } ++ } ++ return NULL; ++ } ++ ++ for (j = 0; j < ea_len; j++) ++ { ++ if (sids[j] != NULL) ++ { ++ LocalFree (sids[j]); ++ sids[j] = NULL; ++ } ++ } ++ ++ /* Add the ACL to the security descriptor. */ ++ if (!SetSecurityDescriptorDacl (pSD, ++ TRUE, // bDaclPresent flag ++ pACL, ++ FALSE)) // not a default DACL ++ { ++ errno = EIO; ++ LocalFree (pSD); ++ LocalFree (pACL); ++ return NULL; ++ } ++ ++ return pSD; ++} ++ ++static void ++free_sd (PSECURITY_DESCRIPTOR sd) ++{ ++ BOOL b, present, defaulted; ++ PACL pACL = NULL; ++ present = FALSE; ++ b = GetSecurityDescriptorDacl (sd, &present, &pACL, &defaulted); ++ if (b && present && !defaulted && pACL) ++ LocalFree (pACL); ++ LocalFree (sd); ++} ++ ++static void ++randtemplate (char *template, size_t l) ++{ ++ int i; ++ for (i = l - 6; i < l; i++) ++ { ++ int r = rand (); ++ if ((r / (RAND_MAX + 1)) > ((RAND_MAX + 1) / 2)) ++ template[i] = 'A' + (double) rand () / (RAND_MAX + 1) * ('Z' - 'A'); ++ else ++ template[i] = 'a' + (double) rand () / (RAND_MAX + 1) * ('z' - 'a'); ++ } ++} ++ ++static char * ++mkdtemp (char *template) ++{ ++ int i; ++ size_t l; ++ BOOL b; ++ SECURITY_ATTRIBUTES sa; ++ ++ if (template == NULL) ++ { ++ errno = EINVAL; ++ return NULL; ++ } ++ l = strlen (template); ++ if (l < 6 || strcmp (&template[l - 6], "XXXXXX") != 0) ++ { ++ errno = EINVAL; ++ return NULL; ++ } ++ srand(time (NULL)); ++ sa.nLength = sizeof (sa); ++ sa.lpSecurityDescriptor = create_sd (0700); ++ sa.bInheritHandle = FALSE; ++ do ++ { ++ randtemplate (template, l); ++ SetLastError (0); ++ b = CreateDirectoryA (template, &sa); ++ } while (!b && GetLastError () == ERROR_ALREADY_EXISTS); ++ free_sd (sa.lpSecurityDescriptor); ++ if (!b) ++ { ++ errno = EIO; ++ return NULL; ++ } ++ else ++ { ++ errno = 0; ++ return template; ++ } ++} ++#endif ++ + FcBool + mkdir_p(const char *dir) + { diff --git a/tools/MINGW-packages/mingw-w64-fontconfig/0005-fix-setenv.mingw.patch b/tools/MINGW-packages/mingw-w64-fontconfig/0005-fix-setenv.mingw.patch new file mode 100644 index 0000000000..36d31d3b06 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-fontconfig/0005-fix-setenv.mingw.patch @@ -0,0 +1,27 @@ +--- fontconfig-2.11.0/test/test-migration.c.orig 2014-02-06 14:43:19.691870300 +0000 ++++ fontconfig-2.11.0/test/test-migration.c 2014-02-06 14:48:25.336182200 +0000 +@@ -214,6 +214,24 @@ + return template; + } + } ++ ++static int ++setenv (const char *var, const char *val, int ovr) ++{ ++ BOOL b; ++ char c[2]; ++ if (!ovr) ++ { ++ DWORD d; ++ d = GetEnvironmentVariableA (var, c, 2); ++ if (0 != d && GetLastError () != ERROR_ENVVAR_NOT_FOUND) ++ return; ++ } ++ b = SetEnvironmentVariableA (var, val); ++ if (b) ++ return 0; ++ return 1; ++} + #endif + + FcBool diff --git a/tools/MINGW-packages/mingw-w64-fontconfig/0007-pkgconfig.mingw.patch b/tools/MINGW-packages/mingw-w64-fontconfig/0007-pkgconfig.mingw.patch new file mode 100644 index 0000000000..0895c2fc43 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-fontconfig/0007-pkgconfig.mingw.patch @@ -0,0 +1,22 @@ +--- fontconfig-2.11.93/m4/pkg.m4.orig 2015-03-09 02:54:03.000000000 +0000 ++++ fontconfig-2.11.93/m4/pkg.m4 2015-04-06 11:04:21.862416100 +0000 +@@ -111,8 +111,8 @@ + pkg_failed=no + AC_MSG_CHECKING([for $1]) + +-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++_PKG_CONFIG([$1][_CFLAGS], [cflags --dont-define-prefix], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs --dont-define-prefix], [$2]) + + m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS + and $1[]_LIBS to avoid the need to call pkg-config. +@@ -207,7 +207,7 @@ + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl + AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +-_PKG_CONFIG([$1], [variable="][$3]["], [$2]) ++_PKG_CONFIG([$1], [variable="][$3][" --dont-define-prefix], [$2]) + AS_VAR_COPY([$1], [pkg_cv_][$1]) + + AS_VAR_IF([$1], [""], [$5], [$4])dnl diff --git a/tools/MINGW-packages/mingw-w64-fontconfig/PKGBUILD b/tools/MINGW-packages/mingw-w64-fontconfig/PKGBUILD new file mode 100644 index 0000000000..ba11fcf6b7 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-fontconfig/PKGBUILD @@ -0,0 +1,84 @@ +# Maintainer: Alexey Pavlov +# Contributor: Renato Silva + +_realname=fontconfig +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=2.13.0 +pkgrel=2 +pkgdesc="A library for configuring and customizing font access (mingw-w64)" +arch=('any') +url="https://wiki.freedesktop.org/www/Software/fontconfig/" +license=("custom") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "${MINGW_PACKAGE_PREFIX}-python3-lxml") +depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" + "${MINGW_PACKAGE_PREFIX}-expat>=2.1.0" + "${MINGW_PACKAGE_PREFIX}-freetype>=2.3.11" + "${MINGW_PACKAGE_PREFIX}-bzip2>=1.0.6" + "${MINGW_PACKAGE_PREFIX}-libiconv") +options=('staticlibs' 'strip') +install=${_realname}-${CARCH}.install +source=("https://www.freedesktop.org/software/fontconfig/release/fontconfig-${pkgver}.tar.bz2" + 0001-fix-config-linking.all.patch + 0002-fix-mkdir.mingw.patch + 0003-fix-link-libintl.patch + 0004-fix-mkdtemp.mingw.patch + 0005-fix-setenv.mingw.patch + 0007-pkgconfig.mingw.patch) +sha256sums=('91dde8492155b7f34bb95079e79be92f1df353fcc682c19be90762fd3e12eeb9' + '1266d4bbd8270f013fee2401c890f0251babf50a175a69d681d3a6af5003c899' + '0d950eb8a19858bff1f0b26e4a560f589e79e7eb7f22f723267748dfe55e0b63' + '7b88b82d1dfba8ccd5a85f103e2f36c4ecc40c5d4acfe1992836fca66d284da7' + '57ff8420dbf62873b6fcb38b52fb7b37e0e278425a9125e15dccba54668c8ab9' + '552b54010f9fe4097f332cf2397bbd3e78489542d3bbf07792ed1cfe9381796e' + 'af373531873da46d0356305da5444c1ec74f443cd2635ea2db6b7dadd1561f5b') + +prepare() { + cd "${srcdir}"/${_realname}-${pkgver} + + patch -p1 -i ${srcdir}/0001-fix-config-linking.all.patch + patch -p1 -i ${srcdir}/0002-fix-mkdir.mingw.patch + patch -p1 -i ${srcdir}/0003-fix-link-libintl.patch + patch -p1 -i ${srcdir}/0004-fix-mkdtemp.mingw.patch + patch -p1 -i ${srcdir}/0005-fix-setenv.mingw.patch + patch -p1 -i ${srcdir}/0007-pkgconfig.mingw.patch + + autoreconf -fiv +} + +build() { + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MINGW_CHOST}" + + ../${_realname}-${pkgver}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --enable-shared \ + --enable-static \ + --enable-iconv \ + --with-libiconv=${MINGW_PREFIX} \ + --disable-docs \ + --with-arch=${CARCH} \ + --with-cache-dir=/var/cache/${_realname} \ + as_ln_s="cp -pR" + + sed -i 's,all-am: Makefile $(PROGRAMS),all-am:,' test/Makefile + make +} + +package() { + cd "${srcdir}/build-${MINGW_CHOST}" + make -j1 DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" + mv ${pkgdir}{,${MINGW_PREFIX}}/var + + find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm + + # Convert MSYS2-specific paths to pkg-config variables (see issue #872) + sed -i "s#${MINGW_PREFIX}/lib#\${libdir}#g" "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/fontconfig.pc + sed -i "s#${MINGW_PREFIX}/include#\${includedir}#g" "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/fontconfig.pc +} diff --git a/tools/MINGW-packages/mingw-w64-fontconfig/fontconfig-i686.install b/tools/MINGW-packages/mingw-w64-fontconfig/fontconfig-i686.install new file mode 100644 index 0000000000..618baf458e --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-fontconfig/fontconfig-i686.install @@ -0,0 +1,35 @@ +post_install() { + cat << _EOF + + Fontconfig configuration is done via /mingw32/etc/fonts/conf.avail and conf.d. + Read /mingw32/etc/fonts/conf.d/README for more information. + +_EOF + + if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then + echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update" + else + echo -n "updating font cache... " + mingw32/bin/fc-cache -f + echo "done." + fi +} + +post_upgrade() { + if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then + echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update" + else + echo -n "updating font cache... " + mingw32/bin/fc-cache -f + echo "done." + fi +} + +post_remove() { + cat << _EOF + + Check for dead symlinks and leftover files + in mingw32/etc/fonts/conf.d/ + +_EOF +} diff --git a/tools/MINGW-packages/mingw-w64-fontconfig/fontconfig-x86_64.install b/tools/MINGW-packages/mingw-w64-fontconfig/fontconfig-x86_64.install new file mode 100644 index 0000000000..469be24b49 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-fontconfig/fontconfig-x86_64.install @@ -0,0 +1,35 @@ +post_install() { + cat << _EOF + + Fontconfig configuration is done via /mingw64/etc/fonts/conf.avail and conf.d. + Read /mingw64/etc/fonts/conf.d/README for more information. + +_EOF + + if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then + echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update" + else + echo -n "updating font cache... " + mingw64/bin/fc-cache -f + echo "done." + fi +} + +post_upgrade() { + if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then + echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update" + else + echo -n "updating font cache... " + mingw64/bin/fc-cache -f + echo "done." + fi +} + +post_remove() { + cat << _EOF + + Check for dead symlinks and leftover files + in mingw64/etc/fonts/conf.d/ + +_EOF +} diff --git a/tools/MINGW-packages/mingw-w64-freetype/PKGBUILD b/tools/MINGW-packages/mingw-w64-freetype/PKGBUILD new file mode 100644 index 0000000000..caed5ea9e3 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-freetype/PKGBUILD @@ -0,0 +1,74 @@ +# Maintainer: Alexey Pavlov +# Contributor: Renato Silva + +_realname=freetype +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=2.9.1 +pkgrel=2 +pkgdesc="TrueType font rendering library (mingw-w64)" +arch=('any') +url="https://www.freetype.org/" +license=(GPL2+ custom:FreeType) +depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" + "${MINGW_PACKAGE_PREFIX}-bzip2" + "${MINGW_PACKAGE_PREFIX}-harfbuzz" + "${MINGW_PACKAGE_PREFIX}-libpng" + "${MINGW_PACKAGE_PREFIX}-zlib") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") +options=('strip' '!libtool' 'staticlibs') +source=(https://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 + freetype-2.7-enable-valid.patch + freetype-2.5.1-enable-spr.patch + freetype-2.5.1-enable-sph.patch) +sha256sums=('db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d' + '975d5a6eb1f6041fe5a497d7658f2e1ca2cfe5610dbd2e94ab375ad481b279d1' + '3ee5690d4d7cb48b8862e203d09b530805066cdfda0f51716b8ae2a47eef8b2d' + '324012ad68388d22c63368314721d2360b48dd40daa808d0383699a281d931b0') + +prepare() { + cd "${srcdir}/freetype-${pkgver}" + plain "freetype-2.7-enable-valid.patch" + patch -p1 -i "${srcdir}/freetype-2.7-enable-valid.patch" + plain "freetype-2.5.1-enable-spr.patch" + patch -p1 -i "${srcdir}/freetype-2.5.1-enable-spr.patch" + + # Disabled for now due to resistance + # Kept here for easier rebuilds via ABS + # https://bugs.archlinux.org/task/35274 + #patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-sph.patch" +} + +build() { + [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}" + mkdir -p "${srcdir}/build-${CARCH}" + cd "${srcdir}/build-${CARCH}" + + ../freetype-${pkgver}/configure \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} \ + --prefix=${MINGW_PREFIX} \ + --enable-static \ + --enable-shared \ + --with-zlib \ + --with-bzip2 \ + --with-png \ + --with-harfbuzz \ + --enable-freetype-config + + make +} + +package () { + cd "${srcdir}/build-${CARCH}" + make DESTDIR="${pkgdir}" install + + # Replace the absolute path. + sed -i "s|$(cygpath -m /)|/|g" ${pkgdir}${MINGW_PREFIX}/bin/freetype-config + + # Licenses + install -Dm644 "${srcdir}/${_realname}-${pkgver}/docs/LICENSE.TXT" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.TXT" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/docs/GPLv2.TXT" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/GPLv2.TXT" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/docs/FTL.TXT" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/FTL.TXT" +} diff --git a/tools/MINGW-packages/mingw-w64-freetype/freetype-2.2.1-enable-valid.patch b/tools/MINGW-packages/mingw-w64-freetype/freetype-2.2.1-enable-valid.patch new file mode 100644 index 0000000000..c78b6b70f6 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-freetype/freetype-2.2.1-enable-valid.patch @@ -0,0 +1,20 @@ +--- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 ++++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 +@@ -110,7 +110,7 @@ + AUX_MODULES += cache + + # TrueType GX/AAT table validation. Needs ftgxval.c below. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -124,7 +124,7 @@ + + # OpenType table validation. Needs ftotval.c below. + # +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # diff --git a/tools/MINGW-packages/mingw-w64-freetype/freetype-2.5.1-enable-sph.patch b/tools/MINGW-packages/mingw-w64-freetype/freetype-2.5.1-enable-sph.patch new file mode 100644 index 0000000000..a4e424cac6 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-freetype/freetype-2.5.1-enable-sph.patch @@ -0,0 +1,13 @@ +diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h +index fe2ba15..1ab4226 100644 +--- i/include/freetype/config/ftoption.h ++++ w/include/freetype/config/ftoption.h +@@ -591,7 +591,7 @@ FT_BEGIN_HEADER + /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ + /* defined. */ + /* */ +-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */ ++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING + + + /*************************************************************************/ diff --git a/tools/MINGW-packages/mingw-w64-freetype/freetype-2.5.1-enable-spr.patch b/tools/MINGW-packages/mingw-w64-freetype/freetype-2.5.1-enable-spr.patch new file mode 100644 index 0000000000..685acef5ac --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-freetype/freetype-2.5.1-enable-spr.patch @@ -0,0 +1,13 @@ +diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h +index fe2ba15..22ce1a3 100644 +--- i/include/freetype/config/ftoption.h ++++ w/include/freetype/config/ftoption.h +@@ -92,7 +92,7 @@ FT_BEGIN_HEADER + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ diff --git a/tools/MINGW-packages/mingw-w64-freetype/freetype-2.7-enable-valid.patch b/tools/MINGW-packages/mingw-w64-freetype/freetype-2.7-enable-valid.patch new file mode 100644 index 0000000000..649425d885 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-freetype/freetype-2.7-enable-valid.patch @@ -0,0 +1,20 @@ +--- freetype-2.7/modules.cfg.orig 2016-09-16 06:16:01.948572000 -0400 ++++ freetype-2.7/modules.cfg 2016-09-16 06:22:20.417222400 -0400 +@@ -120,7 +120,7 @@ + # TrueType GX/AAT table validation. Needs ftgxval.c below. + # + # No FT_CONFIG_OPTION_PIC support. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -143,7 +143,7 @@ + # OpenType table validation. Needs ftotval.c below. + # + # No FT_CONFIG_OPTION_PIC support. +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # diff --git a/tools/MINGW-packages/mingw-w64-freetype/mingw-config.patch b/tools/MINGW-packages/mingw-w64-freetype/mingw-config.patch new file mode 100644 index 0000000000..9127eff5db --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-freetype/mingw-config.patch @@ -0,0 +1,38 @@ +--- freetype-2.6.2/include/freetype/config/ftoption.h.orig 2014-04-02 21:30:52.858800000 +0400 ++++ freetype-2.6.2/include/freetype/config/ftoption.h 2014-04-02 21:32:39.500400000 +0400 +@@ -184,7 +184,7 @@ + /* Do not #undef this macro here since the build system might define */ + /* it for certain configurations only. */ + /* */ +-/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */ ++#define FT_CONFIG_OPTION_SYSTEM_ZLIB + + + /*************************************************************************/ +@@ -200,7 +200,7 @@ + /* */ + /* Define this macro if you want to enable this `feature'. */ + /* */ +-/* #define FT_CONFIG_OPTION_USE_BZIP2 */ ++#define FT_CONFIG_OPTION_USE_BZIP2 + + + /*************************************************************************/ +@@ -225,7 +225,7 @@ + /* */ + /* Define this macro if you want to enable this `feature'. */ + /* */ +-/* #define FT_CONFIG_OPTION_USE_PNG */ ++#define FT_CONFIG_OPTION_USE_PNG + + + /*************************************************************************/ +@@ -238,7 +238,7 @@ + /* */ + /* Define this macro if you want to enable this `feature'. */ + /* */ +-/* #define FT_CONFIG_OPTION_USE_HARFBUZZ */ ++#define FT_CONFIG_OPTION_USE_HARFBUZZ + + + /*************************************************************************/ diff --git a/tools/MINGW-packages/mingw-w64-harfbuzz/PKGBUILD b/tools/MINGW-packages/mingw-w64-harfbuzz/PKGBUILD index 1b8e20cae0..c1d2009e6c 100644 --- a/tools/MINGW-packages/mingw-w64-harfbuzz/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-harfbuzz/PKGBUILD @@ -4,27 +4,30 @@ _realname=harfbuzz pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.7.5 -pkgrel=3 +pkgver=2.2.0 +pkgrel=2 pkgdesc="OpenType text shaping engine (mingw-w64)" arch=('any') url="https://www.freedesktop.org/wiki/Software/HarfBuzz" license=("MIT") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-icu" + "${MINGW_PACKAGE_PREFIX}-gobject-introspection" "${MINGW_PACKAGE_PREFIX}-pkg-config" - "${MINGW_PACKAGE_PREFIX}-cairo") + "${MINGW_PACKAGE_PREFIX}-cairo" + "${MINGW_PACKAGE_PREFIX}-python2" + "${MINGW_PACKAGE_PREFIX}-ragel") depends=("${MINGW_PACKAGE_PREFIX}-freetype" "${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-glib2" "${MINGW_PACKAGE_PREFIX}-graphite2") -options=('strip' 'staticlibs') -optdepends=( - "${MINGW_PACKAGE_PREFIX}-icu: harfbuzz-icu support" - "${MINGW_PACKAGE_PREFIX}-cairo: hb-view program" -) +checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-fonttools" + "${MINGW_PACKAGE_PREFIX}-python3-setuptools") +options=('strip' '!staticlibs') +optdepends=("${MINGW_PACKAGE_PREFIX}-icu: harfbuzz-icu support" + "${MINGW_PACKAGE_PREFIX}-cairo: hb-view program") source=("https://www.freedesktop.org/software/harfbuzz/release/${_realname}-${pkgver}.tar.bz2") -sha256sums=('84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563') +sha256sums=('b7ccfcbd56b970a709e8b9ea9fb46c922c606c2feef8f086fb6a8492e530f810') prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -34,13 +37,15 @@ prepare() { build() { # Build static and shared libs separately due to necessity of defining DGRAPHITE2_STATIC # manually when building static version - export _static_dir="${srcdir}/build-${MINGW_CHOST}-static" - export _shared_dir="${srcdir}/build-${MINGW_CHOST}-shared" + export _static_dir="${srcdir}/build-${CARCH}-static" + export _shared_dir="${srcdir}/build-${CARCH}-shared" # static build [[ -d "${_static_dir}" ]] && rm -rf "${_static_dir}" mkdir -p "${_static_dir}" && pushd "${_static_dir}" - CFLAGS=-DGRAPHITE2_STATIC CXXFLAGS=-DGRAPHITE2_STATIC ../${_realname}-${pkgver}/configure \ + CFLAGS="${CFLAGS} -DGRAPHITE2_STATIC" \ + CXXFLAGS="${CXXFLAGS} -DGRAPHITE2_STATIC" \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -48,6 +53,8 @@ build() { --enable-static=yes \ --disable-introspection \ --with-graphite2=yes \ + --with-uniscribe=yes \ + --with-directwrite=yes \ --with-gobject make popd @@ -63,29 +70,31 @@ build() { --enable-static=no \ --disable-introspection \ --with-graphite2=yes \ + --with-uniscribe=yes \ + --with-directwrite=yes \ --with-gobject make popd } -#check(){ -# export _static_dir="${srcdir}/build-${MINGW_CHOST}-static" -# export _shared_dir="${srcdir}/build-${MINGW_CHOST}-shared" -# -# # static build -# pushd "${_static_dir}" -# make check -# popd -# -# # shared build -# pushd "${_shared_dir}" -# make check -# popd -#} +check(){ + local _static_dir="${srcdir}/build-${CARCH}-static" + local _shared_dir="${srcdir}/build-${CARCH}-shared" + + # static build + pushd "${_static_dir}" + make check + popd + + # shared build + pushd "${_shared_dir}" + make check + popd +} package() { - export _static_dir="${srcdir}/build-${MINGW_CHOST}-static" - export _shared_dir="${srcdir}/build-${MINGW_CHOST}-shared" + local _static_dir="${srcdir}/build-${CARCH}-static" + local _shared_dir="${srcdir}/build-${CARCH}-shared" # static build pushd "${_static_dir}" diff --git a/tools/MINGW-packages/mingw-w64-imagemagick/PKGBUILD b/tools/MINGW-packages/mingw-w64-imagemagick/PKGBUILD index a43a3827e4..c71a8bd81c 100644 --- a/tools/MINGW-packages/mingw-w64-imagemagick/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-imagemagick/PKGBUILD @@ -14,7 +14,7 @@ pkgver=6.9.11.16 _realname=imagemagick pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgrel=3 +pkgrel=4 pkgdesc="An image viewing/manipulation program (mingw-w64)" arch=('any') url="https://www.imagemagick.org/" diff --git a/tools/MINGW-packages/mingw-w64-libass/PKGBUILD b/tools/MINGW-packages/mingw-w64-libass/PKGBUILD new file mode 100644 index 0000000000..996ec69ad1 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-libass/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Alexey Pavlov + +_realname=libass +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=0.14.0 +pkgrel=2 +pkgdesc="A portable library for SSA/ASS subtitles rendering (mingw-w64)" +arch=('any') +url='https://github.com/libass/libass' +license=('ISC') +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-nasm" + "${MINGW_PACKAGE_PREFIX}-pkg-config") +depends=("${MINGW_PACKAGE_PREFIX}-fribidi" + "${MINGW_PACKAGE_PREFIX}-fontconfig" + "${MINGW_PACKAGE_PREFIX}-freetype" + "${MINGW_PACKAGE_PREFIX}-harfbuzz") +options=('strip' 'staticlibs') +source=(https://github.com/libass/${_realname}/releases/download/${pkgver}/${_realname}-${pkgver}.tar.xz) +sha256sums=('881f2382af48aead75b7a0e02e65d88c5ebd369fe46bc77d9270a94aa8fd38a2') + +build() { + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MINGW_CHOST}" + ../${_realname}-${pkgver}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} \ + --enable-shared \ + --enable-static \ + --enable-harfbuzz \ + --enable-fontconfig \ + --enable-asm + make +} + +package() { + cd "${srcdir}/build-${MINGW_CHOST}" + make DESTDIR="${pkgdir}" install +} diff --git a/tools/MINGW-packages/mingw-w64-libbluray/PKGBUILD b/tools/MINGW-packages/mingw-w64-libbluray/PKGBUILD new file mode 100644 index 0000000000..ef683c8950 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-libbluray/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Alexey Pavlov + +_realname=libbluray +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=1.0.2 +pkgrel=2 +pkgdesc="Library to access Blu-Ray disks for video playback (mingw-w64)" +arch=('any') +url='https://www.videolan.org/developers/libbluray.html' +license=('LGPL2.1') +depends=("${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-freetype") +options=('strip' 'staticlibs') +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-doxygen" + "${MINGW_PACKAGE_PREFIX}-pkg-config") +source=(https://download.videolan.org/pub/videolan/libbluray/${pkgver}/${_realname}-${pkgver}.tar.bz2) +sha256sums=('6d9e7c4e416f664c330d9fa5a05ad79a3fb39b95adfc3fd6910cbed503b7aeff') + +prepare() { + cd ${srcdir}/${_realname}-${pkgver} +} + +build() { + [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} + mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}" + export lt_cv_deplibs_check_method='pass_all' + + ../${_realname}-${pkgver}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} \ + --enable-examples \ + --disable-bdjava-jar + + make +} + +package() { + cd ${srcdir}/build-${MINGW_CHOST} + make DESTDIR="${pkgdir}" install + + local _prefix_win="$(cygpath -m "${MINGW_PREFIX}")" + sed -s "s|${_prefix_win}|${MINGW_PREFIX}|g" -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/libbluray.pc +} diff --git a/tools/MINGW-packages/mingw-w64-libcaca/0001-win32-is-not-msvc-it-could-be.mingw.patch b/tools/MINGW-packages/mingw-w64-libcaca/0001-win32-is-not-msvc-it-could-be.mingw.patch new file mode 100644 index 0000000000..b0dbb59685 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-libcaca/0001-win32-is-not-msvc-it-could-be.mingw.patch @@ -0,0 +1,39 @@ +--- libcaca-0.99.beta17/caca/caca.h.orig 2010-02-08 16:34:28 +0400 ++++ libcaca-0.99.beta17/caca/caca.h 2012-04-03 18:21:06 +0400 +@@ -29,9 +29,9 @@ + + #undef __extern + #if defined _DOXYGEN_SKIP_ME +-#elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT ++#elif defined _MSC_VER && defined __LIBCACA__ && defined DLL_EXPORT + # define __extern extern __declspec(dllexport) +-#elif defined _WIN32 && !defined __LIBCACA__ && !defined CACA_STATIC ++#elif defined _MSC_VER && !defined __LIBCACA__ && !defined CACA_STATIC + # define __extern extern __declspec(dllimport) + #else + # define __extern extern +--- libcaca-0.99.beta17/caca/caca0.h.orig 2010-02-08 16:34:28 +0400 ++++ libcaca-0.99.beta17/caca/caca0.h 2012-04-03 18:21:17 +0400 +@@ -22,9 +22,9 @@ + + #undef __extern + #if defined _DOXYGEN_SKIP_ME +-#elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT ++#elif defined _MSC_VER && defined __LIBCACA__ && defined DLL_EXPORT + # define __extern extern __declspec(dllexport) +-#elif defined _WIN32 && !defined __LIBCACA__ ++#elif defined _MSC_VER && !defined __LIBCACA__ + # define __extern extern __declspec(dllimport) + #else + # define __extern extern +--- libcaca-0.99.beta17/cxx/caca++.h.orig 2010-02-08 16:34:28 +0400 ++++ libcaca-0.99.beta17/cxx/caca++.h 2012-04-03 18:21:46 +0400 +@@ -23,7 +23,7 @@ + #include + + #undef __class +-#if defined(_WIN32) && defined(__LIBCACA_PP__) ++#if defined(_MSC_VER) && defined(__LIBCACA_PP__) + # define __class class __declspec(dllexport) + #else + # define __class class diff --git a/tools/MINGW-packages/mingw-w64-libcaca/0002-correct-installation-order.mingw.patch b/tools/MINGW-packages/mingw-w64-libcaca/0002-correct-installation-order.mingw.patch new file mode 100644 index 0000000000..321f04abf7 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-libcaca/0002-correct-installation-order.mingw.patch @@ -0,0 +1,11 @@ +--- libcaca-0.99.beta17/doc/Makefile.am.orig 2010-02-08 16:34:28 +0400 ++++ libcaca-0.99.beta17/doc/Makefile.am 2012-04-03 19:09:57 +0400 +@@ -39,7 +39,7 @@ + clean-local: + -rm -Rf html latex man + +-install-data-local: ++install-data-local: install-man1 + if BUILD_DOCUMENTATION + mkdir -p $(DESTDIR)$(datadir)/doc + ln -sf libcaca-dev $(DESTDIR)$(datadir)/doc/libcucul-dev diff --git a/tools/MINGW-packages/mingw-w64-libcaca/0004-msc-only-please.all.patch b/tools/MINGW-packages/mingw-w64-libcaca/0004-msc-only-please.all.patch new file mode 100644 index 0000000000..5e18cdc4a3 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-libcaca/0004-msc-only-please.all.patch @@ -0,0 +1,40 @@ +--- libcaca-0.99.beta19/caca/figfont.c.orig 2012-12-28 17:34:08.000000000 +0000 ++++ libcaca-0.99.beta19/caca/figfont.c 2014-07-30 10:38:17.765662500 +0000 +@@ -29,7 +29,7 @@ + #include "caca.h" + #include "caca_internals.h" + +-#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3 ++#if defined _MSC_VER && defined __GNUC__ && __GNUC__ >= 3 + int sprintf_s(char *s, size_t n, const char *fmt, ...) CACA_WEAK; + int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) CACA_WEAK; + #endif +@@ -636,7 +636,7 @@ + * Functions for the mingw32 runtime + */ + +-#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3 ++#if defined _MSC_VER && defined __GNUC__ && __GNUC__ >= 3 + int sprintf_s(char *s, size_t n, const char *fmt, ...) + { + va_list args; +--- libcaca-0.99.beta19/caca/string.c.orig 2012-12-28 17:34:08.000000000 +0000 ++++ libcaca-0.99.beta19/caca/string.c 2014-07-30 10:38:28.801063800 +0000 +@@ -36,7 +36,7 @@ + #include "caca.h" + #include "caca_internals.h" + +-#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3 ++#if defined _MSC_VER && defined __GNUC__ && __GNUC__ >= 3 + int vsnprintf_s(char *s, size_t n, size_t c, + const char *fmt, va_list ap) CACA_WEAK; + int vsnprintf(char *s, size_t n, const char *fmt, va_list ap) CACA_WEAK; +@@ -610,7 +610,7 @@ + * Functions for the mingw32 runtime + */ + +-#if defined _WIN32 && defined __GNUC__ && __GNUC__ >= 3 ++#if defined _MSC_VER && defined __GNUC__ && __GNUC__ >= 3 + int vsnprintf_s(char *s, size_t n, size_t c, const char *fmt, va_list ap) + { + return vsnprintf(s, n, fmt, ap); diff --git a/tools/MINGW-packages/mingw-w64-libcaca/0005-ruby-paths.mingw.patch b/tools/MINGW-packages/mingw-w64-libcaca/0005-ruby-paths.mingw.patch new file mode 100644 index 0000000000..06cfe04519 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-libcaca/0005-ruby-paths.mingw.patch @@ -0,0 +1,13 @@ +--- libcaca-0.99.beta19/configure.ac.orig 2014-05-16 19:07:53.000000000 +0000 ++++ libcaca-0.99.beta19/configure.ac 2014-07-30 11:04:20.605117900 +0000 +@@ -467,8 +467,8 @@ + if test "${RUBY}" != "no"; then + RUBY_CFLAGS="$(ruby -r mkmf -e 'conf = RbConfig::CONFIG.merge("hdrdir" => $hdrdir, "arch_hdrdir" => $arch_hdrdir); print RbConfig::expand("#$INCFLAGS", conf)')" + RUBY_LIBS="-L$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"RUBY_SO_NAME"@:>@')" +- RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitearchdir"@:>@'` +- RUBY_SITELIBDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitelibdir"@:>@'` ++ RUBY_SITEARCHDIR=$(cygpath `ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitearchdir"@:>@'`) ++ RUBY_SITELIBDIR=$(cygpath `ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitelibdir"@:>@'`) + AC_SUBST(RUBY_CFLAGS) + AC_SUBST(RUBY_LIBS) + AC_SUBST(RUBY_SITEARCHDIR) diff --git a/tools/MINGW-packages/mingw-w64-libcaca/0006-no-undefined.all.patch b/tools/MINGW-packages/mingw-w64-libcaca/0006-no-undefined.all.patch new file mode 100644 index 0000000000..9e1d967470 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-libcaca/0006-no-undefined.all.patch @@ -0,0 +1,11 @@ +--- libcaca-0.99.beta19/ruby/Makefile.am.orig 2010-02-08 00:49:49.000000000 +0000 ++++ libcaca-0.99.beta19/ruby/Makefile.am 2014-07-30 11:20:48.699589900 +0000 +@@ -24,7 +24,7 @@ + caca-event.c \ + caca-event.h \ + $(NULL) +-caca_la_LDFLAGS = -module -avoid-version -shared $(RUBY_LIBS) ++caca_la_LDFLAGS = -module -avoid-version -shared $(RUBY_LIBS) -no-undefined + caca_la_LIBADD = ../caca/libcaca.la + + EXTRA_DIST = ruby.dox \ diff --git a/tools/MINGW-packages/mingw-w64-libcaca/PKGBUILD b/tools/MINGW-packages/mingw-w64-libcaca/PKGBUILD new file mode 100644 index 0000000000..5e3715a934 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-libcaca/PKGBUILD @@ -0,0 +1,67 @@ +# Maintainer: Alexey Pavlov + +_realname=libcaca +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=0.99.beta19 +pkgrel=5 +pkgdesc="Color AsCii Art library (mingw-w64)" +arch=('any') +url="http://caca.zoy.org/wiki/libcaca" +license=("LGPL") +makedepends=("${MINGW_PACKAGE_PREFIX}-cppunit" + "${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + #"${MINGW_PACKAGE_PREFIX}-ncurses" + "${MINGW_PACKAGE_PREFIX}-python2" + "${MINGW_PACKAGE_PREFIX}-ruby") +depends=("${MINGW_PACKAGE_PREFIX}-fontconfig" + "${MINGW_PACKAGE_PREFIX}-freetype" + "${MINGW_PACKAGE_PREFIX}-zlib") +checkdepends=("${MINGW_PACKAGE_PREFIX}-cppunit") +options=(!libtool strip staticlibs) +source=(http://libcaca.zoy.org/files/libcaca/${_realname}-${pkgver}.tar.gz + 0001-win32-is-not-msvc-it-could-be.mingw.patch + 0002-correct-installation-order.mingw.patch + 0004-msc-only-please.all.patch + 0005-ruby-paths.mingw.patch + 0006-no-undefined.all.patch) +sha256sums=('128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4' + 'd7a30c2717d2cc22eee98a635bf885ea057888381c8a452f942931afb5990ded' + 'bd7b8659347406d76579a6d29148016a452b18dfcc1760db1be8b1f4c0786a63' + '6db33ce3ccec000bb425be756aff48edb0182343f1e4815d3f84177a1bdbd5ad' + 'cec04bee16bd89164b3d63433603fe5cbff212a6f25836bd7f2b877a3a12a67b' + '41868030a0e8ec2828476c17918af6d368e84e6aa1e165338000c36cc9898f82') + +prepare() { + cd ${srcdir}/${_realname}-${pkgver} + patch -p1 -i ${srcdir}/0001-win32-is-not-msvc-it-could-be.mingw.patch + patch -p1 -i ${srcdir}/0002-correct-installation-order.mingw.patch + patch -p1 -i ${srcdir}/0004-msc-only-please.all.patch + patch -p1 -i ${srcdir}/0005-ruby-paths.mingw.patch + patch -p1 -i ${srcdir}/0006-no-undefined.all.patch + + autoreconf -fi +} + +build() { + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}" + ../${_realname}-${pkgver}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --enable-static \ + --enable-shared \ + --disable-ncurses \ + --disable-csharp \ + --disable-doc + + make +} + +package() { + cd "${srcdir}/build-${MINGW_CHOST}" + make -j1 DESTDIR="${pkgdir}" install + find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm +} diff --git a/tools/MINGW-packages/mingw-w64-libcroco/PKGBUILD b/tools/MINGW-packages/mingw-w64-libcroco/PKGBUILD index b04282cd46..f04370848d 100644 --- a/tools/MINGW-packages/mingw-w64-libcroco/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-libcroco/PKGBUILD @@ -4,7 +4,7 @@ _realname=libcroco pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.6.12 -pkgrel=2 +pkgrel=3 pkgdesc="A CSS parsing library (mingw-w64)" arch=('any') url="https://www.gnome.org" diff --git a/tools/MINGW-packages/mingw-w64-librsvg/PKGBUILD b/tools/MINGW-packages/mingw-w64-librsvg/PKGBUILD index 9f6e10a582..3a111d11bd 100644 --- a/tools/MINGW-packages/mingw-w64-librsvg/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-librsvg/PKGBUILD @@ -4,7 +4,7 @@ _realname=librsvg pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.40.20 -pkgrel=3 +pkgrel=5 pkgdesc="A SVG viewing library (mingw-w64)" arch=('any') url="https://live.gnome.org/LibRsvg" diff --git a/tools/MINGW-packages/mingw-w64-openimageio/PKGBUILD b/tools/MINGW-packages/mingw-w64-openimageio/PKGBUILD index 589f26e317..d22a677e31 100644 --- a/tools/MINGW-packages/mingw-w64-openimageio/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-openimageio/PKGBUILD @@ -4,7 +4,7 @@ _realname=openimageio pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.2.18.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing images, including classes, utilities, and applications (mingw-w64)" arch=('any') url="http://www.openimageio.org/" diff --git a/tools/MINGW-packages/mingw-w64-pango/0001-pango-shape.c-Use-the-former-rounding-code-as-needed.patch b/tools/MINGW-packages/mingw-w64-pango/0001-pango-shape.c-Use-the-former-rounding-code-as-needed.patch new file mode 100644 index 0000000000..c23a60f045 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-pango/0001-pango-shape.c-Use-the-former-rounding-code-as-needed.patch @@ -0,0 +1,41 @@ +From 6e51f589c65a4be8e3dcb313bab4f395e067f524 Mon Sep 17 00:00:00 2001 +From: Chun-wei Fan +Date: Mon, 9 Aug 2021 16:22:22 +0800 +Subject: [PATCH] pango/shape.c: Use the former rounding code as needed + +The careful rounding code that was brought back as a result of commit +d4356779 only had effect if we are using a backend that supported font +hinting, so on other backends, use the former rounding code that was +dropped in favor of the careful rounding code that unfortunately did not +apply for all backends. + +Should fix #578. +--- + pango/shape.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/pango/shape.c b/pango/shape.c +index 401c9ec1..0b757b1a 100644 +--- a/pango/shape.c ++++ b/pango/shape.c +@@ -370,5 +370,17 @@ pango_shape_with_flags (const gchar *item_text, + } + } + } ++ else ++ { ++ for (i = 0; i < glyphs->num_glyphs; i++) ++ { ++ glyphs->glyphs[i].geometry.width = ++ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.width); ++ glyphs->glyphs[i].geometry.x_offset = ++ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.x_offset); ++ glyphs->glyphs[i].geometry.y_offset = ++ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.y_offset); ++ } ++ } + } + } +-- +2.32.0.windows.2 + diff --git a/tools/MINGW-packages/mingw-w64-pango/PKGBUILD b/tools/MINGW-packages/mingw-w64-pango/PKGBUILD index e64d5f050b..54de8de1f3 100644 --- a/tools/MINGW-packages/mingw-w64-pango/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-pango/PKGBUILD @@ -4,11 +4,11 @@ _realname=pango pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -# Don't update to 1.44.0! https://gitlab.gnome.org/GNOME/pango/issues/385 -pkgver=1.43.0 -pkgrel=5 +pkgver=1.48.10 +pkgrel=2 pkgdesc="A library for layout and rendering of text (mingw-w64)" arch=('any') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url="https://www.pango.org/" license=('LGPL2.1') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" @@ -16,7 +16,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" "${MINGW_PACKAGE_PREFIX}-meson" "${MINGW_PACKAGE_PREFIX}-ninja" - "${MINGW_PACKAGE_PREFIX}-gtk-doc") + "${MINGW_PACKAGE_PREFIX}-gi-docgen") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-cairo" "${MINGW_PACKAGE_PREFIX}-freetype" @@ -27,25 +27,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libthai") options=('staticlibs' 'strip' 'emptydirs') source=("https://download.gnome.org/sources/pango/${pkgver:0:4}/${_realname}-${pkgver}.tar.xz" - static-skip-help2man.patch - 0001-pango.pc-Make-gobject-2.0-a-non-private-requirement.patch - 002-font-fallback.patch) -sha256sums=('d2c0c253a5328a0eccb00cdd66ce2c8713fabd2c9836000b6e22a8b06ba3ddd2' - '0d4bfd80f82969ae555b7bda6905ac413c325457360164fcd404e23278b51e1a' - '4e605934977b9e4ac1aae58bee47b152397ffd4e97138c184b2508c1cd3b7bab' - '41e72fc17f0e15d74c03eb61fa44750fedcecfc2373bbdee7b28ec9c65a2406d') + "0001-pango-shape.c-Use-the-former-rounding-code-as-needed.patch") +sha256sums=('21e1f5798bcdfda75eabc4280514b0896ab56f656d4e7e66030b9a2535ecdc98' + '830ef46421ce0828dd9228087e5bcc1b64ab524a7f1507d120328c1c2dd91113') prepare() { cd "${srcdir}/${_realname}-${pkgver}" - - # pango-view doesn't work in the static build - patch -p1 -i ${srcdir}/static-skip-help2man.patch - - # https://github.com/Alexpux/MINGW-packages/issues/4830 - patch -p1 -i ${srcdir}/0001-pango.pc-Make-gobject-2.0-a-non-private-requirement.patch - - # https://gitlab.gnome.org/GNOME/pango/merge_requests/97 - patch -p1 -i ${srcdir}/002-font-fallback.patch + patch -Np1 -i "${srcdir}/0001-pango-shape.c-Use-the-former-rounding-code-as-needed.patch" } build() { @@ -54,41 +42,46 @@ build() { mkdir -p build-${MINGW_CHOST} cd build-${MINGW_CHOST} -MSYS2_ARG_CONV_EXCL="--prefix=" meson \ + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/meson \ --prefix="${MINGW_PREFIX}" \ --default-library shared \ --buildtype plain \ - -Denable_docs=false \ - -Dgir=false \ + --auto-features=enabled \ + -Dgtk_doc=false \ + -Dintrospection=disabled \ + -Dxft=disabled \ + --wrap-mode=nofallback \ ../${_realname}-${pkgver} - ninja + ${MINGW_PREFIX}/bin/meson compile - for pcfile in meson-private/*.pc; do - sed -s "s|$(cygpath -m ${MINGW_PREFIX})|${MINGW_PREFIX}|g" -i "${pcfile}" - done - - #cd "${srcdir}" - #[[ -d build-static-${MINGW_CHOST} ]] && rm -rf build-static-${MINGW_CHOST} - #mkdir -p build-static-${MINGW_CHOST} - #cd build-static-${MINGW_CHOST} + cd "${srcdir}" + [[ -d build-static-${MINGW_CHOST} ]] && rm -rf build-static-${MINGW_CHOST} + mkdir -p build-static-${MINGW_CHOST} + cd build-static-${MINGW_CHOST} - #meson \ - # --default-library static \ - # --buildtype plain \ - # -Denable_docs=false \ - # -Dgir=false \ - # ../${_realname}-${pkgver} + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/meson \ + --prefix="${MINGW_PREFIX}" \ + --default-library static \ + --buildtype plain \ + --auto-features=enabled \ + -Dgtk_doc=false \ + -Dintrospection=disabled \ + --wrap-mode=nofallback \ + -Dxft=disabled \ + ../${_realname}-${pkgver} - #ninja + ${MINGW_PREFIX}/bin/meson compile } package() { - #cd "${srcdir}/build-static-${MINGW_CHOST}" - #DESTDIR=${pkgdir}${MINGW_PREFIX} ninja install - + cd "${srcdir}/build-static-${MINGW_CHOST}" + DESTDIR="${pkgdir}" meson install + cd "${srcdir}/build-${MINGW_CHOST}" - DESTDIR=${pkgdir} ninja install + DESTDIR="${pkgdir}" meson install # remove installed tests, no need and they contain the build path which # leads to pkgbuild warnings diff --git a/tools/MINGW-packages/mingw-w64-poppler/PKGBUILD b/tools/MINGW-packages/mingw-w64-poppler/PKGBUILD index 476de20509..7ed87e512e 100644 --- a/tools/MINGW-packages/mingw-w64-poppler/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-poppler/PKGBUILD @@ -4,7 +4,7 @@ _realname=poppler pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.83.0 -pkgrel=4 +pkgrel=5 pkgdesc="PDF rendering library based on xpdf 3.0 (mingw-w64)" arch=('any') url="https://poppler.freedesktop.org/" diff --git a/tools/MINGW-packages/mingw-w64-qt4/PKGBUILD b/tools/MINGW-packages/mingw-w64-qt4/PKGBUILD index dec27bf536..288ce62a1d 100644 --- a/tools/MINGW-packages/mingw-w64-qt4/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-qt4/PKGBUILD @@ -24,7 +24,7 @@ else fi pkgver=4.8.7 -pkgrel=10 +pkgrel=11 arch=('any') url='https://www.qt.io/' install=qt4-${CARCH}.install