CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/01/02 12:04:43
Modified files:
. : ChangeLog Makefile.am configure.ac
doc/C/usermanual/installation: custompath_configuration.xml
plugin/klash : Makefile.am
Log message:
Apply new kde switches patch by Fredrik Johansson submitted on bug
#21907
and document them.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5286&r2=1.5287
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.466&r2=1.467
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/custompath_configuration.xml?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.37&r2=1.38
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5286
retrieving revision 1.5287
diff -u -b -r1.5286 -r1.5287
--- ChangeLog 2 Jan 2008 11:45:19 -0000 1.5286
+++ ChangeLog 2 Jan 2008 12:04:42 -0000 1.5287
@@ -1,5 +1,16 @@
2008-01-02 Sandro Santilli <[EMAIL PROTECTED]>
+ * doc/C/usermanual/installation/custompath_configuration.xml:
+ Document new KDE switches.
+
+2008-01-02 Fredrik Johansson <[EMAIL PROTECTED]>
+
+ * Makefile.am, configure.ac, plugin/klash/Makefile.am:
+ Add --with-kde-appsdatadir and --with-kde-configdir switches.
+ (see bug #21907)
+
+2008-01-02 Sandro Santilli <[EMAIL PROTECTED]>
+
* backend/: render_handler.h, render_handler_d3d.cpp,
render_handler_xbox.cpp: remove last references to the
triangulating render handler.
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- Makefile.am 30 Dec 2007 10:44:44 -0000 1.96
+++ Makefile.am 2 Jan 2008 12:04:43 -0000 1.97
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.96 2007/12/30 10:44:44 strk Exp $
+# $Id: Makefile.am,v 1.97 2008/01/02 12:04:43 strk Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -329,6 +329,8 @@
@echo " KPARTS (KDE) plugin enabled"
@echo " KPARTS plugin install dir: $(KDE_PLUGINDIR)"
@echo " KPARTS service install dir: $(KDE_SERVICESDIR)"
+ @echo " KPARTS config dir: ${KDE_CONFIGDIR}"
+ @echo " KPARTS appsdata dir: ${KDE_APPSDATADIR}"
else
@echo " KPARTS (KDE) plugin disabled"
endif
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -b -r1.466 -r1.467
--- configure.ac 30 Dec 2007 11:03:50 -0000 1.466
+++ configure.ac 2 Jan 2008 12:04:43 -0000 1.467
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.466 2007/12/30 11:03:50 strk Exp $
+dnl $Id: configure.ac,v 1.467 2008/01/02 12:04:43 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -1374,13 +1374,19 @@
KDE_PLUGINDIR='$(libdir)/kde3'
KDE_SERVICESDIR='$(prefix)/share/services'
+ KDE_CONFIGDIR='$(prefix)/share/config'
+ KDE_APPSDATADIR='$(prefix)/share/apps'
AC_SUBST(KDE_PLUGINDIR)
AC_SUBST(KDE_SERVICESDIR)
+ AC_SUBST(KDE_CONFIGDIR)
+ AC_SUBST(KDE_APPSDATADIR)
if test x${KDE_CONFIG} != x; then
KDE_PLUGINDIR=`${KDE_CONFIG} --install module --expandvars`
KDE_SERVICESDIR=`${KDE_CONFIG} --install services --expandvars`
+ KDE_CONFIGDIR=`${KDE_CONFIG} --install config --expandvars`
+ KDE_APPSDATADIR=`${KDE_CONFIG} --install data --expandvars`
fi
AC_ARG_WITH(kde-plugindir,
@@ -1395,6 +1401,18 @@
[KDE_SERVICESDIR=${withval}]
)
+ AC_ARG_WITH(kde-configdir,
+ AC_HELP_STRING([--with-kde-configdir=DIR],
+ [Directory to install KDE configfile in]),
+ [KDE_CONFIGDIR=${withval}]
+ )
+
+ AC_ARG_WITH(kde-appsdatadir,
+ AC_HELP_STRING([--with-kde-appsdatadir=DIR],
+ [Directory to install KDE data in]),
+ [KDE_APPSDATADIR=${withval}]
+ )
+
fi
AM_CONDITIONAL(BUILD_QTOPIA_GUI, [ test x$build_qtopia = xyes ])
@@ -1892,6 +1910,8 @@
echo " KPARTS plugin enabled (default). Use --disable-kparts to
disable"
echo " KDE plugin will be installed in ${KDE_PLUGINDIR}"
echo " KDE service will be installed in ${KDE_SERVICESDIR}"
+ echo " KDE config dir will be in ${KDE_CONFIGDIR}"
+ echo " KDE appsdata will be installed in ${KDE_APPSDATADIR}"
else
echo " KPARTS plugin disabled."
fi
Index: doc/C/usermanual/installation/custompath_configuration.xml
===================================================================
RCS file:
/sources/gnash/gnash/doc/C/usermanual/installation/custompath_configuration.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- doc/C/usermanual/installation/custompath_configuration.xml 30 Dec 2007
11:03:50 -0000 1.6
+++ doc/C/usermanual/installation/custompath_configuration.xml 2 Jan 2008
12:04:43 -0000 1.7
@@ -167,6 +167,24 @@
</entry>
</row><row>
<entry>
+ <option>--with-kde-configdir</option>
+ </entry>
+ <entry>
+ This is the directory to install the KPARTS (kde) config files in.
+ By default it is what's returned by kde-config --install config
--expandvars,
+ or $(prefix)/share/config if kde-config is not found.
+ </entry>
+ </row><row>
+ <entry>
+ <option>--with-kde-appsdatadir</option>
+ </entry>
+ <entry>
+ This is the directory to install the KPARTS (kde) application data
files in.
+ By default it is what's returned by kde-config --install data
--expandvars,
+ or $(prefix)/share/apps if kde-config is not found.
+ </entry>
+ </row><row>
+ <entry>
<option>--with-ming</option>
</entry>
<entry>
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- plugin/klash/Makefile.am 30 Dec 2007 10:44:45 -0000 1.37
+++ plugin/klash/Makefile.am 2 Jan 2008 12:04:43 -0000 1.38
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.37 2007/12/30 10:44:45 strk Exp $
+# $Id: Makefile.am,v 1.38 2008/01/02 12:04:43 strk Exp $
AUTOMAKE_OPTIONS =
@@ -24,9 +24,12 @@
plugindir = $(KDE_PLUGINDIR)
kde_servicesdir = $(KDE_SERVICESDIR)
-rcdir = $(prefix)/share/apps/klash
-appsdatadir = $(prefix)/share/apps/klash
-configdir = $(prefix)/share/config
+kde_rcdir = $(KDE_APPSDATADIR)/klash
+#$(prefix)/share/apps/klash
+kde_appsdatadir = $(KDE_APPSDATADIR)/klash
+#$(prefix)/share/apps/klash
+kde_configdir = $(KDE_CONFIGDIR)
+#$(prefix)/share/config
plugin_LTLIBRARIES= libklashpart.la
@@ -39,11 +42,11 @@
endif
dist_kde_services_DATA = klash_part.desktop
-dist_rc_DATA = klashpartui.rc
-dist_appsdata_DATA = pluginsinfo
-#dist_config_DATA = klashrc
+dist_kde_rc_DATA = klashpartui.rc
+dist_kde_appsdata_DATA = pluginsinfo
+#dist_kde_config_DATA = klashrc
-# DIST_COMMON = $(dist_appsdata_DATA) $(dist_kde_services_DATA) $(dist_rc_DATA)
+# DIST_COMMON = $(dist_kde_appsdata_DATA) $(dist_kde_services_DATA)
$(dist_kde_rc_DATA)
BUILT_SOURCES = klash_part.moc
CLEANFILES = klash_part.moc
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
