Switch back to w2dynamics upstream repository

.github/workflows/build.yml

@@ -61,6 +61,12 @@ jobs:
         python3-sphinx
         python3-nbsphinx
 
+    - name: Set up Python
+      if: matrix.os == 'macos-12'
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11' # 3.12 removed distutils
+
     - name: Install homebrew dependencies
       if: matrix.os == 'macos-12'
       run: |
@@ -77,11 +83,6 @@ jobs:
       run:
         echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
 
-    - name: add clang cxxflags
-      if: ${{ contains(matrix.cxx, 'clang') }}
-      run:
-        echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
-
     - name: Build & Install TRIQS
       env:
         CC: ${{ matrix.cc }}

CMakeLists.txt

@@ -67,7 +67,7 @@ message(STATUS "-------- BUILD-TYPE: ${CMAKE_BUILD_TYPE} --------")
 
 
 # --- Define the w2dynamics interface version numbers and get the git hash
-set(W2DYN_GIT_HASH b5a2bcc9ecdb694703a4e683b63352bedf116882)
+set(W2DYN_GIT_HASH 5d0d8b28b567d0590071f24e784d048f6d35865a)
 message(STATUS "w2dynamics git hash: ${W2DYN_GIT_HASH}")
 
 # --- Build w2dynamics as an external project
@@ -76,8 +76,7 @@ get_property(FFTW_LIBRARIES TARGET triqs::fftw PROPERTY INTERFACE_LINK_LIBRARIES
 include(ExternalProject)
 ExternalProject_Add(w2dynamics
   PREFIX w2dyn_project
-  #GIT_REPOSITORY https://github.com/w2dynamics/w2dynamics
-  GIT_REPOSITORY https://github.com/the-hampel/w2dynamics
+  GIT_REPOSITORY https://github.com/w2dynamics/w2dynamics
   GIT_TAG ${W2DYN_GIT_HASH}
   GIT_CONFIG advice.detachedHead=false
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
@@ -86,7 +85,6 @@ ExternalProject_Add(w2dynamics
              -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
              -DFFTW_LIBRARIES=${FFTW_LIBRARIES}
   INSTALL_COMMAND ""
-  PATCH_COMMAND ${TRIQS_GIT_EXECUTABLE} checkout . && ${TRIQS_GIT_EXECUTABLE} apply ${PROJECT_SOURCE_DIR}/w2dynamics.patch
 )
 
 set(W2DYN_ROOT ${PROJECT_BINARY_DIR}/w2dyn_project/src/w2dynamics)