diff --git a/pahole/.SRCINFO b/pahole/.SRCINFO index dc8644ed4d..f6726d9a4c 100644 --- a/pahole/.SRCINFO +++ b/pahole/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = pahole pkgdesc = Pahole and other DWARF utils - pkgver = 1.27 + pkgver = 1.28 pkgrel = 3 epoch = 1 url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git @@ -19,11 +19,11 @@ pkgbase = pahole makedepends = python makedepends = python-matplotlib makedepends = zlib - source = git+https://github.com/acmel/dwarves?signed#tag=v1.27 + source = git+https://github.com/acmel/dwarves?signed#tag=v1.28 source = 0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch validpgpkeys = 2DBF5BAA46FB4DED338A335BD65016F35352AA40 - b2sums = a2c7641d85ccc4489e4d55f6f59cb0338674a877a7265eacf9ffcb0f05e33b2cd322aaa3af32b75583d0f7847a98b0d6c16e4a001c2a566b2845a52e01247259 - b2sums = 02962095407cdbf191428884b83c3392e39d4acdad0c6a952655daec8b871bab8962c3716c9479192118eef81afe412203ac46600a2d702733254c6d7219f7d2 + b2sums = 9feb786bbe5ff968910acff2ef2e63770ba5ec45adadc6e29e9087ba568683e9631c7ed48701f9bd2e14527629becb1fda1945483deafca8641447b5a59cc317 + b2sums = 957bd9e8b39e384a1209e323f3e99e908654b11167541ee9e42e5f87a2e438a741de817a25e118af88b60cad90d145bf8e63d586a22ee8f2bbf3aaae6457e55e pkgname = pahole depends = bash diff --git a/pahole/0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch b/pahole/0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch index f1d288cca1..6fb867cf7e 100644 --- a/pahole/0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch +++ b/pahole/0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch @@ -12,10 +12,10 @@ Signed-off-by: Jan Alexander Steffens (heftig) 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8ca1bf2173a7..ca997bc040c5 100644 +index fb7eb64c9bbb..f0a777638ff9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -188,7 +188,7 @@ install(FILES dwarves.h dwarves_emit.h dwarves_reorganize.h +@@ -181,7 +181,7 @@ install(FILES dwarves.h dwarves_emit.h dwarves_reorganize.h install(FILES man-pages/pahole.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/) if(Python3_FOUND) install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) diff --git a/pahole/PKGBUILD b/pahole/PKGBUILD index c9ee9b385a..bd35f89a8d 100644 --- a/pahole/PKGBUILD +++ b/pahole/PKGBUILD @@ -6,7 +6,7 @@ pkgname=( pahole ostra-cg ) -pkgver=1.27 +pkgver=1.28 pkgrel=3 epoch=1 pkgdesc="Pahole and other DWARF utils" @@ -28,8 +28,8 @@ source=( "git+https://github.com/acmel/dwarves?signed#tag=v$pkgver" 0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch ) -b2sums=('a2c7641d85ccc4489e4d55f6f59cb0338674a877a7265eacf9ffcb0f05e33b2cd322aaa3af32b75583d0f7847a98b0d6c16e4a001c2a566b2845a52e01247259' - '02962095407cdbf191428884b83c3392e39d4acdad0c6a952655daec8b871bab8962c3716c9479192118eef81afe412203ac46600a2d702733254c6d7219f7d2') +b2sums=('9feb786bbe5ff968910acff2ef2e63770ba5ec45adadc6e29e9087ba568683e9631c7ed48701f9bd2e14527629becb1fda1945483deafca8641447b5a59cc317' + '957bd9e8b39e384a1209e323f3e99e908654b11167541ee9e42e5f87a2e438a741de817a25e118af88b60cad90d145bf8e63d586a22ee8f2bbf3aaae6457e55e') validpgpkeys=( 2DBF5BAA46FB4DED338A335BD65016F35352AA40 # Arnaldo Carvalho de Melo ) @@ -37,11 +37,6 @@ validpgpkeys=( prepare() { cd dwarves - # Fix kernel build with Clang - # https://gitlab.archlinux.org/archlinux/packaging/packages/pahole/-/issues/1 - git cherry-pick -n 6a2b27c0f512619b0e7a769a18a0fb05bb3789a5 \ - 94a01bde592c555b3eb526aeb4c2ad695c5660d8 - # https://bugs.archlinux.org/task/70013 git apply -3 ../0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch }