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


Commits:
640db112 by Christian Hesse at 2023-12-07T10:19:33+01:00
update bundled gdal

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -42,9 +42,7 @@ pkgbase = mysql-workbench
        source = 
https://cdn.mysql.com/Downloads/MySQL-8.1/mysql-8.1.0.tar.gz.asc
        source = 
https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.1.0-src.tar.gz
        source = 
https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.1.0-src.tar.gz.asc
-       source = https://download.osgeo.org/gdal/3.8.0/gdal-3.8.0.tar.xz
-       source = https://github.com/OSGeo/gdal/commit/cbed9fc9.patch
-       source = https://github.com/OSGeo/gdal/commit/ec33f6d6.patch
+       source = https://download.osgeo.org/gdal/3.8.1/gdal-3.8.1.tar.xz
        source = 
https://downloads.sourceforge.net/project/boost/boost/1.77.0/boost_1_77_0.tar.bz2
        source = 0001-mysql-workbench-no-check-for-updates.patch
        source = 0002-disable-unsupported-operating-system-warning.patch
@@ -57,9 +55,7 @@ pkgbase = mysql-workbench
        sha256sums = SKIP
        sha256sums = 
2ee3c7d0d031ce581deeed747d9561d140172373592bed5d0630a790e6053dc1
        sha256sums = SKIP
-       sha256sums = 
ec0f78d9dc32352aeac6edc9c3b27a991b91f9dc6f92c452207d84431c58757d
-       sha256sums = 
467e5ab26344cedb19f581585b16f4e01f9252d4f55ad954b499dd250004264d
-       sha256sums = 
01f3212314119948d1961ec5164a93d8e139248f4cab8907bdbce17e529840fd
+       sha256sums = 
75a20b23879bfa3d8c0db68e1d6f8b924f7f9d97f5fed089b01a72e404293900
        sha256sums = 
fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854
        sha256sums = 
cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f
        sha256sums = 
2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18


=====================================
PKGBUILD
=====================================
@@ -9,7 +9,7 @@ pkgver=8.0.34
 pkgrel=2
 _mysql_version=8.1.0
 _connector_version=8.1.0
-_gdal_version=3.8.0
+_gdal_version=3.8.1
 _boost_version=1.77.0
 # bump the antlr4 version as required, this is to match the jar file name
 _antlr4_version=4.13.1
@@ -28,8 +28,6 @@ 
source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community
        
"https://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
        
"https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}-src.tar.gz"{,.asc}
        
"https://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.xz";
-       'https://github.com/OSGeo/gdal/commit/cbed9fc9.patch'
-       'https://github.com/OSGeo/gdal/commit/ec33f6d6.patch'
        
"https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2";
        '0001-mysql-workbench-no-check-for-updates.patch'
        '0002-disable-unsupported-operating-system-warning.patch'
@@ -41,9 +39,7 @@ 
sha256sums=('b9bfc3e8746d5cebd7fa56a2ef5b7552332633306ccf99630ab242b9ff5aabb5'
             'SKIP'
             '2ee3c7d0d031ce581deeed747d9561d140172373592bed5d0630a790e6053dc1'
             'SKIP'
-            'ec0f78d9dc32352aeac6edc9c3b27a991b91f9dc6f92c452207d84431c58757d'
-            '467e5ab26344cedb19f581585b16f4e01f9252d4f55ad954b499dd250004264d'
-            '01f3212314119948d1961ec5164a93d8e139248f4cab8907bdbce17e529840fd'
+            '75a20b23879bfa3d8c0db68e1d6f8b924f7f9d97f5fed089b01a72e404293900'
             'fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854'
             'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
             '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
@@ -71,10 +67,6 @@ prepare() {
 
        # be happy with more recent antlr
        sed -i "/set(ANTLR_JAR_FILENAME/s/4.11.1/${_antlr4_version}/" 
CMakeLists.txt
-
-       cd "${srcdir}/gdal-${_gdal_version}"
-       patch -Np1 < ../cbed9fc9.patch
-       patch -Np1 < ../ec33f6d6.patch
 }
 
 build() {
@@ -117,7 +109,10 @@ build() {
        cmake -B build-gdal -S "${srcdir}/gdal-${_gdal_version}" \
                -DCMAKE_INSTALL_PREFIX='/usr' \
                -DGDAL_USE_JASPER='OFF' \
-               -DGDAL_USE_MYSQL='OFF'
+               -DGDAL_USE_MYSQL='OFF' \
+               -DBUILD_CSHARP_BINDINGS='FALSE' \
+               -DBUILD_JAVA_BINDINGS='FALSE' \
+               -DBUILD_PYTHON_BINDINGS='FALSE'
        echo "Build gdal..."
        make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/" -C build-gdal
        echo "Install gdal..."



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

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


Reply via email to