Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22762/main/finkinfo/sound
Modified Files: libcanberra-gtk0.info libcanberra-gtk0.patch libcanberra0.info Removed Files: libcanberra0.patch Log Message: GNOME2.26 to stable Index: libcanberra-gtk0.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/libcanberra-gtk0.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libcanberra-gtk0.info 12 May 2009 14:00:08 -0000 1.1 +++ libcanberra-gtk0.info 15 Nov 2009 08:20:31 -0000 1.2 @@ -1,32 +1,32 @@ Package: libcanberra-gtk0 -Version: 0.11 +Version: 0.15 Revision: 1 Source: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%v.tar.gz -Source-MD5: c661db14cb0b1fe9b6963defacc3bba6 +Source-MD5: 79c3c0a62e2c8c7c1906e9072a92763b BuildDepends: << - atk1 (>= 1.24.0-1), + atk1 (>= 1.26.0-1), autoconf, - automake1.10, + automake1.11, cairo (>= 1.8-1), expat1, fink (>= 0.24.12-1), fontconfig2-dev (>= 2.4.1-1), - freetype219 (>= 2.3.7-7), - gconf2-dev (>= 2.24.0-1), - glib2-dev (>= 2.18.0-1), + freetype219 (>= 2.3.8-2), + gconf2-dev (>= 2.26.0-1), + glib2-dev (>= 2.20.0-1), glitz, gtk-doc (>= 1.9-1), - gtk+2-dev (>= 2.14.0-1), + gtk+2-dev (>= 2.16.0-1), libcanberra0 (>= %v-1), libgettext3-dev, libiconv-dev, - libogg, + libogg (>= 1.1.4-1), libpng3, libtool2, - libvorbis0, - pango1-xft2-ft219-dev (>= 1.22.4-1), - pixman (>= 0.12.0-1), + libvorbis0 (>= 1.2.2-1), + pango1-xft2-ft219-dev (>= 1.24.0-1), + pixman (>= 0.14.0-1), pkgconfig (>= 0.23), x11-dev, xft2-dev @@ -35,10 +35,9 @@ BuildDependsOnly: true PatchFile: %n.patch -Patchfile-MD5: bdac8c508d923a53bc16bffd91aba853 +Patchfile-MD5: fd72f18357dab064ba4b44da8bf43577 PatchScript: << %{default_script} - mv libltdl libltdl_UNUSED << ConfigureParams: --disable-dependency-tracking --disable-static --enable-gtk --disable-schemas-install --disable-lynx --disable-tdb --disable-gstreamer PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig @@ -58,27 +57,27 @@ SplitOff: << Package: %N-shlibs Depends: << - atk1-shlibs (>= 1.24.0-1), + atk1-shlibs (>= 1.26.0-1), cairo-shlibs (>= 1.8-1), expat1-shlibs, fontconfig2-shlibs (>= 2.4.1-1), - freetype219-shlibs (>= 2.3.7-7), - glib2-shlibs (>= 2.18.0-1), + freetype219-shlibs (>= 2.3.8-2), + glib2-shlibs (>= 2.20.0-1), glitz-shlibs, - gtk+2-shlibs (>= 2.14.0-1), + gtk+2-shlibs (>= 2.16.0-1), libcanberra0-shlibs (>= %v-1), libgettext3-shlibs, libiconv, - libogg-shlibs, + libogg-shlibs (>= 1.1.4-1), libpng3-shlibs, libtool2-shlibs, - libvorbis0-shlibs, - pango1-xft2-ft219-shlibs (>= 1.22.4-1), - pixman-shlibs (>= 0.12.0-1), + libvorbis0-shlibs (>= 1.2.2-1), + pango1-xft2-ft219-shlibs (>= 1.24.0-1), + pixman-shlibs (>= 0.14.0-1), x11 << Files: lib/libcanberra-gtk.*.dylib - Shlibs: %p/lib/libcanberra-gtk.0.dylib 1.0.0 %n (>= 0.6-1) + Shlibs: %p/lib/libcanberra-gtk.0.dylib 2.0.0 %n (>= 0.13-1) DocFiles: LGPL README << @@ -92,24 +91,25 @@ << Depends: << %N-shlibs (>= %v-%r), - atk1-shlibs (>= 1.24.0-1), + atk1-shlibs (>= 1.26.0-1), cairo-shlibs (>= 1.8-1), expat1-shlibs, fontconfig2-shlibs (>= 2.4.1-1), - freetype219-shlibs (>= 2.3.7-7), - gconf2 (>= 2.24.0-1), - glib2-shlibs (>= 2.18.0-1), + freetype219-shlibs (>= 2.3.8-2), + gconf2 (>= 2.26.0-1), + gconf2-shlibs (>= 2.26.0-1), + glib2-shlibs (>= 2.20.0-1), glitz-shlibs, - gtk+2-shlibs (>= 2.14.0-1), + gtk+2-shlibs (>= 2.16.0-1), libcanberra0-shlibs (>= %v-1), libgettext3-shlibs, libiconv, - libogg-shlibs, + libogg-shlibs (>= 1.1.4-1), libpng3-shlibs, libtool2-shlibs, - libvorbis0-shlibs, - pango1-xft2-ft219-shlibs (>= 1.22.4-1), - pixman-shlibs (>= 0.12.0-1), + libvorbis0-shlibs (>= 1.2.2-1), + pango1-xft2-ft219-shlibs (>= 1.24.0-1), + pixman-shlibs (>= 0.14.0-1), x11 << DocFiles: LGPL README @@ -123,19 +123,12 @@ << << -DescPort: << - canberra-gtk-module.c uses X11 symbols, so link against libX11 - directly. -<< DescPackaging: << Hack to use installed libcanberra instead of building locally and to omit libcanberra files themselves from the .deb. Documentation is installed as part of core libcanberra0-dev package, don't need to install it in the -gtk package also. - - Don't bother with included libltdl at all. See: - http://git.0pointer.de/?p=libcanberra.git;a=commitdiff;h=23247f130601fc02a5368c02e513bb0e28597ef9 << Description: GTK lib and GUI tools for libcanberra Index: libcanberra0.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/libcanberra0.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libcanberra0.info 12 May 2009 14:00:08 -0000 1.1 +++ libcanberra0.info 15 Nov 2009 08:20:31 -0000 1.2 @@ -1,38 +1,27 @@ Package: libcanberra0 -Version: 0.11 -Revision: 3 +Version: 0.15 +Revision: 1 Source: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%v.tar.gz -Source-MD5: c661db14cb0b1fe9b6963defacc3bba6 +Source-MD5: 79c3c0a62e2c8c7c1906e9072a92763b BuildDepends: << - autoconf, - automake1.10, fink (>= 0.24.12-1), - gconf2-dev (>= 2.24.0-1), - glib2-dev (>= 2.18.0-1), - gstreamer-0.10-dev (>= 0.10.22-1), + glib2-dev (>= 2.20.0-1), + gstreamer-0.10-dev (>= 0.10.24-1), gtk-doc (>= 1.9-1), libgettext3-dev, libiconv-dev, - libogg, + libogg (>= 1.1.4-1), libtool2, - libvorbis0, + libvorbis0 (>= 1.2.2-1), libxml2 (>= 2.6.30-1), pkgconfig (>= 0.23) << Depends: %n-shlibs (= %v-%r) BuildDependsOnly: true -PatchFile: %n.patch -Patchfile-MD5: 1f1b8248dbc840162cb6924ca9854962 -PatchScript: << - %{default_script} - mv libltdl libltdl_UNUSED -<< - ConfigureParams: --disable-dependency-tracking --disable-static --disable-gtk --disable-lynx --disable-tdb --enable-gstreamer --enable-gtk-doc CompileScript: << - autoreconf -fi ./configure %c make << @@ -46,20 +35,19 @@ SplitOff: << Package: %N-shlibs Depends: << - glib2-shlibs (>= 2.18.0-1), - gstreamer-0.10-shlibs (>= 0.10.22-1), + glib2-shlibs (>= 2.20.0-1), + gstreamer-0.10-shlibs (>= 0.10.24-1), libgettext3-shlibs, libiconv, - libogg-shlibs, + libogg-shlibs (>= 1.1.4-1), libtool2-shlibs, - libvorbis0-shlibs, + libvorbis0-shlibs (>= 1.2.2-1), libxml2-shlibs (>= 2.6.30-1), xdg-base << - Replaces: canberra-plugins Files: << lib/libcanberra.*.dylib - lib/libcanberra-0.11 + lib/libcanberra-%v << Shlibs: %p/lib/libcanberra.0.dylib 2.0.0 %n (>= 0.6-1) DocFiles: LGPL README @@ -75,17 +63,10 @@ << DescPort: << - Scrap superfluous iconv tests. See: - http://bugs.freedesktop.org/show_bug.cgi?id=20927 - - Scrap gconf tests if not doing gtk stuff. See: - http://bugs.freedesktop.org/show_bug.cgi?id=20926 << DescPackaging: << Core lib doesn't use gtk and the gtk lib's libtool versioning is independent, so don't build as part of the main lib pkgs. - However, do need all BDep because we redo autoconf, so we need - every possible AC macro that could ever be used. Don't bother dragging in lynx just for .html -> .txt for the README @@ -100,9 +81,6 @@ Depends:canberra-plugins. We do our own doc files our own ways and places. - - Don't bother with included libltdl at all. See: - http://git.0pointer.de/?p=libcanberra.git;a=commitdiff;h=23247f130601fc02a5368c02e513bb0e28597ef9 << Description: Abstract interface for playing event sounds Index: libcanberra-gtk0.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/libcanberra-gtk0.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libcanberra-gtk0.patch 12 May 2009 14:00:08 -0000 1.1 +++ libcanberra-gtk0.patch 15 Nov 2009 08:20:31 -0000 1.2 @@ -1,131 +1,29 @@ -diff -Nurd -x'*~' libcanberra-0.11.orig/Makefile.am libcanberra-0.11/Makefile.am ---- libcanberra-0.11.orig/Makefile.am 2009-01-21 15:43:57.000000000 -0500 -+++ libcanberra-0.11/Makefile.am 2009-03-28 18:00:36.000000000 -0400 +diff -Nurd -x'*~' libcanberra-0.15.orig/Makefile.am libcanberra-0.15/Makefile.am +--- libcanberra-0.15.orig/Makefile.am 2009-07-01 21:16:29.000000000 -0400 ++++ libcanberra-0.15/Makefile.am 2009-08-14 13:42:18.000000000 -0400 @@ -19,7 +19,7 @@ dist_doc_DATA = README EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas --SUBDIRS = libltdl src gtkdoc doc +-SUBDIRS = src gtkdoc doc +SUBDIRS = src doc MAINTAINERCLEANFILES = README noinst_DATA = README -@@ -29,7 +29,6 @@ - - if HAVE_GTK - pkgconfig_DATA += libcanberra-gtk.pc --endif - - schemasdir = $(GCONF_SCHEMA_FILE_DIR) - schemas_DATA = libcanberra.schemas -@@ -44,6 +43,9 @@ - else - install-data-local: - endif -+else -+install-data-local: -+endif - - DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc - ACLOCAL_AMFLAGS = -I m4 -diff -Nurd -x'*~' libcanberra-0.11.orig/bootstrap.sh libcanberra-0.11/bootstrap.sh ---- libcanberra-0.11.orig/bootstrap.sh 2009-01-21 15:45:46.000000000 -0500 -+++ libcanberra-0.11/bootstrap.sh 2009-03-28 17:49:17.000000000 -0400 -@@ -54,7 +54,7 @@ - - mkdir -p m4 - gtkdocize --copy --flavour no-tmpl --docdir gtkdoc -- "$LIBTOOLIZE" -c --force --ltdl --recursive -+ "$LIBTOOLIZE" -c --force --recursive - run_versioned aclocal "$VERSION" -I m4 - run_versioned autoconf 2.63 -Wall - run_versioned autoheader 2.63 -diff -Nurd -x'*~' libcanberra-0.11.orig/configure.ac libcanberra-0.11/configure.ac ---- libcanberra-0.11.orig/configure.ac 2009-01-21 15:59:28.000000000 -0500 -+++ libcanberra-0.11/configure.ac 2009-03-28 17:49:17.000000000 -0400 -@@ -65,9 +65,32 @@ - - #### libtool stuff #### - LT_PREREQ(2.2) --LT_CONFIG_LTDL_DIR([libltdl]) - LT_INIT([dlopen win32-dll disable-static]) --LTDL_INIT([convenience recursive]) -+ -+dnl Unfortunately, even up to libtool 2.2.6a there is no way to know -+dnl exactly which version of libltdl is present in the system, so we -+dnl just assume that it's a working version as long as we have the -+dnl library and the header files. -+dnl -+dnl As an extra safety device, check for lt_dladvise_init() which is -+dnl only implemented in libtool 2.x, and refine as we go if we have -+dnl refined requirements. -+dnl -+dnl Check the header files first since the system may have a -+dnl libltdl.so for runtime, but no headers, and we want to bail out as -+dnl soon as possible. -+dnl -+dnl We don't need any special variable for this though, since the user -+dnl can give the proper place to find libltdl through the standard -+dnl variables like LDFLAGS and CPPFLAGS. -+ -+AC_CHECK_HEADER([ltdl.h], -+ [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])], -+ [LIBLTDL=]) -+ -+AS_IF([test "x$LIBLTDL" = "x"], -+ [AC_MSG_ERROR([Unable to find libltdl.])]) -+AC_SUBST([LIBLTDL]) - - #### Determine build environment #### - -@@ -148,10 +171,6 @@ - - AC_SYS_LARGEFILE - --#### [lib]iconv #### -- --AM_ICONV -- - ################################### - # External libraries # - ################################### -@@ -336,6 +355,7 @@ - ], - [gtk=auto]) - -+AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) - if test "x${gtk}" != xno ; then - PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.13.4 gthread-2.0 ], - [ -@@ -343,6 +363,7 @@ - AC_DEFINE([HAVE_GTK], 1, [Have GTK?]) - - AC_PATH_PROG(GCONFTOOL, gconftool-2) -+ AM_GCONF_SOURCE_2 - - GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` - GTK_MODULES_DIR="${libdir}/gtk-2.0/modules" -@@ -356,8 +377,8 @@ - else +diff -Nurd -x'*~' libcanberra-0.15.orig/configure.ac libcanberra-0.15/configure.ac +--- libcanberra-0.15.orig/configure.ac 2009-08-04 21:10:50.000000000 -0400 ++++ libcanberra-0.15/configure.ac 2009-08-14 13:42:18.000000000 -0400 +@@ -373,6 +373,7 @@ HAVE_GTK=0 fi -+PKG_CHECK_MODULES(LIBCANBERRA, [ libcanberra >= 0.11 ]) --AM_GCONF_SOURCE_2 ++PKG_CHECK_MODULES(LIBCANBERRA, [ libcanberra >= 0.15 ]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -@@ -561,7 +582,6 @@ - - AC_CONFIG_FILES([ - Makefile --libltdl/Makefile - src/Makefile - libcanberra.pc - libcanberra-gtk.pc -diff -Nurd -x'*~' libcanberra-0.11.orig/src/Makefile.am libcanberra-0.11/src/Makefile.am ---- libcanberra-0.11.orig/src/Makefile.am 2009-01-21 15:34:23.000000000 -0500 -+++ libcanberra-0.11/src/Makefile.am 2009-03-28 17:49:17.000000000 -0400 +diff -Nurd -x'*~' libcanberra-0.15.orig/src/Makefile.am libcanberra-0.15/src/Makefile.am +--- libcanberra-0.15.orig/src/Makefile.am 2009-07-01 20:55:48.000000000 -0400 ++++ libcanberra-0.15/src/Makefile.am 2009-08-14 13:42:18.000000000 -0400 @@ -31,14 +31,10 @@ EXTRA_DIST = \ map-file @@ -143,16 +41,7 @@ libcanberra_la_SOURCES = \ canberra.h \ -@@ -85,8 +81,6 @@ - libcanberra_la_SOURCES += \ - dso.c \ - driver-order.c driver-order.h --libcanberra_la_CFLAGS += \ -- $(LTDLINCL) - libcanberra_la_LIBADD += \ - $(LIBLTDL) - -@@ -288,20 +282,22 @@ +@@ -287,20 +283,22 @@ canberra-gtk.h \ canberra-gtk.c libcanberra_gtk_la_CFLAGS = \ @@ -179,7 +68,7 @@ libcanberra-gtk.la libcanberra_gtk_module_la_LDFLAGS = \ -avoid-version -module -export-dynamic -@@ -310,10 +306,11 @@ +@@ -309,10 +307,11 @@ canberra-gtk-play.c canberra_gtk_play_LDADD = \ $(GTK_LIBS) \ --- libcanberra0.patch DELETED --- ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs