SOURCES: nautilus-python-api.patch (NEW), nautilus-python-dir.patch (NEW) -...
wrobell
wrobell at pld-linux.org
Sun May 11 14:40:23 CEST 2008
Author: wrobell Date: Sun May 11 12:40:23 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- removed non-existing api call and directories fixes (patches from debian)
---- Files affected:
SOURCES:
nautilus-python-api.patch (NONE -> 1.1) (NEW), nautilus-python-dir.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/nautilus-python-api.patch
diff -u /dev/null SOURCES/nautilus-python-api.patch:1.1
--- /dev/null Sun May 11 14:40:23 2008
+++ SOURCES/nautilus-python-api.patch Sun May 11 14:40:18 2008
@@ -0,0 +1,68 @@
+diff -Nur nautilus-python-0.5.0.orig/src/nautilus.defs nautilus-python-0.5.0/src/nautilus.defs
+--- nautilus-python-0.5.0.orig/src/nautilus.defs 2008-01-11 11:26:55.000000000 +0000
++++ nautilus-python-0.5.0/src/nautilus.defs 2008-05-10 11:54:48.000000000 +0100
+@@ -129,6 +129,18 @@
+ (return-type "gboolean")
+ )
+
++(define-method get_file_type
++ (of-object "NautilusFileInfo")
++ (c-name "nautilus_file_info_get_file_type")
++ (return-type "GFileType")
++)
++
++(define-method get_location
++ (of-object "NautilusFileInfo")
++ (c-name "nautilus_file_info_get_location")
++ (return-type "GFile")
++)
++
+ (define-method get_name
+ (of-object "NautilusFileInfo")
+ (c-name "nautilus_file_info_get_name")
+@@ -141,6 +153,18 @@
+ (return-type "char*")
+ )
+
++(define-method get_activation_uri
++ (of-object "NautilusFileInfo")
++ (c-name "nautilus_file_info_get_activation_uri")
++ (return-type "char*")
++)
++
++(define-method get_parent_location
++ (of-object "NautilusFileInfo")
++ (c-name "nautilus_file_info_get_parent_location")
++ (return-type "GFile")
++)
++
+ (define-method get_parent_uri
+ (of-object "NautilusFileInfo")
+ (c-name "nautilus_file_info_get_parent_uri")
+@@ -174,12 +198,6 @@
+ (return-type "gboolean")
+ )
+
+-(define-method get_vfs_file_info
+- (of-object "NautilusFileInfo")
+- (c-name "nautilus_file_info_get_vfs_file_info")
+- (return-type "GnomeVFSFileInfo*")
+-)
+-
+ (define-method add_emblem
+ (of-object "NautilusFileInfo")
+ (c-name "nautilus_file_info_add_emblem")
+diff -Nur nautilus-python-0.5.0.orig/src/nautilus-python.c nautilus-python-0.5.0/src/nautilus-python.c
+--- nautilus-python-0.5.0.orig/src/nautilus-python.c 2008-01-11 11:26:55.000000000 +0000
++++ nautilus-python-0.5.0/src/nautilus-python.c 2008-05-10 11:54:48.000000000 +0100
+@@ -205,8 +205,8 @@
+ if (Py_IsInitialized())
+ return TRUE;
+
+- debug("g_module_open " PY_LIB_LOC "/libpython" PYTHON_VERSION "." G_MODULE_SUFFIX);
+- libpython = g_module_open(PY_LIB_LOC "/libpython" PYTHON_VERSION "." G_MODULE_SUFFIX, 0);
++ debug("g_module_open " PY_LIB_LOC "/libpython" PYTHON_VERSION "." G_MODULE_SUFFIX ".1");
++ libpython = g_module_open(PY_LIB_LOC "/libpython" PYTHON_VERSION "." G_MODULE_SUFFIX ".1", 0);
+ if (!libpython)
+ g_warning("g_module_open libpython failed: %s", g_module_error());
+ debug("Py_Initialize");
================================================================
Index: SOURCES/nautilus-python-dir.patch
diff -u /dev/null SOURCES/nautilus-python-dir.patch:1.1
--- /dev/null Sun May 11 14:40:23 2008
+++ SOURCES/nautilus-python-dir.patch Sun May 11 14:40:18 2008
@@ -0,0 +1,56 @@
+diff -Nur -x '*.orig' -x '*~' nautilus-python-0.5.0/examples/README.in nautilus-python-0.5.0.new/examples/README.in
+--- nautilus-python-0.5.0/examples/README.in 2008-01-11 12:07:15.000000000 +0100
++++ nautilus-python-0.5.0.new/examples/README.in 2008-04-11 19:30:44.000000000 +0200
+@@ -1,6 +1,6 @@
+ To try any of the examples, copy them over to:
+
+- @NAUTILUS_LIBDIR@/nautilus/extensions-1.0/python/
++ @NAUTILUS_LIBDIR@/nautilus/extensions-2.0/python/
+ or:
+ ~/.nautilus/python-extensions/
+
+diff -Nur -x '*.orig' -x '*~' nautilus-python-0.5.0/nautilus-python.pc.in nautilus-python-0.5.0.new/nautilus-python.pc.in
+--- nautilus-python-0.5.0/nautilus-python.pc.in 2008-01-11 12:07:15.000000000 +0100
++++ nautilus-python-0.5.0.new/nautilus-python.pc.in 2008-04-11 19:30:54.000000000 +0200
+@@ -4,4 +4,4 @@
+
+ prefix=@prefix@
+ libdir=${prefix}/lib
+-pythondir=@NAUTILUS_LIBDIR@/nautilus/extensions-1.0/python
++pythondir=@NAUTILUS_LIBDIR@/nautilus/extensions-2.0/python
+diff -Nur -x '*.orig' -x '*~' nautilus-python-0.5.0/nautilus-python.spec.in nautilus-python-0.5.0.new/nautilus-python.spec.in
+--- nautilus-python-0.5.0/nautilus-python.spec.in 2008-01-11 12:07:15.000000000 +0100
++++ nautilus-python-0.5.0.new/nautilus-python.spec.in 2008-04-11 19:31:07.000000000 +0200
+@@ -45,7 +45,7 @@
+ %defattr(-,root,root,-)
+ %doc AUTHORS ChangeLog NEWS
+ %{_libdir}/nautilus-python
+-%{_libdir}/nautilus/extensions-1.0
++%{_libdir}/nautilus/extensions-2.0
+ %{_libdir}/pkgconfig/nautilus-python.pc
+
+ %changelog
+diff -Nur -x '*.orig' -x '*~' nautilus-python-0.5.0/README nautilus-python-0.5.0.new/README
+--- nautilus-python-0.5.0/README 2008-01-11 12:07:15.000000000 +0100
++++ nautilus-python-0.5.0.new/README 2008-04-11 19:31:42.000000000 +0200
+@@ -6,7 +6,7 @@
+
+ For examples and documentation check the examples sub directory.
+
+-Note that scripts are loaded from $prefix/lib/nautilus/extensions-1.0/python
++Note that scripts are loaded from $prefix/lib/nautilus/extensions-2.0/python
+
+ Try to copy test.py to that directory for an example
+
+diff -Nur -x '*.orig' -x '*~' nautilus-python-0.5.0/src/nautilus-python.c nautilus-python-0.5.0.new/src/nautilus-python.c
+--- nautilus-python-0.5.0/src/nautilus-python.c 2008-04-11 19:28:51.000000000 +0200
++++ nautilus-python-0.5.0.new/src/nautilus-python.c 2008-04-11 19:31:29.000000000 +0200
+@@ -332,7 +332,7 @@
+
+ all_types = g_array_new(FALSE, FALSE, sizeof(GType));
+
+- nautilus_python_load_dir(module, NAUTILUS_LIBDIR "/nautilus/extensions-1.0/python");
++ nautilus_python_load_dir(module, NAUTILUS_LIBDIR "/nautilus/extensions-2.0/python");
+ user_extensions_dir = g_strdup_printf("%s/.nautilus/python-extensions/",
+ g_get_home_dir());
+ nautilus_python_load_dir(module, user_extensions_dir);
================================================================
More information about the pld-cvs-commit
mailing list