libgda: aggiustamenti e compilazione a 64bit (WIP no oracle).

diff --git a/packages/mingw-w64-libgda-full/PKGBUILD b/packages/mingw-w64-libgda-full/PKGBUILD
index a4fca9508e8e6c8c6ec5f275cb9f56bf791ac67a..b4a7a48fe3b3f0e8a49164a51e2a4471731c0a76 100644 (file)
--- a/packages/mingw-w64-libgda-full/PKGBUILD
+++ b/packages/mingw-w64-libgda-full/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=libgda
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-full"
 pkgver=5.2.2
-pkgrel=3
+pkgrel=4
 arch=('any')
 pkgdesc="Data abstraction library based on GLib (mingw-w64)"
 license=("LGPL 2")
@@ -29,6 +29,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "libintl")
 conflicts=("${MINGW_PACKAGE_PREFIX}-libgda")
 options=('!strip' 'debug' 'staticlibs')
+install=${_realname}-${CARCH}.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:3}/${_realname}-$pkgver.tar.xz
         001-lemon.patch
         002-mysql-m4.patch
@@ -56,16 +57,21 @@ prepare() {
 
 build() {
   if [ "${CARCH}" = "i686" ]; then
-    local _conf='--with-oracle=/c/Users/AndreaZ/Documents/development_environment_gtk3/instantclient_10_2/sdk --with-oracle-libdir-name=lib'
-    export GRAPHVIZ_CFLAGS="-I/c/Users/AndreaZ/Documents/development_environment_gtk3/graphviz/include/graphviz"
-    export GRAPHVIZ_LIBS="-L/c/Users/AndreaZ/Documents/development_environment_gtk3/graphviz/lib/release/dll -lgvc -lcgraph -lcdt"
+    local _conf='--with-oracle=/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/i686/instantclient_10_2/sdk --with-oracle-libdir-name=lib'
+    export GRAPHVIZ_CFLAGS="-I/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/i686/graphviz/include/graphviz"
+    export GRAPHVIZ_LIBS="-L/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/i686/graphviz/lib/release/dll -lgvc -lcgraph -lcdt"
   else
-    local _conf=''
+    local _conf='--with-oracle=/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/x86_64/instantclient_10_2/sdk --with-oracle-libdir-name=lib'
+    #export GRAPHVIZ_CFLAGS="-I/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/x86_64/graphviz/include/graphviz"
+    #export GRAPHVIZ_LIBS="-L/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/x86_64/graphviz/lib/release/dll -lgvc -lcgraph -lcdt"
   fi
 
   mkdir -p build-${MINGW_CHOST}
   cd build-${MINGW_CHOST}
 
+  mkdir -p doc/C/html
+  cp -rf ../${_realname}-${pkgver}/doc/C/html/* doc/C/html
+
   $_envvar \
   ../${_realname}-${pkgver}/configure \
     --host=${MINGW_CHOST} \
@@ -91,4 +97,7 @@ build() {
 package() {
   cd "$srcdir/build-${MINGW_CHOST}"
   make DESTDIR=$pkgdir install
+
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LIB" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LIB"
 }

diff --git a/packages/mingw-w64-libgda-full/libgda-i686.install b/packages/mingw-w64-libgda-full/libgda-i686.install
new file mode 100644 (file)
index 0000000..0cac0bd
--- /dev/null
+++ b/packages/mingw-w64-libgda-full/libgda-i686.install
@@ -0,0 +1,12 @@
+post_install() {
+  mingw32/bin/glib-compile-schemas mingw32/share/glib-2.0/schemas
+  mingw32/bin/gtk-update-icon-cache-3.0 -f -t mingw32/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

diff --git a/packages/mingw-w64-libgda-full/libgda-x86_64.install b/packages/mingw-w64-libgda-full/libgda-x86_64.install
new file mode 100644 (file)
index 0000000..c1a4b49
--- /dev/null
+++ b/packages/mingw-w64-libgda-full/libgda-x86_64.install
@@ -0,0 +1,12 @@
+post_install() {
+  mingw64/bin/glib-compile-schemas mingw64/share/glib-2.0/schemas
+  mingw64/bin/gtk-update-icon-cache-3.0 -f -t mingw64/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}