Merge branch 'master' of gitlab.com:gambas/gambas
This commit is contained in:
commit
82888cc0e7
2 changed files with 2 additions and 2 deletions
|
@ -234,7 +234,7 @@ build:opensuse-tumbleweed:
|
||||||
image: opensuse/tumbleweed
|
image: opensuse/tumbleweed
|
||||||
before_script:
|
before_script:
|
||||||
- >
|
- >
|
||||||
zypper update -y && zypper install -y libtool gcc glew-devel gmime-devel gtk2-devel gtk3-devel libqt5-qtx11extras-devel libqt5-qtwebengine-devel libQt5Xml-devel libQt5Sql-devel libqt5-qtsvg-devel libQt5Gui-devel libQt5Core-devel libQt5Sql5-postgresql libQt5Sql5-unixODBC libQt5Sql5-mysql libQt5Sql5-sqlite webkit2gtk3-devel libICE-devel libSM-devel unixODBC-devel libzip-devel libzstd-devel libmariadb-devel gsl-devel libopenssl-devel alure-devel postgresql-devel libcurl-devel libSDL_ttf-devel libSDL_mixer-devel libSDL-devel libSDL2_ttf-devel libSDL2_mixer-devel libSDL2_image-devel libSDL2-devel libxslt-devel libv4l-devel librsvg-devel gtkglext-devel libgnome-keyring-devel libjpeg62-devel libpoppler-devel libpoppler-glib-devel imlib2-devel gmp-devel gstreamermm-devel
|
zypper update -y && zypper install -y libtool gawk gcc glew-devel gmime-devel gtk2-devel gtk3-devel libqt5-qtx11extras-devel libqt5-qtwebengine-devel libQt5Xml-devel libQt5Sql-devel libqt5-qtsvg-devel libQt5Gui-devel libQt5Core-devel libQt5Sql5-postgresql libQt5Sql5-unixODBC libQt5Sql5-mysql libQt5Sql5-sqlite webkit2gtk3-devel libICE-devel libSM-devel unixODBC-devel libzip-devel libzstd-devel libmariadb-devel gsl-devel libopenssl-devel alure-devel postgresql-devel libcurl-devel libSDL_ttf-devel libSDL_mixer-devel libSDL-devel libSDL2_ttf-devel libSDL2_mixer-devel libSDL2_image-devel libSDL2-devel libxslt-devel libv4l-devel librsvg-devel gtkglext-devel libgnome-keyring-devel libjpeg62-devel libpoppler-devel libpoppler-glib-devel imlib2-devel gmp-devel gstreamermm-devel
|
||||||
script:
|
script:
|
||||||
- ./reconf-all
|
- ./reconf-all
|
||||||
- GAMBAS_CONFIG_FAILURE=1 ./configure -C --disable-qt4 --disable-sqlite2 --disable-qt5webkit --disable-pdf
|
- GAMBAS_CONFIG_FAILURE=1 ./configure -C --disable-qt4 --disable-sqlite2 --disable-qt5webkit --disable-pdf
|
||||||
|
|
|
@ -10,7 +10,7 @@ PKG_PROG_PKG_CONFIG
|
||||||
|
|
||||||
GB_COMPONENT_PKG_CONFIG(
|
GB_COMPONENT_PKG_CONFIG(
|
||||||
poppler, POPPLER, gb.pdf, [src],
|
poppler, POPPLER, gb.pdf, [src],
|
||||||
'poppler >= 0.20' 'poppler < 23.0'
|
'poppler >= 0.20'
|
||||||
)
|
)
|
||||||
|
|
||||||
if test "$have_poppler" = "yes"; then
|
if test "$have_poppler" = "yes"; then
|
||||||
|
|
Loading…
Reference in a new issue