From 2a8eec4bcf970c2f195eeb11a6add73406eecb56 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Fri, 23 Jun 2023 09:46:09 +0200 Subject: [PATCH] libipt: update to 2.0.6 also allows dropping the import-lib-naming.patch which is now included --- .../001-fix-import-lib-naming.patch | 10 ---------- mingw-w64-libipt/PKGBUILD | 17 ++++------------- 2 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 mingw-w64-libipt/001-fix-import-lib-naming.patch diff --git a/mingw-w64-libipt/001-fix-import-lib-naming.patch b/mingw-w64-libipt/001-fix-import-lib-naming.patch deleted file mode 100644 index 12a018904a..0000000000 --- a/mingw-w64-libipt/001-fix-import-lib-naming.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libipt/libipt/CMakeLists.txt.orig 2023-06-15 07:31:30.894623900 +0200 -+++ libipt/libipt/CMakeLists.txt 2023-06-15 07:33:43.220525200 +0200 -@@ -99,6 +99,7 @@ - - set_target_properties(libipt PROPERTIES - PREFIX "" -+ IMPORT_PREFIX "" - PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/include/intel-pt.h - VERSION ${PT_VERSION} - SOVERSION ${PT_VERSION_MAJOR} diff --git a/mingw-w64-libipt/PKGBUILD b/mingw-w64-libipt/PKGBUILD index da409a7a72..540f7143b9 100644 --- a/mingw-w64-libipt/PKGBUILD +++ b/mingw-w64-libipt/PKGBUILD @@ -1,7 +1,7 @@ _realname=libipt pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgbase="mingw-w64-${_realname}" -pkgver=2.0.5.r18.gfa32af7 +pkgver=2.0.6.r0.gba98732 pkgrel=1 pkgdesc='Intel(R) Processor Trace decoder library (mingw-w64)' arch=('any') @@ -12,11 +12,9 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" # 'pandoc' # Only required for building the manpage, we likely don't want that "${MINGW_PACKAGE_PREFIX}-cc" 'git') -_commit='fa32af7a3aaa88b11e19ba8259fcd6eb4a2e768a' -source=("${_realname}"::"git+${url}#commit=${_commit}" - "001-fix-import-lib-naming.patch") -sha256sums=('SKIP' - '4e2a72080256239bf38abc1b9bbbd80bb9b9b4e584e914d57f8f93bcec15a26d') +_commit='ba98732fc7c3269e06b8587bce27ac87c847c0ff' +source=("${_realname}"::"git+${url}#commit=${_commit}") +sha256sums=('SKIP') pkgver() { cd "${srcdir}/${_realname}" @@ -24,13 +22,6 @@ pkgver() { git describe --long --tags --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } -prepare() { - cd "${srcdir}/${_realname}" - - # https://github.com/intel/libipt/issues/99 - patch -Np1 -i "${srcdir}/001-fix-import-lib-naming.patch" -} - build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"