mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
enblend-enfuse: do not re-define BOOST_FALLTHROUGH
This commit is contained in:
Đoàn Trần Công Danh
parent
563a1699f4
commit
df6b059993
3 changed files with 86 additions and 5 deletions
20
srcpkgs/enblend-enfuse/patches/boost-fallthrough.patch
Normal file
20
srcpkgs/enblend-enfuse/patches/boost-fallthrough.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
Index: enblend-enfuse-4.2/configure.ac
|
||||||
|
===================================================================
|
||||||
|
--- enblend-enfuse-4.2.orig/configure.ac
|
||||||
|
+++ enblend-enfuse-4.2/configure.ac
|
||||||
|
@@ -287,15 +287,6 @@ AC_CHECK_FUNCS([atexit clock_gettime \
|
||||||
|
AC_C99_FUNC_LRINT
|
||||||
|
AC_C99_FUNC_LRINTF
|
||||||
|
|
||||||
|
-AC_MSG_CHECKING([for BOOST_FALLTHROUGH])
|
||||||
|
-AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[#include <boost/config/suffix.hpp>]],
|
||||||
|
- [[BOOST_FALLTHROUGH]])],
|
||||||
|
- [ac_found=yes; AC_MSG_RESULT([yes])],
|
||||||
|
- [ac_found=no]; AC_MSG_RESULT([no]))
|
||||||
|
-if test "$ac_found" = no; then
|
||||||
|
- AC_DEFINE(BOOST_FALLTHROUGH, [((void) 0)],
|
||||||
|
- [Define if Boost is not recent enough to define BOOST_FALLTHROUGH itself])
|
||||||
|
-fi
|
||||||
|
|
||||||
|
AC_PATH_PROG(PERL, perl, false)
|
||||||
|
if test "$PERL" = false; then
|
||||||
64
srcpkgs/enblend-enfuse/patches/no-latex.patch
Normal file
64
srcpkgs/enblend-enfuse/patches/no-latex.patch
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
Index: enblend-enfuse-4.2/aclocal.m4
|
||||||
|
===================================================================
|
||||||
|
--- enblend-enfuse-4.2.orig/aclocal.m4
|
||||||
|
+++ enblend-enfuse-4.2/aclocal.m4
|
||||||
|
@@ -1422,11 +1422,7 @@ AC_SUBST([am__tar])
|
||||||
|
AC_SUBST([am__untar])
|
||||||
|
]) # _AM_PROG_TAR
|
||||||
|
|
||||||
|
-m4_include([m4/_ac_latex_test.m4])
|
||||||
|
-m4_include([m4/ac_latex_class.m4])
|
||||||
|
-m4_include([m4/ac_latex_package.m4])
|
||||||
|
m4_include([m4/ac_prog_ar.m4])
|
||||||
|
-m4_include([m4/ac_prog_latex.m4])
|
||||||
|
m4_include([m4/ac_type_sig_atomic_t.m4])
|
||||||
|
m4_include([m4/ax_boost_base.m4])
|
||||||
|
m4_include([m4/ax_cxx_as_const.m4])
|
||||||
|
Index: enblend-enfuse-4.2/configure.ac
|
||||||
|
===================================================================
|
||||||
|
--- enblend-enfuse-4.2.orig/configure.ac
|
||||||
|
+++ enblend-enfuse-4.2/configure.ac
|
||||||
|
@@ -316,43 +316,6 @@ fi
|
||||||
|
|
||||||
|
can_build_doc=yes
|
||||||
|
|
||||||
|
-AC_PATH_PROGS(LATEX, [latex elatex lambda],
|
||||||
|
- [AC_MSG_WARN(missing LaTeX translator)
|
||||||
|
- can_build_doc=no
|
||||||
|
- missing_for_doc="$missing_for_doc latex"])
|
||||||
|
-AC_PATH_PROG(PDFLATEX, pdflatex,
|
||||||
|
- [AC_MSG_WARN([missing PDFLaTeX translator -- no direct translation of LaTeX to PDF available])
|
||||||
|
- missing_for_doc="$missing_for_doc pdflatex"])
|
||||||
|
-
|
||||||
|
-if test "$latex" != 'no'
|
||||||
|
-then
|
||||||
|
- AC_LATEX_CLASS(report,report,[],
|
||||||
|
- [AC_MSG_WARN(missing document class report.cls)
|
||||||
|
- can_build_doc=no
|
||||||
|
- missing_for_doc="$missing_for_doc report.cls"])
|
||||||
|
- AC_LATEX_CLASS(refrep,refrep,[],
|
||||||
|
- [AC_MSG_WARN([missing document class refrep.cls -- no Reference Manual Style available])
|
||||||
|
- missing_for_doc="$missing_for_doc refrep.cls"])
|
||||||
|
-
|
||||||
|
-dnl FIXME: We ought to add package `hypcap' to the list, but
|
||||||
|
-dnl `AC_LATEX_PACKAGE' does not allow for prerequisite pqckages to be
|
||||||
|
-dnl mentioned while testing and `hypcap' needs `hyperref' to be
|
||||||
|
-dnl included first.
|
||||||
|
- m4_foreach([package_name],
|
||||||
|
- [amsmath, bold-extra, color, enumitem,
|
||||||
|
- float, footnote, graphicx, hyperref, hyphenat,
|
||||||
|
- ifpdf, index, latexsym, listings,
|
||||||
|
- microtype, ragged2e, shorttoc, suffix,
|
||||||
|
- url, xstring],
|
||||||
|
- [AC_LATEX_PACKAGE([package_name],
|
||||||
|
- [report],
|
||||||
|
- [m4_translit(package_name,[-],[_])],
|
||||||
|
- [],
|
||||||
|
- [AC_MSG_WARN(missing LaTeX package package_name)
|
||||||
|
- can_build_doc=no
|
||||||
|
- missing_for_doc="$missing_for_doc package_name.sty"])])
|
||||||
|
-fi
|
||||||
|
-
|
||||||
|
if test "$PERL" != false; then
|
||||||
|
AX_PROG_PERL_MODULES(File::Basename, [],
|
||||||
|
[AC_MSG_WARN(missing Perl module File::Basename)
|
||||||
|
|
@ -3,8 +3,8 @@ pkgname=enblend-enfuse
|
||||||
version=4.2
|
version=4.2
|
||||||
revision=8
|
revision=8
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-openmp --with-tcmalloc"
|
configure_args="--enable-openmp --with-tcmalloc --with-latex=false HELP2MAN=:"
|
||||||
hostmakedepends="pkg-config perl automake"
|
hostmakedepends="pkg-config perl automake perl-TimeDate"
|
||||||
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
|
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
|
||||||
gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
|
gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
|
||||||
short_desc="Tools for for combining multiple images"
|
short_desc="Tools for for combining multiple images"
|
||||||
|
|
@ -20,9 +20,6 @@ case "$XBPS_TARGET_MACHINE" in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
# can not build documentataion for the lack of latex packages
|
|
||||||
sed -i -e '/latex/d' aclocal.m4
|
|
||||||
sed -i -e '/Documentation/,+46d' configure.ac
|
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue