diff --git a/mingw-w64-goxel/PKGBUILD b/mingw-w64-goxel/PKGBUILD index 89902233203e8..e29f3bcb778f9 100644 --- a/mingw-w64-goxel/PKGBUILD +++ b/mingw-w64-goxel/PKGBUILD @@ -4,7 +4,7 @@ _realname=goxel pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=0.15.1 -pkgrel=1 +pkgrel=2 pkgdesc="3D program that lets you create voxel volumes (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-libsystre/PKGBUILD b/mingw-w64-libsystre/PKGBUILD index d13fd1911259f..637d6e4580bea 100644 --- a/mingw-w64-libsystre/PKGBUILD +++ b/mingw-w64-libsystre/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-libgnurx") conflicts=("${MINGW_PACKAGE_PREFIX}-libgnurx") replaces=("${MINGW_PACKAGE_PREFIX}-libgnurx") pkgver=1.0.1 -pkgrel=5 +pkgrel=6 pkgdesc="Wrapper library around TRE that provides POSIX API (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') diff --git a/mingw-w64-libtre-git/001-autotools.patch b/mingw-w64-libtre-git/001-autotools.patch deleted file mode 100644 index bc12601417e4e..0000000000000 --- a/mingw-w64-libtre-git/001-autotools.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index e4a94af..fac4ed7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2,10 +2,11 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(TRE, 0.8.0) - AC_CONFIG_SRCDIR([lib/regcomp.c]) - AC_CONFIG_AUX_DIR([utils]) -+AC_CONFIG_MACRO_DIRS([m4]) - AC_CANONICAL_TARGET - AM_INIT_AUTOMAKE([foreign]) --AC_PREREQ(2.59) --AM_GNU_GETTEXT_VERSION(0.17) -+AC_PREREQ(2.69) -+AM_GNU_GETTEXT_VERSION(0.18) - - dnl Checks for programs. - AC_PROG_CC -@@ -433,16 +434,6 @@ if test "$tre_enable_wchar" != "no"; then - fi - fi - --case $host in -- *-mingw*) -- dnl wcsrtombs and wcstombs don't seem to work at all on MinGW. -- if test "$tre_libutf8" != "yes"; then -- tre_wchar_reason="Not supported on MinGW" -- tre_wchar="no ($tre_wchar_reason)" -- fi -- ;; --esac -- - # Fail if wide character support was specifically requested but is - # not supported on this system. - if test "$tre_enable_wchar" = "yes"; then diff --git a/mingw-w64-libtre/001-autotools.patch b/mingw-w64-libtre/001-autotools.patch new file mode 100644 index 0000000000000..a6411ef6e633c --- /dev/null +++ b/mingw-w64-libtre/001-autotools.patch @@ -0,0 +1,19 @@ +--- libtre/configure.ac.orig 2024-10-16 07:56:30.608197900 +0200 ++++ libtre/configure.ac 2024-10-16 07:58:37.253298700 +0200 +@@ -435,16 +435,6 @@ + fi + fi + +-case $host in +- *-mingw*) +- dnl wcsrtombs and wcstombs don't seem to work at all on MinGW. +- if test "$tre_libutf8" != "yes"; then +- tre_wchar_reason="Not supported on MinGW" +- tre_wchar="no ($tre_wchar_reason)" +- fi +- ;; +-esac +- + # Fail if wide character support was specifically requested but is + # not supported on this system. + if test "$tre_enable_wchar" = "yes"; then diff --git a/mingw-w64-libtre-git/002-pointer-cast.patch b/mingw-w64-libtre/002-pointer-cast.patch similarity index 100% rename from mingw-w64-libtre-git/002-pointer-cast.patch rename to mingw-w64-libtre/002-pointer-cast.patch diff --git a/mingw-w64-libtre-git/PKGBUILD b/mingw-w64-libtre/PKGBUILD similarity index 77% rename from mingw-w64-libtre-git/PKGBUILD rename to mingw-w64-libtre/PKGBUILD index a4ee0d58d282f..664e06cf9fd0a 100644 --- a/mingw-w64-libtre-git/PKGBUILD +++ b/mingw-w64-libtre/PKGBUILD @@ -3,12 +3,13 @@ # Contributor: Mario Emmenlauer _realname=libtre -pkgbase=mingw-w64-${_realname}-git -pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" -provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") -conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=r177.07e66d0 -pkgrel=2 +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-git") +conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git") +replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git") +pkgver=0.9.0 +pkgrel=1 pkgdesc="The approximate regex matching library and agrep command line tool (mingw-w64)" url="https://github.com/laurikari/tre" arch=('any') @@ -17,18 +18,13 @@ license=('BSD') options=(strip staticlibs) makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "git" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-gettext-tools") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-gettext-runtime") -source=("${_realname}"::"git+https://github.com/laurikari/tre.git#commit=07e66d0" +source=("${_realname}"::"git+https://github.com/laurikari/tre.git#tag=v${pkgver}" 001-autotools.patch 002-pointer-cast.patch) -sha256sums=('SKIP' - '27dd39270d94c6463ec0bc9a8478b7121c6f338f72c3cc552c004acbb6b8de9c' +sha256sums=('81ac859d391cfd1a240a23ac1b7bda51cee7b75103cf03015cea9ea0b3492c3d' + '0fca8835867ccd669aa572d3fe25db8e45f33d93c17ee9c00e50cfab23e78dd1' '72c87b956eade17ed5444c3c6eae7be09b93d145573f20017ec590d9c2516c52') -pkgver() { - cd "${srcdir}/${_realname}" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} - prepare() { cd "${_realname}" patch -p1 -i "${srcdir}/001-autotools.patch"