From 98a775e0591ed26ecc8aeeafde17f0133660b649 Mon Sep 17 00:00:00 2001 From: Umberto Baldi Date: Tue, 8 Oct 2024 16:57:46 +0200 Subject: [PATCH 1/3] remove old patch, should not be required anymore --- ...ild-not-working-with-mingw-toolchain.patch | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 patches/0007-Cmake-fix-build-not-working-with-mingw-toolchain.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 deleted file mode 100644 index 7b6cba2..0000000 --- a/patches/0007-Cmake-fix-build-not-working-with-mingw-toolchain.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c10a77eb..b7769c5b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -50,7 +50,7 @@ endif() - include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - add_compile_definitions(CONFIG_DIR=\"${CONFIG_DIR}\") - --if(WIN32) -+if(WIN32 OR MINGW) - set(EXTRA_WINDOWS_RESOURCES "${PROJECT_BINARY_DIR}/src/windows.rc") - set(EXTRA_WINDOWS_LIBRARIES setupapi hid ws2_32) - endif() -@@ -112,7 +112,7 @@ endif() - - configure_file(cmake_config.h.in ac_cfg.h) - configure_file(avrdude.spec.in avrdude.spec) --if(WIN32) -+if(WIN32 OR MINGW) - configure_file(windows.rc.in windows.rc) - endif() - From be5b442d3a90592a3325f7a9e6a2d6ff223179ee Mon Sep 17 00:00:00 2001 From: Umberto Baldi Date: Tue, 8 Oct 2024 17:14:32 +0200 Subject: [PATCH 2/3] update patch --- ...008-Append-arduino-to-version-string.patch | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/patches/0008-Append-arduino-to-version-string.patch b/patches/0008-Append-arduino-to-version-string.patch index dd16544..26a8f50 100644 --- a/patches/0008-Append-arduino-to-version-string.patch +++ b/patches/0008-Append-arduino-to-version-string.patch @@ -1,7 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ab5a832..c3b5d8a8 100644 +index 431eda87..ff8d678f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ + # cmake --build build + + cmake_minimum_required(VERSION 3.14) +-project(avrdude VERSION 7.3 LANGUAGES C) ++project(avrdude VERSION ARDUINO_VERSION_PLACEHOLDER LANGUAGES C) + + set(CMAKE_C_STANDARD 11) + set(CMAKE_C_STANDARD_REQUIRED True) @@ -49,7 +49,7 @@ include(FindPackageMessage) include(GNUInstallDirs) @@ -20,16 +29,3 @@ index 9ab5a832..c3b5d8a8 100644 endif() endif() -diff --git a/src/configure.ac b/src/configure.ac -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.2, avrdude-dev@nongnu.org) -+AC_INIT(avrdude, ARDUINO_VERSION_PLACEHOLDER, avrdude-dev@nongnu.org) - - AC_CANONICAL_BUILD - AC_CANONICAL_HOST From f5532cb9a68e58b300b09e223df7593af2e8570d Mon Sep 17 00:00:00 2001 From: Umberto Baldi Date: Wed, 9 Oct 2024 10:57:40 +0200 Subject: [PATCH 3/3] fix patch see https://github.com/arduino/avrdude-packing/issues/31#issuecomment-2400441999 --- patches/0008-Append-arduino-to-version-string.patch | 9 --------- 1 file changed, 9 deletions(-) diff --git a/patches/0008-Append-arduino-to-version-string.patch b/patches/0008-Append-arduino-to-version-string.patch index 26a8f50..78d5b11 100644 --- a/patches/0008-Append-arduino-to-version-string.patch +++ b/patches/0008-Append-arduino-to-version-string.patch @@ -2,15 +2,6 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 431eda87..ff8d678f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -21,7 +21,7 @@ - # cmake --build build - - cmake_minimum_required(VERSION 3.14) --project(avrdude VERSION 7.3 LANGUAGES C) -+project(avrdude VERSION ARDUINO_VERSION_PLACEHOLDER LANGUAGES C) - - set(CMAKE_C_STANDARD 11) - set(CMAKE_C_STANDARD_REQUIRED True) @@ -49,7 +49,7 @@ include(FindPackageMessage) include(GNUInstallDirs)