Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27510/crypto/finkinfo
Modified Files:
Tag: pangocairo-branch
firefox2.info gnucash2-10.5.info gnucash2.info
Log Message:
fixes for some conflicts
Index: gnucash2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/gnucash2.info,v
retrieving revision 1.2.2.46
retrieving revision 1.2.2.47
diff -u -d -r1.2.2.46 -r1.2.2.47
--- gnucash2.info 14 Jan 2008 06:24:00 -0000 1.2.2.46
+++ gnucash2.info 5 Mar 2008 16:11:33 -0000 1.2.2.47
@@ -1,6 +1,6 @@
Package: gnucash2
-Version: 2.2.3
-Revision: 1
+Version: 2.2.4
+Revision: 2
Description: Financial-accounting software
License: GPL
Maintainer: Dave Reiser <[EMAIL PROTECTED]>
@@ -22,6 +22,7 @@
bzip2-dev,
dbus-dev (>= 1.0-1),
expat1,
+ fink (>= 0.27.99-1),
libpng3,
cairo (>= 1.2-1),
glitz,
@@ -74,7 +75,7 @@
Replaces: gnucash, gnucash-dev, gnucash-hcbi, gnucash-ofx, gnucash-sql
Suggests: gnucash2-docs (>= 2.0.1)
Source: mirror:sourceforge:gnucash/gnucash-%v.tar.bz2
-Source-MD5: a90e2d01e3c487d36e9a5f5fd82d2149
+Source-MD5: f521cea858ee7223325114ec98de86ca
PatchScript: <<
perl -pi.bak -e 's,DYLD_LIBRARY_PATH,DYLD_FALLBACK_LIBRARY_PATH,g' aclocal.m4
perl -pi.bak -e 's,DYLD_LIBRARY_PATH,DYLD_FALLBACK_LIBRARY_PATH,g' configure
@@ -83,7 +84,6 @@
perl -pi.bak -e 's,DYLD_LIBRARY_PATH,DYLD_FALLBACK_LIBRARY_PATH,g'
src/gnc-test-env
perl -pi.bak -e 's,\"perl\",\"\/usr\/bin\/perl\",g' src/scm/price-quotes.scm
perl -e 'print "#!/bin/sh\nfink update date-manip-pm
finance-quote-pm586\n";' > src/quotes/gnc-fq-update.in
- perl -pi.bak -e 's,G_INLINE_FUNC ,,g' src/engine/SplitP.h
<<
SetCPPFLAGS: -I/usr/X11R6/include -I%p/lib/system-openssl/include
SetLDFLAGS: -L%p/lib/system-openssl/lib
@@ -169,6 +169,29 @@
%p/lib/libgnc-gnome.0.dylib 1.0.0 %n (>= 2.1.1-1)
%p/lib/libgnc-module.0.dylib 1.0.0 %n (>= 2.1.1-1)
%p/lib/libgnc-qof.1.dylib 2.0.0 %n (>= 2.1.1-1)
+ !%p/lib/gnucash/libgncmod-app-utils.dylib
+ !%p/lib/gnucash/libgncmod-business-core.dylib
+ !%p/lib/gnucash/libgncmod-business-gnome.dylib
+ !%p/lib/gnucash/libgncmod-business-utils.dylib
+ !%p/lib/gnucash/libgncmod-calculation.dylib
+ !%p/lib/gnucash/libgncmod-dialog-tax-table.dylib
+ !%p/lib/gnucash/libgncmod-engine.dylib
+ !%p/lib/gnucash/libgncmod-generic-import.dylib
+ !%p/lib/gnucash/libgncmod-gnome-search.dylib
+ !%p/lib/gnucash/libgncmod-gnome-utils.dylib
+ !%p/lib/gnucash/libgncmod-hbci.dylib
+ !%p/lib/gnucash/libgncmod-ledger-core.dylib
+ !%p/lib/gnucash/libgncmod-locale-reports-us.dylib
+ !%p/lib/gnucash/libgncmod-log-replay.dylib
+ !%p/lib/gnucash/libgncmod-ofx.dylib
+ !%p/lib/gnucash/libgncmod-qif.0.dylib
+ !%p/lib/gnucash/libgncmod-qif-import.dylib
+ !%p/lib/gnucash/libgncmod-register-core.dylib
+ !%p/lib/gnucash/libgncmod-register-gnome.dylib
+ !%p/lib/gnucash/libgncmod-report-gnome.dylib
+ !%p/lib/gnucash/libgncmod-report-system.dylib
+ !%p/lib/gnucash/libgncmod-standard-reports.dylib
+ !%p/lib/gnucash/libgncmod-tax-us.dylib
<<
DocFiles: COPYING
<<
Index: gnucash2-10.5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/gnucash2-10.5.info,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -u -d -r1.3.2.6 -r1.3.2.7
--- gnucash2-10.5.info 14 Jan 2008 06:24:00 -0000 1.3.2.6
+++ gnucash2-10.5.info 5 Mar 2008 16:11:33 -0000 1.3.2.7
@@ -1,6 +1,6 @@
Package: gnucash2
-Version: 2.2.3
-Revision: 101
+Version: 2.2.4
+Revision: 102
Distribution: 10.5
Description: Financial-accounting software
License: GPL
@@ -23,6 +23,7 @@
bzip2-dev,
dbus-dev (>= 1.0-1),
expat1,
+ fink (>= 0.27.99-1),
libpng3,
cairo (>= 1.2-1),
glitz,
@@ -75,7 +76,7 @@
Replaces: gnucash, gnucash-dev, gnucash-hcbi, gnucash-ofx, gnucash-sql
Suggests: gnucash2-docs (>= 2.0.1)
Source: mirror:sourceforge:gnucash/gnucash-%v.tar.bz2
-Source-MD5: a90e2d01e3c487d36e9a5f5fd82d2149
+Source-MD5: f521cea858ee7223325114ec98de86ca
PatchScript: <<
perl -pi.bak -e 's,DYLD_LIBRARY_PATH,DYLD_FALLBACK_LIBRARY_PATH,g' aclocal.m4
perl -pi.bak -e 's,DYLD_LIBRARY_PATH,DYLD_FALLBACK_LIBRARY_PATH,g' configure
@@ -84,7 +85,6 @@
perl -pi.bak -e 's,DYLD_LIBRARY_PATH,DYLD_FALLBACK_LIBRARY_PATH,g'
src/gnc-test-env
perl -pi.bak -e 's,\"perl\",\"\/usr\/bin\/perl\",g' src/scm/price-quotes.scm
perl -e 'print "#!/bin/sh\nfink update date-manip-pm
finance-quote-pm588\n";' > src/quotes/gnc-fq-update.in
- perl -pi.bak -e 's,G_INLINE_FUNC ,,g' src/engine/SplitP.h
<<
SetCPPFLAGS: -I/usr/X11R6/include -I%p/lib/system-openssl/include
SetLDFLAGS: -L%p/lib/system-openssl/lib
@@ -171,6 +171,30 @@
%p/lib/libgnc-gnome.0.dylib 1.0.0 %n (>= 2.1.1-1)
%p/lib/libgnc-module.0.dylib 1.0.0 %n (>= 2.1.1-1)
%p/lib/libgnc-qof.1.dylib 2.0.0 %n (>= 2.1.1-1)
+ !%p/lib/gnucash/libgncmod-app-utils.dylib
+ !%p/lib/gnucash/libgncmod-business-core.dylib
+ !%p/lib/gnucash/libgncmod-business-gnome.dylib
+ !%p/lib/gnucash/libgncmod-business-utils.dylib
+ !%p/lib/gnucash/libgncmod-calculation.dylib
+ !%p/lib/gnucash/libgncmod-dialog-tax-table.dylib
+ !%p/lib/gnucash/libgncmod-engine.dylib
+ !%p/lib/gnucash/libgncmod-generic-import.dylib
+ !%p/lib/gnucash/libgncmod-gnome-search.dylib
+ !%p/lib/gnucash/libgncmod-gnome-utils.dylib
+ !%p/lib/gnucash/libgncmod-hbci.dylib
+ !%p/lib/gnucash/libgncmod-ledger-core.dylib
+ !%p/lib/gnucash/libgncmod-locale-reports-us.dylib
+ !%p/lib/gnucash/libgncmod-log-replay.dylib
+ !%p/lib/gnucash/libgncmod-ofx.dylib
+ !%p/lib/gnucash/libgncmod-qif-import.dylib
+ !%p/lib/gnucash/libgncmod-qif.0.dylib
+ !%p/lib/gnucash/libgncmod-register-core.dylib
+ !%p/lib/gnucash/libgncmod-register-gnome.dylib
+ !%p/lib/gnucash/libgncmod-report-gnome.dylib
+ !%p/lib/gnucash/libgncmod-report-system.dylib
+ !%p/lib/gnucash/libgncmod-standard-reports.dylib
+ !%p/lib/gnucash/libgncmod-tax-us.dylib
+
<<
DocFiles: COPYING
<<
Index: firefox2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/firefox2.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- firefox2.info 13 Dec 2007 17:21:56 -0000 1.1.2.1
+++ firefox2.info 5 Mar 2008 16:11:33 -0000 1.1.2.2
@@ -1,6 +1,6 @@
Package: firefox2
-Version: 2.0.0.11
-Revision: 1004
+Version: 2.0.0.12
+Revision: 1006
Description: Lightweight browser from mozilla.org
License: OSI-Approved
Maintainer: Hanspeter Niederstrasser <[EMAIL PROTECTED]>
@@ -24,6 +24,7 @@
BuildDepends: <<
atk1 (>= 1.20.0-1),
cairo (>= 1.2-1),
+ fink (>= 0.27.99-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.5-1),
glib2-dev (>= 2.14.0-1),
@@ -51,7 +52,7 @@
<<
Source:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%v/source/firefox-%v-source.tar.bz2
SourceDirectory: mozilla
-Source-MD5: b2f982f9f3085195d4797957537ca75d
+Source-MD5: 361eadc4f2132287f5812762978f43ee
PatchScript: <<
/usr/bin/sed 's|@PREFIX@|%p|g' <%a/%n.patch | /usr/bin/patch -p1
### hardcode paths inside dylibs so that programs linking to them can see
them
@@ -107,8 +108,19 @@
# rename nspr.m4 to avoid clashes with other gecko installs
/bin/mv %i/share/aclocal/nspr.m4 %i/share/aclocal/nspr-%n.m4
+
+# fix install_names for the base package plugins
+for file in %i/lib/firefox2/plugins/*.dylib; do
+ FILENAME=`basename "$file"`;
+ install_name_tool -id "%p/lib/%n/plugins/$FILENAME"
"%i/lib/%n/plugins/$FILENAME";
+done
+
<<
DocFiles: LEGAL LICENSE README.txt
+Shlibs: <<
+ !%p/lib/%N/plugins/libnullplugin.dylib
+ !%p/lib/%N/plugins/libunixprintplugin.dylib
+<<
SplitOff: <<
Package: %N-dev
Depends: <<
@@ -210,11 +222,7 @@
Patch includes fix for bug #257773, which allows building on OS X/X11
w/out the need for setting missing LDFLAGS.
-Building with freetype2 is disabled because of incompatabilities with
-Xorg X11 (Apple's X11 and Xfree4.4 work though). Theoretically fixed
-from FF1.5 onward, but I'm unable to test, so still disabled. Seems
-to cause no harm as is, however.
-
-ac_add_options --enable-macos-target=10.3 in patch file (.mozconfig) is
-for the minimum OS version that this will compile in.
+ac_add_options --enable-macos-target=foo in patch file (.mozconfig) is
+for the minimum OS version that this will compile in, usu. a lower version
+than the Fink tree the file is in.
<<
-------------------------------------------------------------------------
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
