| 1 |
ssuominen 09/09/29 16:59:22 |
| 2 |
|
| 3 |
Added: gecko-mediaplayer-0.9.8-asneeded.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
(Portage version: 2.2_rc42/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8-asneeded.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8-asneeded.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-asneeded.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gecko-mediaplayer-0.9.8-asneeded.patch |
| 15 |
=================================================================== |
| 16 |
diff -ruN gecko-mediaplayer-0.9.8.orig/m4/gconf-2.m4 gecko-mediaplayer-0.9.8/m4/gconf-2.m4 |
| 17 |
--- gecko-mediaplayer-0.9.8.orig/m4/gconf-2.m4 1970-01-01 02:00:00.000000000 +0200 |
| 18 |
+++ gecko-mediaplayer-0.9.8/m4/gconf-2.m4 2009-09-29 19:59:41.000000000 +0300 |
| 19 |
@@ -0,0 +1,44 @@ |
| 20 |
+dnl AM_GCONF_SOURCE_2 |
| 21 |
+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas |
| 22 |
+dnl (i.e. pass to gconftool-2 |
| 23 |
+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where |
| 24 |
+dnl you should install foo.schemas files |
| 25 |
+dnl |
| 26 |
+ |
| 27 |
+AC_DEFUN([AM_GCONF_SOURCE_2], |
| 28 |
+[ |
| 29 |
+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then |
| 30 |
+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` |
| 31 |
+ else |
| 32 |
+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE |
| 33 |
+ fi |
| 34 |
+ |
| 35 |
+ AC_ARG_WITH([gconf-source], |
| 36 |
+ AC_HELP_STRING([--with-gconf-source=sourceaddress], |
| 37 |
+ [Config database for installing schema files.]), |
| 38 |
+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) |
| 39 |
+ |
| 40 |
+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) |
| 41 |
+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) |
| 42 |
+ |
| 43 |
+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then |
| 44 |
+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' |
| 45 |
+ fi |
| 46 |
+ |
| 47 |
+ AC_ARG_WITH([gconf-schema-file-dir], |
| 48 |
+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir], |
| 49 |
+ [Directory for installing schema files.]), |
| 50 |
+ [GCONF_SCHEMA_FILE_DIR="$withval"],) |
| 51 |
+ |
| 52 |
+ AC_SUBST(GCONF_SCHEMA_FILE_DIR) |
| 53 |
+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) |
| 54 |
+ |
| 55 |
+ AC_ARG_ENABLE(schemas-install, |
| 56 |
+ AC_HELP_STRING([--disable-schemas-install], |
| 57 |
+ [Disable the schemas installation]), |
| 58 |
+ [case ${enableval} in |
| 59 |
+ yes|no) ;; |
| 60 |
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; |
| 61 |
+ esac]) |
| 62 |
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) |
| 63 |
+]) |
| 64 |
diff -ruN gecko-mediaplayer-0.9.8.orig/src/Makefile.am gecko-mediaplayer-0.9.8/src/Makefile.am |
| 65 |
--- gecko-mediaplayer-0.9.8.orig/src/Makefile.am 2009-06-07 20:05:27.000000000 +0300 |
| 66 |
+++ gecko-mediaplayer-0.9.8/src/Makefile.am 2009-09-29 19:59:04.000000000 +0300 |
| 67 |
@@ -20,6 +20,7 @@ |
| 68 |
-Wall \ |
| 69 |
-g |
| 70 |
|
| 71 |
+LIBS = $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) |
| 72 |
|
| 73 |
COMMONCODE = \ |
| 74 |
../config.h \ |
| 75 |
@@ -52,7 +53,7 @@ |
| 76 |
$(COMMONCODE) |
| 77 |
|
| 78 |
gecko_mediaplayer_so_CFLAGS = -fPIC |
| 79 |
-gecko_mediaplayer_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC |
| 80 |
+gecko_mediaplayer_so_LDFLAGS = -shared -fPIC |
| 81 |
gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a |
| 82 |
|
| 83 |
gecko_mediaplayer_qt_so_SOURCES = \ |
| 84 |
@@ -60,7 +61,7 @@ |
| 85 |
$(COMMONCODE) |
| 86 |
|
| 87 |
gecko_mediaplayer_qt_so_CFLAGS = -fPIC |
| 88 |
-gecko_mediaplayer_qt_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC |
| 89 |
+gecko_mediaplayer_qt_so_LDFLAGS = -shared -fPIC |
| 90 |
gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a |
| 91 |
|
| 92 |
gecko_mediaplayer_wmp_so_SOURCES = \ |
| 93 |
@@ -68,7 +69,7 @@ |
| 94 |
$(COMMONCODE) |
| 95 |
|
| 96 |
gecko_mediaplayer_wmp_so_CFLAGS = -fPIC |
| 97 |
-gecko_mediaplayer_wmp_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC |
| 98 |
+gecko_mediaplayer_wmp_so_LDFLAGS = -shared -fPIC |
| 99 |
gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a |
| 100 |
|
| 101 |
gecko_mediaplayer_dvx_so_SOURCES = \ |
| 102 |
@@ -76,7 +77,7 @@ |
| 103 |
$(COMMONCODE) |
| 104 |
|
| 105 |
gecko_mediaplayer_dvx_so_CFLAGS = -fPIC |
| 106 |
-gecko_mediaplayer_dvx_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC |
| 107 |
+gecko_mediaplayer_dvx_so_LDFLAGS = -shared -fPIC |
| 108 |
gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a |
| 109 |
|
| 110 |
gecko_mediaplayer_rm_so_SOURCES = \ |
| 111 |
@@ -84,7 +85,7 @@ |
| 112 |
$(COMMONCODE) |
| 113 |
|
| 114 |
gecko_mediaplayer_rm_so_CFLAGS = -fPIC |
| 115 |
-gecko_mediaplayer_rm_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC |
| 116 |
+gecko_mediaplayer_rm_so_LDFLAGS = -shared -fPIC |
| 117 |
gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a |
| 118 |
|
| 119 |
indent: |
Archives