From 91997ff2bf05052d08bf9a1b809a2018152b37a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Thu, 7 Mar 2024 21:11:33 +0100 Subject: [PATCH] codeblocks: update to 20.03.r13485 --- .../005-aarch64-defines.patch | 35 ------------------- mingw-w64-codeblocks/PKGBUILD | 13 +++---- 2 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 mingw-w64-codeblocks/005-aarch64-defines.patch diff --git a/mingw-w64-codeblocks/005-aarch64-defines.patch b/mingw-w64-codeblocks/005-aarch64-defines.patch deleted file mode 100644 index 41a8efed82..0000000000 --- a/mingw-w64-codeblocks/005-aarch64-defines.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -bur codeblocks-orig/src/sdk/mozilla_chardet/include/nsprpub/pr/include/prcpucfg_winnt.h codeblocks/src/sdk/mozilla_chardet/include/nsprpub/pr/include/prcpucfg_winnt.h ---- codeblocks-orig/src/sdk/mozilla_chardet/include/nsprpub/pr/include/prcpucfg_winnt.h 2024-02-27 23:07:43.417208500 -0700 -+++ codeblocks/src/sdk/mozilla_chardet/include/nsprpub/pr/include/prcpucfg_winnt.h 2024-02-27 23:44:40.449217000 -0700 -@@ -68,7 +68,7 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 2 - --#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_) -+#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_) || defined (_M_ARM64) - - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN -diff -bur codeblocks-orig/src/src/resources/resources.rc codeblocks/src/src/resources/resources.rc ---- codeblocks-orig/src/src/resources/resources.rc 2024-02-27 23:07:42.212627600 -0700 -+++ codeblocks/src/src/resources/resources.rc 2024-02-27 23:23:51.900190100 -0700 -@@ -55,6 +55,10 @@ - #if !defined(WX_CPU_X86) - #define WX_CPU_X86 - #endif -+#elif defined (_M_ARM64) -+ #ifndef WX_CPU_ARM64 -+ #define WX_CPU_ARM64 -+ #endif - #endif - - /////////////////////////////////////////////////////////////////////////////// -@@ -126,7 +130,7 @@ - #define wxMANIFEST_ID CREATEPROCESS_MANIFEST_RESOURCE_ID - #endif - -- #if defined(WX_CPU_AMD64) -+ #if defined(WX_CPU_AMD64) || defined(WX_CPU_ARM64) - #if defined(cbDPI_AWARE_ON) - wxMANIFEST_ID RT_MANIFEST "amd64_dpi_aware_on.manifest" - #warning Manifest: amd64_dpi_aware_on.manifest diff --git a/mingw-w64-codeblocks/PKGBUILD b/mingw-w64-codeblocks/PKGBUILD index 5c96d1c880..b840a8da94 100644 --- a/mingw-w64-codeblocks/PKGBUILD +++ b/mingw-w64-codeblocks/PKGBUILD @@ -6,9 +6,9 @@ _realname=codeblocks pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") _basever=20.03 -_revision=13483 +_revision=13485 pkgver=${_basever}.r${_revision} -pkgrel=2 +pkgrel=1 pkgdesc="Cross-platform C/C++ IDE (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') @@ -30,11 +30,9 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "zip" "subversion") source=("$_realname::svn://svn.code.sf.net/p/codeblocks/code/trunk#revision=$_revision" - "004-disable-parallel-make-for-SmartIndent.patch" - "005-aarch64-defines.patch") + "004-disable-parallel-make-for-SmartIndent.patch") sha256sums=('SKIP' - '4dff5050d2fad37fe29cef40b354c39f70526f0ece3aa895b2e07885cc647089' - 'accf25b14c18a70c9469af4f3258567bc1b70dc2aead6e1ccb62b314a5f69b4d') + '4dff5050d2fad37fe29cef40b354c39f70526f0ece3aa895b2e07885cc647089') apply_patch_with_msg() { for _patch in "$@" @@ -47,8 +45,7 @@ apply_patch_with_msg() { prepare() { cd "${_realname}" apply_patch_with_msg \ - 004-disable-parallel-make-for-SmartIndent.patch \ - 005-aarch64-defines.patch + 004-disable-parallel-make-for-SmartIndent.patch ./bootstrap }