SOURCES (AC-branch): python-gnome-extras-libgda20.patch - from HEAD

baggins baggins at pld-linux.org
Wed May 17 16:28:17 CEST 2006 

Author: baggins                      Date: Wed May 17 14:28:17 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- from HEAD

---- Files affected:
SOURCES:
   python-gnome-extras-libgda20.patch (1.2 -> 1.2.2.1) 

---- Diffs:

================================================================
Index: SOURCES/python-gnome-extras-libgda20.patch
diff -u SOURCES/python-gnome-extras-libgda20.patch:1.2 SOURCES/python-gnome-extras-libgda20.patch:1.2.2.1
--- SOURCES/python-gnome-extras-libgda20.patch:1.2	Mon Nov 14 20:29:35 2005
+++ SOURCES/python-gnome-extras-libgda20.patch	Wed May 17 16:28:12 2006
@@ -1,16 +1,16 @@
-diff -urN gnome-python-extras-2.12.1.orig/configure.ac gnome-python-extras-2.12.1/configure.ac
---- gnome-python-extras-2.12.1.orig/configure.ac	2005-11-14 19:26:47.399433872 +0100
-+++ gnome-python-extras-2.12.1/configure.ac	2005-11-14 19:35:14.566332784 +0100
-@@ -25,7 +25,7 @@
+diff -urN gnome-python-extras-2.14.0.orig/configure.ac gnome-python-extras-2.14.0/configure.ac
+--- gnome-python-extras-2.14.0.orig/configure.ac	2006-04-20 09:42:26.000000000 +0200
++++ gnome-python-extras-2.14.0/configure.ac	2006-04-20 15:59:20.000000000 +0200
+@@ -18,7 +18,7 @@
+ m4_define(gtkhtml2_required_version,          2.3.1)
+ m4_define(mozilla_required_version,           1.2b)
  m4_define(firefox_required_version,           1.0)
- m4_define(libgtop_required_version,           2.9.5)
- m4_define(libnautilus_burn_required_version,  2.11.1)
 -m4_define(libgda_required_version,            1.2.0)
 +m4_define(libgda_required_version,            1.9.100)
  m4_define(gksu_required_version,              1.2.5)
  m4_define(gksuui_required_version,            1.0.3)
- m4_define(mediaprofiles_required_version,     2.10.0)
-@@ -287,7 +287,7 @@
+ 
+@@ -179,7 +179,7 @@
  
  dnl should we build the gda module?
  build_gda=false
@@ -19,18 +19,18 @@
    build_gda=true,
    build_gda=false)
  AM_CONDITIONAL(BUILD_GDA, $build_gda)
-@@ -353,7 +353,7 @@
-   gtop/Makefile
-   nautilusburn/Makefile
+@@ -227,7 +227,7 @@
+   gtkspell/Makefile
+   gdl/Makefile
    gda/Makefile
 -  gda/pygda-1.2.pc
 +  gda/pygda-2.0.pc
    gksu/Makefile
-   mediaprofiles/Makefile
    gnome-python-extras-2.0.pc
-diff -urN gnome-python-extras-2.12.1.orig/gda/gda.defs gnome-python-extras-2.12.1/gda/gda.defs
---- gnome-python-extras-2.12.1.orig/gda/gda.defs	2005-11-14 19:26:45.837671296 +0100
-+++ gnome-python-extras-2.12.1/gda/gda.defs	2005-11-14 19:33:31.898940600 +0100
+   tests/Makefile
+diff -urN gnome-python-extras-2.14.0.orig/gda/gda.defs gnome-python-extras-2.14.0/gda/gda.defs
+--- gnome-python-extras-2.14.0.orig/gda/gda.defs	2006-04-20 09:42:26.000000000 +0200
++++ gnome-python-extras-2.14.0/gda/gda.defs	2006-04-20 16:02:43.000000000 +0200
 @@ -1,5 +1,12 @@
  ;; -*- scheme -*-
  ; object definitions ...
@@ -6927,9 +6927,9 @@
  
  (define-function gda_init
    (c-name "gda_init")
-diff -urN gnome-python-extras-2.12.1.orig/gda/gda.override gnome-python-extras-2.12.1/gda/gda.override
---- gnome-python-extras-2.12.1.orig/gda/gda.override	2005-11-14 19:26:45.903661264 +0100
-+++ gnome-python-extras-2.12.1/gda/gda.override	2005-11-14 19:33:31.912938472 +0100
+diff -urN gnome-python-extras-2.14.0.orig/gda/gda.override gnome-python-extras-2.14.0/gda/gda.override
+--- gnome-python-extras-2.14.0.orig/gda/gda.override	2006-04-20 09:42:26.000000000 +0200
++++ gnome-python-extras-2.14.0/gda/gda.override	2006-04-20 16:02:47.000000000 +0200
 @@ -3,34 +3,11 @@
  #include <Python.h>
  #include <pygobject.h>
@@ -6981,9 +6981,9 @@
  
  	for (tmp = list; tmp != NULL; tmp = tmp->next) {
  		PyObject* obj = pygobject_new (G_OBJECT (tmp->data));
-diff -urN gnome-python-extras-2.12.1.orig/gda/Makefile.am gnome-python-extras-2.12.1/gda/Makefile.am
---- gnome-python-extras-2.12.1.orig/gda/Makefile.am	2005-11-14 19:26:45.895662480 +0100
-+++ gnome-python-extras-2.12.1/gda/Makefile.am	2005-11-14 19:33:31.952932392 +0100
+diff -urN gnome-python-extras-2.14.0.orig/gda/Makefile.am gnome-python-extras-2.14.0/gda/Makefile.am
+--- gnome-python-extras-2.14.0.orig/gda/Makefile.am	2006-04-20 09:42:26.000000000 +0200
++++ gnome-python-extras-2.14.0/gda/Makefile.am	2006-04-20 16:02:39.000000000 +0200
 @@ -6,13 +6,13 @@
  EXTRA_DIST = $(defs_DATA)
  
@@ -7000,9 +7000,9 @@
  
  
  
-diff -urN gnome-python-extras-2.12.1.orig/gda/pygda-1.2.pc.in gnome-python-extras-2.12.1/gda/pygda-1.2.pc.in
---- gnome-python-extras-2.12.1.orig/gda/pygda-1.2.pc.in	2005-11-14 19:26:45.881664608 +0100
-+++ gnome-python-extras-2.12.1/gda/pygda-1.2.pc.in	1970-01-01 01:00:00.000000000 +0100
+diff -urN gnome-python-extras-2.14.0.orig/gda/pygda-1.2.pc.in gnome-python-extras-2.14.0/gda/pygda-1.2.pc.in
+--- gnome-python-extras-2.14.0.orig/gda/pygda-1.2.pc.in	2006-04-20 09:42:26.000000000 +0200
++++ gnome-python-extras-2.14.0/gda/pygda-1.2.pc.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,17 +0,0 @@
 -prefix=@prefix@
 -exec_prefix=@exec_prefix@
@@ -7021,9 +7021,9 @@
 -Requires: pygobject-2.0 libgda
 -Version: @VERSION@
 -Cflags: -I${pygtkincludedir}
-diff -urN gnome-python-extras-2.12.1.orig/gda/pygda-2.0.pc.in gnome-python-extras-2.12.1/gda/pygda-2.0.pc.in
---- gnome-python-extras-2.12.1.orig/gda/pygda-2.0.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-python-extras-2.12.1/gda/pygda-2.0.pc.in	2005-11-14 19:33:32.036919624 +0100
+diff -urN gnome-python-extras-2.14.0.orig/gda/pygda-2.0.pc.in gnome-python-extras-2.14.0/gda/pygda-2.0.pc.in
+--- gnome-python-extras-2.14.0.orig/gda/pygda-2.0.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ gnome-python-extras-2.14.0/gda/pygda-2.0.pc.in	2006-04-20 16:02:57.000000000 +0200
 @@ -0,0 +1,17 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -7042,10 +7042,30 @@
 +Requires: pygobject-2.0 libgda-2.0
 +Version: @VERSION@
 +Cflags: -I${pygtkincludedir}
-diff -urN gnome-python-extras-2.12.1.orig/gda/pygdavalue_conversions.c gnome-python-extras-2.12.1/gda/pygdavalue_conversions.c
---- gnome-python-extras-2.12.1.orig/gda/pygdavalue_conversions.c	2005-11-14 19:26:45.870666280 +0100
-+++ gnome-python-extras-2.12.1/gda/pygdavalue_conversions.c	2005-11-14 19:48:41.115718640 +0100
-@@ -97,9 +97,8 @@
+diff -urN gnome-python-extras-2.14.0.orig/gda/pygdavalue_conversions.c gnome-python-extras-2.14.0/gda/pygdavalue_conversions.c
+--- gnome-python-extras-2.14.0.orig/gda/pygdavalue_conversions.c	2006-04-20 09:42:26.000000000 +0200
++++ gnome-python-extras-2.14.0/gda/pygdavalue_conversions.c	2006-04-20 16:03:01.000000000 +0200
+@@ -34,7 +34,8 @@
+       gda_value_set_double (boxed, PyFloat_AsDouble (input));
+     } else if (PyBool_Check (input)) {
+       gda_value_set_boolean (boxed, (input == Py_True));
+-#if PY_VERSION_HEX >= 0x02040000
++
++#if PY_VERSION_HEX >= 0x02040000 //These functions were introduced in python 2.4.
+     } else if (PyDateTime_Check (input)) {
+          GdaTimestamp gda;
+          gda.year = PyDateTime_GET_YEAR(input);
+@@ -58,7 +59,8 @@
+          gda.second = PyDateTime_TIME_GET_SECOND(input);
+          gda.timezone = 0;
+          gda_value_set_time (boxed, &gda);
+-#endif
++#endif //PY_VERSION_HEX
++
+     } else {
+       g_warning("Unhandled python type.");
+       return -1; //failed.
+@@ -97,9 +99,8 @@
      } else if (value_type == GDA_VALUE_TYPE_BIGUINT) {
          ret = PyLong_FromLong (gda_value_get_biguint ((GdaValue*)boxed));
      } else if (value_type == GDA_VALUE_TYPE_BINARY) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/python-gnome-extras-libgda20.patch?r1=1.2&r2=1.2.2.1&f=u

More information about the pld-cvs-commit mailing list