From fbb2d72e1d121d7f8dd0e28097281a615842a5b9 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 25 Nov 2024 17:56:19 +0100
Subject: [PATCH 1/2] Also install osm2pgsql-gen on make install

---
 CMakeLists.txt     | 3 +--
 README.md          | 6 ------
 man/CMakeLists.txt | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f0f18303..607294739 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -330,7 +330,6 @@ if (ENABLE_INSTALL)
     install(FILES default.style empty.style DESTINATION share/osm2pgsql)
     install(PROGRAMS scripts/osm2pgsql-replication DESTINATION bin)
     if (BUILD_GEN)
-        install(TARGETS osm2pgsql-gen COMPONENT gen EXCLUDE_FROM_ALL DESTINATION bin)
-        add_custom_target(install-gen cmake --install ${CMAKE_BINARY_DIR} --component gen)
+        install(TARGETS osm2pgsql-gen DESTINATION bin)
     endif()
 endif()
diff --git a/README.md b/README.md
index 003c44ede..c6565e0a8 100644
--- a/README.md
+++ b/README.md
@@ -150,12 +150,6 @@ The compiled files can be installed with
 sudo make install
 ```
 
-To install the experimental `osm2pgsql-gen` binary use
-
-```sh
-sudo make install-gen
-```
-
 By default, the Release build with debug info is created and no tests are
 compiled. You can change that behavior by using additional options like
 following:
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index f22ed68c5..94171469d 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -65,6 +65,6 @@ if(ENABLE_INSTALL)
     install(FILES osm2pgsql.1 DESTINATION share/man/man1)
     install(FILES osm2pgsql-replication.1 DESTINATION share/man/man1)
     if (BUILD_GEN)
-        install(FILES osm2pgsql-gen.1 COMPONENT gen EXCLUDE_FROM_ALL DESTINATION share/man/man1)
+        install(FILES osm2pgsql-gen.1 DESTINATION share/man/man1)
     endif()
 endif()

From 08e4669915a190feda4629b2c0797ad2106c7623 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 25 Nov 2024 20:49:58 +0100
Subject: [PATCH 2/2] Github action: Disable macOS build because it is broken
 again

The macOS build breaks all the time for unknown reasons that have
nothing to do with the code but with the build environment.
---
 .github/workflows/ci.yml | 44 ----------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cdd783c1..de6b88281 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,50 +3,6 @@ name: CI
 on: [ push, pull_request ]
 
 jobs:
-  macos:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - "macos-13"
-          - "macos-14" # latest
-    runs-on: ${{ matrix.os }}
-
-    env:
-      LUA_VERSION: 5.4
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install prerequisites
-        run: |
-          # Workaround for github/brew problem. Python is already install
-          # on the Github action runner and then homebrew comes along...
-          # See also: https://github.com/Homebrew/homebrew-core/issues/173191
-          rm -f /usr/local/bin/2to3* /usr/local/bin/idle3* /usr/local/bin/pydoc3* /usr/local/bin/python3*
-          brew install boost lua nlohmann-json opencv pandoc postgis potrace python3
-          # --break-system-packages is needed on macOS 14
-          pip3 install --break-system-packages psycopg2 behave osmium
-          mkdir ~/postgres
-          pg_ctl -D ~/postgres init
-          pg_ctl -D ~/postgres start
-        shell: bash
-
-      - name: Setup database
-        run: |
-          psql -d postgres -c 'CREATE EXTENSION postgis'
-          psql -d postgres -c 'CREATE EXTENSION hstore'
-          psql -d postgres -c 'SELECT PostGIS_Full_Version()'
-          mkdir -m 700 $GITHUB_WORKSPACE/tablespacetest
-          psql -d postgres -c "CREATE TABLESPACE tablespacetest LOCATION '$GITHUB_WORKSPACE/tablespacetest'"
-        shell: bash
-
-      - uses: ./.github/actions/linux-cmake
-      - uses: ./.github/actions/build-and-test
-        with:
-          test-wrapper: ''
-        env:
-          PGHOST: /tmp
 
   ubuntu20-pg96-gcc10-jit:
     runs-on: ubuntu-20.04