Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21749
Modified Files:
gnome-core.info gnome-core.patch
Log Message:
gcc 4 ok
Index: gnome-core.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-core.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-core.patch 24 Jan 2006 08:25:28 -0000 1.1
+++ gnome-core.patch 20 Mar 2006 03:48:10 -0000 1.2
@@ -1,93 +1,252 @@
-diff -Naur gnome-core-1.4.1.old/applets/desk-guide/gwmthumbnail.c
gnome-core-1.4.1.new/applets/desk-guide/gwmthumbnail.c
---- gnome-core-1.4.1.old/applets/desk-guide/gwmthumbnail.c Fri Oct 26
18:12:47 2001
-+++ gnome-core-1.4.1.new/applets/desk-guide/gwmthumbnail.c Tue Jan 28
23:20:47 2003
-@@ -29,23 +29,29 @@
+diff -Naur gnome-core-1.4.1-0001/applets/desk-guide/gwmthumbnail.c
gnome-core-1.4.1-0002/applets/desk-guide/gwmthumbnail.c
+--- gnome-core-1.4.1-0001/applets/desk-guide/gwmthumbnail.c 2001-10-26
05:12:47.000000000 -0400
++++ gnome-core-1.4.1-0002/applets/desk-guide/gwmthumbnail.c 2006-03-19
21:50:02.000000000 -0500
+@@ -18,35 +18,38 @@
+ */
+ #include "gwmthumbnail.h"
+
+-
+ #define USE_SHM // FIXME
+
+ #define EPSILON (1.0/65536.0) /* 16bit EPSILON should be good
enough */
+-
+ /* --- defines --- */
+ #define SHM_IMAGE_HEIGHT (32)
+-
/* --- Gdk & GdkPixbuf compat prototypes --- */
+-GdkImage* gdk_image_get (GdkWindow *window,
+static
- GdkImage* gdk_image_get (GdkWindow *window,
++GdkImage* s_gdk_image_get (GdkWindow *window,
gint x,
gint y,
gint width,
gint height);
+-GdkColormap* gdk_window_get_colormap (GdkWindow *window);
+-GdkVisual* gdk_window_get_visual (GdkWindow *window);
+-GdkImage* gdk_image_new_shared_with_pixmap (GdkWindow *window,
+static
- GdkColormap* gdk_window_get_colormap (GdkWindow *window);
++GdkColormap* s_gdk_window_get_colormap (GdkWindow *window);
+static
- GdkVisual* gdk_window_get_visual (GdkWindow *window);
++GdkVisual* s_gdk_window_get_visual (GdkWindow *window);
+static
- GdkImage* gdk_image_new_shared_with_pixmap (GdkWindow *window,
++GdkImage* s_gdk_image_new_shared_with_pixmap (GdkWindow *window,
gint width,
gint height,
GdkPixmap **pixmap_p);
+-GdkPixbuf* gdk_pixbuf_from_image (GdkImage *image,
+static
- GdkPixbuf* gdk_pixbuf_from_image (GdkImage *image,
++GdkPixbuf* s_gdk_pixbuf_from_image (GdkImage *image,
guint x,
guint y,
guint width,
guint height,
GdkColormap *cmap);
+-void gdk_pixbuf_copy_from_image (GdkPixbuf *pixbuf,
+static
- void gdk_pixbuf_copy_from_image (GdkPixbuf *pixbuf,
++void s_gdk_pixbuf_copy_from_image (GdkPixbuf *pixbuf,
guint dest_x,
guint dest_y,
-@@ -537,7 +543,7 @@
+ GdkImage *image,
+@@ -56,7 +59,6 @@
+ guint height,
+ GdkColormap *cmap);
+
+-
+ /* --- structures --- */
+ typedef struct _ThumbSize ThumbSize;
+ struct _ThumbSize
+@@ -67,12 +69,10 @@
+ guint height;
+ };
+
+-
+ /* --- variables --- */
+ static gboolean gwm_thumb_nails_enabled = FALSE;
+ static GSList *gwm_thumb_nails = NULL;
+
+-
+ /* --- functions --- */
+ void
+ gwm_thumb_nails_set_active (gboolean thumb_nails_enabled)
+@@ -276,7 +276,7 @@
+ static GdkPixmap *shm_pixmap = NULL;
+ gint swidth = gdk_screen_width ();
+ gint sheight = gdk_screen_height ();
+- GdkColormap *cmap = gdk_window_get_colormap (drawable);
++ GdkColormap *cmap = s_gdk_window_get_colormap (drawable);
+ GdkPixbuf *shot_pixbuf = NULL;
+ GdkVisual *visual;
+
+@@ -286,15 +286,15 @@
+ */
+
+ if (!shm_image)
+- shm_image = gdk_image_new_shared_with_pixmap (NULL, swidth,
SHM_IMAGE_HEIGHT, &shm_pixmap);
++ shm_image = s_gdk_image_new_shared_with_pixmap (NULL, swidth,
SHM_IMAGE_HEIGHT, &shm_pixmap);
+
+ /* fallback to root window's colormap and fetch visual */
+ if (!cmap)
+ {
+- visual = gdk_window_get_visual (drawable);
++ visual = s_gdk_window_get_visual (drawable);
+
+- if (visual && visual->depth == gdk_window_get_visual (NULL)->depth)
+- cmap = gdk_window_get_colormap (NULL);
++ if (visual && visual->depth == s_gdk_window_get_visual (NULL)->depth)
++ cmap = s_gdk_window_get_colormap (NULL);
+
+ if (!cmap) /* guess we're screwed */
+ return NULL;
+@@ -338,7 +338,7 @@
+ shot_pixbuf = NULL;
+ break;
+ }
+- gdk_pixbuf_copy_from_image (shot_pixbuf, 0, pix_y, shm_image, 0, 0,
width, n, cmap);
++ s_gdk_pixbuf_copy_from_image (shot_pixbuf, 0, pix_y, shm_image, 0, 0,
width, n, cmap);
+ height -= n;
+ y += n;
+ pix_y += n;
+@@ -352,7 +352,7 @@
+ GdkImage *image;
+ GdkPixmap *pixmap;
+
+- image = gdk_image_new_shared_with_pixmap (drawable, swidth, sheight,
&pixmap);
++ image = s_gdk_image_new_shared_with_pixmap (drawable, swidth, sheight,
&pixmap);
+ if (image)
+ {
+ GdkGCValues gc_values;
+@@ -367,7 +367,7 @@
+ gdk_draw_pixmap (pixmap, gc, drawable, x, y, 0, 0, width, height);
+ gdk_flush ();
+ if (!gdk_error_trap_pop ())
+- shot_pixbuf = gdk_pixbuf_from_image (image, 0, 0, width,
height, cmap);
++ shot_pixbuf = s_gdk_pixbuf_from_image (image, 0, 0, width,
height, cmap);
+ gdk_gc_unref (gc);
+ }
+
+@@ -379,11 +379,11 @@
+ /* last resort, do it slowly ;) */
+ if (!shot_pixbuf)
+ {
+- GdkImage *image = gdk_image_get (drawable, x, y, width, height);
++ GdkImage *image = s_gdk_image_get (drawable, x, y, width, height);
+
+ if (image)
+ {
+- shot_pixbuf = gdk_pixbuf_from_image (image, 0, 0, width, height,
cmap);
++ shot_pixbuf = s_gdk_pixbuf_from_image (image, 0, 0, width, height,
cmap);
+ gdk_image_destroy (image);
+ }
+ }
+@@ -527,7 +527,6 @@
+ return TRUE;
+ }
+
+-
+ /* --- Gdk & GdkPixbuf compat functions --- */
+ #include <gdk/gdkprivate.h>
+ #include <gdk/gdkx.h>
+@@ -537,8 +536,8 @@
#include <sys/shm.h>
#endif /* USE_SHM */
-GdkImage*
+-gdk_image_new_shared_with_pixmap (GdkWindow *window,
+static GdkImage*
- gdk_image_new_shared_with_pixmap (GdkWindow *window,
++s_gdk_image_new_shared_with_pixmap (GdkWindow *window,
gint width,
gint height,
-@@ -617,7 +623,7 @@
+ GdkPixmap **pixmap_p)
+@@ -561,7 +560,7 @@
+ if (!window)
+ window = (GdkWindow*) &gdk_root_parent;
+ window_private = (GdkWindowPrivate*) window;
+- visual = gdk_window_get_visual (window);
++ visual = s_gdk_window_get_visual (window);
+ if (window_private->destroyed || !visual)
+ return NULL;
- /* fixed gdk_image_get(), so we don't crash if we get an X error
+@@ -615,10 +614,10 @@
+ #endif /* !USE_SHM */
+ }
+
+-/* fixed gdk_image_get(), so we don't crash if we get an X error
++/* fixed s_gdk_image_get(), so we don't crash if we get an X error
*/
-GdkImage*
+-gdk_image_get (GdkWindow *window,
+static GdkImage*
- gdk_image_get (GdkWindow *window,
++s_gdk_image_get (GdkWindow *window,
gint x,
gint y,
-@@ -677,7 +683,7 @@
+ gint width,
+@@ -640,7 +639,7 @@
+ }
+
+ win_private = (GdkWindowPrivate *) window;
+- visual = gdk_window_get_visual (window);
++ visual = s_gdk_window_get_visual (window);
+ if (win_private->destroyed || width < 1 || height < 1 ||
+ (win_private->window_type != GDK_WINDOW_PIXMAP && !visual))
+ return NULL;
+@@ -677,8 +676,8 @@
/* instead of bailing on NULL, return the root window's colormap,
* also, guard against XErrors
*/
-GdkColormap*
+-gdk_window_get_colormap (GdkWindow *window)
+static GdkColormap*
- gdk_window_get_colormap (GdkWindow *window)
++s_gdk_window_get_colormap (GdkWindow *window)
{
GdkWindowPrivate *window_private;
-@@ -708,7 +714,7 @@
+ XWindowAttributes window_attributes = { 0, };
+@@ -708,8 +707,8 @@
/* instead of bailing on NULL, return the root window's visual, also
* guard against XErrors
*/
-GdkVisual*
+-gdk_window_get_visual (GdkWindow *window)
+static GdkVisual*
- gdk_window_get_visual (GdkWindow *window)
++s_gdk_window_get_visual (GdkWindow *window)
{
GdkWindowPrivate *window_private;
-@@ -876,7 +882,7 @@
+ XWindowAttributes window_attributes = { 0, };
+@@ -741,7 +740,7 @@
+ return NULL;
+ }
+
+-/* self hacked gdk_pixbuf_from_image(), lacking in gdk-pixbuf.
++/* self hacked s_gdk_pixbuf_from_image(), lacking in gdk-pixbuf.
+ * mostly ripped from the gdk_pixbuf_get_from_drawable() implementation
+ */
+ static void
+@@ -876,8 +875,8 @@
x, y, width, height, cmap);
}
-void
+-gdk_pixbuf_copy_from_image (GdkPixbuf *pixbuf,
+static void
- gdk_pixbuf_copy_from_image (GdkPixbuf *pixbuf,
++s_gdk_pixbuf_copy_from_image (GdkPixbuf *pixbuf,
guint dest_x,
guint dest_y,
-@@ -909,7 +915,7 @@
+ GdkImage *image,
+@@ -909,8 +908,8 @@
cmap);
}
-GdkPixbuf*
+-gdk_pixbuf_from_image (GdkImage *image,
+static GdkPixbuf*
- gdk_pixbuf_from_image (GdkImage *image,
++s_gdk_pixbuf_from_image (GdkImage *image,
guint x,
guint y,
-diff -Naur gnome-core-1.4.1.old/applets/fish/Makefile.in
gnome-core-1.4.1.new/applets/fish/Makefile.in
---- gnome-core-1.4.1.old/applets/fish/Makefile.in Sat Jun 8 08:11:15 2002
-+++ gnome-core-1.4.1.new/applets/fish/Makefile.in Tue Jan 28 23:20:47 2003
+ guint width,
+diff -Naur gnome-core-1.4.1-0001/applets/fish/Makefile.in
gnome-core-1.4.1-0002/applets/fish/Makefile.in
+--- gnome-core-1.4.1-0001/applets/fish/Makefile.in 2002-06-07
19:11:15.000000000 -0400
++++ gnome-core-1.4.1-0002/applets/fish/Makefile.in 2006-03-19
21:49:40.000000000 -0500
@@ -236,7 +236,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -97,9 +256,9 @@
libfish_applet_la_LIBADD =
libfish_applet_la_OBJECTS = fish.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS)
-diff -Naur gnome-core-1.4.1.old/applets/gen_util/Makefile.in
gnome-core-1.4.1.new/applets/gen_util/Makefile.in
---- gnome-core-1.4.1.old/applets/gen_util/Makefile.in Sat Jun 8 08:11:21 2002
-+++ gnome-core-1.4.1.new/applets/gen_util/Makefile.in Tue Jan 28 23:20:47 2003
+diff -Naur gnome-core-1.4.1-0001/applets/gen_util/Makefile.in
gnome-core-1.4.1-0002/applets/gen_util/Makefile.in
+--- gnome-core-1.4.1-0001/applets/gen_util/Makefile.in 2002-06-07
19:11:21.000000000 -0400
++++ gnome-core-1.4.1-0002/applets/gen_util/Makefile.in 2006-03-19
21:49:40.000000000 -0500
@@ -246,7 +246,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -109,9 +268,9 @@
libgen_util_applet_la_LIBADD =
libgen_util_applet_la_OBJECTS = main.lo mailcheck.lo popcheck.lo \
printer.lo clock.lo remote-helper.lo
-diff -Naur gnome-core-1.4.1.old/applets/tasklist/Makefile.in
gnome-core-1.4.1.new/applets/tasklist/Makefile.in
---- gnome-core-1.4.1.old/applets/tasklist/Makefile.in Sat Jun 8 08:11:39 2002
-+++ gnome-core-1.4.1.new/applets/tasklist/Makefile.in Tue Jan 28 23:20:47 2003
+diff -Naur gnome-core-1.4.1-0001/applets/tasklist/Makefile.in
gnome-core-1.4.1-0002/applets/tasklist/Makefile.in
+--- gnome-core-1.4.1-0001/applets/tasklist/Makefile.in 2002-06-07
19:11:39.000000000 -0400
++++ gnome-core-1.4.1-0002/applets/tasklist/Makefile.in 2006-03-19
21:49:40.000000000 -0500
@@ -259,7 +259,7 @@
tasklist_menu.$(OBJEXT) tasklist_properties.$(OBJEXT) gstc.$(OBJEXT) \
gwmh.$(OBJEXT)
@@ -121,9 +280,9 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-diff -Naur gnome-core-1.4.1.old/configure gnome-core-1.4.1.new/configure
---- gnome-core-1.4.1.old/configure Sat Jun 8 06:22:54 2002
-+++ gnome-core-1.4.1.new/configure Tue Jan 28 23:20:47 2003
+diff -Naur gnome-core-1.4.1-0001/configure gnome-core-1.4.1-0002/configure
+--- gnome-core-1.4.1-0001/configure 2002-06-07 17:22:54.000000000 -0400
++++ gnome-core-1.4.1-0002/configure 2006-03-19 21:49:40.000000000 -0500
@@ -3962,11 +3962,11 @@
;;
@@ -138,9 +297,9 @@
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
-diff -Naur gnome-core-1.4.1.old/help-browser/gnome-help-browser.c
gnome-core-1.4.1.new/help-browser/gnome-help-browser.c
---- gnome-core-1.4.1.old/help-browser/gnome-help-browser.c Fri Oct 26
18:13:26 2001
-+++ gnome-core-1.4.1.new/help-browser/gnome-help-browser.c Tue Jan 28
23:20:47 2003
+diff -Naur gnome-core-1.4.1-0001/help-browser/gnome-help-browser.c
gnome-core-1.4.1-0002/help-browser/gnome-help-browser.c
+--- gnome-core-1.4.1-0001/help-browser/gnome-help-browser.c 2001-10-26
05:13:26.000000000 -0400
++++ gnome-core-1.4.1-0002/help-browser/gnome-help-browser.c 2006-03-19
21:49:40.000000000 -0500
@@ -81,8 +81,8 @@
void destroy_server(HelpWindow win);
@@ -152,9 +311,9 @@
/* GHELPPATH probably needs some automatic additions inside toc */
#define DEFAULT_GHELPPATH GNOME_PREFIX "/share/gnome/help:" \
"/opt/gnome/share/gnome/help:" \
-diff -Naur gnome-core-1.4.1.old/ltmain.sh gnome-core-1.4.1.new/ltmain.sh
---- gnome-core-1.4.1.old/ltmain.sh Sat Jun 8 06:22:40 2002
-+++ gnome-core-1.4.1.new/ltmain.sh Tue Jan 28 23:20:47 2003
+diff -Naur gnome-core-1.4.1-0001/ltmain.sh gnome-core-1.4.1-0002/ltmain.sh
+--- gnome-core-1.4.1-0001/ltmain.sh 2002-06-07 17:22:40.000000000 -0400
++++ gnome-core-1.4.1-0002/ltmain.sh 2006-03-19 21:49:41.000000000 -0500
@@ -2862,6 +2862,11 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
@@ -167,9 +326,9 @@
eval cmds=\"$archive_cmds\"
fi
IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
-diff -Naur gnome-core-1.4.1.old/omf-install/Makefile.in
gnome-core-1.4.1.new/omf-install/Makefile.in
---- gnome-core-1.4.1.old/omf-install/Makefile.in Sat Jun 8 08:11:43 2002
-+++ gnome-core-1.4.1.new/omf-install/Makefile.in Tue Jan 28 23:20:59 2003
+diff -Naur gnome-core-1.4.1-0001/omf-install/Makefile.in
gnome-core-1.4.1-0002/omf-install/Makefile.in
+--- gnome-core-1.4.1-0001/omf-install/Makefile.in 2002-06-07
19:11:43.000000000 -0400
++++ gnome-core-1.4.1-0002/omf-install/Makefile.in 2006-03-19
21:49:41.000000000 -0500
@@ -300,7 +300,6 @@
-for file in $(srcdir)/*.omf; do \
$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
@@ -178,9 +337,9 @@
uninstall-local:
-for file in $(srcdir)/*.omf; do \
-diff -Naur gnome-core-1.4.1.old/po/Makefile.in.in
gnome-core-1.4.1.new/po/Makefile.in.in
---- gnome-core-1.4.1.old/po/Makefile.in.in Sat Jun 8 06:22:39 2002
-+++ gnome-core-1.4.1.new/po/Makefile.in.in Tue Jan 28 23:20:47 2003
+diff -Naur gnome-core-1.4.1-0001/po/Makefile.in.in
gnome-core-1.4.1-0002/po/Makefile.in.in
+--- gnome-core-1.4.1-0001/po/Makefile.in.in 2002-06-07 17:22:39.000000000
-0400
++++ gnome-core-1.4.1-0002/po/Makefile.in.in 2006-03-19 21:49:41.000000000
-0500
@@ -106,7 +106,10 @@
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
Index: gnome-core.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-core.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-core.info 24 Jan 2006 08:25:28 -0000 1.1
+++ gnome-core.info 20 Mar 2006 03:48:10 -0000 1.2
@@ -1,22 +1,23 @@
Package: gnome-core
Version: 1.4.1
-Revision: 15
-Architecture: powerpc
+Revision: 16
Source: mirror:gnome:sources/%n/1.4/%n-%v.tar.bz2
Source-MD5: fea00c24018057a6f04315bea8e4bdab
Depends: %N-shlibs (= %v-%r), control-center-shlibs (>= 1.4.0.5-16),
gnome-print-shlibs (>= 0.36-11), scrollkeeper (>= 0.3.11-5)
Conflicts: gnome-session, gnome-terminal, gnome-panel, gnome-desktop
Replaces: gnome-session, gnome-terminal, gnome-panel, gnome-desktop
-BuildDepends: glib, gtk+ (>= 1.2.10-20), gnome-libs-dev (>= 1.4.2-19), libxml,
imlib (>= 1.9.14-14), esound, control-center-dev (>= 1.4.0.5-16), gdk-pixbuf
(>= 0.18.0-12), libjpeg, libpng3, orbit-dev (>= 0.5.17-15), gnome-print-dev (>=
0.36-11), libglade (>= 0.17-13), gtk-doc, bzip2-dev, gettext-dev, gettext-bin,
gettext-tools, gcc3.3, audiofile
+BuildDepends: glib, gtk+ (>= 1.2.10-20), gnome-libs-dev (>= 1.4.2-19), libxml,
imlib (>= 1.9.14-14), esound, control-center-dev (>= 1.4.0.5-16), gdk-pixbuf
(>= 0.18.0-12), libjpeg, libpng3, orbit-dev (>= 0.5.17-15), gnome-print-dev (>=
0.36-11), libglade (>= 0.17-13), gtk-doc, bzip2-dev, gettext-dev, gettext-bin,
gettext-tools, audiofile, gtkhtml-dev
Patch: %n.patch
+
+# Fix __PRETTY_FUNCTION__ becoming a variable
+PatchScript: <<
+ find . -name '*.c' | xargs perl -0777 -i -pe
's/(G_GNUC_PRETTY_FUNCTION)\s*"(.*?)"\s*([,)])/"%%s$2",$1$3/smg'
+<<
+
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
SetCPPFLAGS: -no-cpp-precomp
ConfigureParams: --mandir=%p/share/man
-CompileScript: <<
- export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c
- make CC=gcc-3.3 CXX=g++-3.3
-<<
InstallScript: <<
make install DESTDIR=%d
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
