closer to upstream

r-windows · Feb 12, 2024 · 1e1f2de · 1e1f2de
1 parent 9db9711
commit 1e1f2de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/ci-build.sh b/ci-build.sh
@@ -13,14 +13,15 @@ if [ "$MINGW_ARCH" == "clangarm64" ]; then
 fi
 
 # Enable custom -next repos (this will break msys2 toolchains that use dll's)
-pacman --noconfirm -S ${MINGW_PACKAGE_PREFIX}-{cc,libtre,pkgconf,xz}
+#pacman --noconfirm -S ${MINGW_PACKAGE_PREFIX}-{cc,libtre,pkgconf,xz}
 cp -f pacman.conf /etc/pacman.conf
 pacman --noconfirm -Scc
 pacman --noconfirm -Sy
 
 # Downgrades to be compatible with rtools
 pacman --noconfirm --needed -S git patch make unzip pactoys
-#pacman --noconfirm -S --needed ${MINGW_PACKAGE_PREFIX}-{cc,libtre,pkgconf,xz}
+pacman --noconfirm -S ${MINGW_PACKAGE_PREFIX}-{gettext-runtime,gettext-tools}
+pacman --noconfirm -S ${MINGW_PACKAGE_PREFIX}-{cc,libtre,pkgconf,xz}
 
 # Some upstream DLL files
 pacman --noconfirm --needed -Sdd ${MINGW_PACKAGE_PREFIX}-{gcc-libs,libwinpthread}

diff --git a/mingw-w64-gettext/PKGBUILD b/mingw-w64-gettext/PKGBUILD
@@ -102,17 +102,17 @@ build() {
 
   export MSYS2_ARG_CONV_EXCL="-DLOCALEDIR=;-DLIBDIR=;-DLOCALE_ALIAS_PATH="
 
-#  msg2 "Build static libraries"
-#  mkdir -p ${srcdir}/build-${MSYSTEM}-static && cd ${srcdir}/build-${MSYSTEM}-static
-#  _build "--enable-static --disable-shared"
+  #msg2 "Build static libraries"
+  #mkdir -p ${srcdir}/build-${MSYSTEM}-static && cd ${srcdir}/build-${MSYSTEM}-static
+  #_build "--enable-static --disable-shared"
 
-  msg2 "Build shared libraries"
+  msg2 "Build shared and static libraries"
   mkdir -p ${srcdir}/build-${MSYSTEM}-shared && cd ${srcdir}/build-${MSYSTEM}-shared
-  _build "--enable-shared --disable-static"
+  _build "--enable-shared --enable-static"
 }
 
 check () {
-  echo "Nothing"
+  cd ${srcdir}/build-${MSYSTEM}-shared
 }
 
 package_gettext-runtime() {
@@ -121,7 +121,7 @@ package_gettext-runtime() {
     "${MINGW_PACKAGE_PREFIX}-gcc-libs"
     "${MINGW_PACKAGE_PREFIX}-libiconv"
   )
-#  conflicts=("${MINGW_PACKAGE_PREFIX}-gettext<=0.22.4-3")
+  conflicts=("${MINGW_PACKAGE_PREFIX}-gettext<=0.22.4-3")
 
   #cd ${srcdir}/build-${MSYSTEM}-static/gettext-runtime
   #make DESTDIR="${pkgdir}" install
@@ -148,7 +148,7 @@ package_gettext-tools() {
     "${MINGW_PACKAGE_PREFIX}-libiconv"
   )
   provides=("${MINGW_PACKAGE_PREFIX}-gettext=${pkgver}-${pkgrel}")
-#  conflicts=("${MINGW_PACKAGE_PREFIX}-gettext<=0.22.4-3")
+  conflicts=("${MINGW_PACKAGE_PREFIX}-gettext<=0.22.4-3")
   replaces=("${MINGW_PACKAGE_PREFIX}-gettext")
 
   #cd ${srcdir}/build-${MSYSTEM}-static/gettext-tools