diff options
Diffstat (limited to '')
| -rwxr-xr-x | calibre/build/calibre.SlackBuild | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild index 514d3b16..6b26cf79 100755 --- a/calibre/build/calibre.SlackBuild +++ b/calibre/build/calibre.SlackBuild @@ -1122,11 +1122,11 @@ make_calibre () { # Cut out the DOS crap: sed -i -e 's/\r//' src/calibre/web/feeds/recipes/* - ## Prevent "qfontengine_ft.cpp undefined reference to `FT_Get_Char_Index'": + # Prevent "qfontengine_ft.cpp undefined reference to `FT_Get_Char_Index'": #sed -i -e 's/QMAKE_LIBS_PRIVATE += {glib} {fontconfig}/& {freetype}/' \ # setup/extensions.py - #cat $SRCDIR/patches/calibre_freetype.patch | patch -p1 --verbose \ - # 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log + cat $SRCDIR/patches/calibre_freetype.patch | patch -p1 --verbose \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log # We carry a private version of optipng: sed -i -e "s/optipng/&-calibre/g" $(grep -rl optipng {icons,src,setup/installer/linux}) @@ -1459,6 +1459,19 @@ else cat $SRCDIR/slack-required > $PKG/install/slack-required fi +# libxkbcommon, libinput, qt5-webkit are only required by Qt 5.6 and higher. +case "$SLACKVER" in + 13.*|14.0|14.1) + cat $PKG/install/slack-required \ + | grep -Ev "libxkbcommon|libinput|qt5-webkit" \ + > $PKG/install/slack-required.temp + mv $PKG/install/slack-required.temp $PKG/install/slack-required + ;; + *) + ;; +esac + + # Build the package: cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log |