Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
rz-cutter
Commits:
18aed4e7 by Antonio Rojas at 2024-04-06T09:27:54+02:00
upgpkg: 2.3.4-2: Pyside 6.7 rebuild
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + pyside-6.7.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = rz-cutter
pkgdesc = Qt and C++ GUI for rizin reverse engineering framework
pkgver = 2.3.4
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/rizinorg/cutter
arch = x86_64
license = GPL3
@@ -23,9 +23,12 @@ pkgbase = rz-cutter
optdepends = rz-ghidra: ghidra decompiler plugin
source =
git+https://github.com/rizinorg/cutter#commit=209c26b862ab0bb3b7308618243a9796d3f1109a
source = git+https://github.com/rizinorg/cutter-translations
+ source = pyside-6.7.patch
+ sha512sums =
4b3e053eb1914ffed353c5534b65a305b13af043336ba409def663824767b6f36d78e47a2fe573babfa7a8cfc3dda609a18d4268d5b9416e49be890c8144c40f
sha512sums = SKIP
- sha512sums = SKIP
- b2sums = SKIP
+ sha512sums =
e5024c972d3df603a9a404b6214b7e8622a1e06bfdd02f15304404e75b6eecefc05c032dd738b34d534851c6ba2235ac02463c6207eecae145252b4ef44502ac
+ b2sums =
450145432e0d09c482d9ead14d57bf94ef32843c99538e8c53264e1952c2b58bfb7954f89555c46d80d09a5cd154af5ba8385f6763175df3fa6f17eb7bc788a8
b2sums = SKIP
+ b2sums =
abba422f724da8aedef314aabebd301f799c26e2f5239c1bcba402de3e78e7a9d2ba6256e6aef17c8f37dfa1cea999b6728b97c833ff86065e72b7343cc70d15
pkgname = rz-cutter
=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
pkgname=rz-cutter
_gitcommit=209c26b862ab0bb3b7308618243a9796d3f1109a
pkgver=2.3.4
-pkgrel=1
+pkgrel=2
pkgdesc='Qt and C++ GUI for rizin reverse engineering framework'
url='https://github.com/rizinorg/cutter'
arch=('x86_64')
@@ -25,11 +25,14 @@ depends=(
makedepends=('git' 'cmake' 'ninja' 'shiboken6' 'qt6-tools')
optdepends=('rz-ghidra: ghidra decompiler plugin')
source=("git+https://github.com/rizinorg/cutter#commit=${_gitcommit}";
- "git+https://github.com/rizinorg/cutter-translations";)
-sha512sums=('SKIP'
- 'SKIP')
-b2sums=('SKIP'
- 'SKIP')
+ "git+https://github.com/rizinorg/cutter-translations";
+ pyside-6.7.patch)
+sha512sums=('4b3e053eb1914ffed353c5534b65a305b13af043336ba409def663824767b6f36d78e47a2fe573babfa7a8cfc3dda609a18d4268d5b9416e49be890c8144c40f'
+ 'SKIP'
+
'e5024c972d3df603a9a404b6214b7e8622a1e06bfdd02f15304404e75b6eecefc05c032dd738b34d534851c6ba2235ac02463c6207eecae145252b4ef44502ac')
+b2sums=('450145432e0d09c482d9ead14d57bf94ef32843c99538e8c53264e1952c2b58bfb7954f89555c46d80d09a5cd154af5ba8385f6763175df3fa6f17eb7bc788a8'
+ 'SKIP'
+
'abba422f724da8aedef314aabebd301f799c26e2f5239c1bcba402de3e78e7a9d2ba6256e6aef17c8f37dfa1cea999b6728b97c833ff86065e72b7343cc70d15')
pkgver() {
cd cutter
@@ -40,6 +43,8 @@ prepare() {
cd cutter
git config 'submodule.src/translations.url' "${srcdir}/cutter-translations"
git -c protocol.file.allow=always submodule update --init src/translations
+
+ patch -p1 -i ../pyside-6.7.patch # Fix build with PySide 6.7
}
build() {
=====================================
pyside-6.7.patch
=====================================
@@ -0,0 +1,13 @@
+diff --git a/src/plugins/PluginManager.cpp b/src/plugins/PluginManager.cpp
+index 6f6a5aa5..ea96814f 100644
+--- a/src/plugins/PluginManager.cpp
++++ b/src/plugins/PluginManager.cpp
+@@ -215,7 +215,7 @@ CutterPlugin *PluginManager::loadPythonPlugin(const char
*moduleName)
+ }
+
+ PythonToCppFunc pythonToCpp =
Shiboken::Conversions::isPythonToCppPointerConvertible(
+- reinterpret_cast<SbkObjectType
*>(SbkCutterBindingsTypes[SBK_CUTTERPLUGIN_IDX]),
++ reinterpret_cast<SbkObjectType *>(reinterpret_cast<PyTypeObject
**>(SbkCutterBindingsTypeStructs)[SBK_CUTTERPLUGIN_IDX]),
+ pluginObject);
+ if (!pythonToCpp) {
+ qWarning() << "Plugin's create_cutter_plugin() function did not
return an instance of "
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/rz-cutter/-/commit/18aed4e7f736c630b4cd3aa081eb9836875fdc4b
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/rz-cutter/-/commit/18aed4e7f736c630b4cd3aa081eb9836875fdc4b
You're receiving this email because of your account on gitlab.archlinux.org.
