Add .gitignore and .gitea/workflows/ci.yml

.gitea/workflows/ci.yml

@@ -13,4 +13,5 @@ jobs:
         with:
           CI_DEPLOY: ${{ secrets.CI_DEPLOY }}
           PUBLICATOR: ${{ secrets.PUBLICATOR }}
+          REPO_DEPLOY: ${{ secrets.REPO_DEPLOY }}
 

android-tools.spec

@@ -4,7 +4,7 @@
 
 Summary:	Android platform tools (adb, fastboot, mkbootimg)
 Name:		android-tools
-Version:	34.0.5
+Version:	35.0.2
 Release:	1
 License:	Apache Software License and BSD
 Group:		Development/Tools
@@ -22,11 +22,13 @@ Patch0:		android-tools-31.0.0-system-golang-x-crypto.patch
 #Patch3:		android-tools-31.0.0-disable-Werror-with-gcc11.patch
 BuildRequires:	cmake
 BuildRequires:	go
-BuildRequires:  clang
+BuildRequires:  git-core
+#BuildRequires:  clang
 BuildRequires:  %{llvm_ver}
 BuildRequires:  e2fsprogs
 #BuildRequires:	golang-x-crypto-devel
 #BuildRequires:  kernel-devel
+BuildRequires:  python38-devel
 BuildRequires:	pkgconfig(bash-completion)
 BuildRequires:	pkgconfig(gtest)
 BuildRequires:	pkgconfig(libbrotlidec)
@@ -34,13 +36,14 @@ BuildRequires:	pkgconfig(libbrotlienc)
 BuildRequires:  pkgconfig(libbrotlicommon)
 BuildRequires:	pkgconfig(liblz4)
 BuildRequires:	pkgconfig(libpcre2-8)
-BuildRequires:	pkgconfig(libunwind-generic)
+BuildRequires:	pkgconfig(libunwind-generic) >= 1.3
 BuildRequires:	pkgconfig(libusb-1.0)
 BuildRequires:	pkgconfig(libzstd)
-#BuildRequires:	pkgconfig(openssl)
-BuildRequires:  openssl-devel
+BuildRequires:	pkgconfig(openssl3.3)
+#BuildRequires:  openssl-devel
 BuildRequires:	pkgconfig(protobuf)
 BuildRequires:	pkgconfig(zlib)
+BuildRequires:  pkgconfig(fmt) >= 9
 BuildRequires:  stdc++-gcc10-devel
 BuildRequires:  ninja
 Provides:	adb = %{EVRD}
@@ -102,9 +105,9 @@ For Rosa Fresh you must use the following commands:
 %prep
 %setup -q
 
-sed -i -e '1s/python$/python3/' vendor/mkbootimg/mkbootimg.py
+#sed -i -e '1s/python$/python3/' vendor/mkbootimg/mkbootimg.py
 
-sed -i '/CMAKE_CXX_STANDARD/s/20/17/' vendor/CMakeLists.txt
+#sed -i '/CMAKE_CXX_STANDARD/s/20/17/' vendor/CMakeLists.txt
 
 %build
 install -m0755 %{SOURCE4} $RPM_BUILD_DIR/%{name}-%{version}
@@ -113,23 +116,28 @@ chmod +x loffice-libc-wrapper.sh
 
 #clang_gcc_wrapper
 
-export CC=%{llvm_prefix}/bin/clang
-export CXX=%{llvm_prefix}/bin/clang++
-export AR=%{llvm_prefix}/bin/llvm-ar
-export NM=%{llvm_prefix}/bin/llvm-nm
+#export CC=%{llvm_prefix}/bin/clang
+#export CXX=%{llvm_prefix}/bin/clang++
+#export AR=%{llvm_prefix}/bin/llvm-ar
+#export NM=%{llvm_prefix}/bin/llvm-nm
 
-export READELF=readelf
+#export READELF=readelf
 
 #export CXX_STANDARD=17
 
 export LDFLAGS="-lstdc++-gcc10"
 
 
-echo $LDFLAGS
-echo $optflags
-echo $CFLAGS
-echo $CXXFLAGS
+#echo $LDFLAGS
+#echo $optflags
+#echo $CFLAGS
+#echo $CXXFLAGS
 
+/usr/libexec/python3.8 -m venv .
+. bin/activate
+
+export PKG_CONFIG_PATH=/opt/openssl3.3/lib/pkgconfig:${PKG_CONFIG_PATH}
+export LD_LIBRARY_PATH=/opt/openssl3.3/lib/:${LD_LIBRARY_PATH}
 
 #export CFLAGS="`echo %{optflags} | sed -e 's/-gdwarf-4//' -e 's/-fvar-tracking-assignments//' -e 's/-frecord-gcc-switches//' -e 's/-flto//g' -e 's/-std=gnu11//g'`"
 #export CXXFLAGS="$CFLAGS"
@@ -147,17 +155,21 @@ echo $CXXFLAGS
 #      -DCMAKE_INSTALL_LIBDIR="%{_lib}" \
 #      -DBUILD_SHARED_LIBS=ON \
 #      -DBUILD_STATIC_LIBS=OFF
+#  -DCMAKE_CXX_STANDARD="17" \
+# -G Ninja \
 
 %cmake	\
     -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=%{prefix} \
     -DCMAKE_INSTALL_LIBDIR=%{lib} \
-    -DCMAKE_BUILD_TYPE=None \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     -DBUILD_STATIC_LIBS:BOOL=OFF \
-    -DCMAKE_CXX_STANDARD="17" \
-    -DCMAKE_CXX_FLAGS="-std=c++1z -nostdinc++ -I/usr/include/libstdc++-gcc10 -I/usr/include/libstdc++-gcc10/%{_host} " \
-    -DCMAKE_C_FLAGS="-Werror=implicit-function-declaration -nostdinc++ -I/usr/include/libstdc++-gcc10 -I/usr/include/libstdc++-gcc10/%{_host}"
+    -DCMAKE_CXX_FLAGS="-I/usr/include/libstdc++-gcc10 -I/usr/include/libstdc++-gcc10/%{_host} " \
+    -DCMAKE_C_FLAGS="-I/usr/include/libstdc++-gcc10 -I/usr/include/libstdc++-gcc10/%{_host}" \
+    -DCMAKE_CXX_COMPILER:FILEPATH=%{llvm_prefix}/bin/clang++ \
+    -DCMAKE_C_COMPILER:FILEPATH=%{llvm_prefix}/bin/clang \
+    -DCMAKE_CXX_STANDARD="20"
 
 cmake --build .