[geany/geany] eebc01: Remove GTK2 from travis.yaml

Matthew Brush git-noreply at xxxxx
Sat May 29 12:20:47 UTC 2021


Branch:      refs/heads/master
Author:      Matthew Brush <matt at geany.org>
Committer:   Matthew Brush <matt at geany.org>
Date:        Sun, 04 Oct 2020 13:02:30 UTC
Commit:      eebc01e3a52e1722b774cc467562b0351b3672a9
             https://github.com/geany/geany/commit/eebc01e3a52e1722b774cc467562b0351b3672a9

Log Message:
-----------
Remove GTK2 from travis.yaml


Modified Paths:
--------------
    .travis.yml

Modified: .travis.yml
15 lines changed, 5 insertions(+), 10 deletions(-)
===================================================================
@@ -5,17 +5,14 @@ dist: trusty
 compiler:
   - gcc
 env:
-  - GTK2=no BINRELOC=no
-  - GTK2=yes BINRELOC=no
-  - GTK2=no BINRELOC=yes
-  - GTK2=yes BINRELOC=yes
-  - GTK2=no MINGW=yes
-  - GTK2=yes MINGW=yes
+  - GTK3=yes BINRELOC=no
+  - GTK3=yes BINRELOC=yes
+  - GTK3=yes MINGW=yes
 before_install:
   - sudo apt-get update -qq
 install:
   - sudo apt-get install -y intltool libtool
-  - test -n "$MINGW" || sudo apt-get install -y libgtk2.0-dev libgtk-3-dev
+  - test -n "$MINGW" || sudo apt-get install -y libgtk-3-dev
   - test -z "$MINGW" || sudo apt-get install -y mingw-w64-tools g++-mingw-w64-i686 gcc-mingw-w64-i686 binutils-mingw-w64-i686
   # fix broken pkg-config-crosswrapper, see https://bugs.launchpad.net/ubuntu/+source/mingw-w64/+bug/1327242
   - test -z "$MINGW" || sudo sed -e 's/PKG_CONFIG_PATH=/&$PKG_CONFIG_PATH:/' -i /usr/bin/i686-w64-mingw32-pkg-config
@@ -29,9 +26,7 @@ script:
   - NOCONFIGURE=1 ./autogen.sh
   - >
     if [ -n "$MINGW" ]; then
-      arg=-3; [ "$GTK2" = yes ] && arg=-2;
-      unset CC CXX;
-      sh ./scripts/cross-build-mingw.sh $arg;
+      sh ./scripts/cross-build-mingw.sh;
     else
       CONFIGURE_FLAGS="--enable-gtk2=$GTK2 --enable-binreloc=$BINRELOC";
       mkdir _build                        &&



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list