[arch-commits] Commit in stardict/trunk (PKGBUILD mariadb.patch)

[Christian Hesse]

    Date: Wednesday, January 16, 2019 @ 16:24:19
  Author: eworm
Revision: 423655

fix for mariadb 10.3

Added:
  stardict/trunk/mariadb.patch
Modified:
  stardict/trunk/PKGBUILD

---------------+
 PKGBUILD      |   13 ++++++++-----
 mariadb.patch |   15 +++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-16 16:20:12 UTC (rev 423654)
+++ PKGBUILD	2019-01-16 16:24:19 UTC (rev 423655)
@@ -18,12 +18,19 @@
 options=('!emptydirs')
 source=("http://downloads.sourceforge.net/project/stardict-4/$pkgver/$pkgname-$pkgver.tar.bz2"
         'gcc46.patch'
-        'glib2.patch')
+        'glib2.patch'
+        'mariadb.patch')
+sha256sums=('6a0a695a8977604e0509a3db1bc6a67e53599b14f29494ba942f21d2c26b82e7'
+            '207dc727b69ee8552372d5551f54a638b472703aeb13a64cdfee6bad00dc380d'
+            '5be4d0468f6089b760924a5d25030110ca62869b4611afb46a411cd4eb59b832'
+            'f66b916c358bddf48fcb91a7d0190a7109fe92a1388ec982c47dfa9ac1ee69cf')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   patch -p1 -i ../gcc46.patch
   patch -p1 -i ../glib2.patch
+  patch -p1 -i ../mariadb.patch
 
   sed -i 's/, enchant/, enchant-2/' dict/configure.ac
   sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac
@@ -51,7 +58,3 @@
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-
-md5sums=('93371b35482e6380e8bd4ba5d256b864'
-         '52ff47441c503de07add4b7688510bc5'
-         'b2f216897c9053c7e4666c3d78705cf1')

Added: mariadb.patch
===================================================================
--- mariadb.patch	                        (rev 0)
+++ mariadb.patch	2019-01-16 16:24:19 UTC (rev 423655)
@@ -0,0 +1,15 @@
+diff --git a/tools/src/wikipediaImage.cpp b/tools/src/wikipediaImage.cpp
+index ff38f50..2fa5712 100644
+--- a/tools/src/wikipediaImage.cpp
++++ b/tools/src/wikipediaImage.cpp
+@@ -25,6 +25,10 @@
+ #define CONN_PASS "123"
+ #define CONN_DB   "wikidb"
+ 
++/* MariaDB >= 10.2 client does not set MYSQL_PORT */
++#ifndef MYSQL_PORT
++#  define MYSQL_PORT 3306
++#endif
+ 
+ void dump_file()
+ {