Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5078
Modified Files:
libcanberra-gtk0.info libcanberra-gtk0.patch libcanberra0.info
libcanberra0.patch
Log Message:
new version
Index: libcanberra-gtk0.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libcanberra-gtk0.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- libcanberra-gtk0.info 28 Mar 2009 17:53:01 -0000 1.10
+++ libcanberra-gtk0.info 29 Mar 2009 03:36:19 -0000 1.11
@@ -1,13 +1,13 @@
Package: libcanberra-gtk0
-Version: 0.10
-Revision: 6
+Version: 0.11
+Revision: 1
Source: http://0pointer.de/public/libcanberra-%v.tar.gz
-Source-MD5: 2623370bfcecaeecaeb85e5ec445f340
-PatchFile: %n.patch
-PatchFile-MD5: e7b2ab8b2f63e1fa437f809143ca52be
+Source-MD5: c661db14cb0b1fe9b6963defacc3bba6
BuildDepends: <<
atk1 (>= 1.24.0-1),
+ autoconf,
+ automake1.10,
cairo (>= 1.8-1),
expat1,
fink (>= 0.24.12-1),
@@ -34,9 +34,16 @@
Depends: %n-shlibs (= %v-%r)
BuildDependsOnly: true
+PatchFile: %n.patch
+Patchfile-MD5: bdac8c508d923a53bc16bffd91aba853
+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
CompileScript: <<
-# ./autogen.sh %c
+ autoreconf -fi
./configure %c
make plugin_LTLIBRARIES=
<<
@@ -45,7 +52,6 @@
rm %i/lib/pkgconfig/libcanberra.pc
rm %i/share/doc/libcanberra/README
rmdir %i/share/doc/libcanberra
- rm -rf %i/share/gtk-doc
<<
DocFiles: LGPL README
@@ -88,7 +94,6 @@
%N-shlibs (>= %v-%r),
atk1-shlibs (>= 1.24.0-1),
cairo-shlibs (>= 1.8-1),
- canberra-plugins (>= %v-1),
expat1-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
freetype219-shlibs (>= 2.3.7-7),
@@ -119,9 +124,6 @@
<<
DescPort: <<
- Don't shadow sys/signal.h "signal" variable locally in
- canberra-gtk-module.c
-
canberra-gtk-module.c uses X11 symbols, so link against libX11
directly.
<<
@@ -129,24 +131,18 @@
Hack to use installed libcanberra instead of building locally
and to omit libcanberra files themselves from the .deb.
- can't alter Makefile.am and do automake because
- teeny-version of automake1.10 might not match
-
- libtool2 throws hardcoding errors during linking and
- there are lots of warnings from .ac and .m4 if we redo
- full autotools
-
- so fool the hell out of make and hope for the best.
-
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
DescDetail: <<
- XDG sound spec:
+ XDG Sound Theme and Name Specifications:
http://0pointer.de/public/sound-theme-spec.html
<<
-Homepage: http://0pointer.de/blog/projects/sixfold-announcement.html
+Homepage: http://0pointer.de/lennart/projects/libcanberra
License: LGPL
Maintainer: Daniel Macks <[email protected]>
Index: libcanberra0.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libcanberra0.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- libcanberra0.info 28 Mar 2009 17:49:41 -0000 1.10
+++ libcanberra0.info 29 Mar 2009 03:36:19 -0000 1.11
@@ -1,10 +1,8 @@
Package: libcanberra0
-Version: 0.10
-Revision: 4
+Version: 0.11
+Revision: 1
Source: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%v.tar.gz
-Source-MD5: 2623370bfcecaeecaeb85e5ec445f340
-PatchFile: %n.patch
-Patchfile-MD5: 15e727eb10de4c3653565e64e1b9d9dd
+Source-MD5: c661db14cb0b1fe9b6963defacc3bba6
BuildDepends: <<
autoconf,
@@ -12,7 +10,7 @@
fink (>= 0.24.12-1),
gconf2-dev (>= 2.24.0-1),
glib2-dev (>= 2.18.0-1),
- gstreamer-0.10-dev (>= 0.10.21-1),
+ gstreamer-0.10-dev (>= 0.10.22-1),
gtk-doc (>= 1.9-1),
libgettext3-dev,
libiconv-dev,
@@ -25,6 +23,12 @@
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
CompileScript: <<
@@ -42,12 +46,17 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
+ glib2-shlibs (>= 2.18.0-1),
+ gstreamer-0.10-shlibs (>= 0.10.22-1),
+ libgettext3-shlibs,
+ libiconv,
libogg-shlibs,
libtool2-shlibs,
libvorbis0-shlibs,
+ libxml2-shlibs (>= 2.6.30-1),
xdg-base
<<
- Recommends: canberra-plugins
+ Replaces: canberra-plugins
Files: lib/libcanberra.*.dylib
Shlibs: %p/lib/libcanberra.0.dylib 2.0.0 %n (>= 0.6-1)
DocFiles: LGPL README
@@ -55,29 +64,19 @@
SplitOff2: <<
Package: canberra-plugins
- Depends: <<
- %N-shlibs (>= %v-%r),
- glib2-shlibs (>= 2.18.0-1),
- gstreamer-0.10-shlibs (>= 0.10.21-1),
- libgettext3-shlibs,
- libiconv,
- libogg-shlibs,
- libtool2-shlibs,
- libvorbis0-shlibs,
- libxml2-shlibs (>= 2.6.30-1)
+ Depends: fink-obsolete-packages
+ InstallScript: <<
+ mkdir -p %i/share/doc/installed-packages
+ touch %i/share/doc/installed-packages/%n
<<
- Replaces: %N-shlibs (<< 0.10-2)
- Files: lib/libcanberra
- DocFiles: LGPL README
- Description: Back-end sound generators for libcanberra
<<
DescPort: <<
Scrap superfluous iconv tests. See:
-
https://tango.0pointer.de/pipermail/libcanberra-discuss/2008-November/000133.html
+ http://bugs.freedesktop.org/show_bug.cgi?id=20927
Scrap gconf tests if not doing gtk stuff. See:
-
https://tango.0pointer.de/pipermail/libcanberra-discuss/2008-November/000134.html
+ http://bugs.freedesktop.org/show_bug.cgi?id=20926
<<
DescPackaging: <<
Core lib doesn't use gtk and the gtk lib's libtool versioning
@@ -87,15 +86,18 @@
tdb not in fink now--disable for consistency if we do get it.
- Plugins moved %N-shlibs -> canberra-plugins as of 0.10-2.
- They are loaded by %N-shlibs but not libversioned, so
- externalize in case install_name changes we can have a
- constant place to install these things. Stupid circular
- dependencies! Better would be to hack dso.c to look in a
- libversioned dir for standard plugins and then also a constant
- place for third-party-supplied ones. Some day...
+ Plugins reverted canberra-plugins -> %N-shlibs as of 0.11-1.
+ They are loaded by %N-shlibs and are now in libversioned dir.
+ Third-party plugin packages (of which there are presently
+ none) will have to be adjusted each time %v changes. Cannot
+ have %N-shlibs:Conflicts:canberra-plugins and nuke it cleanly
+ because old libcanberra-gtk0 and maybe other packages have
+ 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/unstable/main/finkinfo/sound/libcanberra-gtk0.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libcanberra-gtk0.patch 26 Nov 2008 09:37:19 -0000 1.5
+++ libcanberra-gtk0.patch 29 Mar 2009 03:36:19 -0000 1.6
@@ -1,52 +1,195 @@
-diff -Nurd -x'*~' libcanberra-0.10.orig/src/Makefile.in
libcanberra-0.10/src/Makefile.in
---- libcanberra-0.10.orig/src/Makefile.in 2008-10-05 21:57:34.000000000
-0400
-+++ libcanberra-0.10/src/Makefile.in 2008-11-26 04:15:49.000000000 -0500
+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
+@@ -19,7 +19,7 @@
+ dist_doc_DATA = README
+
+ EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
+-SUBDIRS = libltdl 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 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--noinst_PROGRAMS = test-canberra$(EXEEXT)
-+noinst_PROGRAMS =
- @use_version_script_t...@am__append_1 = -Wl,-version-script=$(srcdir)/map-file
- @have_cache_t...@am__append_2 = \
- @HAVE_CACHE_TRUE@ cache.c cache.h
-@@ -527,8 +527,8 @@
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
- AM_LDADD = $(PTHREAD_LIBS)
- EXTRA_DIST = map-file $(am__append_27)
--lib_LTLIBRARIES = libcanberra.la $(am__append_25)
--include_HEADERS = canberra.h $(am__append_26)
-+lib_LTLIBRARIES = $(am__append_25)
-+include_HEADERS = $(am__append_26)
- libcanberra_la_SOURCES = canberra.h common.c common.h mutex-posix.c \
- mutex.h proplist.c proplist.h driver.h read-sound-file.c \
- read-sound-file.h read-vorbis.c read-vorbis.h read-wav.c \
-@@ -848,7 +848,9 @@
- $(libcanberra_oss_la_LINK) $(am_libcanberra_oss_la_rpath)
$(libcanberra_oss_la_OBJECTS) $(libcanberra_oss_la_LIBADD) $(LIBS)
- libcanberra-pulse.la: $(libcanberra_pulse_la_OBJECTS)
$(libcanberra_pulse_la_DEPENDENCIES)
- $(libcanberra_pulse_la_LINK) $(am_libcanberra_pulse_la_rpath)
$(libcanberra_pulse_la_OBJECTS) $(libcanberra_pulse_la_LIBADD) $(LIBS)
--libcanberra.la: $(libcanberra_la_OBJECTS) $(libcanberra_la_DEPENDENCIES)
-+libcanberra.la:
-+ ln -s $(libdir)/$@ .
-+_libcanberra.la: $(libcanberra_la_OBJECTS) $(libcanberra_la_DEPENDENCIES)
- $(libcanberra_la_LINK) -rpath $(libdir) $(libcanberra_la_OBJECTS)
$(libcanberra_la_LIBADD) $(LIBS)
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-diff -Nurd -x'*~' libcanberra-0.10.orig/src/canberra-gtk-module.c
libcanberra-0.10/src/canberra-gtk-module.c
---- libcanberra-0.10.orig/src/canberra-gtk-module.c 2008-10-03
15:47:32.000000000 -0400
-+++ libcanberra-0.10/src/canberra-gtk-module.c 2008-11-04 02:48:38.000000000
-0500
-@@ -693,12 +693,12 @@
- return TRUE;
- }
--static void install_hook(GType type, const char *signal, guint *sn) {
-+static void install_hook(GType type, const char *signal_, guint *sn) {
- GTypeClass *type_class;
+ 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 @@
- type_class = g_type_class_ref(type);
+ #### 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])
-- *sn = g_signal_lookup(signal, type);
-+ *sn = g_signal_lookup(signal_, type);
- g_signal_add_emission_hook(*sn, 0, emission_hook_cb, NULL, NULL);
+ #### Determine build environment ####
- g_type_class_unref(type_class);
+@@ -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
+ HAVE_GTK=0
+ fi
++PKG_CHECK_MODULES(LIBCANBERRA, [ libcanberra >= 0.11 ])
+
+-AM_GCONF_SOURCE_2
+
+ 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
+@@ -31,14 +31,10 @@
+ EXTRA_DIST = \
+ map-file
+
+-lib_LTLIBRARIES = \
+- libcanberra.la
++lib_LTLIBRARIES =
+
+-include_HEADERS = \
+- canberra.h
++include_HEADERS =
+
+-noinst_PROGRAMS = \
+- test-canberra
+
+ 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 @@
+ canberra-gtk.h \
+ canberra-gtk.c
+ libcanberra_gtk_la_CFLAGS = \
+- $(GTK_CFLAGS)
++ $(GTK_CFLAGS) \
++ $(LIBCANBERRA_CFLAGS)
+ libcanberra_gtk_la_LIBADD = \
+ $(GTK_LIBS) \
+- libcanberra.la
++ $(LIBCANBERRA_LIBS)
+ libcanberra_gtk_la_LDFLAGS = \
+ -export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO)
+
+ libcanberra_gtk_module_la_SOURCES = \
+ canberra-gtk-module.c
+ libcanberra_gtk_module_la_CFLAGS = \
+- $(GTK_CFLAGS)
++ $(GTK_CFLAGS) \
++ $(LIBCANBERRA_CFLAGS)
+ libcanberra_gtk_module_la_LIBADD = \
+ $(GTK_LIBS) \
+- libcanberra.la \
++ $(LIBCANBERRA_LIBS) \
+ libcanberra-gtk.la
+ libcanberra_gtk_module_la_LDFLAGS = \
+ -avoid-version -module -export-dynamic
+@@ -310,10 +306,11 @@
+ canberra-gtk-play.c
+ canberra_gtk_play_LDADD = \
+ $(GTK_LIBS) \
+- libcanberra.la \
++ $(LIBCANBERRA_LIBS) \
+ libcanberra-gtk.la
+ canberra_gtk_play_CFLAGS = \
+- $(GTK_CFLAGS)
++ $(GTK_CFLAGS) \
++ $(LIBCANBERRA_LIBS)
+
+ EXTRA_DIST += \
+ libcanberra-login-sound.desktop.in \
Index: libcanberra0.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libcanberra0.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libcanberra0.patch 4 Nov 2008 06:34:29 -0000 1.5
+++ libcanberra0.patch 29 Mar 2009 03:36:19 -0000 1.6
@@ -1,31 +1,95 @@
-diff -Nurd -x'*~' libcanberra-0.10.orig/Makefile.am
libcanberra-0.10/Makefile.am
---- libcanberra-0.10.orig/Makefile.am 2008-10-05 22:07:43.000000000 -0400
-+++ libcanberra-0.10/Makefile.am 2008-11-04 01:25:41.000000000 -0500
-@@ -29,10 +29,10 @@
+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 17:26:16.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
+
+ MAINTAINERCLEANFILES = README
+ noinst_DATA = README
+@@ -29,7 +29,6 @@
if HAVE_GTK
pkgconfig_DATA += libcanberra-gtk.pc
-+schemas_DATA = libcanberra.schemas
- endif
+-endif
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
--schemas_DATA = libcanberra.schemas
-
- if GCONF_SCHEMAS_INSTALL
+ schemas_DATA = libcanberra.schemas
+@@ -44,6 +43,9 @@
+ else
install-data-local:
-diff -Nurd -x'*~' libcanberra-0.10.orig/configure.ac
libcanberra-0.10/configure.ac
---- libcanberra-0.10.orig/configure.ac 2008-10-05 21:56:57.000000000 -0400
-+++ libcanberra-0.10/configure.ac 2008-11-04 01:08:35.000000000 -0500
-@@ -153,7 +153,7 @@
+ endif
++else
++install-data-local:
++endif
- #### [lib]iconv ####
+ 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:26:16.000000000 -0400
+@@ -54,7 +54,7 @@
--AM_ICONV
-+#AM_ICONV
+ 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:26:16.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 #
-@@ -339,6 +339,7 @@
+ ###################################
+@@ -336,6 +355,7 @@
],
[gtk=auto])
@@ -33,7 +97,7 @@
if test "x${gtk}" != xno ; then
PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.13.4 gthread-2.0 ],
[
-@@ -346,6 +347,7 @@
+@@ -343,6 +363,7 @@
AC_DEFINE([HAVE_GTK], 1, [Have GTK?])
AC_PATH_PROG(GCONFTOOL, gconftool-2)
@@ -41,7 +105,7 @@
GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
GTK_MODULES_DIR="${libdir}/gtk-2.0/modules"
-@@ -360,7 +362,6 @@
+@@ -357,7 +378,6 @@
HAVE_GTK=0
fi
@@ -49,3 +113,23 @@
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
+@@ -561,7 +581,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:26:16.000000000 -0400
+@@ -85,8 +85,6 @@
+ libcanberra_la_SOURCES += \
+ dso.c \
+ driver-order.c driver-order.h
+-libcanberra_la_CFLAGS += \
+- $(LTDLINCL)
+ libcanberra_la_LIBADD += \
+ $(LIBLTDL)
+
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
