[PR PATCH] shiboken2: update to 5.15.0.

[PR PATCH] shiboken2: update to 5.15.0.

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is a new pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages shiboken2-5.15
https://github.com/void-linux/void-packages/pull/23607

shiboken2: update to 5.15.0.


A patch file from https://github.com/void-linux/void-packages/pull/23607.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-shiboken2-5.15-23607.patch --]
[-- Type: text/x-diff, Size: 6161 bytes --]

From e4a6f9c7cff49ae193cdf2fdadee921cb1317194 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 17 Jul 2020 00:43:45 +0200
Subject: [PATCH 1/3] shiboken2: update to 5.15.0.

---
 common/shlibs                                 |  2 +-
 .../cmake-fix-path-for-crossuild.patch        | 29 -----------------
 srcpkgs/shiboken2/patches/musl-execinfo.patch | 32 -------------------
 srcpkgs/shiboken2/template                    |  6 ++--
 4 files changed, 4 insertions(+), 65 deletions(-)
 delete mode 100644 srcpkgs/shiboken2/patches/cmake-fix-path-for-crossuild.patch
 delete mode 100644 srcpkgs/shiboken2/patches/musl-execinfo.patch

diff --git a/common/shlibs b/common/shlibs
index ba4d41130a5..6c35b9e3bc2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1701,7 +1701,7 @@ libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
 libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
-libshiboken2.so.5.14 libshiboken2-5.14.0_1
+libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
 libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
 libpyside2.so.5.14 libpyside2-python3-5.14.0_1
diff --git a/srcpkgs/shiboken2/patches/cmake-fix-path-for-crossuild.patch b/srcpkgs/shiboken2/patches/cmake-fix-path-for-crossuild.patch
deleted file mode 100644
index c33f6b22510..00000000000
--- a/srcpkgs/shiboken2/patches/cmake-fix-path-for-crossuild.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-
-* LIB_INSTALL_DIR must be set as a relative path.
-  If not, side-effect on shiboken2/CMakeList.txt: LIB_INSTALL_DIR is redefined,
-  so generated Shiboken2Targets.cmake contains absolute paths that are wrong for crossbuild.
-
-* bin/shiboken2 localization must be absolute for crossbuild.
-
---- sources/shiboken2/ApiExtractor/CMakeLists.txt.ORIG
-+++ sources/shiboken2/ApiExtractor/CMakeLists.txt
-@@ -84,7 +84,7 @@
- 
- target_compile_definitions(apiextractor PRIVATE CMAKE_CXX_COMPILER="${CMAKE_CXX_COMPILER}")
- 
--set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
-+set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
- 
- if (BUILD_TESTS)
-     find_package(Qt5Test 5.12 REQUIRED)
---- sources/shiboken2/generator/CMakeLists.txt.ORIG
-+++ sources/shiboken2/generator/CMakeLists.txt
-@@ -30,7 +30,7 @@
- 
- install(TARGETS shiboken2
-         EXPORT Shiboken2Targets
--        DESTINATION bin)
-+        DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
- 
- set(shiboken_generator_package_name "shiboken2_generator")
- 
diff --git a/srcpkgs/shiboken2/patches/musl-execinfo.patch b/srcpkgs/shiboken2/patches/musl-execinfo.patch
deleted file mode 100644
index 4c8babcc1fc..00000000000
--- a/srcpkgs/shiboken2/patches/musl-execinfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- sources/shiboken2/libshiboken/signature.cpp.ORIG
-+++ sources/shiboken2/libshiboken/signature.cpp
-@@ -473,12 +473,15 @@
- ////////////////////////////////////////////////////////////////////////////
- // a stack trace for linux-like platforms
- #include <stdio.h>
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
- #include <signal.h>
- #include <stdlib.h>
- #include <unistd.h>
- 
- void handler(int sig) {
-+#if defined(__GLIBC__)
-     void *array[30];
-     size_t size;
- 
-@@ -486,8 +489,13 @@
-     size = backtrace(array, 30);
- 
-     // print out all the frames to stderr
-+#endif
-     fprintf(stderr, "Error: signal %d:\n", sig);
-+#if defined(__GLIBC__)
-     backtrace_symbols_fd(array, size, STDERR_FILENO);
-+#else
-+    fprintf(stderr, "sorry, no backtrace on musl libc\n");
-+#endif
-     exit(1);
- }
- 
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index 0951551008e..d9055ae4901 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,7 +1,7 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
-version=5.14.2.1
-revision=2
+version=5.15.0
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=11f48956208a487dabf6f531e60fb88ad0e48f2979cfc9e79c1c986387c491fa
+checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
 
 python_version=3
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr

From fe27bcc53a0ee606da7d7f540b56e06cfd96dd10 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 17 Jul 2020 00:45:05 +0200
Subject: [PATCH 2/3] python3-pyside2: rebuild against shiboken2-5.15.0.

---
 srcpkgs/python3-pyside2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index 3538d3a7998..c70af2f0495 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyside2'
 pkgname=python3-pyside2
 version=5.14.2.1
-revision=1
+revision=2
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2"

From 6caff78b287c41fd865ef8b2bbec4c6901a23c1f Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 17 Jul 2020 00:45:04 +0200
Subject: [PATCH 3/3] freecad: rebuild against shiboken2-5.15.0.

[ci skip]
---
 srcpkgs/freecad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 0a08bf9eae7..9f296b6086c 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.18.4
-revision=6
+revision=7
 wrksrc="FreeCAD-${version}"
 build_style=cmake
 

Re: shiboken2: update to 5.15.0.

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 148 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/23607#issuecomment-659717642

Comment:
@yopito 

Re: shiboken2: update to 5.15.0.

[yopito]

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/23607#issuecomment-659937347

Comment:
PR #23231 already cover this (waiting for merge)

Le 17 juillet 2020 00:49:25 GMT+02:00, Piraty <notifications@github.com> a écrit :
>@yopito 

Re: shiboken2: update to 5.15.0.

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/23607#issuecomment-659940525

Comment:
thank you!

Re: [PR PATCH] [Closed]: shiboken2: update to 5.15.0.

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

There's a closed pull request on the void-packages repository

shiboken2: update to 5.15.0.
https://github.com/void-linux/void-packages/pull/23607

Description: