Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv16211
Modified Files:
Tag: pangocairo-branch
libbonobo2.info libbonobo2.patch
Added Files:
Tag: pangocairo-branch
bonobo-activation2.info
Log Message:
new version
externalize the obsolete stuff
--- NEW FILE: bonobo-activation2.info ---
Package: bonobo-activation2
Version: 2.20.3
Revision: 1
Description: Upgrader for gnome2.4-layout packages
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
License: GPL/LGPL
Source: none
Depends: libbonobo2 (>= 2.6.0-1), fink-obsolete-packages
CompileScript: #
InstallScript: <<
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%n
<<
SplitOff: <<
Package: %N-shlibs
Depends: libbonobo2-shlibs (>= 2.6.0-1), fink-obsolete-packages
InstallScript: <<
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%n
<<
<<
Index: libbonobo2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libbonobo2.patch,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -d -r1.4.2.3 -r1.4.2.4
--- libbonobo2.patch 3 Mar 2007 03:22:01 -0000 1.4.2.3
+++ libbonobo2.patch 21 Jan 2008 08:29:14 -0000 1.4.2.4
@@ -1,17 +1,37 @@
-diff -Nurd -x'*~' libbonobo-2.16.0.orig/doc/api/Makefile.in
libbonobo-2.16.0/doc/api/Makefile.in
---- libbonobo-2.16.0.orig/doc/api/Makefile.in 2006-09-04 11:09:02.000000000
-0400
-+++ libbonobo-2.16.0/doc/api/Makefile.in 2006-09-19 23:06:29.000000000
-0400
-@@ -279,6 +279,7 @@
+diff -Nurd -x'*~' libbonobo-2.20.3.orig/configure libbonobo-2.20.3/configure
+--- libbonobo-2.20.3.orig/configure 2007-12-22 15:35:08.000000000 -0500
++++ libbonobo-2.20.3/configure 2008-01-21 03:10:57.000000000 -0500
+@@ -24062,6 +24062,8 @@
+
+
+ # popt
++# See: http://bugzilla.gnome.org/show_bug.cgi?id=357145
++if false; then
+ { echo "$as_me:$LINENO: checking for poptStrippedArgv in -lpopt" >&5
+ echo $ECHO_N "checking for poptStrippedArgv in -lpopt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_popt_poptStrippedArgv+set}" = set; then
+@@ -24130,6 +24132,7 @@
+ echo "$as_me: error: You must have popt version 1.5 or greater installed."
>&2;}
+ { (exit 1); exit 1; }; }
+ fi
++fi
+
+
+ if test "${ac_cv_header_popt_h+set}" = set; then
+diff -Nurd -x'*~' libbonobo-2.20.3.orig/doc/api/Makefile.in
libbonobo-2.20.3/doc/api/Makefile.in
+--- libbonobo-2.20.3.orig/doc/api/Makefile.in 2007-12-22 15:45:16.000000000
-0500
++++ libbonobo-2.20.3/doc/api/Makefile.in 2008-01-21 03:05:35.000000000
-0500
+@@ -301,6 +301,7 @@
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(LIBBONOBO_CFLAGS) \
-I$(top_srcdir) \
+ -I$(top_srcdir)/bonobo \
-I$(top_builddir)
-
-diff -Nurd -x'*~' libbonobo-2.16.0.orig/doc/api/libbonobo.types
libbonobo-2.16.0/doc/api/libbonobo.types
---- libbonobo-2.16.0.orig/doc/api/libbonobo.types 2006-09-04
11:11:51.000000000 -0400
-+++ libbonobo-2.16.0/doc/api/libbonobo.types 2006-09-19 23:06:29.000000000
-0400
+ GTKDOC_LIBS = $(top_builddir)/bonobo/libbonobo-2.la $(LIBBONOBO_LIBS)
+diff -Nurd -x'*~' libbonobo-2.20.3.orig/doc/api/libbonobo.types
libbonobo-2.20.3/doc/api/libbonobo.types
+--- libbonobo-2.20.3.orig/doc/api/libbonobo.types 2007-12-22
15:46:37.000000000 -0500
++++ libbonobo-2.20.3/doc/api/libbonobo.types 2008-01-21 03:05:35.000000000
-0500
@@ -1,4 +1,8 @@
#include <libbonobo.h>
+#include "bonobo-running-context.h"
Index: libbonobo2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libbonobo2.info,v
retrieving revision 1.11.2.15
retrieving revision 1.11.2.16
diff -u -d -r1.11.2.15 -r1.11.2.16
--- libbonobo2.info 12 Dec 2007 16:13:22 -0000 1.11.2.15
+++ libbonobo2.info 21 Jan 2008 08:29:14 -0000 1.11.2.16
@@ -1,5 +1,5 @@
Package: libbonobo2
-Version: 2.20.2
+Version: 2.20.3
Revision: 1
Depends: <<
%N-shlibs (= %v-%r),
@@ -10,8 +10,6 @@
orbit2 (>= 2.14.9-1)
<<
BuildDepends: <<
- autoconf (>= 2.60-1),
- automake1.9,
fink (>= 0.24.12-1),
gettext-bin,
gettext-tools,
@@ -21,24 +19,16 @@
libgettext3-dev,
libiconv-dev,
libidl2 (>= 0.8.9-1),
- libtool14,
libxml2 (>= 2.6.17-1),
orbit2-dev (>= 2.14.9-1),
- pkgconfig,
+ pkgconfig (>= 0.21-1),
popt (>= 1.7-5)
<<
-Replaces: bonobo-activation2 (<< 2.6.0-1)
-Provides: bonobo-activation2
+Replaces: bonobo-activation2
Source: mirror:gnome:sources/libbonobo/2.20/libbonobo-%v.tar.bz2
-Source-MD5: 57c706962674a2ad6480943ac31055ec
+Source-MD5: db152a4e97eaf2670b666fef45098413
PatchFile: %n.patch
-PatchFile-MD5: b2fe3319961fbc50541f641ba1d3831e
-PatchScript: <<
- %{default_script}
- perl -pi -e "s/need_relink=yes/need_relink=no/" ltmain.sh
- intltoolize --force
- aclocal --force
-<<
+PatchFile-MD5: d5c12b664a2c153adee7006f554a83ab
ConfigureParams: --mandir=%p/share/man --libexecdir=%p/lib/%n
--disable-dependency-tracking --disable-gtk-doc
SetCFLAGS: -Os -fno-common
NoSetMAKEFLAGS: true
@@ -55,9 +45,8 @@
<<
SplitOff: <<
Package: %N-shlibs
- Depends: glib2-shlibs (>= 2.12.0-1), libgettext3-shlibs, libiconv,
orbit2-shlibs (>= 2.14.9-1)
- Replaces: bonobo-activation2-shlibs (<< 2.4.2-1), %N (<< 2.16.0-1)
- Provides: bonobo-activation2-shlibs
+ Depends: glib2-shlibs (>= 2.12.0-1), libgettext3-shlibs, libiconv,
orbit2-shlibs (>= 2.14.9-1), popt-shlibs (>= 1.7-5)
+ Replaces: bonobo-activation2-shlibs, %N (<< 2.16.0-1)
Files: <<
lib/libbonobo-2.*.dylib
lib/libbonobo-activation.*.dylib
@@ -75,33 +64,13 @@
Depends: %N (= %v-%r)
Conflicts: bonobo-activation2-dev
Replaces: %N (<< 2.6.0-1), bonobo-activation2-dev
- Provides: bonobo-activation2-dev
BuildDependsOnly: True
Files: include lib/libbonobo-2.* lib/libbonobo-activation.*
lib/pkgconfig share/gtk-doc share/idl
DocFiles: AUTHORS COPYING* ChangeLog po/ChangeLog:ChangeLog.po NEWS
README TODO
<<
-SplitOff3: <<
- Package: bonobo-activation2-shlibs
- Depends: %N-shlibs (>= 2.6.0-1), fink-obsolete-packages
- Replaces: %n (<< 2.6.0-1)
- Conflicts: %n (<< 2.6.0-1)
- Files: share/doc/dummy/%n
- Description: placeholder for bonobo-activation2-shlibs to allow
upgrading over pre-gnome2.4 packages
-<<
-SplitOff4: <<
- Package: bonobo-activation2
- Depends: %N (>= 2.6.0-1), fink-obsolete-packages
- Replaces: %n (<< 2.6.0-1)
- Conflicts: %n (<< 2.6.0-1)
- Files: share/doc/dummy/%n
- Description: placeholder for bonobo-activation2 to allow upgrading over
pre-gnome2.4 packages
-<<
DocFiles: AUTHORS COPYING* ChangeLog po/ChangeLog:ChangeLog.po NEWS README TODO
Description: GNOME component and compound document system
DescPort: <<
- Update to autoconf 2.60 so that all @ templates in .pc get replaced.
- See: http://bugzilla.gnome.org/show_bug.cgi?id=342326
-
Some public functions moved from gnomevfs2 to libbonbo-activation
during the GNOME2.14->2.16 transition. The libbonobo-activation
compatibility_version was not increased.
@@ -111,9 +80,8 @@
gettext catalogs moved %N->%N-shlibs in 2.16.0-1
Runtime popt library usage removed from library code as of 2.16.0
- Patch bonobo-activation-init.h to CVS revision 1.11 to hide popt unless
- BONOBO_DISABLE_DEPRECATED to avoid needless inherited BuildDepends:popt
- See: http://bugzilla.gnome.org/show_bug.cgi?id=357145
+ Patch configure to avoid testing for -lpopt (unused). Still need
+ popt.h. See: http://bugzilla.gnome.org/show_bug.cgi?id=357145
<<
License: GPL/LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
