Attachment 61081 Details for Bug 32327 – patch

[patch] patch

libcanberra.patch (text/plain), 1.64 KB, created by Matthias Clasen on 2012-05-05 12:16:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2012-05-05 12:16:34 UTC

Size: 1.64 KB

patch

obsolete

>--- libcanberra-0.28/configure.ac	2011-02-24 16:55:54.000000000 -0500
>+++ libcanberra-0.28.no-gconf/configure.ac	2012-05-05 15:11:15.195001732 -0400
>@@ -392,9 +392,6 @@
>             HAVE_GTK=1
>             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"
>         ],
>@@ -431,9 +428,6 @@
>             HAVE_GTK3=1
>             AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?])
> 
>-            AC_PATH_PROG(GCONFTOOL, gconftool-2)
>-	    AM_GCONF_SOURCE_2
>-
>             GTK3_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
>             GTK3_MODULES_DIR="${libdir}/gtk-3.0/modules"
>         ],
>--- libcanberra-0.28/Makefile.am	2011-02-22 20:51:00.000000000 -0500
>+++ libcanberra-0.28.no-gconf/Makefile.am	2012-05-05 15:12:16.890005790 -0400
>@@ -22,7 +22,6 @@
> 	bootstrap.sh \
> 	autogen.sh \
> 	LGPL \
>-	libcanberra.schemas \
> 	vala/libcanberra.vapi \
> 	vala/libcanberra-gtk.vapi
> 
>@@ -49,23 +48,6 @@
> 
> vapi_DATA += vala/libcanberra-gtk.vapi
> 
>-schemasdir = $(GCONF_SCHEMA_FILE_DIR)
>-schemas_DATA = libcanberra.schemas
>-
>-if GCONF_SCHEMAS_INSTALL
>-install-data-local:
>-	if test -z "$(DESTDIR)" ; then \
>-		for p in $(schemas_DATA) ; do \
>-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/$$p ; \
>-                done ; \
>-	fi
>-else
>-install-data-local:
>-endif
>-else
>-install-data-local:
>-endif
>-
> DISTCHECK_CONFIGURE_FLAGS =  \
> 	--enable-gtk-doc \
> 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)

Actions: View | Splinter Review

Attachments on bug 32327: 61081

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.