Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-media/files: gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch
Date: Fri, 25 Nov 2011 06:55:05
Message-Id: 20111125065455.8A8C62004C@flycatcher.gentoo.org
1 tetromino 11/11/25 06:54:55
2
3 Added:
4 gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch
5 Log:
6 Add gnome-media-2.32.0-r300 from the gnome overlay, needed for rhythmbox-0.13 under gnome3. It comes with a patch to not install media profiles, meaning it can be installed in parallel with libgnome-media-profiles.
7
8 (Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 gnome-extra/gnome-media/files/gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-media/files/gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-media/files/gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch?rev=1.1&content-type=text/plain
15
16 Index: gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch
17 ===================================================================
18 gnome-audio-profiles-properties and related files are now provided by
19 media-libs/libgnome-media-profiles:3
20
21 So we don't build them, or install them to avoid file collisions
22
23 ---
24 --- profiles/Makefile.am
25 +++ profiles/Makefile.am
26 @@ -1,4 +1,3 @@
27 -bin_PROGRAMS = gnome-audio-profiles-properties
28 noinst_PROGRAMS =
29
30 defines = \
31 @@ -21,11 +20,6 @@
32 @INTLTOOL_SCHEMAS_RULE@
33
34 uidir = $(pkgdatadir)
35 -ui_DATA = gnome-audio-profile-new.ui gnome-audio-profile-edit.ui
36 -
37 -gnome_audio_profiles_properties_SOURCES = gnome-audio-profiles-properties.c
38 -gnome_audio_profiles_properties_CFLAGS = $(GMP_CFLAGS) $(defines) -I$(top_srcdir)
39 -gnome_audio_profiles_properties_LDADD = libgnome-media-profiles.la $(GMP_LIBS)
40
41 libgnome_media_profiles_la_SOURCES = \
42 audio-profile.c \
43 @@ -67,15 +61,8 @@
44
45 pkgconfigdir = $(libdir)/pkgconfig
46 pkgconfig_DATA = gnome-media-profiles.pc
47 -EXTRA_DIST = $(ui_DATA) $(schema_DATA) $(pkgconfig_DATA)
48 +EXTRA_DIST = $(schema_DATA) $(pkgconfig_DATA)
49
50 CLEANFILES = $(schema_DATA)
51
52 -# "." is dirty hack to first build our .la in this dir before moving to glade
53 -SUBDIRS = . help
54 -
55 -if HAVE_GLADEUI
56 -SUBDIRS += glade
57 -endif
58 -
59 -include $(top_srcdir)/git.mk