Control: tags 1074811 + patch
Control: tags 1074811 + pending

Dear maintainer,

I've prepared an NMU for android-platform-tools (versioned as 34.0.4-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Thank you,
tony
diff -Nru android-platform-tools-34.0.4/debian/changelog android-platform-tools-34.0.4/debian/changelog
--- android-platform-tools-34.0.4/debian/changelog	2023-08-21 00:22:39.000000000 -0700
+++ android-platform-tools-34.0.4/debian/changelog	2024-08-15 21:12:28.000000000 -0700
@@ -1,3 +1,10 @@
+android-platform-tools (34.0.4-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch to build against GCC-14 (Closes: #1074811)
+
+ -- tony mancill <tmanc...@debian.org>  Thu, 15 Aug 2024 21:12:28 -0700
+
 android-platform-tools (34.0.4-1) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru android-platform-tools-34.0.4/debian/patches/20-gcc-14.patch android-platform-tools-34.0.4/debian/patches/20-gcc-14.patch
--- android-platform-tools-34.0.4/debian/patches/20-gcc-14.patch	1969-12-31 16:00:00.000000000 -0800
+++ android-platform-tools-34.0.4/debian/patches/20-gcc-14.patch	2024-08-15 21:12:28.000000000 -0700
@@ -0,0 +1,34 @@
+Description: Address FTBFS with GCC-14
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074811
+Author: tony mancill <tmanc...@debian.org>
+
+--- a/packages/modules/adb/client/incremental_utils.cpp
++++ b/packages/modules/adb/client/incremental_utils.cpp
+@@ -24,6 +24,7 @@
+ #include <ziparchive/zip_archive.h>
+ #include <ziparchive/zip_writer.h>
+ 
++#include <algorithm>
+ #include <array>
+ #include <cinttypes>
+ #include <numeric>
+--- a/system/core/fs_mgr/liblp/super_layout_builder.cpp
++++ b/system/core/fs_mgr/liblp/super_layout_builder.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include <liblp/liblp.h>
+ 
++#include <algorithm>
+ #include "images.h"
+ #include "utility.h"
+ #include "writer.h"
+--- a/system/core/fs_mgr/liblp/utility.cpp
++++ b/system/core/fs_mgr/liblp/utility.cpp
+@@ -25,6 +25,7 @@
+ #include <sys/ioctl.h>
+ #endif
+ 
++#include <algorithm>
+ #include <map>
+ #include <string>
+ #include <vector>
diff -Nru android-platform-tools-34.0.4/debian/patches/series android-platform-tools-34.0.4/debian/patches/series
--- android-platform-tools-34.0.4/debian/patches/series	2023-08-21 00:22:39.000000000 -0700
+++ android-platform-tools-34.0.4/debian/patches/series	2024-08-15 20:38:10.000000000 -0700
@@ -17,3 +17,4 @@
 system/Implement-const_iterator-operator.patch
 system/Update_casting_type.patch
 development/typos.patch
+20-gcc-14.patch

Reply via email to