Add patch to fix build with gcc 14

This commit is contained in:
Orion Poplawski 2024-02-27 19:54:45 -07:00
commit 5c41b4b107
2 changed files with 38 additions and 1 deletions

View file

@ -0,0 +1,34 @@
diff -up android-tools-34.0.4/vendor/adb/client/incremental_utils.cpp.include android-tools-34.0.4/vendor/adb/client/incremental_utils.cpp
--- android-tools-34.0.4/vendor/adb/client/incremental_utils.cpp.include 2023-09-03 07:06:16.000000000 -0600
+++ android-tools-34.0.4/vendor/adb/client/incremental_utils.cpp 2024-02-27 19:25:25.026823079 -0700
@@ -24,6 +24,7 @@
#include <ziparchive/zip_archive.h>
#include <ziparchive/zip_writer.h>
+#include <algorithm>
#include <array>
#include <cinttypes>
#include <numeric>
diff -up android-tools-34.0.4/vendor/core/fs_mgr/liblp/super_layout_builder.cpp.include android-tools-34.0.4/vendor/core/fs_mgr/liblp/super_layout_builder.cpp
--- android-tools-34.0.4/vendor/core/fs_mgr/liblp/super_layout_builder.cpp.include 2023-09-03 07:06:37.000000000 -0600
+++ android-tools-34.0.4/vendor/core/fs_mgr/liblp/super_layout_builder.cpp 2024-02-27 19:31:26.527846061 -0700
@@ -17,6 +17,8 @@
#include <liblp/liblp.h>
+#include <algorithm>
+
#include "images.h"
#include "utility.h"
#include "writer.h"
diff -up android-tools-34.0.4/vendor/core/fs_mgr/liblp/utility.cpp.include android-tools-34.0.4/vendor/core/fs_mgr/liblp/utility.cpp
--- android-tools-34.0.4/vendor/core/fs_mgr/liblp/utility.cpp.include 2023-09-03 07:06:37.000000000 -0600
+++ android-tools-34.0.4/vendor/core/fs_mgr/liblp/utility.cpp 2024-02-27 19:42:57.193703638 -0700
@@ -25,6 +25,7 @@
#include <sys/ioctl.h>
#endif
+#include <algorithm>
#include <map>
#include <string>
#include <vector>

View file

@ -14,6 +14,9 @@ URL: http://developer.android.com/guide/developing/tools/
Source0: https://github.com/nmeum/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
Source1: 51-android.rules
Source2: adb.service
# Fix includes
# https://github.com/nmeum/android-tools/commit/289759dfb6017c8f1ec1767d8922a7300c54ef05
Patch1: android-tools-include.patch
BuildRequires: brotli-devel
BuildRequires: cmake
@ -67,7 +70,7 @@ to read and write the flash partitions. It needs the same USB device
setup between the host and the target phone as adb.
%prep
%setup -q
%autosetup -p1
cp -p %{SOURCE1} 51-android.rules
%build