Update of /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19594/10.3/unstable/crypto/finkinfo

Modified Files:
        galeon.info galeon.patch 
Log Message:
backport new %v from 10.4*...


Index: galeon.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/galeon.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- galeon.patch        10 Sep 2004 03:21:45 -0000      1.4
+++ galeon.patch        11 Apr 2006 01:58:53 -0000      1.5
@@ -1,12 +1,21 @@
-diff -Naur galeon-old/mozilla/Makefile.in galeon-new/mozilla/Makefile.in
---- galeon-old/mozilla/Makefile.in     Fri Dec 19 11:57:30 2003
-+++ galeon-new/mozilla/Makefile.in     Mon Jan 26 01:31:58 2004
-@@ -332,7 +332,7 @@
-        -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h
+diff -Naur galeon-1.3.21-orig/utils/gul-x11.c galeon-1.3.21/utils/gul-x11.c
+--- galeon-1.3.21-orig/utils/gul-x11.c 2005-02-10 19:56:17.000000000 +0100
++++ galeon-1.3.21/utils/gul-x11.c      2006-01-12 08:54:11.000000000 +0100
+@@ -52,7 +52,7 @@
  
- libgaleon_xpcom_la_LIBADD = $(MOZILLA_COMPONENT_LIBS)
--libgaleon_xpcom_la_LDFLAGS = -avoid-version
-+libgaleon_xpcom_la_LDFLAGS = -avoid-version -module
- galeon_libdir = $(pkglibdir)/components
- galeon_lib_LTLIBRARIES = libgaleon-xpcom.la
- libgaleon_xpcom_la_SOURCES = \
+        XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID 
(root_win),
+                            gdk_x11_get_xatom_by_name_for_display (display, 
"_NET_CURRENT_DESKTOP"),
+-                           0, G_MAXLONG,
++                           0, G_MAXLONG - 3,
+                            False, XA_CARDINAL, &type, &format, &nitems,
+                            &bytes_after, (gpointer)&current_desktop);
+        if (type == XA_CARDINAL && format == 32 && nitems > 0)
+@@ -85,7 +85,7 @@
+ 
+        XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID 
(window),
+                            gdk_x11_get_xatom_by_name_for_display (display, 
"_NET_WM_DESKTOP"),
+-                           0, G_MAXLONG,
++                           0, G_MAXLONG - 3,
+                            False, XA_CARDINAL, &type, &format, &nitems,
+                            &bytes_after, (gpointer)&workspace);
+        if (type == XA_CARDINAL && format == 32 && nitems > 0)

Index: galeon.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/galeon.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- galeon.info 8 Jul 2005 02:05:25 -0000       1.7
+++ galeon.info 11 Apr 2006 01:58:53 -0000      1.8
@@ -1,25 +1,26 @@
 Package: galeon
-Version: 1.3.17
-Revision: 1
+Version: 1.3.21
+Revision: 12
 Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
-##
+
 License: GPL
 Homepage: http://sourceforge.net/projects/galeon/
+
 Source: mirror:sourceforge:%n/%n-%v.tar.bz2
-Source-MD5: 781ac1c9e15fa4c2b367b195e78d1ab2
-##
-##
-## 
+Source-MD5: 5106e037bb52bdb234b3fc09c1e0a3f3
+
 Depends: x11, esound-bin, scrollkeeper, yelp, nautilus-shlibs, mozilla-browser
 BuildDepends: <<
-       x11-dev, gettext-bin, gettext-tools, intltool, pkgconfig, sed,
+       x11-dev, intltool, pkgconfig, sed,
        atk1,
        audiofile,
        eel2-dev,
+       esound,
        gail17-dev,
        gconf2-dev,
-       gettext-dev,
+       gettext-dev, gettext-bin, gettext-tools,
        glib2-dev,
+       gnome-desktop4-dev,
        gnome-keyring-dev (>= 0.4.3-1),
        gnome-vfs2-ssl-dev | gnome-vfs2-dev,
        gtk+2-dev,
@@ -36,16 +37,19 @@
        mozilla-dev (>= 1.7-1), mozilla-dev (<< 1.8-1),
        nautilus-dev,
        orbit2-dev,
-       pango1-xft2-dev
+       pango1-xft2-dev,
+       popt,
+       startup-notification-dev
 <<
 GCC: 3.3
 ##
 ##
 Patch: %n.patch
-ConfigureParams: --mandir=%i/share/man --with-mozilla-libs=%p/lib/mozilla 
--with-mozilla-includes=%p/include/mozilla --with-mozilla-snapshot=1.7 
--disable-schemas-install --enable-nautilus-view --localstatedir="`pwd`/var"
-##
-##
-##
+# Don't do scrollkeeper-update on install
+PatchScript: find . -name Makefile.in | xargs perl -i -pe 
's/^\s+-scrollkeeper-update/#$&/g'
+
+ConfigureParams: --mandir=%i/share/man --with-mozilla-libs=%p/lib/mozilla 
--with-mozilla-includes=%p/include/mozilla --with-mozilla-snapshot=1.7 
--disable-schemas-install --enable-nautilus-view --disable-dependency-tracking
+
 PostInstScript: <<
   if [ configure = "$1" ]; then
     scrollkeeper-update
@@ -58,10 +62,9 @@
     scrollkeeper-update
   fi
 <<
+
 DocFiles: AUTHORS COPYING* ChangeLog FAQ* NEWS README* THANKS TODO
-##
-##
-##
+
 Description: Light-weight GNOME web browser
 DescDetail: <<
 Galeon is a GNOME web browser based on Gecko (the Mozilla rendering engine). 



-------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to