commit 0f0382ca9a73a57f82dc9551cf2a988f656cb303
parent 02c817fbc21f5e8384a8492859c053410b7e2a01
Author: aabacchus <ben@bvnf.space>
Date: Sun, 16 May 2021 13:26:27 +0100
log4cxx: revert version (https://github.com/MiKTeX/miktex/issues/817)
Diffstat:
6 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
@@ -9,6 +9,13 @@ at compilation time ("on-the-fly").
## NEWS
+### log4cxx
+log4cxx 0.12.0 has been released upstream, including some changes to the version
+of C++ being used, and MiKTeX's build is currently incompatible with it (see the
+[issue upstream]).
+Therefore, log4cxx has not been updated (yet).
+
+### gettext-tiny
This package of MiKTeX now uses [gettext-tiny] instead of gettext. This is much
more lightweight than the GNU version, weighing in at 340 kB compared to 19 MB.
Of course, it is less featureful, so gettext itself is still present if you want.
@@ -84,3 +91,4 @@ root privileges and `--admin`, may be useful.
Feel free to open an issue.
[gettext-tiny]: https://github.com/sabotage-linux/gettext-tiny
+[issue upstream]: https://github.com/MiKTeX/miktex/issues/817
diff --git a/log4cxx/build b/log4cxx/build
@@ -1,15 +1,7 @@
#!/bin/sh -e
-export DESTDIR="$1"
-cmake -B build \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DBUILD_TESTING=off
+./autogen.sh
+./configure --prefix=/usr
-cmake --build build
-cmake --install build
-
-# correct location of cmake and pkgconfig files
-mv "$1/usr/share/cmake" "$1/usr/share/pkgconfig" \
- "$1/usr/lib/"
-rmdir "$1/usr/share/"
+make
+make DESTDIR="$1" install
diff --git a/log4cxx/checksums b/log4cxx/checksums
@@ -1 +1 @@
-bd5b5009ca914c8fa7944b92ea6b4ca6fb7d146f65d526f21bf8b3c6a0520e44
+c316705ee3c4e5b919d3561d5f305162d21687aa6ae1f31f02f6cdadc958b393
diff --git a/log4cxx/depends b/log4cxx/depends
@@ -1,5 +1,7 @@
apr
apr-util
-cmake make
+autoconf make
+automake make
expat
+libtool make
util-linux
diff --git a/log4cxx/sources b/log4cxx/sources
@@ -1 +1 @@
-https://apache.mirrors.nublue.co.uk/logging/log4cxx/0.12.0/apache-log4cxx-0.12.0.tar.gz
+https://archive.apache.org/dist/logging/log4cxx/0.11.0/apache-log4cxx-0.11.0.tar.gz
diff --git a/log4cxx/version b/log4cxx/version
@@ -1 +1 @@
-0.12.0 1
+0.11.0 1
