Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19723

Modified Files:
        anjuta.info anjuta.patch 
Log Message:
start to fix...gets further before compile failure, maybe just update %v?


Index: anjuta.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome/anjuta.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- anjuta.info 28 Sep 2010 03:56:28 -0000      1.1
+++ anjuta.info 28 Sep 2010 03:57:22 -0000      1.2
@@ -1,7 +1,7 @@
 Info3: <<
 Package: anjuta
 Version: 2.24.2
-Revision: 2
+Revision: 3
 Distribution: 10.5, 10.6
 
 BuildDepends: <<
@@ -32,8 +32,8 @@
   libavahi-glib1-dev,
   libbonobo2-dev (>= 2.24.0-1),
   libbonoboui2-dev (>= 2.24.0-1),
-  libgdl-1.0 (>= 2.24.0),
-  libgettext3-dev,
+  libgdl-1.3-dev (>= 2.28.0),
+  libgettext8-dev,
   libglade2 (>= 2.6.2-1),
   libgnome2-dev (>= 2.24.0-1),
   libgnomecanvas2-dev (>= 2.20.0-1),
@@ -41,7 +41,7 @@
   libgnomeprintui2.2-dev (>= 2.18.1-1),
   libgnomeui2-dev (>= 2.24.0-1),
   libiconv-dev,
-  libpng3,
+  libpng14,
   libtool2,
   libxml2 (>= 2.6.30-1),
   orbit2-dev (>= 2.14.16-1),
@@ -58,10 +58,11 @@
   autogen,
   bzip2-shlibs,
   dbus (>= 1.2.1-1),
+  gconf2,
   glade3-shlibs (>= 3.6.3-2),
   gnome-build (>= 2.24.0),
   gnome-build-shlibs (>= 2.24.0),
-  libgdl-1.0-shlibs (>= 2.24.0),
+  libgdl-1.3-shlibs (>= 2.28.0),
   libgnomeprint2.2-shlibs (>= 2.18.1-1),
   libgnomeprintui2.2-shlibs (>= 2.18.1-1),
   libtool2-shlibs,
@@ -74,16 +75,20 @@
 Source: mirror:sourceforge:%n/%n-%v.tar.bz2
 Source-MD5: d1db75bc1c8d4ab4c9d180767e24e39a
 PatchFile: %n.patch
-PatchFile-MD5: e607d1ec84b0514bf7ab179c822b3b79
+PatchFile-MD5: 3bdcd2badc423c721fcda4a33039bdf4
 ConfigureParams: <<
   --libexecdir=%p/lib/%n \
   --mandir=%p/share/man \
   --enable-plugin-scintilla \
   --disable-schemas-install \
-  --disable-dependency-tracking \
+  --enable-dependency-tracking \
   --enable-static \
   --enable-shared
 << 
+CompileScript: <<
+       %{default_script}
+       fink-package-precedence --prohibit-bdep=%n-dev .
+<<
 
 InstallScript: make install DESTDIR=%d; rm -rf %i/doc
 DocFiles: doc/ScintillaDoc.html ABOUT-NLS AUTHORS COPYING FUTURE INSTALL NEWS 
README THANKS TODO ChangeLog
@@ -137,13 +142,13 @@
     libavahi-glib1-shlibs,
     libbonobo2-shlibs (>= 2.24.0-1),
     libbonoboui2-shlibs (>= 2.24.0-1),
-    libgettext3-shlibs,
+    libgettext8-shlibs,
     libglade2-shlibs (>= 2.6.2-1),
     libgnome2-shlibs (>= 2.24.0-1),
     libgnomecanvas2-shlibs (>= 2.20.0-1),
     libgnomeui2-shlibs (>= 2.24.0-1),
     libiconv,
-    libpng3-shlibs,
+    libpng14-shlibs,
     libxml2-shlibs (>= 2.6.30-1),
     orbit2-shlibs (>= 2.14.16-1),
     pango1-xft2-ft219-shlibs (>= 1.22.0-4),
@@ -204,6 +209,9 @@
 <<
 DescPackaging: <<
 The initial packaging for Fink was done by Marc Weil.
+
+       Pass explicit -lX11 that was formerly inherited from some
+       dependency's .la
 <<
 DescPort: <<
        Doesn't build on 10.4 due to upstream platform assumtion. See:

Index: anjuta.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome/anjuta.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- anjuta.patch        28 Sep 2010 03:56:28 -0000      1.1
+++ anjuta.patch        28 Sep 2010 03:57:22 -0000      1.2
@@ -30,3 +30,15 @@
  #  include <util.h>
  #elif !defined(__sun)
  #  include <pty.h>
+diff -Nurd -x'*~' anjuta-2.24.2.orig/plugins/gtodo/Makefile.in 
anjuta-2.24.2/plugins/gtodo/Makefile.in
+--- anjuta-2.24.2.orig/plugins/gtodo/Makefile.in       2008-11-24 
09:11:36.000000000 -0500
++++ anjuta-2.24.2/plugins/gtodo/Makefile.in    2010-09-27 23:29:05.000000000 
-0400
+@@ -422,7 +422,7 @@
+       $(GTK_LIBS) \
+       $(GNOME_VFS_LIBS) \
+       $(LIBXSLT_LIBS) \
+-      $(LIBANJUTA_LIBS)
++      $(LIBANJUTA_LIBS) -lX11 -L/usr/X11/lib -L/usr/X11R6/lib
+ 
+ libanjuta_gtodo_la_SOURCES = \
+       plugin.c\


------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to