libgda5.0 5.2.2
authorYaakov Selkowitz <yselkowi@redhat.com>
Thu, 8 Jan 2015 19:32:30 +0000 (13:32 -0600)
committerYaakov Selkowitz <yselkowi@redhat.com>
Thu, 8 Jan 2015 19:32:30 +0000 (13:32 -0600)
4.2.2-cygwin.patch [deleted file]
5.2.2-cygwin-bdb.patch [new file with mode: 0644]
5.2.2-cygwin-configure.patch [new file with mode: 0644]
5.2.2-cygwin-glade.patch [new file with mode: 0644]
5.2.2-vala026.patch [new file with mode: 0644]
libgda5.0.cygport

diff --git a/4.2.2-cygwin.patch b/4.2.2-cygwin.patch
deleted file mode 100644 (file)
index 2350ce8..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
---- origsrc/libgda-4.2.2/configure.ac  2010-11-21 08:44:43.000000000 -0600
-+++ src/libgda-4.2.2/configure.ac      2010-12-23 21:53:23.292010800 -0600
-@@ -302,14 +302,16 @@ EXPORT_PROV_SYM_REGEX='-export-symbols-r
- EXPORT_UI_SYM_REGEX='-export-symbols-regex "^(gdaui_).*"'
- AC_MSG_CHECKING([for platform])
- platform_win32=no
-+platform_cygwin=no
- platform_carbon=no
- have_ige=no
- linklibext=".so"
- case "$host" in
- *-cygwin*)
-     AC_MSG_RESULT([Win32 - cygwin])
-+    platform_cygwin=yes
-     NO_UNDEFINED='-no-undefined'
--    LIBTOOL_EXPORT_OPTIONS=$EXPORT_SYM_REGEX
-+    LIBTOOL_EXPORT_OPTIONS=
-     LIBTOOL_PROV_EXPORT_OPTIONS=$EXPORT_PROV_SYM_REGEX
-     LIBTOOL_UI_EXPORT_OPTIONS=$EXPORT_UI_SYM_REGEX
-     linklibext=".dll.a"
-@@ -362,6 +364,7 @@ case "$host" in
- esac
- AM_CONDITIONAL(PLATFORM_WIN32, [test $platform_win32 = yes])
-+AM_CONDITIONAL(PLATFORM_CYGWIN, [test $platform_win32 = yes])
- AM_CONDITIONAL(PLATFORM_CARBON, [test $platform_carbon = yes])
- AM_CONDITIONAL(HAVE_IGE, [test $have_ige = yes])
- AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
-@@ -569,7 +572,7 @@ dnl test for system-installed SQLite
- dnl If no SQLite is found or if the SQLite found does not have the sqlite3_table_column_metadata()
- dnl function call, then use the embedded version
- dnl also, on Win32, always use the embedded version
--if test x"$platform_win32" = "xyes"
-+if test x"$platform_win32" = "xyes" -o x"$platform_cygwin" = "xyes"
- then
-         AM_CONDITIONAL(HAVE_SQLITE, 0)
- else
---- origsrc/libgda-4.2.2/m4/bdb.m4     2010-11-10 12:08:10.000000000 -0600
-+++ src/libgda-4.2.2/m4/bdb.m4 2010-12-22 23:39:08.539499300 -0600
-@@ -114,7 +114,7 @@ m4_define([_BDB_CHECK_INTERNAL],
-       do
-           bdbdir=""
-           AC_MSG_CHECKING([for Berkeley DB files in $d])
--          for version in "" 5.1 5.0 4.9 4.8 4.7
-+          for version in 5.2 5.1 5.0 4.9 4.8 4.7
-           do
-               if test $platform_win32 = yes
-               then
-@@ -129,7 +129,13 @@ m4_define([_BDB_CHECK_INTERNAL],
-                   db_libfile="$d/$bdb_loclibdir/libdb$bdb_libext"
-                   try_headers="db.h"
-               else
--                  if test $platform_win32 = yes
-+                  if test $platform_cygwin = yes
-+                  then
-+                      db_libfilename="cygdb-$version.dll"
-+                      db_lib="-ldb-$version"
-+                      db_libfile="$d/lib/libdb-$version.dll.a"
-+                      try_headers="db$version/db.h db$sversion/db.h"
-+                  elif test $platform_win32 = yes
-                   then
-                       db_libfilename="libdb$sversion$bdb_libext"
-                       db_lib="-ldb$sversion"
diff --git a/5.2.2-cygwin-bdb.patch b/5.2.2-cygwin-bdb.patch
new file mode 100644 (file)
index 0000000..6b4d2dc
--- /dev/null
@@ -0,0 +1,26 @@
+--- origsrc/libgda-5.2.2/m4/bdb.m4     2013-11-16 08:27:35.000000000 -0600
++++ src/libgda-5.2.2/m4/bdb.m4 2015-01-08 11:41:04.333028600 -0600
+@@ -114,7 +114,7 @@ m4_define([_BDB_CHECK_INTERNAL],
+       do
+           bdbdir=""
+           AC_MSG_CHECKING([for Berkeley DB files in $d])
+-          for version in "" 6.0 5.3 5.1 5.0 4.9 4.8 4.7
++          for version in 6.0 5.3 5.2 5.1 5.0 4.9 4.8 4.7
+           do
+               if test $platform_win32 = yes
+               then
+@@ -129,7 +129,13 @@ m4_define([_BDB_CHECK_INTERNAL],
+                   db_libfile="$d/$bdb_loclibdir/libdb$bdb_libext"
+                   try_headers="db.h"
+               else
+-                  if test $platform_win32 = yes
++                  if test $platform_cygwin = yes
++                  then
++                      db_libfilename="cygdb-$version.dll"
++                      db_lib="-ldb-$version"
++                      db_libfile="$d/lib/libdb-$version.dll.a"
++                      try_headers="db$version/db.h db$sversion/db.h"
++                  elif test $platform_win32 = yes
+                   then
+                       db_libfilename="libdb$sversion$bdb_libext"
+                       db_lib="-ldb$sversion"
diff --git a/5.2.2-cygwin-configure.patch b/5.2.2-cygwin-configure.patch
new file mode 100644 (file)
index 0000000..f1dc9aa
--- /dev/null
@@ -0,0 +1,37 @@
+--- origsrc/libgda-5.2.2/configure.ac  2013-12-23 06:39:56.000000000 -0600
++++ src/libgda-5.2.2/configure.ac      2015-01-08 11:41:04.330028200 -0600
+@@ -342,14 +342,16 @@ EXPORT_PROV_SYM_REGEX='-export-symbols-r
+ EXPORT_UI_SYM_REGEX='-export-symbols-regex "^(gdaui_).*"'
+ AC_MSG_CHECKING([for platform])
+ platform_win32=no
++platform_cygwin=no
+ platform_carbon=no
+ have_ige=no
+ linklibext=".so"
+ case "$host" in
+ *-cygwin*)
+     AC_MSG_RESULT([Win32 - cygwin])
++    platform_cygwin=yes
+     NO_UNDEFINED='-no-undefined'
+-    LIBTOOL_EXPORT_OPTIONS=$EXPORT_SYM_REGEX
++    LIBTOOL_EXPORT_OPTIONS=
+     LIBTOOL_PROV_EXPORT_OPTIONS=$EXPORT_PROV_SYM_REGEX
+     LIBTOOL_UI_EXPORT_OPTIONS=$EXPORT_UI_SYM_REGEX
+     linklibext=".dll.a"
+@@ -402,6 +404,7 @@ case "$host" in
+ esac
+ AM_CONDITIONAL(PLATFORM_WIN32, [test $platform_win32 = yes])
++AM_CONDITIONAL(PLATFORM_CYGWIN, [test $platform_win32 = yes])
+ AM_CONDITIONAL(PLATFORM_CARBON, [test $platform_carbon = yes])
+ AM_CONDITIONAL(HAVE_IGE, [test $have_ige = yes])
+ AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
+@@ -688,7 +691,7 @@ dnl test for system-installed SQLite
+ dnl If no SQLite is found or if the SQLite found does not have the sqlite3_table_column_metadata()
+ dnl function call, then use the embedded version
+ dnl also, on Win32, always use the embedded version
+-if test x"$platform_win32" = "xyes"
++if test x"$platform_win32" = "xyes" -o x"$platform_cygwin" = "xyes"
+ then
+         AM_CONDITIONAL(HAVE_SQLITE, false)
+ else
diff --git a/5.2.2-cygwin-glade.patch b/5.2.2-cygwin-glade.patch
new file mode 100644 (file)
index 0000000..351bc26
--- /dev/null
@@ -0,0 +1,8 @@
+--- origsrc/libgda-5.2.2/libgda-ui/glade/gdaui-catalog.xml     2013-10-19 07:35:28.000000000 -0500
++++ src/libgda-5.2.2/libgda-ui/glade/gdaui-catalog.xml 2015-01-08 12:15:17.739778100 -0600
+@@ -1,4 +1,4 @@
+-<glade-catalog name="gdaui" library="libgda-ui-5.0.so" depends="gtk+">
++<glade-catalog name="gdaui" library="gda-ui-5.0-4" depends="gtk+">
+   <init-function>gdaui_init</init-function>
+   <glade-widget-classes>
+     <glade-widget-class name="GdauiGrid" generic-name="gdauigrid" title="Database Grid"/>
diff --git a/5.2.2-vala026.patch b/5.2.2-vala026.patch
new file mode 100644 (file)
index 0000000..f1bc15e
--- /dev/null
@@ -0,0 +1,11 @@
+--- origsrc/libgda-5.2.2/configure.ac  2015-01-08 11:47:49.054421700 -0600
++++ src/libgda-5.2.2/configure.ac      2015-01-08 13:06:52.021702000 -0600
+@@ -548,7 +548,7 @@ fi
+ if test "x$enable_vala" = "xyes"
+ then
+       AM_PROG_VALAC([0.17.7])
+-      VAPIGEN_CHECK([0.17.7],[0.18],,no)
++      VAPIGEN_CHECK([0.17.7],[0.26],,no)
+ else
+       AM_CONDITIONAL(ENABLE_VAPIGEN,false)
+ fi
index e99cab26b1af07d5b9072bbd76872e92c8b95cb9..66a590526504ec42acd6c50b27d0e128615b04fa 100644 (file)
@@ -2,8 +2,8 @@ ORIG_PN="libgda"
 inherit gnome2 python
 
 NAME="libgda5.0"
-VERSION=5.1.2
-RELEASE=2
+VERSION=5.2.2
+RELEASE=1
 CATEGORY="Libs"
 SUMMARY="GNOME Data Access libraries"
 DESCRIPTION="GNU Data Access (GDA) is an attempt to provide uniform access to
@@ -15,17 +15,19 @@ through them."
 HOMEPAGE="http://www.gnome-db.org/"
 
 PATCH_URI="
-       https://git.gnome.org/browse/libgda/patch/tools/browser/canvas/browser-canvas.c?id=a09196d
-       4.2.2-cygwin.patch
-       5.1.2-sqlite3-locking.patch
+       5.2.2-cygwin-configure.patch
+       5.2.2-cygwin-bdb.patch
+       5.2.2-cygwin-glade.patch
+       5.2.2-vala026.patch
 "
 
-PKG_NAMES="libgda5.0_4 libgda5.0-devel libgda5.0-doc libgda-ui5.0_4 libgda-ui5.0-devel
-           gda-browser5.0 girepository-Gda5.0 girepository-Gdaui5.0" # vala-libgda5.0"
+PKG_NAMES="libgda5.0_4 libgda5.0-devel libgda5.0-doc
+       libgda-ui5.0_4 libgda-ui5.0-devel glade-gdaui
+       gda-browser5.0 girepository-Gda5.0 girepository-Gdaui5.0 vala-libgda5.0"
 gda_browser5_0_CONTENTS="Database"
 gda_browser5_0_SUMMARY="GNOME Data Access browser"
 gda_browser5_0_CONTENTS="usr/bin/gda-browser* usr/share/applications/gda-browser*
-                         usr/share/gnome/help/ usr/share/gtk-doc/html/gda-browser/
+                         usr/share/help/ usr/share/gtk-doc/html/gda-browser/
                          usr/share/libgda-5.0/pixmaps/gda-browser*
                          usr/share/pixmaps/gda-browser-*"
 libgda5_0_4_SUMMARY="${SUMMARY} (runtime libs)"
@@ -60,15 +62,16 @@ girepository_Gdaui5_0_SUMMARY="GNOME Data Access UI library (GObject Introspecti
 girepository_Gdaui5_0_CONTENTS="usr/*/gir*/Gdaui-5.0.*"
 vala_libgda5_0_SUMMARY="${SUMMARY} (Vala bindings)"
 vala_libgda5_0_CONTENTS="usr/share/vala*/"
+glade_gdaui_CONTENTS="usr/share/glade/"
 
 DIFF_EXCLUDES="libgda.h libgda.types *.pc"
 
-CPPFLAGS+=" -DGRAPHVIZ_NEW_API"
+CPPFLAGS+=" -DSQLITE_OS_UNIX=1"
 CYGCONF_ARGS="
        --disable-binreloc
        --enable-gda-gi
        --enable-gdaui-gi
-       --disable-vala
+       --enable-vala
        --without-java
        --with-bdb=/usr
        --with-ldap=/usr
This page took 0.02863 seconds and 5 git commands to generate.