Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17:/tmp/cvs-serv2090/main/finkinfo/gnome
Modified Files:
Tag: pangocairo-branch
gnome-mag2.info gok.info gok.patch gst-python-0.10-py.info
totem.info glib2.info
Log Message:
more buildfink fixes
Index: gok.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gok.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- gok.patch 1 Jun 2006 04:16:43 -0000 1.1
+++ gok.patch 19 Jul 2007 20:28:18 -0000 1.1.2.1
@@ -1,40 +1,19 @@
-diff -Nurd -x'*~' gok-0.10.2.orig/gok/gok-spy.c gok-0.10.2/gok/gok-spy.c
---- gok-0.10.2.orig/gok/gok-spy.c 2004-04-01 07:31:09.000000000 -0500
-+++ gok-0.10.2/gok/gok-spy.c 2006-05-31 23:06:04.000000000 -0400
-@@ -227,36 +227,6 @@
- gok_log_leave ();
- }
-
--gboolean gok_spy_accessible_is_okay(Accessible* accessible)
--{
-- gboolean returncode = FALSE;
-- gok_log_enter();
-- if (accessible != NULL)
-- {
-- /* FIXME: we should have a better way of doing this! */
-- returncode = cspi_accessible_is_a (accessible,
"IDL:Accessibility/Accessible:1.0");
-- /*
-- if (Accessible_isApplication(accessible) ||
-- Accessible_isComponent(accessible))
-- {
-- returncode = TRUE;
-- }
-- */
-- /*
-- if (gok_spy_accessible_is_desktopChild(accessible) == FALSE)
-- {
-- accessible = NULL;
-- }
-- else
-- {
-- returncode = TRUE;
-- }
-- */
-- }
-- gok_log("returning: %d",returncode);
-- gok_log_leave();
-- return returncode;
--}
+diff -uNr gok-1.2.5/gok/gok-libusb.c gok-1.2.5-new/gok/gok-libusb.c
+--- gok-1.2.5/gok/gok-libusb.c 2007-03-05 10:08:03.000000000 -0500
++++ gok-1.2.5-new/gok/gok-libusb.c 2007-07-19 14:58:02.000000000 -0400
+@@ -261,6 +261,7 @@
+ /* check if the device is attached to a
kernel driver and attempt to detach if it is
+ * if the OS doesn't support detaching
from the kernel driver, just try to claim the interface anyway
+ */
++#if defined(LIBUSB_HAS_GET_DRIVER_NP) &&
defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
+ if (LIBUSB_HAS_GET_DRIVER_NP &&
LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
+ {
+ gchar *driver_name =
g_malloc0(128);
+@@ -283,6 +284,7 @@
+ }
+ g_free(driver_name);
+ }
++#endif
- static gboolean
- gok_spy_idle_handler (gpointer data)
+ if (usb_claim_interface(handle, j) < 0)
+ {
Index: gnome-mag2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-mag2.info,v
retrieving revision 1.7.2.26
retrieving revision 1.7.2.27
diff -u -d -r1.7.2.26 -r1.7.2.27
--- gnome-mag2.info 19 Jul 2007 18:49:36 -0000 1.7.2.26
+++ gnome-mag2.info 19 Jul 2007 20:28:18 -0000 1.7.2.27
@@ -1,7 +1,7 @@
Package: gnome-mag2
-# can't go to 0.14.x until we update X11 to x.org 7.2
-Version: 0.12.6
-Revision: 1
+# can't go higher than 0.14.0 until we update X11 to x.org 7.2
+Version: 0.14.0
+Revision: 1002
Conflicts: gnome-mag
Replaces: gnome-mag
Depends: <<
@@ -55,8 +55,8 @@
x11-dev,
xft2-dev
<<
-Source: mirror:gnome:sources/gnome-mag/0.12/gnome-mag-%v.tar.bz2
-Source-MD5: c402b06408d3b40843720ae09ad74234
+Source: mirror:gnome:sources/gnome-mag/0.14/gnome-mag-%v.tar.bz2
+Source-MD5: 012ad052da51031eca1f521942f865f2
ConfigureParams: --libexecdir=%p/lib/%n --mandir=%p/share/man
--disable-dependency-tracking --enable-static
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
Index: gst-python-0.10-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gst-python-0.10-py.info,v
retrieving revision 1.2.2.20
retrieving revision 1.2.2.21
diff -u -d -r1.2.2.20 -r1.2.2.21
--- gst-python-0.10-py.info 19 Jun 2007 21:16:57 -0000 1.2.2.20
+++ gst-python-0.10-py.info 19 Jul 2007 20:28:18 -0000 1.2.2.21
@@ -25,6 +25,7 @@
gtk-doc (>= 1.5-1),
libhowl-dev,
liboil-0.3,
+ libxml2,
libxml2-py%type_pkg[python],
pygobject2-py%type_pkg[python]-dev,
pygtk2-gtk-py%type_pkg[python]-dev,
Index: gok.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gok.info,v
retrieving revision 1.4.2.26
retrieving revision 1.4.2.27
diff -u -d -r1.4.2.26 -r1.4.2.27
--- gok.info 19 Jul 2007 18:54:23 -0000 1.4.2.26
+++ gok.info 19 Jul 2007 20:28:18 -0000 1.4.2.27
@@ -82,6 +82,7 @@
Source: mirror:gnome:sources/%n/1.2/%n-%v.tar.bz2
Source-MD5: 2ef1f171385a37f93408dbca7ecfdf11
PatchScript: find . -name Makefile.in | xargs perl -pi -e
"s/-scrollkeeper-update/#-scrollkeeper-update/g"
+Patch: %n.patch
SetCPPFLAGS: -I/usr/X11R6/include
SetCFLAGS: -Os
SetLIBS: -L/usr/X11R6/lib
@@ -102,12 +103,6 @@
ConfFiles: %p/etc/gconf/schemas/gok.schemas
DocFiles: AUTHORS COPYING ChangeLog README
Description: Gnome Onscreen Keyboard
-DescPort: <<
- Need to fix static vs. nonstatic problem; for now, compile with gcc-3.3.
-
- Remove function that is not referenced from anywhere and that tries
- to access private symbol from libcspi (hence linker crash).
-<<
License: GPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
Index: glib2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2.info,v
retrieving revision 1.16.2.17
retrieving revision 1.16.2.18
diff -u -d -r1.16.2.17 -r1.16.2.18
--- glib2.info 17 Jul 2007 03:27:35 -0000 1.16.2.17
+++ glib2.info 19 Jul 2007 20:28:18 -0000 1.16.2.18
@@ -26,7 +26,7 @@
perl -pi -e '$_="#define BROKEN_POLL 1\n" if /BROKEN_POLL/' config.h
make
<<
-InfoTest: TestScript: LANG=C make check
+#InfoTest: TestScript: LANG=C make check
InstallScript: <<
make install DESTDIR=%d
mkdir -p %i/share/doc/installed-packages
Index: totem.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/Attic/totem.info,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -u -d -r1.4.2.7 -r1.4.2.8
--- totem.info 19 Jun 2007 14:41:41 -0000 1.4.2.7
+++ totem.info 19 Jul 2007 20:28:18 -0000 1.4.2.8
@@ -5,7 +5,8 @@
Depends: <<
%N-shlibs (= %v-%r),
control-center (>= 2.18.0-1),
- gnome-icon-theme (>= 2.18.0-1)
+ gnome-icon-theme (>= 2.18.0-1),
+ gst-plugins-good-0.10-shlibs (>= 0.10.5-1)
<<
BuildDepends: <<
atk1 (>= 1.17.0-1),
@@ -34,6 +35,7 @@
gnome-menus2-dev (>= 2.18.0),
gnome-vfs2-unified-dev (>= 1:2.18.0-1),
gst-plugins-base-0.10-dev (>= 0.10.7-1),
+ gst-plugins-good-0.10-dev (>= 0.10.5-1),
gstreamer-0.10-dev (>= 0.10.6-1),
gtk+2-dev (>= 2.10.0-1),
gtk-doc (>= 1.2-1),
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
