Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / 
mysql-workbench


Commits:
0437c179 by Christian Hesse at 2024-04-04T20:08:01+02:00
upgpkg: 8.0.36-3: Python 3.12 rebuild part 1

- - - - -


3 changed files:

- .SRCINFO
- + 0005-python-3-12.patch
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = mysql-workbench
        pkgdesc = A cross-platform, visual database design tool developed by 
MySQL
        pkgver = 8.0.36
-       pkgrel = 2
+       pkgrel = 3
        url = https://www.mysql.com/products/workbench/
        arch = x86_64
        license = GPL2
@@ -46,6 +46,7 @@ pkgbase = mysql-workbench
        source = 0002-disable-unsupported-operating-system-warning.patch
        source = 0003-include-list.patch
        source = 0004-libxml2.patch
+       source = 0005-python-3-12.patch
        source = arch_linux_profile.xml
        validpgpkeys = BCA43417C3B485DD128EC6D4B7B3B788A8D3785C
        sha256sums = 
634d8a66b6c2777491058a60aba8187e947e4c49a0e7ae83df312fa70714637c
@@ -60,6 +61,7 @@ pkgbase = mysql-workbench
        sha256sums = 
2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18
        sha256sums = 
e7e66ba68a21a0da87f0513f2b9550359c923a94aa7d16afe6ead063322e3d53
        sha256sums = 
a9f1d3262350b22850f9720647c806be8959f2ed387d0095e6134b7f3251363c
+       sha256sums = 
e596ef8ed8479c5052c78fe17139309182d22bfd5765f32866367fd3e787277d
        sha256sums = 
d816164098c90c432b4fe590708c14f95ab137abfe16ad1b7d498b2e83c0e265
 
 pkgname = mysql-workbench


=====================================
0005-python-3-12.patch
=====================================
@@ -0,0 +1,12 @@
+diff --git a/library/grt/src/python_context.cpp 
b/library/grt/src/python_context.cpp
+index b1e1f5d..65514d1 100644
+--- a/library/grt/src/python_context.cpp
++++ b/library/grt/src/python_context.cpp
+@@ -33,7 +33,6 @@
+ // python internals
+ #include <Python.h>
+ #include <errcode.h>
+-#include <token.h>
+ #include <frameobject.h>
+ 
+ #include "python_grtobject.h"


=====================================
PKGBUILD
=====================================
@@ -6,7 +6,7 @@
 
 pkgname=mysql-workbench
 pkgver=8.0.36
-pkgrel=2
+pkgrel=3
 _mysql_version=8.3.0
 _connector_version=8.3.0
 _gdal_version=3.8.4
@@ -33,6 +33,7 @@ 
source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community
        '0002-disable-unsupported-operating-system-warning.patch'
        '0003-include-list.patch'
        '0004-libxml2.patch'
+       '0005-python-3-12.patch'
        'arch_linux_profile.xml')
 sha256sums=('634d8a66b6c2777491058a60aba8187e947e4c49a0e7ae83df312fa70714637c'
             'SKIP'
@@ -46,6 +47,7 @@ 
sha256sums=('634d8a66b6c2777491058a60aba8187e947e4c49a0e7ae83df312fa70714637c'
             '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
             'e7e66ba68a21a0da87f0513f2b9550359c923a94aa7d16afe6ead063322e3d53'
             'a9f1d3262350b22850f9720647c806be8959f2ed387d0095e6134b7f3251363c'
+            'e596ef8ed8479c5052c78fe17139309182d22bfd5765f32866367fd3e787277d'
             'd816164098c90c432b4fe590708c14f95ab137abfe16ad1b7d498b2e83c0e265')
 
 prepare() {
@@ -64,6 +66,9 @@ prepare() {
        # fix build with libxml2
        patch -Np1 < "${srcdir}"/0004-libxml2.patch
 
+       # fix build with python 3.12
+       patch -Np1 < "${srcdir}"/0005-python-3-12.patch
+
        # remove left over requirement on PCRE
        sed -i '/PCRE REQUIRED/d' CMakeLists.txt
 



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/mysql-workbench/-/commit/0437c179f0e22070a70e103a6a98c841d7362d8b

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/mysql-workbench/-/commit/0437c179f0e22070a70e103a6a98c841d7362d8b
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to