| 1 |
eva 08/11/30 11:56:18 |
| 2 |
|
| 3 |
Added: camorama-0.19-gconf.patch |
| 4 |
Log: |
| 5 |
Bump to 0.19-r1, fix sandbox violation due to gconf, bug #243274. |
| 6 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-video/camorama/files/camorama-0.19-gconf.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/camorama/files/camorama-0.19-gconf.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/camorama/files/camorama-0.19-gconf.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: camorama-0.19-gconf.patch |
| 15 |
=================================================================== |
| 16 |
# Make camorama respect --disable-schemas-install configure switch |
| 17 |
# https://bugs.gentoo.org/show_bug.cgi?id=243274 |
| 18 |
# |
| 19 |
# Makefile.am | 4 ++++ |
| 20 |
# Makefile.in | 7 ++++--- |
| 21 |
# 2 files changed, 8 insertions(+), 3 deletions(-) |
| 22 |
# |
| 23 |
# |
| 24 |
--- a/data/Makefile.am 2008-11-30 12:39:56.000000000 +0100 |
| 25 |
+++ b/data/Makefile.am 2008-11-30 12:41:33.000000000 +0100 |
| 26 |
@@ -24,9 +24,13 @@ |
| 27 |
cp $(app_DATA) ~/.gnome/application-registry |
| 28 |
cp $(keys_DATA) ~/.gnome/mime-info/ |
| 29 |
|
| 30 |
+if GCONF_SCHEMAS_INSTALL |
| 31 |
install-data-local: |
| 32 |
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) |
| 33 |
$(GCONFTOOL) --shutdown |
| 34 |
+else |
| 35 |
+install-data-local: |
| 36 |
+endif |
| 37 |
|
| 38 |
EXTRA_DIST = $(glade_DATA) $(schema_in_files) $(stuff_DATA) |
| 39 |
|
| 40 |
--- a/data/Makefile.in 2008-11-30 12:41:10.000000000 +0100 |
| 41 |
+++ b/data/Makefile.in 2008-11-30 12:42:24.000000000 +0100 |
| 42 |
@@ -448,9 +437,10 @@ |
| 43 |
cp $(app_DATA) ~/.gnome/application-registry |
| 44 |
cp $(keys_DATA) ~/.gnome/mime-info/ |
| 45 |
|
| 46 |
-install-data-local: |
| 47 |
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) |
| 48 |
- $(GCONFTOOL) --shutdown |
| 49 |
+@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: |
| 50 |
+@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) |
| 51 |
+@GCONF_SCHEMAS_INSTALL_TRUE@ $(GCONFTOOL) --shutdown |
| 52 |
+@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: |
| 53 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
| 54 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
| 55 |
.NOEXPORT: |
Archives