Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24020/10.3/unstable/main/finkinfo/gnome
Modified Files:
nautilus.info nautilus.patch
Log Message:
dep-fixes, sync/backport patches, annotate some patches TTBOMK
Index: nautilus.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/nautilus.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- nautilus.info 21 Mar 2005 19:14:37 -0000 1.12
+++ nautilus.info 17 May 2006 06:06:19 -0000 1.13
@@ -1,8 +1,8 @@
Package: nautilus
Version: 2.6.3
-Revision: 11
-Depends: %N-shlibs (= %v-%r), libexif-shlibs, atk1-shlibs (>= 1.6.0-1),
audiofile-shlibs (>= 0.2.5-1), eel2 (>= 2.6.0-1), esound (>= 0.2.34-1), gail17
(>= 1.6.0-1), gconf2 (>= 2.6.0-1), gettext, glib2 (>= 2.4.0-1), gnome-desktop
(>= 2.6.0-1), gnome-vfs2 (>= 2.6.0-1) | gnome-vfs2-ssl (>= 2.6.0-1), gtk+2 (>=
2.4.0-1), libart2-shlibs (>= 2.3.16-1), libbonobo2 (>= 2.6.0-1), libbonoboui2
(>= 2.6.0-1), libglade2-shlibs (>= 2.3.6-1), libgnome2 (>= 2.6.0-1),
libgnomecanvas2 (>= 2.6.0-1), libgnomeui2 (>= 2.6.0-1), libiconv,
libgsf-shlibs, libcroco1-shlibs, librsvg2 (>= 2.6.0-1), libxml2-shlibs (>=
2.6.7-1), orbit2 (>= 2.10.0-1), pango1-xft2 (>= 1.4.0-1),
startup-notification-shlibs, popt-shlibs, x11
-BuildDepends: libexif-dev, eel2-dev (>= 2.6.0-1), audiofile (>= 0.2.5-1),
esound (>= 0.2.34-1), gail17-dev (>= 1.6.0-1), gconf2-dev (>= 2.6.0-1),
gettext-bin, gettext-tools, gettext-dev, glib2-dev (>= 2.4.0-1),
gnome-desktop4-dev (>= 2.6.0-1), gnome-icon-theme (>= 1.2.0-1), gnome-vfs2-dev
(>= 2.6.0-1) | gnome-vfs2-ssl-dev (>= 2.6.0-1), gtk+2-dev (>= 2.4.0-1), libart2
(>= 2.3.16-1), libbonobo2-dev (>= 2.6.0-1), libbonoboui2-dev (>= 2.6.0-1),
libglade2 (>= 2.3.6-1), libgnome2-dev (>= 2.6.0-1), libgnomecanvas2-dev (>=
2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), libiconv-dev, libjpeg, libgsf-dev,
libcroco1, librsvg2 (>= 2.6.0-1), libxml2 (>= 2.6.7-1), orbit2-dev (>=
2.10.0-1), pango1-xft2-dev (>= 1.4.0-1), startup-notification-dev, pkgconfig,
popt
+Revision: 15
+Depends: %N-shlibs (= %v-%r), libexif-shlibs, atk1-shlibs (>= 1.6.0-1),
audiofile-shlibs (>= 0.2.5-1), eel2 (>= 2.6.0-1), esound-shlibs (>= 0.2.34-1),
esound-bin (>= 0.2.34-1), gail17 (>= 1.6.0-1), gconf2 (>= 2.6.0-1), gettext,
glib2 (>= 2.4.0-1), gnome-desktop (>= 2.6.0-1), gnome-vfs2-ssl (>= 2.6.0-1) |
gnome-vfs2 (>= 2.6.0-1), gtk+2 (>= 2.4.0-1), libart2-shlibs (>= 2.3.16-1),
libbonobo2 (>= 2.6.0-1), libbonoboui2 (>= 2.6.0-1), libglade2-shlibs (>=
2.3.6-1), libgnome2 (>= 2.6.0-1), libgnomecanvas2 (>= 2.6.0-1), libgnomeui2 (>=
2.6.0-1), libiconv, libgsf-shlibs, libcroco3-shlibs, librsvg2-shlibs (>=
2.6.0-1), libxml2-shlibs (>= 2.6.7-1), orbit2 (>= 2.10.0-1), pango1-xft2 (>=
1.4.0-1), startup-notification-shlibs, popt-shlibs, x11, gnome-keyring-shlibs
+BuildDepends: atk1 (>= 1.6.0-1), libexif-dev, eel2-dev (>= 2.6.0-1), audiofile
(>= 0.2.5-1), esound (>= 0.2.34-1), gail17-dev (>= 1.6.0-1), gconf2-dev (>=
2.6.0-1), gettext-bin, gettext-tools, gettext-dev, glib2-dev (>= 2.4.0-1),
gnome-desktop4-dev (>= 2.6.0-1), gnome-icon-theme (>= 1.2.0-1),
gnome-vfs2-ssl-dev (>= 2.6.0-1) | gnome-vfs2-dev (>= 2.6.0-1), gtk+2-dev (>=
2.4.0-1), libart2 (>= 2.3.16-1), libbonobo2-dev (>= 2.6.0-1), libbonoboui2-dev
(>= 2.6.0-1), libglade2 (>= 2.3.6-1), libgnome2-dev (>= 2.6.0-1),
libgnomecanvas2-dev (>= 2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), libiconv-dev,
libjpeg, libgsf-dev, libcroco3, librsvg2 (>= 2.8.1-1), libxml2 (>= 2.6.7-1),
orbit2-dev (>= 2.10.0-1), pango1-xft2-dev (>= 1.4.0-1),
startup-notification-dev, pkgconfig, popt, gnome-keyring-dev (>= 0.4.3-1),
intltool
Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
Source-MD5: ef91c7eefd219800a3aab93e6510a5c9
Patch: %n.patch
@@ -26,7 +26,7 @@
%p/lib/libnautilus-private.2.dylib 3.0.0 %n (>= 2.0.8-0.2)
%p/lib/libnautilus-adapter.2.dylib 3.0.0 %n (>= 2.0.8-0.2)
<<
- Depends: libexif-shlibs, atk1-shlibs (>= 1.6.0-1), audiofile-shlibs (>=
0.2.5-1), eel2 (>= 2.6.0-1), esound (>= 0.2.34-1), gail17 (>= 1.6.0-1), gconf2
(>= 2.6.0-1), gettext, glib2 (>= 2.4.0-1), gnome-desktop (>= 2.6.0-1),
gnome-vfs2 (>= 2.6.0-1) | gnome-vfs2-ssl (>= 2.6.0-1), gtk+2 (>= 2.4.0-1),
libart2-shlibs (>= 2.3.16-1), libbonobo2 (>= 2.6.0-1), libbonoboui2 (>=
2.6.0-1), libglade2-shlibs (>= 2.3.6-1), libgnome2 (>= 2.6.0-1),
libgnomecanvas2 (>= 2.6.0-1), libgnomeui2 (>= 2.6.0-1), libiconv,
libgsf-shlibs, libcroco1-shlibs, librsvg2 (>= 2.6.0-1), libxml2-shlibs (>=
2.6.7-1), orbit2 (>= 2.10.0-1), pango1-xft2 (>= 1.4.0-1),
startup-notification-shlibs, popt-shlibs, x11
+ Depends: libexif-shlibs, atk1-shlibs (>= 1.6.0-1), audiofile-shlibs (>=
0.2.5-1), eel2 (>= 2.6.0-1), esound-bin (>= 0.2.34-1), esound-shlibs (>=
0.2.34-1), gail17 (>= 1.6.0-1), gconf2 (>= 2.6.0-1), gettext, glib2 (>=
2.4.0-1), gnome-desktop (>= 2.6.0-1), gnome-vfs2-ssl (>= 2.6.0-1) | gnome-vfs2
(>= 2.6.0-1), gtk+2 (>= 2.4.0-1), libart2-shlibs (>= 2.3.16-1), libbonobo2 (>=
2.6.0-1), libbonoboui2 (>= 2.6.0-1), libglade2-shlibs (>= 2.3.6-1), libgnome2
(>= 2.6.0-1), libgnomecanvas2 (>= 2.6.0-1), libgnomeui2 (>= 2.6.0-1), libiconv,
libgsf-shlibs, libcroco3-shlibs, librsvg2-shlibs (>= 2.8.1-1), libxml2-shlibs
(>= 2.6.7-1), orbit2 (>= 2.10.0-1), pango1-xft2 (>= 1.4.0-1),
startup-notification-shlibs, popt-shlibs, x11, gnome-keyring-shlibs
Files: lib/*.*.dylib
DocFiles: HACKING TODO THANKS MAINTAINERS README COPYING* ChangeLog
AUTHORS NEWS
<<
@@ -54,6 +54,13 @@
applications, bundles, etc. So beware! Certain actions (like moving a file
with a rsource fork to another disk) may damage your data.
<<
+DescPort: <<
+ The usual **environ fix. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=342084
+
+ Fix workarea detection on 64bit machines (fm-desktop-icon-view.c):
+ patch its CVS revision 1.216->1.217 changes
+<<
###
License: GPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Index: nautilus.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/nautilus.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nautilus.patch 2 Jul 2004 15:36:59 -0000 1.2
+++ nautilus.patch 17 May 2006 06:06:19 -0000 1.3
@@ -162,3 +162,87 @@
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po
+
+diff -Naur nautilus-2.6.3-old/src/file-manager/fm-desktop-icon-view.c
nautilus-2.6.3/src/file-manager/fm-desktop-icon-view.c
+--- nautilus-2.6.3-old/src/file-manager/fm-desktop-icon-view.c 2004-06-10
00:14:55.000000000 +1000
++++ nautilus-2.6.3/src/file-manager/fm-desktop-icon-view.c 2004-12-17
13:08:31.187503033 +1100
+@@ -163,6 +163,7 @@
+ net_workarea_changed (FMDesktopIconView *icon_view,
+ GdkWindow *window)
+ {
++ long *nworkareas = NULL;
+ long *workareas = NULL;
+ GdkAtom type_returned;
+ int format_returned;
+@@ -174,23 +175,57 @@
+
+ icon_container = get_icon_container (icon_view);
+
++ /* Find the number of desktops so we know how long the
++ * workareas array is going to be (each desktop will have four
++ * elements in the workareas array describing
++ * x,y,width,height) */
+ gdk_error_trap_push ();
+ if (!gdk_property_get (window,
+- gdk_atom_intern ("_NET_WORKAREA", FALSE),
++ gdk_atom_intern ("_NET_NUMBER_OF_DESKTOPS",
FALSE),
+ gdk_x11_xatom_to_atom (XA_CARDINAL),
+- 0, G_MAXLONG, FALSE,
++ 0, 4, FALSE,
+ &type_returned,
+ &format_returned,
+ &length_returned,
+- (guchar **) &workareas)) {
++ (guchar **) &nworkareas)) {
++ g_warning("Can not caclulate _NET_NUMBER_OF_DESKTOPS");
++ }
++ if (gdk_error_trap_pop()
++ || nworkareas == NULL
++ || type_returned != gdk_x11_xatom_to_atom (XA_CARDINAL)
++ || format_returned != 32)
++ g_warning("Can not calculate _NET_NUMBER_OF_DESKTOPS");
++
++ /* Note : gdk_property_get() is broken (API documents admit
++ * this). As a length argument, it expects the number of
++ * _bytes_ of data you require. Internally, gdk_property_get
++ * converts that value to a count of 32 bit (4 byte) elements.
++ * However, the length returned is in bytes, but is calculated
++ * via the count of returned elements * sizeof(long). This
++ * means on a 64 bit system, the number of bytes you have to
++ * request does not correspond to the number of bytes you get
++ * back, and is the reason for the workaround below.
++ */
++ gdk_error_trap_push ();
++ if ((*nworkareas < 1)
++ || !gdk_property_get (window,
++ gdk_atom_intern ("_NET_WORKAREA", FALSE),
++ gdk_x11_xatom_to_atom (XA_CARDINAL),
++ 0, ((*nworkareas) * 4 * 4), FALSE,
++ &type_returned,
++ &format_returned,
++ &length_returned,
++ (guchar **) &workareas)) {
++ g_warning("Can not get _NET_WORKAREA");
+ workareas = NULL;
+ }
+
+ if (gdk_error_trap_pop ()
+ || workareas == NULL
+ || type_returned != gdk_x11_xatom_to_atom (XA_CARDINAL)
+- || (length_returned % 4) != 0
++ || ((*nworkareas) * 4 * sizeof(long)) != length_returned
+ || format_returned != 32) {
++ g_warning("Can not determine workarea, guessing at layout");
+ nautilus_icon_container_set_margins (icon_container,
+ 0, 0, 0, 0);
+ } else {
+@@ -200,6 +235,9 @@
+ icon_container, screen, workareas, length_returned /
sizeof (long));
+ }
+
++ if (nworkareas != NULL)
++ g_free (nworkareas);
++
+ if (workareas != NULL)
+ g_free (workareas);
+ }
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
