1 |
yngwin 10/01/26 21:55:52 |
2 |
|
3 |
Added: gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch |
4 |
Log: |
5 |
Add patch for configuration without gconf. Fixes bug 301932. |
6 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch |
15 |
=================================================================== |
16 |
--- gecko-mediaplayer-r347/Makefile.in.orig 2010-01-26 22:14:23.000000000 +0100 |
17 |
+++ gecko-mediaplayer-r347/Makefile.in 2010-01-26 22:15:32.000000000 +0100 |
18 |
@@ -39,7 +39,8 @@ |
19 |
AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \ |
20 |
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs |
21 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
22 |
-am__aclocal_m4_deps = $(top_srcdir)/configure.in |
23 |
+am__aclocal_m4_deps = $(top_srcdir)/configure.in \ |
24 |
+ $(top_srcdir)/gconf-2.m4 |
25 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
26 |
$(ACLOCAL_M4) |
27 |
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
28 |
diff -burN gecko-mediaplayer-r347.orig/gconf-2.m4 gecko-mediaplayer-r347/gconf-2.m4 |
29 |
--- gecko-mediaplayer-r347.orig/gconf-2.m4 1970-01-01 01:00:00.000000000 +0100 |
30 |
+++ gecko-mediaplayer-r347/gconf-2.m4 2010-01-26 21:59:08.000000000 +0100 |
31 |
@@ -0,0 +1,44 @@ |
32 |
+dnl AM_GCONF_SOURCE_2 |
33 |
+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas |
34 |
+dnl (i.e. pass to gconftool-2 |
35 |
+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where |
36 |
+dnl you should install foo.schemas files |
37 |
+dnl |
38 |
+ |
39 |
+AC_DEFUN([AM_GCONF_SOURCE_2], |
40 |
+[ |
41 |
+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then |
42 |
+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` |
43 |
+ else |
44 |
+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE |
45 |
+ fi |
46 |
+ |
47 |
+ AC_ARG_WITH([gconf-source], |
48 |
+ AC_HELP_STRING([--with-gconf-source=sourceaddress], |
49 |
+ [Config database for installing schema files.]), |
50 |
+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) |
51 |
+ |
52 |
+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) |
53 |
+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) |
54 |
+ |
55 |
+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then |
56 |
+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' |
57 |
+ fi |
58 |
+ |
59 |
+ AC_ARG_WITH([gconf-schema-file-dir], |
60 |
+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir], |
61 |
+ [Directory for installing schema files.]), |
62 |
+ [GCONF_SCHEMA_FILE_DIR="$withval"],) |
63 |
+ |
64 |
+ AC_SUBST(GCONF_SCHEMA_FILE_DIR) |
65 |
+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) |
66 |
+ |
67 |
+ AC_ARG_ENABLE(schemas-install, |
68 |
+ AC_HELP_STRING([--disable-schemas-install], |
69 |
+ [Disable the schemas installation]), |
70 |
+ [case ${enableval} in |
71 |
+ yes|no) ;; |
72 |
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; |
73 |
+ esac]) |
74 |
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) |
75 |
+]) |
76 |
--- gecko-mediaplayer-r347/configure.in.orig 2010-01-26 22:43:08.000000000 +0100 |
77 |
+++ gecko-mediaplayer-r347/configure.in 2010-01-26 22:43:41.000000000 +0100 |
78 |
@@ -6,6 +6,8 @@ |
79 |
AM_CONFIG_HEADER(config.h) |
80 |
AM_MAINTAINER_MODE |
81 |
|
82 |
+m4_include([gconf-2.m4]) |
83 |
+ |
84 |
AC_ISC_POSIX |
85 |
AC_PROG_CC |
86 |
AM_PROG_CC_STDC |