From 2628d848fed0d126b10465f3d4be17a6ceabe15b Mon Sep 17 00:00:00 2001
From: Kez Cleal <42997789+kcleal@users.noreply.github.com>
Date: Fri, 24 Jan 2025 08:35:37 +0000
Subject: [PATCH] Update GW to v1.1.2 (#53435)

* Gw v1.1.2

* Gw v1.1.2

* Gw v1.1.2

* Gw v1.1.2

* Gw v1.1.2
---
 recipes/gw/build.sh                | 13 ++++---------
 recipes/gw/conda_build_config.yaml | 12 ------------
 recipes/gw/fix-context.patch       |  9 ---------
 recipes/gw/fix-linker-issues.patch |  5 -----
 recipes/gw/meta.yaml               | 11 ++++-------
 5 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 recipes/gw/conda_build_config.yaml
 delete mode 100644 recipes/gw/fix-context.patch
 delete mode 100644 recipes/gw/fix-linker-issues.patch

diff --git a/recipes/gw/build.sh b/recipes/gw/build.sh
index 04532b916b152..75577581cffa3 100644
--- a/recipes/gw/build.sh
+++ b/recipes/gw/build.sh
@@ -2,15 +2,8 @@
 set -e
 
 # Get pre-compiled skia from jetbrains
-USE_GL=1 make prep 2> /dev/null
+OLD_SKIA=1 make prep 2> /dev/null
 
-if [[ "$OSTYPE" != "darwin"* ]]; then
-  sed -i.bak 's/-lEGL -lGLESv2/-lEGL -lGLESv2 -lGL -lGLX/' Makefile
-  sed -i.bak 's/GLFW_EGL_CONTEXT_API/GLFW_NATIVE_CONTEXT_API/' src/plot_manager.cpp
-  # Let conda set these
-  sed -i.bak 's/-mmacosx-version-min=10.15//g' Makefile
-  sed -i.bak 's/-mmacosx-version-min=11//g' Makefile
-fi
 
 # Set flags conditionally based on the OS type
 if [[ "$OSTYPE" != "darwin"* ]]; then
@@ -18,6 +11,8 @@ if [[ "$OSTYPE" != "darwin"* ]]; then
   CPPFLAGS="${CPPFLAGS} -I${BUILD_PREFIX}/${HOST}/sysroot/usr/include ${SYSROOT_FLAGS}"
   LDFLAGS="${LDFLAGS} -L${PREFIX}/lib -L${BUILD_PREFIX}/${HOST}/sysroot/usr/lib -L${BUILD_PREFIX}/${HOST}/sysroot/usr/lib64 ${SYSROOT_FLAGS}"
 else
+  sed -i.bak 's| -Wl,-rpath-link,\$(CONDA_PREFIX)\/lib||' Makefile
+
   # No sysroot settings for macOS
   SYSROOT_FLAGS=""
   CPPFLAGS="${CPPFLAGS}"
@@ -28,7 +23,7 @@ CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" \
 CPPFLAGS="${CPPFLAGS}" \
 LDFLAGS="${LDFLAGS}" \
 prefix="${PREFIX}" \
-make -j ${CPU_COUNT}
+OLD_SKIA=1 make -j ${CPU_COUNT}
 
 mkdir -p $PREFIX/bin
 cp gw $PREFIX/bin/gw
diff --git a/recipes/gw/conda_build_config.yaml b/recipes/gw/conda_build_config.yaml
deleted file mode 100644
index 1fa9eba4fd39a..0000000000000
--- a/recipes/gw/conda_build_config.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-#MACOSX_DEPLOYMENT_TARGET:  # [osx and x86_64]
-#  - "10.15"                # [osx and x86_64]
-
-#MACOSX_SDK_VERSION:        # [osx and x86_64]
-#  - "10.15"                # [osx and x86_64]
-
-#CFLAGS:
-#  - "-mmacosx-version-min=10.15"  # [osx and x86_64]
-#CXXFLAGS:
-#  - "-mmacosx-version-min=10.15"  # [osx and x86_64]
-#LDFLAGS:
-#  - "-mmacosx-version-min=10.15"  # [osx and x86_64]
diff --git a/recipes/gw/fix-context.patch b/recipes/gw/fix-context.patch
deleted file mode 100644
index 6a5aa5d6a9e0c..0000000000000
--- a/recipes/gw/fix-context.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/plot_manager.cpp
-+++ b/src/plot_manager.cpp
-@@ -252,1 +252,1 @@
--        glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, (minor_v == -1) ? 1 : major_v);
-+        glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, (minor_v == -1) ? 1 : minor_v);
-
-@@ -258,1 +258,1 @@
--        glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, (minor_v == -1) ? 1 : major_v);
-+        glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, (minor_v == -1) ? 1 : minor_v);
diff --git a/recipes/gw/fix-linker-issues.patch b/recipes/gw/fix-linker-issues.patch
deleted file mode 100644
index 27ab2e2f7e8ca..0000000000000
--- a/recipes/gw/fix-linker-issues.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -132,1 +132,1 @@
--	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LDFLAGS) $(LDLIBS) -o $@
-+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LDFLAGS) $(LDLIBS) -Wl,-rpath,$(PREFIX)/lib -Wl,-rpath-link,$(PREFIX)/lib -o $@
diff --git a/recipes/gw/meta.yaml b/recipes/gw/meta.yaml
index efe2b65beb815..20968875040ce 100644
--- a/recipes/gw/meta.yaml
+++ b/recipes/gw/meta.yaml
@@ -1,5 +1,5 @@
-{% set version = "1.1.1" %}
-{% set sha256 = "5ac0430d9179d1a48938f24011c329fe807e72aba0c20eb191c566d129115f86" %}
+{% set version = "1.1.2" %}
+{% set sha256 = "c01a3ea537342ebfc8ff7e2a5fb04507693e71ba3184ffa4ff1c4bc6d7aba613" %}
 
 package:
   name: gw
@@ -8,12 +8,9 @@ package:
 source:
   url: https://github.com/kcleal/gw/archive/refs/tags/v{{ version }}.tar.gz
   sha256: {{ sha256 }}
-  patches:
-    - fix-linker-issues.patch  # [linux]
-    - fix-context.patch
 
 build:
-  number: 1
+  number: 0
   run_exports:
     - {{ pin_subpackage('gw', max_pin="x") }}
   ignore_run_exports:
@@ -31,7 +28,7 @@ build:
     - zlib            # [osx]
     - libuuid
     - libdeflate
-  skip: true  # [osx and x86_64]
+  # skip: true  # [osx and x86_64]
 
 requirements:
   build: