summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorUffe Jakobsen2019-04-02 11:18:16 +0200
committerUffe Jakobsen2019-04-09 16:10:46 +0200
commitc9ee27b539074103abd974b280a3f4bb240032aa (patch)
tree47b751a1f41b87f4c6090c65de086000d7eade72
parentd4e3b9f3684e904ca2bd26a9336c5956fe8f0110 (diff)
downloadaur-c9ee27b539074103abd974b280a3f4bb240032aa.tar.gz
Applied mariadb-libs patch - thanks
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD49
-rw-r--r--mariadb_10_3.patch48
3 files changed, 87 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4aad068a428..e7e32835ee2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Fri Mar 2 10:50:16 UTC 2018
+# Tue Apr 9 14:05:22 UTC 2019
pkgbase = codelite
pkgdesc = Cross platform C/C++/PHP and Node.js IDE written in C++
pkgver = 12.0
@@ -16,7 +16,7 @@ pkgbase = codelite
depends = lldb
depends = libedit
depends = libssh
- depends = libmariadbclient
+ depends = mariadb-libs
depends = ncurses
depends = xterm
depends = curl
@@ -26,11 +26,12 @@ pkgbase = codelite
optdepends = gcc: compiler
optdepends = gdb: debugger
optdepends = valgrind: debugger
- noextract = wxgui.zip
- source = https://github.com/eranif/codelite/archive/12.0.tar.gz
+ source = codelite-12.0.tar.gz::https://github.com/eranif/codelite/archive/12.0.tar.gz
source = http://repos.codelite.org/wxCrafterLibs/wxgui.zip
+ source = mariadb_10_3.patch
md5sums = 674287c16de4744726afd5fd6521ee4f
md5sums = 20f3428eb831c3ff2539a7228afaa3b4
+ md5sums = 6cd2ad345bc5eff9f88f690519ce6432
pkgname = codelite
diff --git a/PKGBUILD b/PKGBUILD
index 86485d9572b..bdb574d0698 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,10 +9,17 @@
# Contributor: p2k <Patrick.Schneider@uni-ulm.de>
# Contributor: Uffe Jakobsen <uffe@uffe.org>
#
+# NOTES:
+#
+# 20190409: Mariadb patch applied from https://aur.archlinux.org/packages/codelite/
+# 20151027: ArchLinux clang/llvm-3.7: CommandLine Error: Option 'aarch64-reserve-x18' registered more than once
+# 20151027: -DENABLE_LLDB=0: ArchLinux clang/llvm-3.7: CommandLine Error: Option 'aarch64-reserve-x18' registered more than once
+# 20151027: sudo chmod 000 /usr/lib/codelite/LLDBDebugger.so
+#
pkgname=codelite
pkgver=12.0
-pkgrel=1
+pkgrel=2
pkgdesc="Cross platform C/C++/PHP and Node.js IDE written in C++"
arch=('i686' 'x86_64')
url="http://www.codelite.org/"
@@ -22,7 +29,7 @@ depends=('wxgtk'
'clang' 'lldb'
'libedit'
'libssh'
- 'libmariadbclient'
+ 'mariadb-libs'
'ncurses'
'xterm' 'curl'
'python2'
@@ -34,10 +41,20 @@ optdepends=('graphviz: callgraph visualization'
'valgrind: debugger'
)
-source=(https://github.com/eranif/${pkgname}/archive/${pkgver//_/-}.tar.gz http://repos.codelite.org/wxCrafterLibs/wxgui.zip)
+#source=(https://github.com/eranif/${pkgname}/archive/${pkgver//_/-}.tar.gz
+# http://repos.codelite.org/wxCrafterLibs/wxgui.zip)
+#noextract=('wxgui.zip')
+
+
+source=(
+ "${pkgname}-${pkgver}.tar.gz::https://github.com/eranif/${pkgname}/archive/${pkgver//_/-}.tar.gz"
+ http://repos.codelite.org/wxCrafterLibs/wxgui.zip
+ mariadb_10_3.patch
+ )
md5sums=('674287c16de4744726afd5fd6521ee4f'
- '20f3428eb831c3ff2539a7228afaa3b4')
+ '20f3428eb831c3ff2539a7228afaa3b4'
+ '6cd2ad345bc5eff9f88f690519ce6432')
#if [[ "$CARCH" == 'i686' ]]; then
@@ -48,33 +65,35 @@ md5sums=('674287c16de4744726afd5fd6521ee4f'
# md5sums+=('6fcd2f0fada5fc401d0bcd62cd5452bb')
#fi
-noextract=('wxgui.zip')
pkg_name_ver="${pkgname}-${pkgver//_/-}"
-# 20151027: ArchLinux clang/llvm-3.7: CommandLine Error: Option 'aarch64-reserve-x18' registered more than once
-# 20151027: -DENABLE_LLDB=0: ArchLinux clang/llvm-3.7: CommandLine Error: Option 'aarch64-reserve-x18' registered more than once
-# 20151027: sudo chmod 000 /usr/lib/codelite/LLDBDebugger.so
+prepare()
+{
+ cd "${srcdir}/${pkg_name_ver}"
+ patch -p1 -i "${srcdir}"/mariadb_10_3.patch
+}
-build() {
+
+build()
+{
cd "${srcdir}/${pkg_name_ver}"
CXXFLAGS="${CXXFLAGS} -fno-devirtualize"
mkdir -p build
cd build
-# ArchLinux: CL 9.1.0 needs to be built without LLDB (clang-3.7) because of error: Option 'aarch64-reserve-x18' registered more than once
-#cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DENABLE_CLANG=1 -DENABLE_LLDB=0 -DWITH_MYSQL=1 -DCMAKE_INSTALL_LIBDIR=lib ..
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DENABLE_CLANG=1 -DENABLE_LLDB=1 -DWITH_MYSQL=1 -DCMAKE_INSTALL_LIBDIR=lib ..
+cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DENABLE_CLANG=1 -DENABLE_LLDB=0 -DWITH_MYSQL=1 -DCMAKE_INSTALL_LIBDIR=lib ..
make
}
-package() {
+package()
+{
cd "${srcdir}/${pkg_name_ver}/build"
make -j1 DESTDIR="${pkgdir}" install
-#install -m 755 -D "${srcdir}/wxCrafter.so" "${pkgdir}/usr/lib/codelite/wxCrafter.so"
-install -m 644 -D "${srcdir}/wxgui.zip" "${pkgdir}/usr/share/codelite/wxgui.zip"
install -m 644 -D "${srcdir}/${pkg_name_ver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+#install -m 755 -D "${srcdir}/wxCrafter.so" "${pkgdir}/usr/lib/codelite/wxCrafter.so"
+#install -m 644 -D "${srcdir}/wxgui.zip" "${pkgdir}/usr/share/codelite/wxgui.zip"
}
#
diff --git a/mariadb_10_3.patch b/mariadb_10_3.patch
new file mode 100644
index 00000000000..10c81efd44b
--- /dev/null
+++ b/mariadb_10_3.patch
@@ -0,0 +1,48 @@
+diff --git a/sdk/databaselayer/CMakeLists.txt b/sdk/databaselayer/CMakeLists.txt
+index b7632bc7d..23907a5ad 100644
+--- a/sdk/databaselayer/CMakeLists.txt
++++ b/sdk/databaselayer/CMakeLists.txt
+@@ -56,6 +56,18 @@ if ( WITH_MYSQL )
+ include_directories(${MYSQLCLIENT_INCLUDE})
+ message("-- Adding MySQL include path: ${MYSQLCLIENT_INCLUDE} ")
+ FILE(GLOB MYSQL_SRCS "src/dblayer/Mysql*.cpp")
++
++if(UNIX AND NOT APPLE)
++# Recent (2019) versions of debian and Arch have mariadb 10.3 which, it seems, isn't directly compatable with the included dblayer source
++# It has a necessary header file in /usr/include/mariadb/server/ so flag to #include it if it exists
++# See https://github.com/eranif/codelite/issues/2215
++ find_path(MARIADBSERVER_INCLUDE NAMES mysql.h PATH_SUFFIXES mysql/server mariadb/server)
++ if ( NOT ${MARIADBSERVER_INCLUDE} STREQUAL "MARIADBSERVER_INCLUDE-NOTFOUND" )
++ add_definitions( -DMARIADBSERVER_INCLUDE=1 )
++ message( "-- Adding MySQL server include" )
++ endif(NOT ${MARIADBSERVER_INCLUDE} STREQUAL "MARIADBSERVER_INCLUDE-NOTFOUND")
++endif(UNIX AND NOT APPLE)
++
+ endif ( WITH_MYSQL )
+
+ # Define the output
+diff --git a/sdk/databaselayer/src/dblayer/MysqlPreparedStatementWrapper.cpp b/sdk/databaselayer/src/dblayer/MysqlPreparedStatementWrapper.cpp
+index 699df3a53..3cac9b6c6 100644
+--- a/sdk/databaselayer/src/dblayer/MysqlPreparedStatementWrapper.cpp
++++ b/sdk/databaselayer/src/dblayer/MysqlPreparedStatementWrapper.cpp
+@@ -1,3 +1,9 @@
++#if defined(MARIADBSERVER_INCLUDE)
++// See https://github.com/eranif/codelite/issues/2215
++// (For some reason this needs to come before the other #includes)
++ #include "server/mysql.h"
++#endif
++
+ #include "../include/MysqlPreparedStatementWrapper.h"
+ #include "../include/MysqlPreparedStatementResultSet.h"
+ #include "../include/MysqlDatabaseLayer.h"
+diff --git a/sdk/databaselayer/src/dblayer/MysqlResultSetMetaData.cpp b/sdk/databaselayer/src/dblayer/MysqlResultSetMetaData.cpp
+index a22963a9a..831708d23 100644
+--- a/sdk/databaselayer/src/dblayer/MysqlResultSetMetaData.cpp
++++ b/sdk/databaselayer/src/dblayer/MysqlResultSetMetaData.cpp
+@@ -1,5 +1,5 @@
+ #include "../include/MysqlResultSetMetaData.h"
+-#include "mysql_com.h"
++#include "mysql.h"
+
+ // ctor
+ MysqlResultSetMetaData::MysqlResultSetMetaData(MysqlInterface* pInterface, MYSQL_RES* pMetaData)