From 99bfb6178d7114b2944465b0641f17b5c0ca84ac Mon Sep 17 00:00:00 2001
From: kcleal <clealk@cardiff.ac.uk>
Date: Thu, 23 Jan 2025 14:20:21 +0000
Subject: [PATCH 1/5] Gw v1.1.2

---
 recipes/gw/build.sh                |  6 +++---
 recipes/gw/conda_build_config.yaml | 12 ------------
 recipes/gw/fix-context.patch       |  9 ---------
 recipes/gw/fix-linker-issues.patch |  5 -----
 recipes/gw/meta.yaml               |  9 +++------
 5 files changed, 6 insertions(+), 35 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..92fd77673423e 100644
--- a/recipes/gw/build.sh
+++ b/recipes/gw/build.sh
@@ -2,11 +2,11 @@
 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
+  # 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
@@ -28,7 +28,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..c988b91c3c939 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,9 +8,6 @@ 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
@@ -31,7 +28,7 @@ build:
     - zlib            # [osx]
     - libuuid
     - libdeflate
-  skip: true  # [osx and x86_64]
+  # skip: true  # [osx and x86_64]
 
 requirements:
   build:

From 1cfcec6c725a19f0ad80143853d9d5401b674dc6 Mon Sep 17 00:00:00 2001
From: kcleal <clealk@cardiff.ac.uk>
Date: Thu, 23 Jan 2025 14:29:54 +0000
Subject: [PATCH 2/5] Gw v1.1.2

---
 recipes/gw/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/gw/meta.yaml b/recipes/gw/meta.yaml
index c988b91c3c939..20968875040ce 100644
--- a/recipes/gw/meta.yaml
+++ b/recipes/gw/meta.yaml
@@ -10,7 +10,7 @@ source:
   sha256: {{ sha256 }}
 
 build:
-  number: 1
+  number: 0
   run_exports:
     - {{ pin_subpackage('gw', max_pin="x") }}
   ignore_run_exports:

From 0feef5225ac03a011349838c4a02a3eb7f7b9bdc Mon Sep 17 00:00:00 2001
From: kcleal <clealk@cardiff.ac.uk>
Date: Thu, 23 Jan 2025 15:13:40 +0000
Subject: [PATCH 3/5] Gw v1.1.2

---
 recipes/gw/build.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/recipes/gw/build.sh b/recipes/gw/build.sh
index 92fd77673423e..b7630e83ac953 100644
--- a/recipes/gw/build.sh
+++ b/recipes/gw/build.sh
@@ -10,6 +10,10 @@ if [[ "$OSTYPE" != "darwin"* ]]; then
   # 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
+
+  # path-link is not available for macOS
+  sed 's| -Wl,-rpath-link,\$(CONDA_PREFIX)\/lib||' yourfile.mk
+
 fi
 
 # Set flags conditionally based on the OS type

From 9aedd9044356384d15e5b267e3f2dc44e6f7752b Mon Sep 17 00:00:00 2001
From: kcleal <clealk@cardiff.ac.uk>
Date: Thu, 23 Jan 2025 15:32:20 +0000
Subject: [PATCH 4/5] Gw v1.1.2

---
 recipes/gw/build.sh | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/recipes/gw/build.sh b/recipes/gw/build.sh
index b7630e83ac953..0b17a46299290 100644
--- a/recipes/gw/build.sh
+++ b/recipes/gw/build.sh
@@ -4,17 +4,6 @@ set -e
 # Get pre-compiled skia from jetbrains
 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
-
-  # path-link is not available for macOS
-  sed 's| -Wl,-rpath-link,\$(CONDA_PREFIX)\/lib||' yourfile.mk
-
-fi
 
 # Set flags conditionally based on the OS type
 if [[ "$OSTYPE" != "darwin"* ]]; then
@@ -22,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 's| -Wl,-rpath-link,\$(CONDA_PREFIX)\/lib||' Makefile
+
   # No sysroot settings for macOS
   SYSROOT_FLAGS=""
   CPPFLAGS="${CPPFLAGS}"

From d4d88e5b635b70027c0aa948be9f7a48d02cb4c1 Mon Sep 17 00:00:00 2001
From: kcleal <clealk@cardiff.ac.uk>
Date: Thu, 23 Jan 2025 15:42:46 +0000
Subject: [PATCH 5/5] Gw v1.1.2

---
 recipes/gw/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/gw/build.sh b/recipes/gw/build.sh
index 0b17a46299290..75577581cffa3 100644
--- a/recipes/gw/build.sh
+++ b/recipes/gw/build.sh
@@ -11,7 +11,7 @@ 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 's| -Wl,-rpath-link,\$(CONDA_PREFIX)\/lib||' Makefile
+  sed -i.bak 's| -Wl,-rpath-link,\$(CONDA_PREFIX)\/lib||' Makefile
 
   # No sysroot settings for macOS
   SYSROOT_FLAGS=""