Skip to content

Commit 19bafc6

Browse files
committed
apply patch to update doxygen to 1.8.11, which fixes version checks of flex
1 parent bd61d2f commit 19bafc6

2 files changed

Lines changed: 32 additions & 2 deletions

File tree

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUN pacman -Sy && \
1414
RUN pacman -S --noconfirm --needed --force \
1515
base-devel \
1616
git \
17+
cmake \
1718
zlib \
1819
libutil-linux \
1920
help2man \
@@ -30,4 +31,4 @@ RUN useradd -M -N packager
3031
VOLUME /data
3132
WORKDIR /data
3233

33-
CMD ["bash" "-l"]
34+
CMD ["bash", "-l"]

PKGBUILD

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ url="http://www.xapian.org"
1010
license=('GPL')
1111
groups=()
1212
depends=('lua' 'python>=3.5')
13-
makedepends=('git' 'zlib' 'libutil-linux' 'help2man' 'graphviz' 'perl' 'tcl' 'python-docutils' 'python-sphinx')
13+
makedepends=('git' 'cmake' 'zlib' 'libutil-linux' 'help2man' 'graphviz' 'perl' 'tcl' 'python-docutils' 'python-sphinx')
1414
provides=("$_name" xapian-core)
1515
conflicts=("$_name" xapian-core)
1616
replaces=()
@@ -29,6 +29,35 @@ pkgver() {
2929

3030
prepare() {
3131
cd "$srcdir/$_name"
32+
patch -p 1 <<EOF
33+
diff --git a/bootstrap b/bootstrap
34+
index ec68966..01876fa 100755
35+
--- a/bootstrap
36+
+++ b/bootstrap
37+
@@ -220,7 +220,9 @@ END
38+
mv qtools/qglobal.hT qtools/qglobal.h
39+
fi
40+
41+
- if test -n "\$AUTOCONF" ; then
42+
+ if test -f "CMakeLists.txt" ; then
43+
+ cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX:PATH="\$instdir" .
44+
+ elif test -n "\$AUTOCONF" ; then
45+
./configure --prefix "\$instdir" AUTOCONF="\$AUTOCONF"
46+
else
47+
./configure --prefix "\$instdir"
48+
@@ -360,8 +362,8 @@ else
49+
cd BUILD
50+
51+
# The last field is the SHA1 checksum of the tarball.
52+
- lazy_build doxygen 1.8.8 \\
53+
- src.tar.gz cd511c73e7669dde5ac3e14a5d1abae093aaf1d9
54+
+ lazy_build doxygen 1.8.11 \\
55+
+ src.tar.gz c0841007cf8a7910ccf0d8e4f7a5dd8fd2d9fc18
56+
lazy_build autoconf 2.68 \\
57+
tar.xz 63a3b495400c1c053f2f6b62efb7a5c0ad4156c9 \\
58+
tar.bz2 b534c293b22048c022b1ff3a372b9c03f26170b4 \\
59+
60+
EOF
3261
}
3362

3463
build() {

0 commit comments

Comments
 (0)