commit e377ea1a92d1ec376b3e6d403eca2de892d9be43
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Thu Feb 2 17:19:23 2023 +0100
- added sqlite patch (use proper header for system/static/bdb sqlite)
- added mdb1.0 patch (adjust for mdbtools 0.9/1.0)
- added openssl patch (fix for openssl 3)
- added perl patch (fix for recent perl)
- added encoding patch (fix mixed iso-8859-1/iso-8859-2/utf-8 encodings in
sources)
- added java patch (adjust libjvm path search)
- added vala patch, switched to vala 0.56.x
libgda-encoding.patch | 563 ++++++++++++++++++++++++++++++++++++++++++++++++++
libgda-java.patch | 26 +++
libgda-mdb1.0.patch | 107 ++++++++++
libgda-openssl.patch | 34 +++
libgda-perl.patch | 47 +++++
libgda-sqlite.patch | 24 +++
libgda-vala.patch | 9 +
libgda4.spec | 26 ++-
8 files changed, 832 insertions(+), 4 deletions(-)
---
diff --git a/libgda4.spec b/libgda4.spec
index 5d36278..6bb4996 100644
--- a/libgda4.spec
+++ b/libgda4.spec
@@ -15,7 +15,7 @@
%ifnarch i486 i586 i686 pentium3 pentium4 athlon %{x8664}
%undefine with_jdbc
%endif
-%define vala_ver 0.24
+%define vala_ver 0.56
Summary: GNU Data Access library
Summary(pl.UTF-8): Biblioteka GNU Data Access
@@ -29,6 +29,13 @@ Source0:
https://download.gnome.org/sources/libgda/4.2/libgda-%{version}.tar.xz
Patch0: %{name}-configure.patch
Patch1: %{name}-gir.patch
Patch2: %{name}-graphviz.patch
+Patch3: libgda-sqlite.patch
+Patch4: libgda-mdb1.0.patch
+Patch5: libgda-openssl.patch
+Patch6: libgda-perl.patch
+Patch7: libgda-encoding.patch
+Patch8: libgda-java.patch
+Patch9: libgda-vala.patch
URL: https://www.gnome-db.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.8
@@ -350,21 +357,32 @@ Narzędzia graficzne dla GDA.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
%{__sed} -i -e 's/libvala-0.14 >= 0.14/libvala-%{vala_ver}/' configure.ac
+%{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' \
+ libgda-report/RML/trml2html/trml2html.py \
+ libgda-report/RML/trml2pdf/trml2pdf.py
+
%build
# included version is bash-specific, use system file
cp -f %{_aclocaldir}/introspection.m4 m4/introspection.m4
-%if %{with jdbc}
-export JAVA_HOME="%{java_home}"
-%endif
%{__gtkdocize}
%{__intltoolize}
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
%{__automake}
+%if %{with jdbc}
+export JAVA_HOME="%{java_home}"
+%endif
%configure \
--disable-default-binary \
--disable-silent-rules \
diff --git a/libgda-encoding.patch b/libgda-encoding.patch
new file mode 100644
index 0000000..482709e
--- /dev/null
+++ b/libgda-encoding.patch
@@ -0,0 +1,563 @@
+--- libgda-4.2.13/tools/browser/dnd.c.orig 2012-04-27 17:34:25.000000000
+0200
++++ libgda-4.2.13/tools/browser/dnd.c 2023-02-01 18:58:59.640011844 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2009 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/gda-column.h.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda/gda-column.h 2023-02-01 19:20:37.066316416 +0100
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (C) 2005 - 2009 Vivien Malerba <male...@gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ * Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorc...@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+--- libgda-4.2.13/libgda/gda-connection-internal.h.orig 2012-04-27
17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda/gda-connection-internal.h 2023-02-01
19:22:00.159199596 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/gda-connection-sqlite.h.orig 2012-03-06
22:33:07.000000000 +0100
++++ libgda-4.2.13/libgda/gda-connection-sqlite.h 2023-02-01
19:23:04.092186575 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2009 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/gda-connection.h.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda/gda-connection.h 2023-02-01 19:23:46.641956063
+0100
+@@ -6,7 +6,7 @@
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonz...@ximian.com>
+ * Copyright (C) 2003 Filip Van Raemdonck <mecha...@debian.org>
+ * Copyright (C) 2004 - 2005 Alan Knowles <al...@src.gnome.org>
+- * Copyright (C) 2004 Jos� Mar�a Casanova Crespo <jmcasan...@igalia.com>
++ * Copyright (C) 2004 José María Casanova Crespo <jmcasan...@igalia.com>
+ * Copyright (C) 2005 - 2009 Bas Driessen <bas.dries...@xobas.com>
+ * Copyright (C) 2006 - 2008 Murray Cumming <murr...@murrayc.com>
+ * Copyright (C) 2007 Leonardo Boshell <l...@kmc.com.co>
+--- libgda-4.2.13/libgda/gda-data-model-extra.h.orig 2012-03-06
22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/gda-data-model-extra.h 2023-02-01
19:27:00.514239100 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2003 Rodrigo Moya <rodr...@gnome-db.org>
+ * Copyright (C) 2001 - 2008 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonz...@gnome-db.org>
+--- libgda-4.2.13/libgda/gda-data-model-iter-extra.h.orig 2012-03-06
22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/gda-data-model-iter-extra.h 2023-02-01
19:28:06.263882904 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2008 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/gda-data-model.h.orig 2023-02-01 19:28:59.803592854
+0100
++++ libgda-4.2.13/libgda/gda-data-model.h 2023-02-01 19:29:07.296885593
+0100
+@@ -4,7 +4,7 @@
+ * Copyright (C) 2003 Laurent Sansonetti <l...@gnome.org>
+ * Copyright (C) 2005 Dan Winship <d...@src.gnome.org>
+ * Copyright (C) 2005 - 2011 Vivien Malerba <male...@gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ * Copyright (C) 2007 Murray Cumming <murr...@murrayc.com>
+ *
+ * This library is free software; you can redistribute it and/or
+--- libgda-4.2.13/libgda/gda-meta-store-extra.h.orig 2012-03-06
22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/gda-meta-store-extra.h 2023-02-01
19:30:52.402982851 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2009 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/gda-meta-struct-private.h.orig 2012-03-06
22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/gda-meta-struct-private.h 2023-02-01
19:31:12.689539616 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2008 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/gda-mutex.h.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda/gda-mutex.h 2023-02-01 19:31:34.536087929 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/gda-row.h.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda/gda-row.h 2023-02-01 19:32:15.385866627 +0100
+@@ -3,10 +3,10 @@
+ * Copyright (C) 2001 - 2009 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@gnome-db.org>
+ * Copyright (C) 2003 Laurent Sansonetti <laur...@datarescue.be>
+- * Copyright (C) 2003 Xabier Rodr�guez Calvar <xrcal...@igalia.com>
++ * Copyright (C) 2003 Xabier Rodríguez Calvar <xrcal...@igalia.com>
+ * Copyright (C) 2004 Paisa Seeluangsawat <pa...@users.sf.net>
+ * Copyright (C) 2005 Bas Driessen <bas.dries...@xobas.com>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+--- libgda-4.2.13/libgda/gda-server-operation-private.h.orig 2012-03-06
22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/gda-server-operation-private.h 2023-02-01
19:32:38.715740238 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2009 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/gda-server-provider-private.h.orig 2012-03-06
22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/gda-server-provider-private.h 2023-02-01
19:33:39.665410046 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2005 Dan Winship <d...@src.gnome.org>
+ * Copyright (C) 2005 - 2008 Vivien Malerba <male...@gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ * Copyright (C) 2007 Murray Cumming <murr...@murrayc.com>
+ *
+ * This library is free software; you can redistribute it and/or
+--- libgda-4.2.13/libgda/gda-util.h.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda/gda-util.h 2023-02-01 19:33:59.775301101 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ * Copyright (C) 2006 - 2007 Murray Cumming <murr...@murrayc.com>
+--- libgda-4.2.13/libgda/libgda-global-variables.h.orig 2012-03-06
22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/libgda-global-variables.h 2023-02-01
19:34:21.375184084 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2003 Rodrigo Moya <rodr...@gnome-db.org>
+ * Copyright (C) 2001 - 2010 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonz...@gnome-db.org>
+--- libgda-4.2.13/libgda/libgda.h.in.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda/libgda.h.in 2023-02-01 20:18:36.600799493 +0100
+@@ -1,14 +1,14 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2004 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Andrew Hill <an...@src.gnome.org>
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonz...@ximian.com>
+ * Copyright (C) 2003 - 2006 Murray Cumming <murr...@murrayc.com>
+ * Copyright (C) 2004 Szalai Ferenc <szf...@einstein.ki.iif.hu>
+ * Copyright (C) 2005 Bas Driessen <bas.dries...@xobas.com>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+--- libgda-4.2.13/libgda/libgda.h.orig 2023-02-01 19:00:55.232718958 +0100
++++ libgda-4.2.13/libgda/libgda.h 2023-02-01 19:34:44.845056937 +0100
+@@ -1,14 +1,14 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2004 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Andrew Hill <an...@src.gnome.org>
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonz...@ximian.com>
+ * Copyright (C) 2003 - 2006 Murray Cumming <murr...@murrayc.com>
+ * Copyright (C) 2004 Szalai Ferenc <szf...@einstein.ki.iif.hu>
+ * Copyright (C) 2005 Bas Driessen <bas.dries...@xobas.com>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+--- libgda-4.2.13/libgda/binreloc/gda-binreloc.h.orig 2012-03-06
22:33:07.000000000 +0100
++++ libgda-4.2.13/libgda/binreloc/gda-binreloc.h 2023-02-01
19:34:59.684976542 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2007 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/providers-support/gda-data-select-priv.h.orig
2012-04-27 17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda/providers-support/gda-data-select-priv.h
2023-02-01 19:35:55.928005181 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/sql-parser/gda-sql-statement.h.orig 2012-04-27
17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda/sql-parser/gda-sql-statement.h 2023-02-01
19:36:47.564392110 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2008 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/sql-parser/gda-statement-struct-delete.h.orig
2012-04-27 17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda/sql-parser/gda-statement-struct-delete.h
2023-02-01 19:37:08.944276285 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2005 Dan Winship <d...@src.gnome.org>
+ * Copyright (C) 2005 - 2009 Vivien Malerba <male...@gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ * Copyright (C) 2007 Armin Burgmeier <ar...@openismus.com>
+ * Copyright (C) 2007 - 2009 Murray Cumming <murr...@murrayc.com>
+ *
+--- libgda-4.2.13/libgda/sql-parser/gda-statement-struct-unknown.h.orig
2012-04-27 17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda/sql-parser/gda-statement-struct-unknown.h
2023-02-01 19:37:48.537395124 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2009 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ * Copyright (C) 2009 Murray Cumming <murr...@murrayc.com>
+--- libgda-4.2.13/libgda/sql-parser/gda-statement-struct-util.h.orig
2012-04-27 17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda/sql-parser/gda-statement-struct-util.h
2023-02-01 19:38:18.147234714 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2005 Dan Winship <d...@src.gnome.org>
+ * Copyright (C) 2005 - 2009 Vivien Malerba <male...@gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ * Copyright (C) 2007 - 2009 Murray Cumming <murr...@murrayc.com>
+ *
+ * This library is free software; you can redistribute it and/or
+--- libgda-4.2.13/libgda/sqlite/gda-sqlite-provider.h.orig 2012-03-06
22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/sqlite/gda-sqlite-provider.h 2023-02-01
19:38:39.533785519 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2001 - 2002 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ * Copyright (C) 2002 Rodrigo Moya <rodr...@gnome-db.org>
+ * Copyright (C) 2007 - 2009 Vivien Malerba <male...@gnome-db.org>
+--- libgda-4.2.13/libgda/sqlite/gda-sqlite-recordset.h.orig 2012-03-06
22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/sqlite/gda-sqlite-recordset.h 2023-02-01
19:49:55.626789476 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 - 2002 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2009 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/sqlite/gda-sqlite.h.orig 2012-03-06
22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/sqlite/gda-sqlite.h 2023-02-01 19:57:20.687711707
+0100
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2001 - 2002 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+---
libgda-4.2.13/libgda/sqlite/virtual/gda-vconnection-data-model-private.h.orig
2012-03-10 14:46:22.000000000 +0100
++++ libgda-4.2.13/libgda/sqlite/virtual/gda-vconnection-data-model-private.h
2023-02-01 19:57:43.360922209 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/sqlite/virtual/libgda-virtual.h.in.orig
2012-03-06 22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/sqlite/virtual/libgda-virtual.h.in 2023-02-01
20:19:36.180476722 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/sqlite/virtual/libgda-virtual.h.orig 2023-02-01
19:00:55.399384722 +0100
++++ libgda-4.2.13/libgda/sqlite/virtual/libgda-virtual.h 2023-02-01
19:58:01.677489647 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda/thread-wrapper/gda-thread-provider.h.orig
2012-03-06 22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/thread-wrapper/gda-thread-provider.h 2023-02-01
19:58:21.587381785 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2001 - 2002 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ * Copyright (C) 2002 Rodrigo Moya <rodr...@gnome-db.org>
+ * Copyright (C) 2007 - 2009 Vivien Malerba <male...@gnome-db.org>
+--- libgda-4.2.13/libgda-report/gda-report-document-private.h.orig
2012-03-06 22:33:07.000000000 +0100
++++ libgda-4.2.13/libgda-report/gda-report-document-private.h 2023-02-01
19:58:36.717299820 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2007 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda-report/gda-report-document.h.orig 2012-04-27
17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda-report/gda-report-document.h 2023-02-01
19:58:56.283860485 +0100
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (C) 2001 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2002 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2002 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ * Copyright (C) 2003 Santi Camps <sa...@gnome-db.org>
+ * Copyright (C) 2003 Santi Camps Taltavull <sa...@src.gnome.org>
+--- libgda-4.2.13/libgda-report/libgda-report.h.orig 2012-03-06
22:33:07.000000000 +0100
++++ libgda-4.2.13/libgda-report/libgda-report.h 2023-02-01
19:59:10.407117306 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2007 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda-report/engine/rt-parser.h.orig 2012-03-06
22:33:07.000000000 +0100
++++ libgda-4.2.13/libgda-report/engine/rt-parser.h 2023-02-01
19:59:26.080365730 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda-ui/gdaui-easy.h.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda-ui/gdaui-easy.h 2023-02-01 19:59:45.150262420
+0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2009 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda-ui/libgda-ui.h.orig 2012-03-06 22:33:07.000000000
+0100
++++ libgda-4.2.13/libgda-ui/libgda-ui.h 2023-02-01 20:00:01.063509544
+0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13/libgda-xslt/libgda-xslt.h.orig 2012-03-06
22:33:07.000000000 +0100
++++ libgda-4.2.13/libgda-xslt/libgda-xslt.h 2023-02-01 20:00:23.676720371
+0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2009 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ *
+--- libgda-4.2.13//libgda/gda-column.c.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13//libgda/gda-column.c 2023-02-01 20:33:35.912594170 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2005 Andrew Hill <an...@src.gnome.org>
+ * Copyright (C) 2005 - 2010 Vivien Malerba <male...@gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ * Copyright (C) 2007 - 2008 Murray Cumming <murr...@murrayc.com>
+ * Copyright (C) 2008 Johannes Schmid <johannes.sch...@openismus.com>
+ * Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorc...@gmail.com>
+--- libgda-4.2.13/libgda/gda-connection.c.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda/gda-connection.c 2023-02-01 20:34:24.605663710
+0100
+@@ -10,10 +10,10 @@
+ * Copyright (C) 2003 Paisa Seeluangsawat <pa...@users.sf.net>
+ * Copyright (C) 2004 - 2005 Alan Knowles <al...@src.gnome.org>
+ * Copyright (C) 2004 Dani Baeyens <daniel.baey...@hispalinux.es>
+- * Copyright (C) 2004 Jos� Mar�a Casanova Crespo <jmcasan...@igalia.com>
++ * Copyright (C) 2004 José María Casanova Crespo <jmcasan...@igalia.com>
+ * Copyright (C) 2004 Szalai Ferenc <szf...@einstein.ki.iif.hu>
+ * Copyright (C) 2005 - 2009 Bas Driessen <bas.dries...@xobas.com>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ * Copyright (C) 2006 - 2010 Murray Cumming <murr...@murrayc.com>
+ * Copyright (C) 2007 Armin Burgmeier <ar...@openismus.com>
+ * Copyright (C) 2007 Leonardo Boshell <l...@kmc.com.co>
+--- libgda-4.2.13/libgda/gda-data-model-array.c.orig 2012-04-27
17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda/gda-data-model-array.c 2023-02-01
20:34:46.302212836 +0100
+@@ -6,7 +6,7 @@
+ * Copyright (C) 2004 Szalai Ferenc <szf...@einstein.ki.iif.hu>
+ * Copyright (C) 2005 Bas Driessen <bas.dries...@xobas.com>
+ * Copyright (C) 2005 - 2011 Vivien Malerba <male...@gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ * Copyright (C) 2006 - 2008 Murray Cumming <murr...@murrayc.com>
+ * Copyright (C) 2008 Phil Longstaff <plongst...@rogers.com>
+ * Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorc...@gmail.com>
+--- libgda-4.2.13/libgda/gda-data-model.c.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda/gda-data-model.c 2023-02-01 20:35:20.382028210
+0100
+@@ -7,7 +7,7 @@
+ * Copyright (C) 2003 Philippe CHARLIER <p.charl...@chello.be>
+ * Copyright (C) 2004 Dani Baeyens <daniel.baey...@hispalinux.es>
+ * Copyright (C) 2004 Szalai Ferenc <szf...@einstein.ki.iif.hu>
+- * Copyright (C) 2004 - 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2004 - 2005 Álvaro Peña <alvar...@telefonica.net>
+ * Copyright (C) 2005 - 2009 Bas Driessen <bas.dries...@xobas.com>
+ * Copyright (C) 2005 Dan Winship <d...@src.gnome.org>
+ * Copyright (C) 2005 Stanislav Brabec <sbra...@suse.de>
+--- libgda-4.2.13/libgda/gda-init.c.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda/gda-init.c 2023-02-01 20:35:40.481919320 +0100
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinh...@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 Andrew Hill <an...@src.gnome.org>
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonz...@gnome-db.org>
+--- libgda-4.2.13/libgda/gda-row.c.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda/gda-row.c 2023-02-01 20:36:11.345085453 +0100
+@@ -4,7 +4,7 @@
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonz...@gnome-db.org>
+ * Copyright (C) 2003 Laurent Sansonetti <laur...@datarescue.be>
+ * Copyright (C) 2003 Paisa Seeluangsawat <pa...@users.sf.net>
+- * Copyright (C) 2003 Xabier Rodr�guez Calvar <xrcal...@igalia.com>
++ * Copyright (C) 2003 Xabier Rodríguez Calvar <xrcal...@igalia.com>
+ * Copyright (C) 2004 Paisa Seeluangsawat <pa...@users.sf.net>
+ * Copyright (C) 2004 Szalai Ferenc <szf...@einstein.ki.iif.hu>
+ * Copyright (C) 2005 - 2011 Vivien Malerba <male...@gnome-db.org>
+--- libgda-4.2.13/libgda/gda-server-provider.c.orig 2012-04-27
17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda/gda-server-provider.c 2023-02-01 20:36:31.891640809
+0100
+@@ -8,7 +8,7 @@
+ * Copyright (C) 2004 Julio M. Merino Vidal <j...@menta.net>
+ * Copyright (C) 2005 - 2006 Bas Driessen <bas.dries...@xobas.com>
+ * Copyright (C) 2005 - 2010 Vivien Malerba <male...@gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ * Copyright (C) 2007 Armin Burgmeier <ar...@openismus.com>
+ * Copyright (C) 2008 Murray Cumming <murr...@murrayc.com>
+ * Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorc...@gmail.com>
+--- libgda-4.2.13/libgda/gda-util.c.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda/gda-util.c 2023-02-01 20:37:25.441350706 +0100
+@@ -4,7 +4,7 @@
+ * Copyright (C) 2003 - 2004 Laurent Sansonetti <l...@gnome.org>
+ * Copyright (C) 2003 Paisa Seeluangsawat <pa...@users.sf.net>
+ * Copyright (C) 2004 Caolan McNamara <caol...@redhat.com>
+- * Copyright (C) 2004 J�rg Billeter <j...@bitron.ch>
++ * Copyright (C) 2004 Jürg Billeter <j...@bitron.ch>
+ * Copyright (C) 2004 - 2010 Murray Cumming <murr...@murrayc.com>
+ * Copyright (C) 2005 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2007 - 2009 Armin Burgmeier <ar...@openismus.com>
+--- libgda-4.2.13/libgda/sqlite/gda-sqlite-provider.c.orig 2012-04-27
17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda/sqlite/gda-sqlite-provider.c 2023-02-01
20:38:09.794443758 +0100
+@@ -1,15 +1,15 @@
+ /*
+- * Copyright (C) 2001 - 2002 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2003 Rodrigo Moya <rodr...@gnome-db.org>
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ * Copyright (C) 2004 Benjamin Otte <in7y...@public.uni-hamburg.de>
+ * Copyright (C) 2004 J.H.M. Dassen (Ray) <jdas...@debian.org>
+ * Copyright (C) 2004 Julio M. Merino Vidal <j...@menta.net>
+- * Copyright (C) 2004 J�rg Billeter <j...@bitron.ch>
++ * Copyright (C) 2004 Jürg Billeter <j...@bitron.ch>
+ * Copyright (C) 2004 Nikolai Weibull
<ruby-gnome2-devel-en-l...@pcppopper.org>
+ * Copyright (C) 2005 Denis Fortin <denis.for...@free.fr>
+ * Copyright (C) 2005 - 2011 Vivien Malerba <male...@gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ * Copyright (C) 2008 - 2009 Bas Driessen <bas.dries...@xobas.com>
+ * Copyright (C) 2008 Murray Cumming <murr...@murrayc.com>
+ * Copyright (C) 2009 Armin Burgmeier <ar...@openismus.com>
+--- libgda-4.2.13/libgda/sqlite/gda-sqlite-recordset.c.orig 2012-04-27
17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda/sqlite/gda-sqlite-recordset.c 2023-02-01
20:38:34.064312276 +0100
+@@ -1,10 +1,10 @@
+ /*
+- * Copyright (C) 2001 - 2002 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
+ * Copyright (C) 2002 - 2005 Rodrigo Moya <rodr...@gnome-db.org>
+ * Copyright (C) 2005 Denis Fortin <denis.for...@free.fr>
+ * Copyright (C) 2005 - 2011 Vivien Malerba <male...@gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvar...@telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvar...@telefonica.net>
+ * Copyright (C) 2006 - 2008 Murray Cumming <murr...@murrayc.com>
+ * Copyright (C) 2007 Armin Burgmeier <arm...@src.gnome.org>
+ * Copyright (C) 2009 Bas Driessen <bas.dries...@xobas.com>
+--- libgda-4.2.13/libgda/sqlite/gda-sqlite-util.c.orig 2012-04-27
17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda/sqlite/gda-sqlite-util.c 2023-02-01
20:38:54.397535455 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2001 - 2002 Carlos Perell� Mar�n <car...@gnome-db.org>
++ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <car...@gnome-db.org>
+ * Copyright (C) 2001 - 2002 Rodrigo Moya <rodr...@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <male...@gnome-db.org>
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonz...@src.gnome.org>
diff --git a/libgda-java.patch b/libgda-java.patch
new file mode 100644
index 0000000..4eb09f5
--- /dev/null
+++ b/libgda-java.patch
@@ -0,0 +1,26 @@
+--- libgda-4.2.13/m4/java.m4.orig 2012-04-27 17:34:23.000000000 +0200
++++ libgda-4.2.13/m4/java.m4 2023-02-01 21:16:29.291986310 +0100
+@@ -165,9 +165,9 @@ m4_define([_JAVA_CHECK_INTERNAL],
+ JTYPE="Sun JRE 1.5"
+ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
+ ;;
+- JRE1.6.*)
++ JRE1.[[6789]].*|JRE1[[0123456789]].*)
+ try_java=true
+- JTYPE="Sun JRE 1.6"
++ JTYPE="Sun JRE 1.6+"
+ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
+ ;;
+ JREgcj-4*)
+@@ -209,8 +209,10 @@ m4_define([_JAVA_CHECK_INTERNAL],
+ ;;
+ *)
+ RUN_JAVA(JAVA_LIBS, [-classpath ${srcdir} getsp
-libs])
+- JAVA_LIBS="${JAVA_LIBS} -ljvm"
+ RUN_JAVA(JAVA_LD_PATH, [-classpath ${srcdir} getsp
java.library.path])
++ RUN_JAVA(JAVA_BOOT_PATH, [-classpath ${srcdir}
getsp sun.boot.library.path])
++ JAVA_LIBS="${JAVA_LIBS} -L${JAVA_BOOT_PATH}
-L${JAVA_BOOT_PATH}/client -L${JAVA_BOOT_PATH}/server"
++ JAVA_LIBS="${JAVA_LIBS} -ljvm"
+ ;;
+ esac
+ # note that we actually don't test JAVA_LIBS - we hope that
the detection
diff --git a/libgda-mdb1.0.patch b/libgda-mdb1.0.patch
new file mode 100644
index 0000000..949a184
--- /dev/null
+++ b/libgda-mdb1.0.patch
@@ -0,0 +1,107 @@
+--- libgda-4.2.13/providers/mdb/gda-mdb.h.orig 2023-02-01 17:08:02.566076308
+0100
++++ libgda-4.2.13/providers/mdb/gda-mdb.h 2023-02-01 17:08:57.269113289
+0100
+@@ -39,6 +39,7 @@ typedef struct {
+ GdaConnection *cnc;
+ MdbHandle *mdb;
+ gchar *server_version;
++ gchar *filename;
+ } MdbConnectionData;
+
+ #endif
+--- libgda-4.2.13/providers/mdb/gda-mdb-provider.c.orig 2023-02-01
17:08:02.569409623 +0100
++++ libgda-4.2.13/providers/mdb/gda-mdb-provider.c 2023-02-01
17:13:17.234371604 +0100
+@@ -63,8 +63,6 @@ static const gchar *gda_mdb_provider_get
+
+
+ static GObjectClass *parent_class = NULL;
+-static GStaticMutex mdb_init_mutex = G_STATIC_MUTEX_INIT;
+-static gint loaded_providers = 0;
+ char *g_input_ptr;
+
+ /*
+@@ -93,7 +93,6 @@ gda_mdb_provider_class_init (GdaMdbProvi
+ static void
+ gda_mdb_provider_init (GdaMdbProvider *myprv, GdaMdbProviderClass *klass)
+ {
+- mdb_set_date_fmt ("%Y-%m-%d %H:%M:%S");
+ }
+
+ static void
+@@ -107,13 +104,6 @@ gda_mdb_provider_finalize (GObject *obje
+
+ /* chain to parent class */
+ parent_class->finalize (object);
+-
+- /* call MDB exit function if there are no more providers */
+- g_static_mutex_lock (&mdb_init_mutex);
+- loaded_providers--;
+- if (loaded_providers == 0)
+- mdb_exit ();
+- g_static_mutex_unlock (&mdb_init_mutex);
+ }
+
+ GType
+@@ -148,12 +138,6 @@ gda_mdb_provider_new (void)
+ {
+ GdaMdbProvider *provider;
+
+- g_static_mutex_lock (&mdb_init_mutex);
+- if (loaded_providers == 0)
+- mdb_init ();
+- loaded_providers++;
+- g_static_mutex_unlock (&mdb_init_mutex);
+-
+ provider = g_object_new (gda_mdb_provider_get_type (), NULL);
+ return GDA_SERVER_PROVIDER (provider);
+ }
+@@ -304,6 +288,7 @@ gda_mdb_provider_open_connection (GdaSer
+ cdata = g_new0 (MdbConnectionData, 1);
+ cdata->cnc = cnc;
+ cdata->server_version = NULL;
++ cdata->filename = filename;
+ #ifdef MDB_WITH_WRITE_SUPPORT
+ cdata->mdb = mdb_open (filename, MDB_WRITABLE);
+ #else
+@@ -316,6 +299,7 @@ gda_mdb_provider_open_connection (GdaSer
+ gda_mdb_free_cnc_data (cdata);
+ return FALSE;
+ }
++ mdb_set_date_fmt (cdata->mdb, "%Y-%m-%d %H:%M:%S");
+
+ /* open virtual connection */
+ if (! GDA_SERVER_PROVIDER_CLASS (parent_class)->open_connection
(GDA_SERVER_PROVIDER (provider), cnc, params,
+@@ -416,8 +402,7 @@ table_create_columns_func (LocalSpec *sp
+ gda_column_set_name (gda_col, tmp);
+ g_free (tmp);
+ gda_column_set_g_type (gda_col, gda_mdb_type_to_gda
(mdb_col->col_type));
+- tmp = sanitize_name (g_strdup (mdb_get_coltype_string
(spec->cdata->mdb->default_backend,
+-
mdb_col->col_type)));
++ tmp = sanitize_name (g_strdup (mdb_get_colbacktype_string
(mdb_col)));
+ gda_column_set_dbms_type (gda_col, tmp);
+ g_free (tmp);
+ columns = g_list_prepend (columns, gda_col);
+@@ -474,7 +459,7 @@ table_create_model_func (LocalSpec *spec
+ gda_column_set_name (gda_col, tmp);
+ gda_column_set_description (gda_col, tmp);
+ g_free (tmp);
+- tmp = sanitize_name (g_strdup (mdb_get_coltype_string
(spec->cdata->mdb->default_backend, mdb_col->col_type)));
++ tmp = sanitize_name (g_strdup (mdb_get_colbacktype_string
(mdb_col)));
+ gda_column_set_dbms_type (gda_col, tmp);
+ g_free (tmp);
+ gda_column_set_g_type (gda_col, coltypes [c]);
+@@ -567,7 +552,7 @@ gda_mdb_provider_get_database (GdaServer
+ if (!cdata)
+ return NULL;
+
+- return (const gchar *) cdata->mdb->f->filename;
++ return (const gchar *) cdata->filename;
+ }
+
+ /*
+@@ -577,5 +562,6 @@ static void
+ gda_mdb_free_cnc_data (MdbConnectionData *cdata)
+ {
+ g_free (cdata->server_version);
++ g_free (cdata->filename);
+ g_free (cdata);
+ }
diff --git a/libgda-openssl.patch b/libgda-openssl.patch
new file mode 100644
index 0000000..2900a7b
--- /dev/null
+++ b/libgda-openssl.patch
@@ -0,0 +1,34 @@
+--- libgda-4.2.13/providers/sqlcipher/sqlite3.c.orig 2012-04-27
17:42:37.000000000 +0200
++++ libgda-4.2.13/providers/sqlcipher/sqlite3.c 2023-02-01
18:03:04.868186203 +0100
+@@ -11961,7 +11961,7 @@ static int codec_key_derive(codec_ctx *c
+ * out - pouter to output bytes
+ */
+ static int codec_cipher(cipher_ctx *ctx, Pgno pgno, int mode, int size,
unsigned char *in, unsigned char *out) {
+- EVP_CIPHER_CTX ectx;
++ EVP_CIPHER_CTX *ectx = EVP_CIPHER_CTX_new();
+ unsigned char *iv;
+ int tmp_csz, csz;
+
+@@ -11983,15 +11983,16 @@ static int codec_cipher(cipher_ctx *ctx,
+ memcpy(iv, in+size, ctx->iv_sz);
+ }
+
+- EVP_CipherInit(&ectx, ctx->evp_cipher, NULL, NULL, mode);
+- EVP_CIPHER_CTX_set_padding(&ectx, 0);
+- EVP_CipherInit(&ectx, NULL, ctx->key, iv, mode);
+- EVP_CipherUpdate(&ectx, out, &tmp_csz, in, size);
++ EVP_CipherInit(ectx, ctx->evp_cipher, NULL, NULL, mode);
++ EVP_CIPHER_CTX_set_padding(ectx, 0);
++ EVP_CipherInit(ectx, NULL, ctx->key, iv, mode);
++ EVP_CipherUpdate(ectx, out, &tmp_csz, in, size);
+ csz = tmp_csz;
+ out += tmp_csz;
+- EVP_CipherFinal(&ectx, out, &tmp_csz);
++ EVP_CipherFinal(ectx, out, &tmp_csz);
+ csz += tmp_csz;
+- EVP_CIPHER_CTX_cleanup(&ectx);
++ EVP_CIPHER_CTX_cleanup(ectx);
++ EVP_CIPHER_CTX_free(ectx);
+ assert(size == csz);
+
+ return SQLITE_OK;
diff --git a/libgda-perl.patch b/libgda-perl.patch
new file mode 100644
index 0000000..23a587b
--- /dev/null
+++ b/libgda-perl.patch
@@ -0,0 +1,47 @@
+--- libgda-4.2.13/libgda-ui/demos/geninclude.pl.in.orig 2023-02-01
18:25:57.004086039 +0100
++++ libgda-4.2.13/libgda-ui/demos/geninclude.pl.in 2023-02-01
18:26:00.094069299 +0100
+@@ -40,7 +40,7 @@ foreach $href (@demos) {
+ my $do_next = 0;
+
+ # parent detected
+- if (defined @parents) {
++ if (defined $parents && @parents) {
+ foreach $foo (@parents) {
+ if ($foo eq $parent_name) {
+ $do_next = 1;
+@@ -54,7 +54,7 @@ foreach $href (@demos) {
+
+ push @parents, $parent_name;
+
+- $tmp = (defined @child_arrays)?($#child_arrays + 1):0;
++ $tmp = (defined $child_arrays && @child_arrays)?($#child_arrays + 1):0;
+ push @child_arrays, "child$tmp";
+
+ push @demos, {"title" => $parent_name, "file" => "NULL",
+@@ -62,7 +62,7 @@ foreach $href (@demos) {
+ }
+ }
+
+-if (defined @parents) {
++if (defined $parents && @parents) {
+ $i = 0;
+ for ($i = 0; $i <= $#parents; $i++) {
+ $first = 1;
+@@ -105,7 +105,7 @@ if (defined @parents) {
+ } @demos_old;
+
+ # sort the child arrays
+-if (defined @child_arrays) {
++if (defined $child_arrays && @child_arrays) {
+ for ($i = 0; $i <= $#child_arrays; $i++) {
+ @foo_old = @{$child_arrays[$i]};
+
+@@ -133,7 +133,7 @@ foreach $href (@demos) {
+ print ", \n";
+ }
+
+- if (defined @parents) {
++ if (defined $parents && @parents) {
+ for ($i = 0; $i <= $#parents; $i++) {
+ if ($parents[$i] eq $href->{title}) {
+
diff --git a/libgda-sqlite.patch b/libgda-sqlite.patch
new file mode 100644
index 0000000..62be6b3
--- /dev/null
+++ b/libgda-sqlite.patch
@@ -0,0 +1,24 @@
+--- libgda-4.2.13/libgda/sqlite/Makefile.am.orig 2012-04-27
17:34:23.000000000 +0200
++++ libgda-4.2.13/libgda/sqlite/Makefile.am 2023-02-01 17:01:22.627394979
+0100
+@@ -77,7 +77,7 @@ libgda_bdbsqlite_la_LDFLAGS = -export-dy
+ libgda_bdbsqlite_la_LIBADD =
+
+ libgda_sqlcipher_la_SOURCES = $(sqlitesources)
+-libgda_sqlcipher_la_CFLAGS = -DPNAME=\""SQLCipher"\"
-DCLASS_PREFIX=\""GdaSQLCipher"\" -DSTATIC_SQLITE -DSQLITE_HAS_CODEC
-DSEARCH_LIB_PATH=\"""\"
++libgda_sqlcipher_la_CFLAGS = -DPNAME=\""SQLCipher"\"
-DCLASS_PREFIX=\""GdaSQLCipher"\" -DSQLITE_HAS_CODEC -DSEARCH_LIB_PATH=\"""\"
+ libgda_sqlcipher_la_LDFLAGS = -export-dynamic -module -avoid-version
$(NO_UNDEFINED)
+ libgda_sqlcipher_la_LIBADD =
+
+--- libgda-4.2.13/libgda/sqlite/gda-sqlite-pstmt.h.orig 2012-03-06
22:33:08.000000000 +0100
++++ libgda-4.2.13/libgda/sqlite/gda-sqlite-pstmt.h 2023-02-01
17:01:53.534167852 +0100
+@@ -21,7 +21,9 @@
+ #define __GDA_SQLITE_PSTMT_H__
+
+ #include <libgda/providers-support/gda-pstmt.h>
+-#ifdef HAVE_SQLITE
++#ifdef WITH_BDBSQLITE
++#include <dbsql.h>
++#elif defined(HAVE_SQLITE) && !defined(STATIC_SQLITE)
+ #include <sqlite3.h>
+ #else
+ #include "sqlite-src/sqlite3.h"
diff --git a/libgda-vala.patch b/libgda-vala.patch
new file mode 100644
index 0000000..28ea2b8
--- /dev/null
+++ b/libgda-vala.patch
@@ -0,0 +1,9 @@
+--- libgda-4.2.13/libgda/Gda-4.0.metadata.orig 2012-04-27 17:34:23.000000000
+0200
++++ libgda-4.2.13/libgda/Gda-4.0.metadata 2023-02-02 17:02:44.363581808
+0100
+@@ -1,5 +1,5 @@
+ // Vala Bindings for GDA
+-ValueList type="GLib.List<GLib.Value>"
++ValueList type="GLib.List<GLib.Value?>"
+ ServerProviderMeta skip
+ ServerProviderXa skip
+ // libxml2: replace xml.NodePtr by xml.Node* used by Vala bindings
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgda4.git/commitdiff/e377ea1a92d1ec376b3e6d403eca2de892d9be43
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
