diff --git a/mingw-w64-babl/001-file-open-unicode.patch b/mingw-w64-babl/001-file-open-unicode.patch deleted file mode 100644 index 5705dee7d4..0000000000 --- a/mingw-w64-babl/001-file-open-unicode.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- babl-0.1.82/tools/xml-insert.py.orig 2020-10-12 10:39:16.580051300 +0300 -+++ babl-0.1.82/tools/xml-insert.py 2020-10-12 10:42:16.168046100 +0300 -@@ -48,7 +48,7 @@ - args = Args() - - try: -- in_file = open(args.input, 'r') -+ in_file = open(args.input, mode='r', encoding='utf-8') - except IOError: - print('cannot access input file ' + args.input, - file=sys.stderr) -@@ -75,7 +75,7 @@ - - # read in insert file - try: -- ins_file = open(os.path.realpath(insert[1]), 'r') -+ ins_file = open(os.path.realpath(insert[1]), mode='r', encoding='utf-8') - except IOError: - print ('cannot open insert file %s - skipping' % insert[1], - file=sys.stderr) -@@ -93,7 +93,7 @@ - # output to file or stdout - if args.output: - try: -- out_file = open(os.path.realpath(args.output), 'w') -+ out_file = open(os.path.realpath(args.output), mode='w', encoding='utf-8') - except IOError: - print('cannot open output file %s' % args.output) - sys.exit(1) diff --git a/mingw-w64-babl/PKGBUILD b/mingw-w64-babl/PKGBUILD index 024b48f1ca..013214de1d 100644 --- a/mingw-w64-babl/PKGBUILD +++ b/mingw-w64-babl/PKGBUILD @@ -3,7 +3,7 @@ _realname=babl pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.1.116 +pkgver=0.1.118 pkgrel=1 pkgdesc="Dynamic Pixel Format Translation Library (mingw-w64)" arch=('any') @@ -16,29 +16,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" "${MINGW_PACKAGE_PREFIX}-vala" - "${MINGW_PACKAGE_PREFIX}-pkgconf") + "${MINGW_PACKAGE_PREFIX}-pkgconf" + "git") depends=("${MINGW_PACKAGE_PREFIX}-cc-libs" "${MINGW_PACKAGE_PREFIX}-lcms2") -source=("https://download.gimp.org/pub/babl/${pkgver%.*}/${_realname}-${pkgver}.tar.xz" - "001-file-open-unicode.patch") -sha256sums=('50fae069867c7ade1259888ff1e3db85fec86d708252e5385b5a4f39a78ec483' - '98cf43394eb1d1a8140438fbb745ed31f3768c07086afab297e4be9d609d07c5') - -apply_patch_with_msg() { - for _patch in "$@" - do - msg2 "Applying ${_patch}" - patch -bp1 -i "${srcdir}/${_patch}" - done -} - -prepare() { - cd "${_realname}-${pkgver}" - - #FIXME: remove this patch on babl 0.1.118 - apply_patch_with_msg \ - 001-file-open-unicode.patch -} +source=("https://download.gimp.org/pub/babl/${pkgver%.*}/${_realname}-${pkgver}.tar.xz") +sha256sums=('c3febe923e225c2a58f952689a89bb1db956788bfecb18a7eff6fc94da9e2469') build() { mkdir -p "build-${MSYSTEM}" && cd "build-${MSYSTEM}" @@ -50,10 +33,12 @@ build() { MSYS2_ARG_CONV_EXCL="--prefix=" \ meson setup \ --prefix="${MINGW_PREFIX}" \ + --auto-features=enabled \ + --wrap-mode=nodownload \ --buildtype=plain \ - -Dwith-lcms=true \ -Denable-gir=true \ -Dwith-docs=false \ + -Dgi-docgen=disabled \ ${_arch_opt} \ "../${_realname}-${pkgver}"