Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16445

Added Files:
        libcanberra-gtk0.info libcanberra-gtk0.patch 
Log Message:
gtk sound themes builds fine finally


--- NEW FILE: libcanberra-gtk0.info ---
Package: libcanberra-gtk0
Version: 0.10
Revision: 1
Source: http://0pointer.de/public/libcanberra-%v.tar.gz
Source-MD5: 2623370bfcecaeecaeb85e5ec445f340
PatchFile: %n.patch
PatchFile-MD5: 6157bc19150075182fdd7e0e311d6b1f

BuildDepends: <<
        atk1 (>= 1.24.0-1),
        automake1.10,
        cairo (>= 1.8-1),
        expat1,
        fink (>= 0.24.12-1),
        fontconfig2-dev (>= 2.4.1-1),
        freetype219 (>= 2.3.7-7),
        glib2-dev (>= 2.18.0-1),
        glitz,
        gtk-doc (>= 1.9-1),
        gtk+2-dev (>= 2.14.0-1),
        libcanberra0 (>= %v-1),
        libgettext3-dev,
        libiconv-dev,
        libogg,
        libpng3,
        libtool2,
        libvorbis0,
        pango1-xft2-ft219-dev (>= 1.22.0-1),
        pixman (>= 0.12.0-1),
        pkgconfig (>= 0.23),
        x11-dev,
        xft2-dev
<<
Depends: %n-shlibs (= %v-%r)
BuildDependsOnly: true

ConfigureParams: --disable-dependecny-tracking --disable-static --enable-gtk 
--disable-schemas-install --disable-lynx --disable-tdb --disable-gstreamer 
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig
CompileScript: <<
        automake
        ./configure %c
        make
<<
InstallScript: <<
        make install DESTDIR=%d
        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

SplitOff: <<
        Package: %N-shlibs
        Depends: <<
                atk1-shlibs (>= 1.24.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),
                glitz-shlibs,
                gtk+2-shlibs (>= 2.14.0-1),
                libcanberra0-shlibs (>= %v-1),
                libgettext3-shlibs,
                libiconv,
                libogg-shlibs,
                libpng3-shlibs,
                libtool2-shlibs,
                libvorbis0-shlibs,
                pango1-xft2-ft219-shlibs (>= 1.22.0-1),
                pixman-shlibs (>= 0.12.0-1),
                x11
        <<
        Files: lib/libcanberra-gtk.*.dylib
        Shlibs: %p/lib/libcanberra-gtk.0.dylib 1.0.0 %n (>= 0.6-1)
        DocFiles: LGPL README
<<

SplitOff2: <<
        Package: canberra-gtk-module
        Files: <<
                bin
                etc
                lib/gtk-2.0
                share/gnome
        <<
        Depends: <<
                %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),
                glib2-shlibs (>= 2.18.0-1),
                glitz-shlibs,
                gtk+2-shlibs (>= 2.14.0-1),
                libcanberra0-shlibs (>= %v-1),
                libgettext3-shlibs,
                libiconv,
                libogg-shlibs,
                libpng3-shlibs,
                libtool2-shlibs,
                libvorbis0-shlibs,
                pango1-xft2-ft219-shlibs (>= 1.22.0-1),
                pixman-shlibs (>= 0.12.0-1),
                x11
        <<
        DocFiles: LGPL README
        ConfFiles: %p/etc/gconf/schemas/libcanberra.schemas
        PostInstScript: <<
                if [ configure = "$1" ]; then
                        export GCONF_CONFIG_SOURCE=`gconftool-2 
--get-default-source`
                        export schemadir=%p/etc/gconf/schemas
                        gconftool-2 --makefile-install-rule 
$schemadir/libcanberra.schemas >/dev/null
                endif
        <<
<<

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.
<<
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.
<<

Description: GTK lib and GUI tools for libcanberra
DescDetail: <<
        XDG sound spec:
        http://0pointer.de/public/sound-theme-spec.html
<<
Homepage: http://0pointer.de/blog/projects/sixfold-announcement.html
License: LGPL
Maintainer: Daniel Macks <[EMAIL PROTECTED]>

--- NEW FILE: libcanberra-gtk0.patch ---
diff -Nurd -x'*~' libcanberra-0.10.orig/src/Makefile.am 
libcanberra-0.10/src/Makefile.am
--- libcanberra-0.10.orig/src/Makefile.am       2008-10-05 14:43:59.000000000 
-0400
+++ libcanberra-0.10/src/Makefile.am    2008-11-04 02:48:38.000000000 -0500
@@ -31,6 +31,10 @@
 EXTRA_DIST = \
        map-file
 
+if HAVE_GTK
+lib_LTLIBRARIES =
+include_HEADERS =
+else
 lib_LTLIBRARIES = \
         libcanberra.la
 
@@ -270,6 +274,7 @@
 endif
 endif
 
+endif
 if HAVE_GTK
 
 lib_LTLIBRARIES += \
@@ -291,7 +296,7 @@
        $(GTK_CFLAGS)
 libcanberra_gtk_la_LIBADD = \
        $(GTK_LIBS) \
-       libcanberra.la
+       -lcanberra
 libcanberra_gtk_la_LDFLAGS = \
        -export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO)
 
@@ -301,7 +306,7 @@
        $(GTK_CFLAGS)
 libcanberra_gtk_module_la_LIBADD = \
        $(GTK_LIBS) \
-       libcanberra.la \
+       -lcanberra \
        libcanberra-gtk.la
 libcanberra_gtk_module_la_LDFLAGS = \
        -avoid-version -module -export-dynamic
@@ -310,7 +315,7 @@
        canberra-gtk-play.c
 canberra_gtk_play_LDADD = \
        $(GTK_LIBS) \
-       libcanberra.la \
+       -lcanberra \
        libcanberra-gtk.la
 canberra_gtk_play_CFLAGS = \
        $(GTK_CFLAGS)
@@ -338,8 +343,11 @@
 
 endif
 
+if HAVE_GTK
+else
 test_canberra_SOURCES = \
         test-canberra.c
 test_canberra_LDADD = \
         $(AM_LDADD) \
         libcanberra.la
+endif
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;
 
     type_class = g_type_class_ref(type);
 
-    *sn = g_signal_lookup(signal, type);
+    *sn = g_signal_lookup(signal_, type);
     g_signal_add_emission_hook(*sn, 0, emission_hook_cb, NULL, NULL);
 
     g_type_class_unref(type_class);


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to