From aa9084e3dfa6a3a2675ffe5a2cdcfb3d45d57a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Wed, 10 Jul 2019 02:32:35 +0000 Subject: [PATCH 1/5] Fix debian-oldstable --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5484d5538..2b22c3fc4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ build:debian-oldstable: image: debian:oldstable before_script: - > - apt-get update && apt-get install -y build-essential g++ automake autoconf libbz2-dev libfbclient2 libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-9.4 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libldap2-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libsage-dev libxml2-dev libxslt1-dev libbonobo2-dev libcos4-dev libomniorb4-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev libpoppler-private-dev libasound2-dev libesd0-dev libdirectfb-dev libaa1-dev libxtst-dev libffi-dev kdelibs5-dev firebird-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgnome-keyring-dev libgdk-pixbuf2.0-dev linux-libc-dev libgsl0-dev libncurses5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgmime-2.6-dev libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev llvm-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git libssl-dev + apt-get update && apt-get install -y build-essential g++ automake autoconf libbz2-dev libfbclient2 default-libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-9.6 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libldap2-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev libxslt1-dev libbonobo2-dev libcos4-dev libomniorb4-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev libpoppler-private-dev libasound2-dev libesd0-dev libdirectfb-dev libaa1-dev libxtst-dev libffi-dev kdelibs5-dev firebird-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgnome-keyring-dev libgdk-pixbuf2.0-dev linux-libc-dev libgsl0-dev libncurses5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgmime-2.6-dev libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev llvm-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git libssl-dev script: - ./reconf-all - GAMBAS_CONFIG_FAILURE=1 ./configure -C From 78bd93d4657f1b37692754a34b12dd014cc0eee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Wed, 10 Jul 2019 02:36:24 +0000 Subject: [PATCH 2/5] Fix debian-oldstable again --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b22c3fc4..13f0aadc5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ build:debian-oldstable: image: debian:oldstable before_script: - > - apt-get update && apt-get install -y build-essential g++ automake autoconf libbz2-dev libfbclient2 default-libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-9.6 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libldap2-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev libxslt1-dev libbonobo2-dev libcos4-dev libomniorb4-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev libpoppler-private-dev libasound2-dev libesd0-dev libdirectfb-dev libaa1-dev libxtst-dev libffi-dev kdelibs5-dev firebird-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgnome-keyring-dev libgdk-pixbuf2.0-dev linux-libc-dev libgsl0-dev libncurses5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgmime-2.6-dev libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev llvm-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git libssl-dev + apt-get update && apt-get install -y build-essential g++ automake autoconf libbz2-dev libfbclient2 default-libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-9.6 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libldap2-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev libxslt1-dev libbonobo2-dev libcos4-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev libpoppler-private-dev libasound2-dev libesd0-dev libdirectfb-dev libaa1-dev libxtst-dev libffi-dev kdelibs5-dev firebird-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgnome-keyring-dev libgdk-pixbuf2.0-dev linux-libc-dev libgsl0-dev libncurses5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgmime-2.6-dev libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev llvm-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git libssl-dev script: - ./reconf-all - GAMBAS_CONFIG_FAILURE=1 ./configure -C From cb1159377de7e135f687f549318b6de01551d904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Wed, 10 Jul 2019 02:41:44 +0000 Subject: [PATCH 3/5] Fix debian-oldstable by moving debian-stable to debian-oldstable --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13f0aadc5..184e5f95e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ build:debian-oldstable: image: debian:oldstable before_script: - > - apt-get update && apt-get install -y build-essential g++ automake autoconf libbz2-dev libfbclient2 default-libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-9.6 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libldap2-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev libxslt1-dev libbonobo2-dev libcos4-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev libpoppler-private-dev libasound2-dev libesd0-dev libdirectfb-dev libaa1-dev libxtst-dev libffi-dev kdelibs5-dev firebird-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgnome-keyring-dev libgdk-pixbuf2.0-dev linux-libc-dev libgsl0-dev libncurses5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgmime-2.6-dev libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev llvm-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git libssl-dev + apt-get update && apt-get install -y build-essential g++ automake autoconf libbz2-dev default-libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-9.6 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev libpoppler-private-dev libasound2-dev libesd0-dev libdirectfb-dev libxtst-dev libffi-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgnome-keyring-dev libgdk-pixbuf2.0-dev linux-libc-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgsl-dev libncurses5-dev libgmime-2.6-dev libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev sane-utils libdumb1-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git libssl-dev script: - ./reconf-all - GAMBAS_CONFIG_FAILURE=1 ./configure -C From 30a73a440fabfdb91dea7d645c8385e4d4e31be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Wed, 10 Jul 2019 02:45:10 +0000 Subject: [PATCH 4/5] Fix debian-stable by moving debian-testing to debian-stable. --- .gitlab-ci.yml | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 184e5f95e..783904835 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,22 @@ build:debian-oldstable: image: debian:oldstable before_script: - > - apt-get update && apt-get install -y build-essential g++ automake autoconf libbz2-dev default-libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-9.6 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev libpoppler-private-dev libasound2-dev libesd0-dev libdirectfb-dev libxtst-dev libffi-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgnome-keyring-dev libgdk-pixbuf2.0-dev linux-libc-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgsl-dev libncurses5-dev libgmime-2.6-dev libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev sane-utils libdumb1-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git libssl-dev + apt-get update && apt-get install -y build-essential g++ automake + autoconf libbz2-dev default-libmysqlclient-dev unixodbc-dev libpq-dev + postgresql-server-dev-9.6 libsqlite0-dev libsqlite3-dev libglib2.0-dev + libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev + libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev + libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev + libpoppler-private-dev libasound2-dev libesd0-dev libdirectfb-dev + libxtst-dev libffi-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev + libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev + libgnome-keyring-dev libgdk-pixbuf2.0-dev linux-libc-dev + libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev + libgsl-dev libncurses5-dev libgmime-2.6-dev libalure-dev libgmp-dev + libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev + libsdl2-image-dev sane-utils libdumb1-dev libqt5opengl5-dev + libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git + libssl-dev script: - ./reconf-all - GAMBAS_CONFIG_FAILURE=1 ./configure -C @@ -53,7 +68,21 @@ build:debian-stable: image: debian:stable before_script: - > - apt-get update && apt-get install -y build-essential g++ automake autoconf libbz2-dev default-libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-9.6 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev libpoppler-private-dev libasound2-dev libesd0-dev libdirectfb-dev libxtst-dev libffi-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgnome-keyring-dev libgdk-pixbuf2.0-dev linux-libc-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgsl-dev libncurses5-dev libgmime-2.6-dev libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev sane-utils libdumb1-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git libssl-dev + apt-get update && apt-get install -y build-essential g++ automake + autoconf libbz2-dev default-libmysqlclient-dev unixodbc-dev libpq-dev + postgresql-server-dev-11 libsqlite0-dev libsqlite3-dev libglib2.0-dev + libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev + libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev + libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev + libpoppler-private-dev libasound2-dev libdirectfb-dev libxtst-dev + libffi-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev + libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgdk-pixbuf2.0-dev + linux-libc-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev + libcairo2-dev libgsl-dev libncurses5-dev libgmime-2.6-dev libalure-dev + libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev + libsdl2-image-dev sane-utils libdumb1-dev libqt5opengl5-dev + libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git + libssl-dev script: - ./reconf-all - GAMBAS_CONFIG_FAILURE=1 ./configure -C @@ -64,7 +93,21 @@ build:debian-testing: image: debian:testing before_script: - > - apt-get update && apt-get install -y build-essential g++ automake autoconf libbz2-dev default-libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-11 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev libpoppler-private-dev libasound2-dev libdirectfb-dev libxtst-dev libffi-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgdk-pixbuf2.0-dev linux-libc-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgsl-dev libncurses5-dev libgmime-2.6-dev libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev sane-utils libdumb1-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git libssl-dev + apt-get update && apt-get install -y build-essential g++ automake + autoconf libbz2-dev default-libmysqlclient-dev unixodbc-dev libpq-dev + postgresql-server-dev-11 libsqlite0-dev libsqlite3-dev libglib2.0-dev + libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev + libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev + libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev + libpoppler-private-dev libasound2-dev libdirectfb-dev libxtst-dev + libffi-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev + libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgdk-pixbuf2.0-dev + linux-libc-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev + libcairo2-dev libgsl-dev libncurses5-dev libgmime-2.6-dev libalure-dev + libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev + libsdl2-image-dev sane-utils libdumb1-dev libqt5opengl5-dev + libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git + libssl-dev script: - ./reconf-all - GAMBAS_CONFIG_FAILURE=1 ./configure -C --disable-keyring From 4362ebbbbfb287c11a605b109687c479a09b643e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Wed, 10 Jul 2019 02:59:32 +0000 Subject: [PATCH 5/5] No more 'gb.desktop.keyring' in debian-stable. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 783904835..662dde829 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,7 +85,7 @@ build:debian-stable: libssl-dev script: - ./reconf-all - - GAMBAS_CONFIG_FAILURE=1 ./configure -C + - GAMBAS_CONFIG_FAILURE=1 ./configure -C --disable-keyring - make -j$(nproc) - make install