From 8336147bdf4671f70119f00c89af55ad36247717 Mon Sep 17 00:00:00 2001 From: Jehan Date: Wed, 3 Mar 2021 13:21:51 +0100 Subject: [PATCH] Revert "gitlab-ci: testing gtk!1563 for Windows Ink support." This reverts commit 32434d9fc3fa53ae5ce6422d53967c5ec3d4f8fc. Argh sorry. I was planning on making a branch for this (not directly on master!) and also the patch should obviously have been applied on a GTK tree, not GIMP's. I'm probably tired! Reverting. --- .gitlab-ci.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64b3688ddd..061aa25e1f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,12 +223,6 @@ gimp-win64: - apt-cache script: - export PATH="`pwd`/.local/bin:$PATH" - - - apt-get update - - apt-get install -y --no-install-recommends wget - - wget https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1563.patch - - git apply 1563.patch - - mkdir _build && cd _build - echo 'crossroad meson .. -Dgtk-doc=false && ninja install && @@ -288,12 +282,6 @@ gimp-win32: - apt-cache script: - export PATH="`pwd`/.local/bin:$PATH" - - - apt-get update - - apt-get install -y --no-install-recommends wget - - wget https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1563.patch - - git apply 1563.patch - - mkdir _build && cd _build - echo 'crossroad meson .. -Dwmf=disabled -Dmng=disabled -Dgtk-doc=false && ninja install &&