Merge pull request #29 from arduino/update-for-7.2

Update for 7.2
arduino · Oct 5, 2023 · fc8f1a8 · fc8f1a8
2 parents 5f3032e + 96f12a2
commit fc8f1a8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 56 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -65,7 +65,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         repository: avrdudes/avrdude
-        ref: ${{ steps.get_tag_name.outputs.AVRDUDE_TAG }} # pay attention, the pathches could not apply to newer version than 7.0
+        ref: ${{ steps.get_tag_name.outputs.AVRDUDE_TAG }} # pay attention, the pathches could need updating
         path: ${{ env.PROJECT_NAME }}
 
     - name: Set the version

diff --git a/patches/0006-Cmake-add-libtinfo-and-libncurses-as-dependencies.patch b/patches/0006-Cmake-add-libtinfo-and-libncurses-as-dependencies.patch
diff --git a/patches/0007-Cmake-fix-build-not-working-with-mingw-toolchain.patch b/patches/0007-Cmake-fix-build-not-working-with-mingw-toolchain.patch
@@ -1,5 +1,5 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ca6cb64..2ccf4af 100644
+index c10a77eb..b7769c5b 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -50,7 +50,7 @@ endif()
@@ -9,9 +9,9 @@ index ca6cb64..2ccf4af 100644
 -if(WIN32)
 +if(WIN32 OR MINGW)
      set(EXTRA_WINDOWS_RESOURCES "${PROJECT_BINARY_DIR}/src/windows.rc")
-     set(EXTRA_WINDOWS_LIBRARIES setupapi ws2_32)
+     set(EXTRA_WINDOWS_LIBRARIES setupapi hid ws2_32)
  endif()
-@@ -108,7 +108,7 @@ endif()
+@@ -112,7 +112,7 @@ endif()
 
  configure_file(cmake_config.h.in ac_cfg.h)
  configure_file(avrdude.spec.in avrdude.spec)

diff --git a/patches/0008-Append-arduino-to-version-string.patch b/patches/0008-Append-arduino-to-version-string.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 95c89d2..4b8c739 100644
+index 9ab5a832..c3b5d8a8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -42,7 +42,7 @@ include(FindPackageMessage)
+@@ -49,7 +49,7 @@ include(FindPackageMessage)
  include(GNUInstallDirs)
 
  set(CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
@@ -11,15 +11,24 @@ index 95c89d2..4b8c739 100644
 
  # =====================================
  # Get Git commit info
+@@ -91,7 +91,7 @@ if(Git_FOUND)
+
+     # If the commit is not tagged, include the date and commit hash in the full version string.
+     if(NOT GIT_COMMIT_HASH STREQUAL GIT_TAG_HASH)
+-        set(AVRDUDE_FULL_VERSION "${CMAKE_PROJECT_VERSION}-${GIT_COMMIT_DATE} (${GIT_COMMIT_HASH})")
++        set(AVRDUDE_FULL_VERSION "ARDUINO_VERSION_PLACEHOLDER-${GIT_COMMIT_DATE} (${GIT_COMMIT_HASH})")
+     endif()
+ endif()
+
 diff --git a/src/configure.ac b/src/configure.ac
-index ae60e3f..32fb196 100644
+index 4b8425f0..2282ed74 100644
 --- a/src/configure.ac
 +++ b/src/configure.ac
 @@ -23,7 +23,7 @@
  # Process this file with autoconf to produce a configure script.
 
  AC_PREREQ(2.60)
--AC_INIT(avrdude, 7.1, avrdude-dev@nongnu.org)
+-AC_INIT(avrdude, 7.2, avrdude-dev@nongnu.org)
 +AC_INIT(avrdude, ARDUINO_VERSION_PLACEHOLDER, avrdude-dev@nongnu.org)
 
  AC_CANONICAL_BUILD