View Issue Details
ID | Project | Category | View Status | Date Submitted | Last Update |
---|---|---|---|---|---|
0016107 | Scribus | Build System | public | 2020-05-12 15:54 | 2020-08-11 20:56 |
Reporter | ale | Assigned To | ale | ||
Priority | normal | Severity | minor | Reproducibility | N/A |
Status | closed | Resolution | fixed | ||
Product Version | 1.5.6.svn | ||||
Fixed in Version | 1.5.6.svn | ||||
Summary | 0016107: Fix the Travis CI | ||||
Description | probono has posted a patch on gitlab: https://gitlab.com/scribus/scribus/-/merge_requests/22 the diff is attached. | ||||
Tags | No tags attached. | ||||
Patch | Yes | ||||
|
ci.diff (9,538 bytes)
diff --git a/.travis.yml b/.travis.yml index 0397a1349ae8b2fe7838a8fc69e6ed4686540ff1..0d6846eb4efb0929a01e371daf2733cf4dd425e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,105 +1,72 @@ -language: c++ +language: cpp -matrix: - include: - - os: linux - dist: xenial - sudo: required - compiler: - - gcc - - os: linux - dist: xenial - sudo: required - compiler: - - clang - - os: osx - compiler: clang - exclude: - - os: osx - compiler: gcc - - os: linux - dist: precise - - os: linux - dist: trusty +os: linux + +dist: focal + +compiler: + - clang + - gcc + +env: + - NPROC=2 before_install: -# Linux -- if [ $TRAVIS_OS_NAME == linux ]; then - sudo apt-add-repository ppa:beineri/opt-qt5.10.1-xenial -y; - sudo apt-add-repository ppa:as-bahanta/raqm -y; - sudo apt-add-repository ppa:ricotz/testing -y; - sudo apt-get update -qq; - fi -# OSX -- if [ $TRAVIS_OS_NAME == osx ]; then - brew update; - fi - + - sudo apt-add-repository ppa:beineri/opt-qt-5.14.2-focal -y + - sudo apt-get update -qq + install: -# Linux -- if [ $TRAVIS_OS_NAME == linux ]; then - sudo apt-get install --force-yes cmake libboost-python-dev libcairo2-dev libcups2-dev - libharfbuzz-dev libharfbuzz-icu0 libhunspell-dev libhyphen-dev liblcms2-dev libpng-dev - libpodofo-dev libpoppler-dev libpoppler-cpp-dev libtiff-dev libxml2-dev - qt510base qt510declarative qt510tools python3-all-dev python3-tk zlib1g-dev - libgraphicsmagick++1-dev libopenscenegraph-dev libcdr-dev libmspub-dev libwpg-dev libvisio-dev - coreutils binutils ; -# Build a more recent poppler than Ubuntu Xenial's poppler 0.41.0 - mkdir deps && pushd deps; - sudo apt-get install --force-yes libopenjpeg-dev; - wget https://poppler.freedesktop.org/poppler-data-0.4.9.tar.gz && tar -xf poppler-data-0.4.9.tar.gz; - pushd poppler-data-0.4.9 && cmake -DCMAKE_BUILD_TYPE=Release && sudo make install && popd; - wget https://poppler.freedesktop.org/poppler-0.62.0.tar.xz && tar -xf poppler-0.62.0.tar.xz; - pushd poppler-0.62.0 && cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_XPDF_HEADERS=1 && sudo make install && popd; - popd; - fi -# OSX -- if [ $TRAVIS_OS_NAME == osx ]; then - brew outdated cmake --verbose || brew upgrade cmake; - brew tap homebrew/dupes && brew install homebrew/dupes/zlib && brew link --force zlib; - brew install icu4c && brew link --force icu4c; - brew install xz little-cms2 cairo qt5 hunspell ghostscript graphicsmagick poppler podofo harfbuzz; - brew install python3 --with-tcl-tk; - brew outdated jpeg --verbose || brew upgrade jpeg; - brew outdated libpng --verbose || brew upgrade libpng; - brew outdated libtiff --verbose || brew upgrade libtiff; - brew outdated fontconfig --verbose || brew upgrade fontconfig; - brew install openssl && brew link --force openssl; - brew outdated pkg-config --verbose || brew upgrade pkg-config; - brew outdated boost || brew upgrade boost; - brew outdated freetype || brew upgrade freetype; - brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph; - fi - # - export LDFLAGS+=-L/usr/local/opt/zlib/lib:-L/usr/local/opt/gettext/lib:-L/usr/local/opt/libffi/lib:-L/usr/local/opt/qt5/lib:-L/usr/local/opt/sqlite/lib:-L/usr/local/opt/openssl/lib:-L/usr/local/opt/icu4c/lib - # - export CXXFLAGS+=-I/usr/local/opt/zlib/include:-I/usr/local/opt/gettext/include:-I/usr/local/opt/qt5/include:-I/usr/local/opt/sqlite/include:-I/usr/local/opt/openssl/include:-I/usr/local/opt/icu4c/include - + - sudo apt-get install --force-yes cmake libboost-python-dev libcairo2-dev libcups2-dev libharfbuzz-dev libharfbuzz-icu0 libhunspell-dev libhyphen-dev liblcms2-dev libpng-dev libpodofo-dev libpoppler-dev libpoppler-cpp-dev libtiff-dev libxml2-dev qt514base qt514declarative qt514tools python3-all-dev python3-tk zlib1g-dev libgraphicsmagick++1-dev libopenscenegraph-dev libcdr-dev libmspub-dev libwpg-dev libvisio-dev coreutils binutils poppler-data libpoppler-private-dev libfreehand-dev libpagemaker-dev libqxp-dev libzmf-dev + script: - - if [ $TRAVIS_OS_NAME == linux ]; then - source /opt/qt510/bin/qt510-env.sh; - if [[ $CC == gcc ]]; then - export NPROC=8; - else - export NPROC=1; - fi; - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US; - make -j"$NPROC"; - make install; - bash -ex ./AppImage-package/bundle.sh; - fi + - source /opt/qt514/bin/qt514-env.sh + - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US + - make -j"$NPROC" + - sudo make install + - sudo bash -ex ./AppImage-package/bundle.sh + +jobs: + include: + os: osx + before_install: + - brew update + install: + - brew outdated cmake || brew upgrade cmake + - brew outdated zlib || brew upgrade zlib + - brew outdated icu4c || brew upgrade icu4c + - brew outdated xz || brew upgrade xz + - brew outdated cairo || brew upgrade cairo + - brew outdated qt5 || brew upgrade qt5 + - brew outdated little-cms2 || brew upgrade little-cms2 + - brew outdated poppler || brew upgrade poppler + - brew outdated python || brew unlink python@2 && brew upgrade python + - brew outdated jpeg || brew upgrade jpeg + - brew outdated libpng || brew upgrade libpng + - brew outdated libtiff || brew upgrade libtiff + - brew outdated fontconfig || brew upgrade fontconfig + - brew outdated pkg-config || brew upgrade pkg-config + - brew outdated boost || brew upgrade boost + - brew outdated freetype || brew upgrade freetype + - brew outdated openssl || brew upgrade openssl + - brew install hunspell podofo ghostscript graphicsmagick harfbuzz librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand # open-scene-graph + + before_script: + - export PKG_CONFIG_PATH="$(pkg-config --variable pc_path pkg-config):/usr/local/opt/openssl/lib/pkgconfig:/usr/local/opt/qt/lib/pkgconfig:/usr/local/opt/icu4c/lib/pkgconfig" + - export LDFLAGS="-L/usr/local/opt/zlib/lib -L/usr/local/opt/gettext/lib -L/usr/local/opt/libffi/lib -L/usr/local/opt/qt/lib -L/usr/local/opt/sqlite/lib -L/usr/local/opt/openssl/lib -L/usr/local/opt/icu4c/lib -L/usr/local/opt/hunspell/lib" + - export CXXFLAGS="-I/usr/local/opt/zlib/include -I/usr/local/opt/gettext/include -I/usr/local/opt/qt5/include -I/usr/local/opt/sqlite/include -I/usr/local/opt/openssl/include -I/usr/local/opt/icu4c/include -I/usr/local/opt/hunspell/include" + + script: + - cmake . -DCMAKE_INSTALL_PREFIX=~/.local -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US -DWANT_NOOSG=1 -DBUILD_OSX_BUNDLE=1 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DQT_PREFIX=/usr/local/opt/qt + - make -j"$NPROC" + - make install - - if [ $TRAVIS_OS_NAME = osx -a $CC = clang ]; then - cmake . -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_NOOSG=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US -DWANT_NOEXAMPLES=1 -DWANT_NOTEMPLATES=1 -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_OSX_ARCHITECTURES="x86_64" -DQT_PREFIX=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=~/.local; - make -j8; - make install; - fi notifications: irc: channels: - - "chat.freenode.net#scribus" - - "chat.freenode.net#scribus-dev" +# - "chat.freenode.net#scribus" +# - "chat.freenode.net#scribus-dev" template: - "%{repository}/%{branch} (%{author}): %{build_url}: %{message}" on_success: always on_failure: always - diff --git a/AppImage-package/bundle.sh b/AppImage-package/bundle.sh index a59a7a9ec73bf42caf8cbebaa1abbcec1c4253f9..562b7419700388fda4c2a15c062f6bdb801ff5f4 100644 --- a/AppImage-package/bundle.sh +++ b/AppImage-package/bundle.sh @@ -73,7 +73,7 @@ mkdir -p etc/fonts/ cp /etc/fonts/fonts.conf etc/fonts/ # Bundle Python -apt-get download python3.6 python3.6-minimal libpython3.6-minimal libpython3.6-stdlib python3-tk +apt-get download python3.8 python3.8-minimal libpython3.8-minimal libpython3.8-stdlib python3-tk find *.deb -exec dpkg-deb -x {} . \; rm *deb cd - @@ -123,6 +123,6 @@ wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/contin chmod a+x linuxdeployqt-continuous-x86_64.AppImage ARCH=x86_64 VERSION=$SCRIBUS_VERSION ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract-and-run appdir/usr/share/applications/scribus.desktop \ -appimage -unsupported-bundle-everything \ - -executable=appdir/usr/bin/python3.6 \ - -executable=appdir/usr/lib/python3.6/lib-dynload/_tkinter.cpython-36m-x86_64-linux-gnu.so \ + -executable=appdir/usr/bin/python3.8 \ + -executable=appdir/usr/lib/python3.8/lib-dynload/_tkinter.cpython-38-x86_64-linux-gnu.so \ -extra-plugins=platformthemes/libqgtk2.so,styles/libqgtk2style.so |
|
as it seems, the original PR was by t0b3 on github: https://github.com/scribusproject/scribus/pull/128 |
Date Modified | Username | Field | Change |
---|---|---|---|
2020-05-12 15:54 | ale | New Issue | |
2020-05-12 15:54 | ale | File Added: ci.diff | |
2020-05-12 15:58 | ale | Note Added: 0047615 | |
2020-05-12 17:01 | jghali | Category | - => Build System |
2020-05-12 18:37 | jghali | Summary | fix the travis ci => Fix the Travis ci |
2020-05-12 18:40 | jghali | Assigned To | => ale |
2020-05-12 18:40 | jghali | Status | new => resolved |
2020-05-12 18:40 | jghali | Resolution | open => fixed |
2020-05-12 18:40 | jghali | Fixed in Version | => 1.5.6.svn |
2020-05-12 18:48 | jghali | Summary | Fix the Travis ci => Fix the Travis CI |
2020-08-11 20:56 | cbradney | Status | resolved => closed |