libgda
This commit is contained in:
parent
b7c45df4b9
commit
28be4f3f32
|
@ -0,0 +1,83 @@
|
||||||
|
From b611c805b3a2248e2f4f85f993f96c13a05b4730 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Emmanuele Bassi <ebassi@gnome.org>
|
||||||
|
Date: Mon, 17 Jul 2017 22:37:50 +0100
|
||||||
|
Subject: Convert files to Unicode
|
||||||
|
|
||||||
|
These header files have mixed encoding, and makes various tools choke on
|
||||||
|
them.
|
||||||
|
---
|
||||||
|
libgda/gda-connection.h | 2 +-
|
||||||
|
libgda/sql-parser/gda-sql-statement.h | 2 +-
|
||||||
|
libgda/sql-parser/gda-statement-struct-delete.h | 2 +-
|
||||||
|
libgda/sql-parser/gda-statement-struct-unknown.h | 2 +-
|
||||||
|
libgda/sql-parser/gda-statement-struct-util.h | 2 +-
|
||||||
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libgda/gda-connection.h b/libgda/gda-connection.h
|
||||||
|
index 94d1b27b5..19ca63fc3 100644
|
||||||
|
--- a/libgda/gda-connection.h
|
||||||
|
+++ b/libgda/gda-connection.h
|
||||||
|
@@ -6,7 +6,7 @@
|
||||||
|
* Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@ximian.com>
|
||||||
|
* Copyright (C) 2003 Filip Van Raemdonck <mechanix@debian.org>
|
||||||
|
* Copyright (C) 2004 - 2005 Alan Knowles <alank@src.gnome.org>
|
||||||
|
- * Copyright (C) 2004 José María Casanova Crespo <jmcasanova@igalia.com>
|
||||||
|
+ * Copyright (C) 2004 José MarÃa Casanova Crespo <jmcasanova@igalia.com>
|
||||||
|
* Copyright (C) 2005 - 2009 Bas Driessen <bas.driessen@xobas.com>
|
||||||
|
* Copyright (C) 2006 - 2008 Murray Cumming <murrayc@murrayc.com>
|
||||||
|
* Copyright (C) 2007 Leonardo Boshell <lb@kmc.com.co>
|
||||||
|
diff --git a/libgda/sql-parser/gda-sql-statement.h b/libgda/sql-parser/gda-sql-statement.h
|
||||||
|
index 0ba1f9edc..8783ca8a1 100644
|
||||||
|
--- a/libgda/sql-parser/gda-sql-statement.h
|
||||||
|
+++ b/libgda/sql-parser/gda-sql-statement.h
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
|
||||||
|
* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
|
||||||
|
- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
|
||||||
|
+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org>
|
||||||
|
* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
|
||||||
|
* Copyright (C) 2011 Murray Cumming <murrayc@murrayc.com>
|
||||||
|
diff --git a/libgda/sql-parser/gda-statement-struct-delete.h b/libgda/sql-parser/gda-statement-struct-delete.h
|
||||||
|
index cab8b9dad..2e51c5eae 100644
|
||||||
|
--- a/libgda/sql-parser/gda-statement-struct-delete.h
|
||||||
|
+++ b/libgda/sql-parser/gda-statement-struct-delete.h
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
|
||||||
|
* Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
|
||||||
|
+ * Copyright (C) 2005 Ã<>lvaro Peña <alvaropg@telefonica.net>
|
||||||
|
* Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
|
||||||
|
* Copyright (C) 2007 - 2009 Murray Cumming <murrayc@murrayc.com>
|
||||||
|
*
|
||||||
|
diff --git a/libgda/sql-parser/gda-statement-struct-unknown.h b/libgda/sql-parser/gda-statement-struct-unknown.h
|
||||||
|
index 5c530d4d9..e0aaf945f 100644
|
||||||
|
--- a/libgda/sql-parser/gda-statement-struct-unknown.h
|
||||||
|
+++ b/libgda/sql-parser/gda-statement-struct-unknown.h
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
|
||||||
|
* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
|
||||||
|
- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
|
||||||
|
+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org>
|
||||||
|
* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
|
||||||
|
* Copyright (C) 2009 Murray Cumming <murrayc@murrayc.com>
|
||||||
|
diff --git a/libgda/sql-parser/gda-statement-struct-util.h b/libgda/sql-parser/gda-statement-struct-util.h
|
||||||
|
index cd4596281..252d6edcc 100644
|
||||||
|
--- a/libgda/sql-parser/gda-statement-struct-util.h
|
||||||
|
+++ b/libgda/sql-parser/gda-statement-struct-util.h
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
|
||||||
|
* Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
|
||||||
|
+ * Copyright (C) 2005 Ã<>lvaro Peña <alvaropg@telefonica.net>
|
||||||
|
* Copyright (C) 2007 - 2009 Murray Cumming <murrayc@murrayc.com>
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
diff --git i/libgda-ui/data-entries/plugins/libmain.c w/libgda-ui/data-entries/plugins/libmain.c
|
||||||
|
index a30c2db2c3258111..1356488c8b0940f9 100644
|
||||||
|
--- i/libgda-ui/data-entries/plugins/libmain.c
|
||||||
|
+++ w/libgda-ui/data-entries/plugins/libmain.c
|
||||||
|
@@ -39,15 +39,7 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_GTKSOURCEVIEW
|
||||||
|
- #ifdef GTK_DISABLE_SINGLE_INCLUDES
|
||||||
|
- #undef GTK_DISABLE_SINGLE_INCLUDES
|
||||||
|
- #endif
|
||||||
|
-
|
||||||
|
- #include <gtksourceview/gtksourceview.h>
|
||||||
|
- #include <gtksourceview/gtksourcelanguagemanager.h>
|
||||||
|
- #include <gtksourceview/gtksourcebuffer.h>
|
||||||
|
- #include <gtksourceview/gtksourcestyleschememanager.h>
|
||||||
|
- #include <gtksourceview/gtksourcestylescheme.h>
|
||||||
|
+#include <gtksourceview/gtksource.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static GdauiDataEntry *plugin_entry_filesel_create_func (GdaDataHandler *handler, GType type, const gchar *options);
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/libgda-ui/gdaui-easy.h 2017-10-08 21:17:30.203226827 +0000
|
||||||
|
+++ b/libgda-ui/gdaui-easy.h 2017-10-08 21:19:38.143497887 +0000
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
|
||||||
|
* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
|
||||||
|
- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
|
||||||
|
+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org>
|
||||||
|
* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
|
||||||
|
*
|
|
@ -0,0 +1,103 @@
|
||||||
|
Description: Fix FTBFS with glib 2.54
|
||||||
|
glib-mkenums now expects input files to be UTF-8,
|
||||||
|
fix the encoding of libgnomeui/gnome-scores.h
|
||||||
|
Author: Adrian Bunk <bunk@debian.org>
|
||||||
|
|
||||||
|
--- libgda5-5.2.4.orig/libgda/gda-column.h
|
||||||
|
+++ libgda5-5.2.4/libgda/gda-column.h
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
|
||||||
|
+ * Copyright (C) 2005 Ã<>lvaro Peña <alvaropg@telefonica.net>
|
||||||
|
* Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com>
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
--- libgda5-5.2.4.orig/libgda/gda-data-model-extra.h
|
||||||
|
+++ libgda5-5.2.4/libgda/gda-data-model-extra.h
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/*
|
||||||
|
- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
|
||||||
|
+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org>
|
||||||
|
* Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
|
||||||
|
* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
* Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
|
||||||
|
--- libgda5-5.2.4.orig/libgda/gda-data-model-iter-extra.h
|
||||||
|
+++ libgda5-5.2.4/libgda/gda-data-model-iter-extra.h
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
|
||||||
|
* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
|
||||||
|
- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
|
||||||
|
+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org>
|
||||||
|
* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
|
||||||
|
*
|
||||||
|
--- libgda5-5.2.4.orig/libgda/gda-data-model.h
|
||||||
|
+++ libgda5-5.2.4/libgda/gda-data-model.h
|
||||||
|
@@ -4,7 +4,7 @@
|
||||||
|
* Copyright (C) 2003 Laurent Sansonetti <lrz@gnome.org>
|
||||||
|
* Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
|
||||||
|
* Copyright (C) 2005 - 2012 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
|
||||||
|
+ * Copyright (C) 2005 Ã<>lvaro Peña <alvaropg@telefonica.net>
|
||||||
|
* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
|
||||||
|
* Copyright (C) 2011 Daniel Espinosa <despinosa@src.gnome.org>
|
||||||
|
*
|
||||||
|
--- libgda5-5.2.4.orig/libgda/gda-mutex.h
|
||||||
|
+++ libgda5-5.2.4/libgda/gda-mutex.h
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
|
||||||
|
* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
|
||||||
|
- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
|
||||||
|
+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org>
|
||||||
|
* Copyright (C) 2001 - 2013 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
|
||||||
|
*
|
||||||
|
--- libgda5-5.2.4.orig/libgda/gda-row.h
|
||||||
|
+++ libgda5-5.2.4/libgda/gda-row.h
|
||||||
|
@@ -3,10 +3,10 @@
|
||||||
|
* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
|
||||||
|
* Copyright (C) 2003 Laurent Sansonetti <laurent@datarescue.be>
|
||||||
|
- * Copyright (C) 2003 Xabier Rodríguez Calvar <xrcalvar@igalia.com>
|
||||||
|
+ * Copyright (C) 2003 Xabier RodrÃguez Calvar <xrcalvar@igalia.com>
|
||||||
|
* Copyright (C) 2004 Paisa Seeluangsawat <paisa@users.sf.net>
|
||||||
|
* Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com>
|
||||||
|
- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
|
||||||
|
+ * Copyright (C) 2005 Ã<>lvaro Peña <alvaropg@telefonica.net>
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
--- libgda5-5.2.4.orig/libgda/gda-server-provider-private.h
|
||||||
|
+++ libgda5-5.2.4/libgda/gda-server-provider-private.h
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
|
||||||
|
* Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
|
||||||
|
+ * Copyright (C) 2005 Ã<>lvaro Peña <alvaropg@telefonica.net>
|
||||||
|
* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
--- libgda5-5.2.4.orig/libgda/gda-util.h
|
||||||
|
+++ libgda5-5.2.4/libgda/gda-util.h
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
|
||||||
|
* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
|
||||||
|
- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
|
||||||
|
+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org>
|
||||||
|
* Copyright (C) 2001 - 2013 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
|
||||||
|
* Copyright (C) 2006 - 2007 Murray Cumming <murrayc@murrayc.com>
|
||||||
|
--- libgda5-5.2.4.orig/libgda/libgda-global-variables.h
|
||||||
|
+++ libgda5-5.2.4/libgda/libgda-global-variables.h
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/*
|
||||||
|
- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
|
||||||
|
+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org>
|
||||||
|
* Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
|
||||||
|
* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
|
||||||
|
* Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
|
|
@ -0,0 +1,36 @@
|
||||||
|
diff -u -r libgda-5.2.4/getsp.java libgda-5.2.4-java/getsp.java
|
||||||
|
--- libgda-5.2.4/getsp.java 2014-02-05 21:28:20.000000000 +0100
|
||||||
|
+++ libgda-5.2.4-java/getsp.java 2015-06-14 20:27:35.770310228 +0200
|
||||||
|
@@ -25,7 +25,7 @@
|
||||||
|
while (i<=j) {
|
||||||
|
if (i==j || lp.charAt(i)==ps) {
|
||||||
|
String lib=lp.substring(k,i);
|
||||||
|
- String suffix="/lib/amd64/server";
|
||||||
|
+ String suffix="/lib/"+System.getProperty("os.arch")+"/server";
|
||||||
|
k=i+1;
|
||||||
|
if (lib.compareTo(".")!=0)
|
||||||
|
r=(r==null)?(prefix+lib+suffix):(r+" "+prefix+lib+suffix);
|
||||||
|
@@ -50,7 +50,7 @@
|
||||||
|
|
||||||
|
if (r!=null) System.out.println(r);
|
||||||
|
} else if (args[0].compareTo("-ldpath")==0) {
|
||||||
|
- String lp1=System.getProperty("java.home")+"/lib/amd64/server";
|
||||||
|
+ String lp1=System.getProperty("java.home")+"/lib/"+System.getProperty("os.arch")+"/server";
|
||||||
|
String lp2=System.getProperty("java.library.path");
|
||||||
|
System.out.println(lp1+":"+lp2);
|
||||||
|
}
|
||||||
|
diff -u -r libgda-5.2.4/m4/java.m4 libgda-5.2.4-java/m4/java.m4
|
||||||
|
--- libgda-5.2.4/m4/java.m4 2015-06-13 10:36:25.000000000 +0200
|
||||||
|
+++ libgda-5.2.4-java/m4/java.m4 2015-06-14 20:16:59.865581930 +0200
|
||||||
|
@@ -175,6 +175,11 @@
|
||||||
|
JTYPE="Sun JRE 1.7"
|
||||||
|
JFLAGS="-Xlint:unchecked -Xlint:deprecation"
|
||||||
|
;;
|
||||||
|
+ JRE1.8.*)
|
||||||
|
+ try_java=true
|
||||||
|
+ JTYPE="Sun JRE 1.8"
|
||||||
|
+ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
|
||||||
|
+ ;;
|
||||||
|
JREgcj-4*)
|
||||||
|
try_java=true
|
||||||
|
JTYPE="GCJ"
|
|
@ -0,0 +1,44 @@
|
||||||
|
# Tanım: Veritabanı erişim kitaplığı
|
||||||
|
# URL: https://git.gnome.org/browse/libgda
|
||||||
|
# Paketçi: Cihan_Alkan
|
||||||
|
# Gerekler: gnome-common json-glib gtksourceview3 libxslt python libsecret graphviz goocanvas iso-codes openjdk
|
||||||
|
# Grup: kütüphane
|
||||||
|
|
||||||
|
isim=libgda
|
||||||
|
surum=5.2.4
|
||||||
|
devir=1
|
||||||
|
_apiver=5.0
|
||||||
|
|
||||||
|
kaynak=(https://git.gnome.org/browse/libgda/snapshot/LIBGDA_5_2_4.tar.xz
|
||||||
|
fix-crash.diff
|
||||||
|
java.patch
|
||||||
|
0001-Convert-files-to-Unicode.patch
|
||||||
|
glib-2.54-ftbfs.patch
|
||||||
|
glib-2.54-ftbfs-2.patch)
|
||||||
|
|
||||||
|
derle() {
|
||||||
|
mkdir providers
|
||||||
|
cd LIBGDA_5_2_4
|
||||||
|
|
||||||
|
patch -Np1 -i ../java.patch
|
||||||
|
patch -Np1 -i ../0001-Convert-files-to-Unicode.patch
|
||||||
|
patch -Np1 -i ../glib-2.54-ftbfs.patch
|
||||||
|
patch -Np1 -i ../glib-2.54-ftbfs-2.patch
|
||||||
|
patch -Np1 -i ../fix-crash.diff
|
||||||
|
/opt/jdk/bin/javac getsp.java
|
||||||
|
|
||||||
|
find -name '*.py' -exec sed -i '1s/python$/&2/' {} +
|
||||||
|
|
||||||
|
NOCONFIGURE=1 ./autogen.sh
|
||||||
|
|
||||||
|
./configure --prefix=/usr --sysconfdir=/etc --disable-static \
|
||||||
|
--with-bdb=/usr --with-bdb-libdir-name=lib \
|
||||||
|
--enable-json --enable-system-sqlite --enable-binreloc \
|
||||||
|
--enable-gda-gi --enable-gdaui-gi \
|
||||||
|
--enable-vala --enable-gdaui-vala VALA_API_VERSION=0.38 \
|
||||||
|
--disable-crypto
|
||||||
|
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||||
|
make
|
||||||
|
make DESTDIR="$PKG" install
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue