[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 92d2f32d 3/5: Extend CI TIFF hack to deal wit
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 92d2f32d 3/5: Extend CI TIFF hack to deal with libdeflate dependency |
Date: |
Mon, 13 Jun 2022 09:57:24 -0400 (EDT) |
branch: master
commit 92d2f32d2dc648872102f333ebe752c9503055e9
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Extend CI TIFF hack to deal with libdeflate dependency
This is temporary and simply cherry picks the wx commit which ensures
that libtiff built as part of wx build doesn't pick up libdeflate as a
dependency.
---
.github/workflows/ci.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f87c4bd4..b2d28e2c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -214,7 +214,10 @@ jobs:
- name: Fix up TIFF submodule
run: |
- cd third_party/wx/src/tiff
+ cd third_party/wx
+ git fetch https://github.com/let-me-illustrate/wx.git master
+ git cherry-pick -n 3be68008319160e6f08153afdeffe6461250cd91
+ cd src/tiff
git fetch origin
git switch --detach af035310bddac3e2f58ae0a330bc6ef168e180f1