[arch-commits] Commit in totem/repos (4 files)
Jan de Groot
jgc at archlinux.org
Sun Jun 22 18:18:30 UTC 2008
Date: Sunday, June 22, 2008 @ 14:18:29
Author: jgc
Revision: 3424
Merged revisions 886-3422 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/totem/trunk
........
r3310 | jgc | 2008-06-21 23:37:43 +0000 (Sat, 21 Jun 2008) | 2 lines
upgpkg: totem 2.22.2-1
Fix configure options, compile against xulrunner 1.9
........
r3314 | jgc | 2008-06-21 23:43:04 +0000 (Sat, 21 Jun 2008) | 2 lines
Remove patch
........
Added:
totem/repos/extra-x86_64/30_totem_xulrunner19.patch
(from rev 3314, totem/trunk/30_totem_xulrunner19.patch)
Modified:
totem/repos/extra-x86_64/ (properties)
totem/repos/extra-x86_64/PKGBUILD
Deleted:
totem/repos/extra-x86_64/totem-plparse.patch
----------------------------+
30_totem_xulrunner19.patch | 164 ++++++++++++++
PKGBUILD | 19 +
totem-plparse.patch | 495 -------------------------------------------
3 files changed, 176 insertions(+), 502 deletions(-)
Property changes on: totem/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /totem/trunk:1-885
+ /totem/trunk:1-3422
Copied: totem/repos/extra-x86_64/30_totem_xulrunner19.patch (from rev 3314, totem/trunk/30_totem_xulrunner19.patch)
===================================================================
--- extra-x86_64/30_totem_xulrunner19.patch (rev 0)
+++ extra-x86_64/30_totem_xulrunner19.patch 2008-06-22 18:18:29 UTC (rev 3424)
@@ -0,0 +1,164 @@
+Summary:
+
+Fix configure.in to detect xulrunner-1.9 as gecko=mozilla 1.9
+ - update configure.in:
+
+Instructions:
+
+1. Drop this into debian/patches directory of totem package and add the filename
+used into the debian/patches/series file such that it gets applied _before_ the
+autoconf patch.
+2. Update autoconf patch by: QUILT_PATCHES=debian/patches quilt push -a; autoconf; quilt refresh --diffstat -U --no-timestamps
+3. Build as usually (e.g. dpkg-buildpackage -rfakeroot -b)
+
+Tested Package Versions:
+ + totem >= 2.21.2-0ubuntu2, build: OK, works: OK (asac)
+
+---
+ configure.in | 77 ++++++++++++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 58 insertions(+), 19 deletions(-)
+
+--- a/configure.in 2008-02-27 12:24:51.000000000 +0100
++++ b/configure.in 2008-02-27 12:25:05.000000000 +0100
+@@ -590,13 +590,19 @@
+ if test -z "$with_gecko"; then
+ dnl Autodetect gecko
+ for g in $GECKOS; do
++ if $PKG_CONFIG --exists $g-plugin; then
++ gecko=$g
++ break;
++ fi
+ if $PKG_CONFIG --exists $g-xpcom; then
+ gecko=$g
+ break;
+ fi
+ done
+ elif ! $PKG_CONFIG --exists $gecko-xpcom; then
+- AC_MSG_ERROR([Gecko "$gecko" not found])
++ if ! $PKG_CONFIG --exists $gecko-plugin; then
++ AC_MSG_ERROR([Gecko "$gecko" not found])
++ fi
+ fi
+
+ if test -z "$gecko" -a "$enable_browser_plugins" = "autodetect"; then
+@@ -634,24 +640,35 @@
+ # Check for mozilla modules, but keep the CFLAGS and LIBS in
+ # separate vars
+ if test "$enable_browser_plugins" = "yes" ; then
+- PKG_CHECK_MODULES([MOZILLA_NOT_LINKED],
+- [$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin],,
+- [enable_browser_plugins=no])
++ if $PKG_CONFIG --exists $MOZILLA-plugin; then
++ MOZILLA_VERSION_MIN=1.9
++ PKG_CHECK_MODULES([MOZILLA_NOT_LINKED],
++ [libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN],,
++ [enable_browser_plugins=no])
++ else
++ PKG_CHECK_MODULES([MOZILLA_NOT_LINKED],
++ [$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
++ $MOZILLA-plugin],,
++ [enable_browser_plugins=no])
++ fi
+ fi
+ # Check for other required modules, and merge CFLAGS, but not link
+ # flags to avoid linking against -lxpcom -lplds4 -lplc4 -lnspr4
+ if test "$enable_browser_plugins" = "yes" ; then
+ PKG_CHECK_MODULES([BROWSER_PLUGIN],
+ [glib-2.0
+- gnome-vfs-2.0 >= $GNOMEVFS_REQS
+- gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+- gthread-2.0
+- totem-plparser-mini >= $TOTEM_PLPARSER_REQS],
++ gnome-vfs-2.0 >= $GNOMEVFS_REQS
++ gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++ gthread-2.0
++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS],
+ [],[enable_browser_plugins=no])
+
+ BROWSER_PLUGIN_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS $BROWSER_PLUGIN_CFLAGS"
+ AC_SUBST([BROWSER_PLUGIN_CFLAGS])
++ # for xul 1.9 we have to link anyway
++ if test "$MOZILLA_VERSION_MIN" = 1.9; then
++ BROWSER_PLUGIN_LIBS="$MOZILLA_NOT_LINKED_LIBS $BROWSER_PLUGIN_LIBS"
++ fi
+ AC_SUBST([BROWSER_PLUGIN_LIBS])
+
+ # Earlier versions misdetect playlists
+@@ -683,10 +700,18 @@
+
+ # Sets some variables, and check for xpidl
+ if test "$enable_browser_plugins" = "yes" ; then
+- MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-xpcom --variable=prefix`"
+- MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-xpcom --variable=libdir`"
+- MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
+- MOZILLA_XPCOM_CFLAGS="-I`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
++ if $PKG_CONFIG --exists $MOZILLA-plugin; then
++ MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`"
++ MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=sdkdir`/bin"
++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-plugin`"
++ MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-plugin` `$PKG_CONFIG --cflags libxul-unstable`"
++ else
++ MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`"
++ MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=libdir`"
++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
++ MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-xpcom`"
++ fi
++
+ MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:-"\${libdir}/mozilla/plugins"}"
+
+ AC_PATH_PROG([MOZILLA_XPIDL], [xpidl], [no], [$MOZILLA_LIBDIR:$PATH])
+@@ -708,8 +733,12 @@
+
+ # Search for the idl include directory
+ if test "$enable_browser_plugins" = "yes" ; then
+- dnl This only works on gecko 1.8
+- MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
++ dnl This only works on gecko 1.9 and 1.8
++ if $PKG_CONFIG --exists libxul; then
++ MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/unstable"
++ else
++ MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
++ fi
+ dnl Fallback for older versions
+ if test "x$MOZILLA_IDLDIR" = "x"; then
+ MOZILLA_IDLDIR="`echo $MOZILLA_LIBDIR | sed -e s!lib!share/idl!`"
+@@ -741,8 +770,14 @@
+
+ CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT"
+ CXXFLAGS="$CXXFLAGS $MOZILLA_NOT_LINKED_CFLAGS"
+- LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
+- LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++ if test $MOZILLA_VERSION_MIN = 1.9; then
++ CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT/unstable"
++ LIBS="$LIBS $MOZILLA_NOT_LINKED_LIBS"
++ LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++ else
++ LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
++ LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++ fi
+
+ AC_MSG_CHECKING([for libxpcomglue_s])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+@@ -763,7 +798,11 @@
+ AC_LANG_POP([C++])
+
+ if test "$have_libxpcomglue_s" = "yes"; then
+- LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
++ if test $MOZILLA_VERSION_MIN = 1.9; then
++ LIBXPCOMGLUE_S="$MOZILLA_NOT_LINKED_LIBS"
++ else
++ LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
++ fi
+ else
+ AC_MSG_WARN([libxpcomglue_s not available; plugins may not be portable])
+ fi
+@@ -795,7 +834,7 @@
+ if test "$enable_browser_plugins" = "yes"; then
+ AC_LANG_PUSH([C++])
+ __SAVE_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/xpcom"
++ CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom -I$MOZILLA_INCLUDE_ROOT/unstable -I$MOZILLA_INCLUDE_ROOT/stable"
+
+ AC_CHECK_HEADERS([nsTArray.h])
+
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-06-22 18:18:24 UTC (rev 3423)
+++ extra-x86_64/PKGBUILD 2008-06-22 18:18:29 UTC (rev 3424)
@@ -8,24 +8,29 @@
pkgdesc="A GNOME2 integrated movie player based on Gstreamer."
arch=(i686 x86_64)
license=('GPL')
-depends=('gstreamer0.10-good-plugins' 'totem-plparser>=2.22.2' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'libepc>=0.3.5' 'python>=2.5' 'startup-notification' 'libgnomeui>=2.22.1' 'python-gdata' 'gnome-vfs>=2.22.0-2')
-makedepends=('perlxml' 'nautilus>=2.22.2' 'xulrunner>=1.8.1.12' 'pkgconfig' 'bluez-libs' 'lirc-utils' 'gnome-doc-utils>=0.12.2' 'gnome-control-center>=2.22.1' 'libtracker')
+depends=('gstreamer0.10-good-plugins' 'totem-plparser>=2.22.3' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes>=2.0' 'libepc>=0.3.5' 'python>=2.5.2' 'startup-notification' 'libgnomeui>=2.22.1' 'python-gdata' 'gnome-vfs>=2.22.0-2')
+makedepends=('perlxml' 'nautilus>=2.22.2' 'xulrunner>=1.9' 'pkgconfig' 'bluez-libs' 'lirc-utils' 'gnome-doc-utils>=0.12.2' 'gnome-control-center>=2.22.1' 'libtracker')
options=('!libtool' '!emptydirs')
conflicts=('totem-xine')
groups=('gnome-extra')
install=totem.install
-source=(http://ftp.gnome.org/pub/gnome/sources/totem/2.22/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('6062080e81b4859f87fee8a592b92489')
+source=(http://ftp.gnome.org/pub/gnome/sources/totem/2.22/${pkgname}-${pkgver}.tar.bz2
+ 30_totem_xulrunner19.patch)
+md5sums=('6062080e81b4859f87fee8a592b92489' '42e3246acb3163bab35fc12816a19419')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
+ patch -Np1 -i ${startdir}/src/30_totem_xulrunner19.patch || return 1
+ libtoolize --force --copy || return 1
+ aclocal || return 1
+ autoconf || return 1
+ automake --add-missing || return 1
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/totem \
--localstatedir=/var --disable-static \
- --disable-lirc \
- --enable-nautilus --enable-gstreamer \
+ --enable-nautilus \
--enable-mozilla --with-dbus \
- --disable-scrollkeeper --disable-vanity || return 1
+ --disable-scrollkeeper || return 1
make || return 1
make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
DESTDIR=${startdir}/pkg install || return 1
Deleted: extra-x86_64/totem-plparse.patch
===================================================================
--- extra-x86_64/totem-plparse.patch 2008-06-22 18:18:24 UTC (rev 3423)
+++ extra-x86_64/totem-plparse.patch 2008-06-22 18:18:29 UTC (rev 3424)
@@ -1,495 +0,0 @@
-diff -ruN totem-2.20.1/Makefile.am totem-2.20.1.plparse/Makefile.am
---- totem-2.20.1/Makefile.am 2007-10-05 14:17:27.000000000 +0000
-+++ totem-2.20.1.plparse/Makefile.am 2007-12-27 14:42:06.000000000 +0000
-@@ -14,16 +14,12 @@
- totem.spec.in \
- totem.spec \
- omf.make \
-- totem-plparser.pc.in \
- xmldocs.make \
- gnome-doc-utils.make
-
--CLEANFILES = totem.spec totem-plparser.pc
-+CLEANFILES = totem.spec
-
- DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
- gnome-doc-utils.make
-
--pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = totem-plparser.pc
--
- DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
-diff -ruN totem-2.20.1/bindings/python/totem.override totem-2.20.1.plparse/bindings/python/totem.override
---- totem-2.20.1/bindings/python/totem.override 2007-10-05 14:17:24.000000000 +0000
-+++ totem-2.20.1.plparse/bindings/python/totem.override 2007-12-27 14:41:05.000000000 +0000
-@@ -9,7 +9,7 @@
-
- #include "override_common.h"
- #include "totem.h"
--#include "plparse/totem-disc.h"
-+#include "totem-disc.h"
- #include "plugins/totem-plugin.h"
-
- void pytotem_register_classes (PyObject *d);
-diff -ruN totem-2.20.1/browser-plugin/Makefile.am totem-2.20.1.plparse/browser-plugin/Makefile.am
---- totem-2.20.1/browser-plugin/Makefile.am 2007-10-05 14:17:20.000000000 +0000
-+++ totem-2.20.1.plparse/browser-plugin/Makefile.am 2007-12-27 14:33:50.000000000 +0000
-@@ -89,10 +89,8 @@
- -I$(top_srcdir) \
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/src \
-- -I$(top_srcdir)/src/plparse \
- -I$(top_srcdir)/src/backend \
- -I$(top_builddir)/src \
-- -I$(top_builddir)/src/plparse \
- -I$(top_builddir)/src/backend \
- -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
- -DGCONF_PREFIX="\"/apps/totem\"" \
-@@ -114,7 +112,6 @@
- totem_plugin_viewer_LDADD = \
- $(top_builddir)/src/backend/libbaconvideowidget.la \
- $(top_builddir)/src/libtotem_player.la \
-- $(top_builddir)/src/plparse/libtotem-plparser.la \
- $(top_builddir)/lib/libtotemscrsaver.la \
- libtotempluginviewer_helper.la \
- $(EXTRA_GNOME_LIBS) \
-@@ -154,10 +151,8 @@
- libtotem_basic_plugin_la_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/backend \
-- -I$(top_srcdir)/src/plparse \
- -I$(top_builddir)/src \
- -I$(top_builddir)/src/backend \
-- -I$(top_builddir)/src/plparse \
- -Iidl \
- $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \
- -DTOTEM_BASIC_PLUGIN \
-@@ -182,7 +177,6 @@
- $(AM_CXXFLAGS)
-
- libtotem_basic_plugin_la_LIBADD = \
-- $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
- libtotempluginviewer_helper.la \
- $(DBUS_LIBS) \
- $(MOZILLA_LIBS) \
-@@ -223,10 +217,8 @@
- libtotem_gmp_plugin_la_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/backend \
-- -I$(top_srcdir)/src/plparse \
- -I$(top_builddir)/src \
- -I$(top_builddir)/src/backend \
-- -I$(top_builddir)/src/plparse \
- -Iidl \
- $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \
- -DTOTEM_GMP_PLUGIN \
-@@ -251,7 +243,6 @@
- $(AM_CXXFLAGS)
-
- libtotem_gmp_plugin_la_LIBADD = \
-- $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
- libtotempluginviewer_helper.la \
- $(DBUS_LIBS) \
- $(MOZILLA_LIBS) \
-@@ -286,10 +277,8 @@
- libtotem_complex_plugin_la_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/backend \
-- -I$(top_srcdir)/src/plparse \
- -I$(top_builddir)/src \
- -I$(top_builddir)/src/backend \
-- -I$(top_builddir)/src/plparse \
- -Iidl \
- $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \
- -DTOTEM_COMPLEX_PLUGIN \
-@@ -314,7 +303,6 @@
- $(AM_CXXFLAGS)
-
- libtotem_complex_plugin_la_LIBADD = \
-- $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
- libtotempluginviewer_helper.la \
- $(DBUS_LIBS) \
- $(MOZILLA_LIBS) \
-@@ -349,10 +337,8 @@
- libtotem_narrowspace_plugin_la_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/backend \
-- -I$(top_srcdir)/src/plparse \
- -I$(top_builddir)/src \
- -I$(top_builddir)/src/backend \
-- -I$(top_builddir)/src/plparse \
- -Iidl \
- $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \
- -DTOTEM_NARROWSPACE_PLUGIN \
-@@ -377,7 +363,6 @@
- $(AM_CXXFLAGS)
-
- libtotem_narrowspace_plugin_la_LIBADD = \
-- $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
- libtotempluginviewer_helper.la \
- $(DBUS_LIBS) \
- $(MOZILLA_LIBS) \
-@@ -412,10 +397,8 @@
- libtotem_mully_plugin_la_CPPFLAGS = \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/backend \
-- -I$(top_srcdir)/src/plparse \
- -I$(top_builddir)/src \
- -I$(top_builddir)/src/backend \
-- -I$(top_builddir)/src/plparse \
- -Iidl \
- $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \
- -DTOTEM_MULLY_PLUGIN \
-@@ -440,7 +423,6 @@
- $(AM_CXXFLAGS)
-
- libtotem_mully_plugin_la_LIBADD = \
-- $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
- libtotempluginviewer_helper.la \
- $(DBUS_LIBS) \
- $(MOZILLA_LIBS) \
-diff -ruN totem-2.20.1/configure.in totem-2.20.1.plparse/configure.in
---- totem-2.20.1/configure.in 2007-10-17 13:09:22.000000000 +0000
-+++ totem-2.20.1.plparse/configure.in 2007-12-27 14:38:07.000000000 +0000
-@@ -34,34 +34,19 @@
- GLIB_REQS=2.13.4
- GTK_REQS=2.12.1
- GNOMEVFS_REQS=2.16.0
-+TOTEM_PLPARSER_REQS=2.21.6
- GNOMEUI_REQS=2.3.3
- LIBGNOME_REQS=2.14.0
- GNOMEICON_REQS=2.15.90
- DBUS_REQS=0.61
- VALA_REQS=0.0.8
-
--# Before making a release, the PLPARSER_LT_VERSION string should be modified.
--# The string is of the form C:R:A.
--# - If interfaces have been changed or added, but binary compatibility has
--# been preserved, change to C+1:0:A+1
--# - If binary compatibility has been broken (eg removed or changed interfaces)
--# change to C+1:0:0
--# - If the interface is the same as the previous version, change to C:R+1:A
--PLPARSER_LT_VERSION=8:1:1
--AC_SUBST(PLPARSER_LT_VERSION)
--
- TOTEM_VERSION_MAJOR=totem_version_major
- TOTEM_VERSION_MINOR=totem_version_minor
- TOTEM_VERSION_MICRO=totem_version_micro
- AC_SUBST(TOTEM_VERSION_MAJOR)
- AC_SUBST(TOTEM_VERSION_MINOR)
- AC_SUBST(TOTEM_VERSION_MICRO)
--TOTEM_PL_PARSER_VERSION_MAJOR=totem_version_major
--TOTEM_PL_PARSER_VERSION_MINOR=totem_version_minor
--TOTEM_PL_PARSER_VERSION_MICRO=totem_version_micro
--AC_SUBST(TOTEM_PL_PARSER_VERSION_MAJOR)
--AC_SUBST(TOTEM_PL_PARSER_VERSION_MINOR)
--AC_SUBST(TOTEM_PL_PARSER_VERSION_MICRO)
-
- # The full list of plugins
- allowed_plugins="screensaver ontop galago gromit lirc media-player-keys properties sidebar-test skipto sample-python sample-vala bemused"
-@@ -249,11 +234,11 @@
- dnl Also check if we're going to be using GTK+ only
- if test x$ENABLE_GTK = "xno" ; then
- # FIXME: use gmodule-no-export instead!
-- PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-desktop-2.0 >= 2.1.5 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 $ISO_CODES $MM)
-+ PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-desktop-2.0 >= 2.1.5 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
- HAVE_GNOME=yes
- else
- # FIXME: use gmodule-no-export instead!
-- PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 $ISO_CODES $MM)
-+ PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
- AC_DEFINE(USE_STABLE_LIBGNOMEUI, 1, [defined if we don't have GNOME])
- AC_DEFINE(HAVE_GTK_ONLY, 1, [defined if GNOME isn't used])
- HAVE_GNOME=no
-@@ -466,7 +451,8 @@
- [glib-2.0
- gnome-vfs-2.0 >= $GNOMEVFS_REQS
- gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
-- gthread-2.0],
-+ gthread-2.0
-+ totem-plparser-mini >= $TOTEM_PLPARSER_REQS],
- [],[enable_browser_plugins=no])
-
- BROWSER_PLUGIN_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS $BROWSER_PLUGIN_CFLAGS"
-@@ -792,13 +778,6 @@
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
- AM_GCONF_SOURCE_2
-
--dnl Check for packages for building libtotem-plparser.la
--PKG_CHECK_MODULES(TOTEM_PLPARSER, [gtk+-2.0 libxml-2.0 gnome-vfs-2.0
-- gnome-vfs-module-2.0])
--
--PKG_CHECK_MODULES([TOTEM_PLPARSER_MINI],
-- [gnome-vfs-2.0 gnome-vfs-module-2.0])
--
- GNOME_COMMON_INIT
- GNOME_DEBUG_CHECK
- GNOME_COMPILE_WARNINGS([maximum])
-@@ -910,7 +889,8 @@
- PYGTK_REQUIRED=2.8.0
-
- PKG_CHECK_MODULES([PYGTK], [
-- pygtk-2.0 >= $PYGTK_REQUIRED],
-+ pygtk-2.0 >= $PYGTK_REQUIRED
-+ totem-plparser >= $TOTEM_PLPARSER_REQS],
- [],[have_python=no])
-
- AC_SUBST([PYGTK_CFLAGS])
-@@ -990,8 +970,6 @@
- AC_OUTPUT([
- Makefile
- totem.spec
--totem-plparser.pc
--totem-plparser-uninstalled.pc
- lib/Makefile
- src/Makefile
- src/plugins/Makefile
-@@ -1008,8 +986,6 @@
- src/plugins/sample-python/Makefile
- src/plugins/sample-vala/Makefile
- src/backend/Makefile
--src/plparse/Makefile
--src/plparse/totem-pl-parser-features.h
- browser-plugin/Makefile
- browser-plugin/idl/Makefile
- data/Makefile
-diff -ruN totem-2.20.1/po/POTFILES.in totem-2.20.1.plparse/po/POTFILES.in
---- totem-2.20.1/po/POTFILES.in 2007-10-05 14:17:27.000000000 +0000
-+++ totem-2.20.1.plparse/po/POTFILES.in 2007-12-27 14:42:32.000000000 +0000
-@@ -29,12 +29,6 @@
- src/backend/bacon-video-widget-gst-0.10.c
- src/backend/bacon-video-widget-xine.c
- src/backend/video-utils.c
--src/plparse/totem-disc.c
--src/plparse/totem-pl-parser.c
--src/plparse/totem-pl-parser-lines.c
--src/plparse/totem-pl-parser-pla.c
--src/plparse/totem-pl-parser-pls.c
--src/plparse/totem-pl-parser-xspf.c
- src/plugins/totem-plugin-manager.c
- src/plugins/totem-plugins-engine.c
- [type: gettext/ini]src/plugins/bemused/bemused.totem-plugin.in
-diff -ruN totem-2.20.1/src/Makefile.am totem-2.20.1.plparse/src/Makefile.am
---- totem-2.20.1/src/Makefile.am 2007-10-05 14:17:22.000000000 +0000
-+++ totem-2.20.1.plparse/src/Makefile.am 2007-12-27 14:47:25.000000000 +0000
-@@ -1,4 +1,4 @@
--SUBDIRS = plugins backend plparse
-+SUBDIRS = plugins backend
-
- bin_PROGRAMS = totem totem-video-thumbnailer totem-video-indexer
- libexec_PROGRAMS =
-@@ -62,8 +62,6 @@
-
- libtotem_player_la_CPPFLAGS = \
- -I$(srcdir)/backend \
-- -I$(srcdir)/plparse \
-- -I$(top_builddir)/src/plparse \
- $(common_defines) \
- $(AM_CPPFLAGS)
-
-@@ -107,11 +105,9 @@
- totem-subtitle-encoding.h
-
- totem_CPPFLAGS = \
-- -I$(srcdir)/plparse \
- -I$(srcdir)/backend \
- -I$(srcdir)/plugins \
- -I$(top_builddir)/data \
-- -I$(top_builddir)/src/plparse \
- $(common_defines) \
- $(AM_CPPFLAGS)
-
-@@ -127,7 +123,6 @@
- $(AM_LDFLAGS)
-
- totem_LDADD = \
-- plparse/libtotem-plparser.la \
- backend/libbaconvideowidget.la \
- plugins/libtotemmodule.la \
- libbaconmessageconnection.la \
-@@ -154,7 +149,6 @@
- totem-resources.h
-
- totem_video_thumbnailer_CPPFLAGS = \
-- -I$(srcdir)/plparse \
- -I$(srcdir)/backend \
- $(common_defines) \
- $(AM_CPPFLAGS)
-@@ -191,7 +185,6 @@
-
- libtotem_properties_page_la_CPPFLAGS = \
- -I$(srcdir)/backend \
-- -I$(srcdir)/plparse \
- -I$(srcdir)/plugins/properties \
- -I$(top_builddir)/data \
- $(common_defines) \
-@@ -229,7 +222,6 @@
-
- test_properties_page_CPPFLAGS = \
- -I$(srcdir)/backend \
-- -I$(srcdir)/plparse \
- -I$(top_builddir)/data \
- -I$(srcdir)/plugins/properties \
- $(common_defines) \
-@@ -266,7 +258,6 @@
- totem-resources.h
-
- totem_video_indexer_CPPFLAGS = \
-- -I$(srcdir)/plparse \
- -I$(srcdir)/backend \
- -I$(top_builddir)/data \
- $(common_defines) \
-@@ -296,7 +287,6 @@
- disc-test.c
-
- disc_test_CPPFLAGS = \
-- -I$(srcdir)/plparse \
- $(common_defines) \
- $(AM_CPPFLAGS)
-
-@@ -310,7 +300,6 @@
- $(AM_LDFLAGS)
-
- disc_test_LDADD = \
-- plparse/libtotem-plparser.la \
- $(GTK_LIBS) \
- $(EXTRA_GNOME_LIBS)
-
-diff -ruN totem-2.20.1/src/backend/bacon-video-widget.h totem-2.20.1.plparse/src/backend/bacon-video-widget.h
---- totem-2.20.1/src/backend/bacon-video-widget.h 2007-10-05 14:17:21.000000000 +0000
-+++ totem-2.20.1.plparse/src/backend/bacon-video-widget.h 2007-12-27 14:38:25.000000000 +0000
-@@ -31,7 +31,7 @@
- #include <gtk/gtkeventbox.h>
-
- /* for optical disc enumeration type */
--#include "totem-disc.h"
-+#include <totem-disc.h>
-
- G_BEGIN_DECLS
-
-diff -ruN totem-2.20.1/src/totem-playlist.h totem-2.20.1.plparse/src/totem-playlist.h
---- totem-2.20.1/src/totem-playlist.h 2007-10-05 14:17:22.000000000 +0000
-+++ totem-2.20.1.plparse/src/totem-playlist.h 2007-12-27 14:40:17.000000000 +0000
-@@ -26,7 +26,7 @@
- #include <gtk/gtkvbox.h>
- #include <libgnomevfs/gnome-vfs-volume.h>
-
--#include "totem-pl-parser.h"
-+#include <totem-pl-parser.h>
-
- G_BEGIN_DECLS
-
-diff -ruN totem-2.20.1/src/totem.c totem-2.20.1.plparse/src/totem.c
---- totem-2.20.1/src/totem.c 2007-10-05 14:17:22.000000000 +0000
-+++ totem-2.20.1.plparse/src/totem.c 2007-12-27 14:39:59.000000000 +0000
-@@ -31,6 +31,7 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
-+#include <totem-disc.h>
- #include <stdlib.h>
- #include <math.h>
-
-@@ -65,7 +66,6 @@
- #include "totem.h"
- #include "totem-private.h"
- #include "totem-preferences.h"
--#include "totem-disc.h"
-
- #include "debug.h"
-
-diff -ruN totem-2.20.1/src/totem.h totem-2.20.1.plparse/src/totem.h
---- totem-2.20.1/src/totem.h 2007-10-05 14:17:22.000000000 +0000
-+++ totem-2.20.1.plparse/src/totem.h 2007-12-27 14:40:33.000000000 +0000
-@@ -30,7 +30,7 @@
-
- #include <glib-object.h>
- #include <gtk/gtk.h>
--#include "plparse/totem-disc.h"
-+#include <totem-disc.h>
-
- #define TOTEM_GCONF_PREFIX "/apps/totem"
-
-diff -ruN totem-2.20.1/totem-plparser-uninstalled.pc.in totem-2.20.1.plparse/totem-plparser-uninstalled.pc.in
---- totem-2.20.1/totem-plparser-uninstalled.pc.in 2007-10-05 14:17:27.000000000 +0000
-+++ totem-2.20.1.plparse/totem-plparser-uninstalled.pc.in 1970-01-01 00:00:00.000000000 +0000
-@@ -1,14 +0,0 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--gconf_serverdir=@libexecdir@
--
--
--Name: totem-plparser
--Description: Totem Playlist Parser library
--Version: @VERSION@
--Requires: gtk+-2.0
--Requires.private: libxml-2.0 gnome-vfs-2.0 gnome-vfs-module-2.0
--Libs: ${pc_top_builddir}/${pcfiledir}/src/plparse/libtotem-plparser.la
--Cflags: -I${pc_top_builddir}/${pcfiledir}/src/plparse
-diff -ruN totem-2.20.1/totem-plparser.pc.in totem-2.20.1.plparse/totem-plparser.pc.in
---- totem-2.20.1/totem-plparser.pc.in 2007-10-05 14:17:27.000000000 +0000
-+++ totem-2.20.1.plparse/totem-plparser.pc.in 1970-01-01 00:00:00.000000000 +0000
-@@ -1,14 +0,0 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--gconf_serverdir=@libexecdir@
--
--
--Name: totem-plparser
--Description: Totem Playlist Parser library
--Version: @VERSION@
--Requires: gtk+-2.0
--Requires.private: libxml-2.0 gnome-vfs-2.0 gnome-vfs-module-2.0
--Libs: -L${libdir} -ltotem-plparser
--Cflags: -I${includedir}/totem/1/plparser
---- totem-2.20.1/browser-plugin/Makefile.am.orig 2007-12-27 16:01:50.000000000 +0100
-+++ totem-2.20.1/browser-plugin/Makefile.am 2007-12-27 16:04:01.000000000 +0100
-@@ -179,7 +179,7 @@
- libtotem_basic_plugin_la_LIBADD = \
- libtotempluginviewer_helper.la \
- $(DBUS_LIBS) \
-- $(MOZILLA_LIBS) \
-+ $(BROWSER_PLUGIN_LIBS) \
- $(LIBXPCOMGLUE_S)
-
- libtotem_basic_plugin_la_LDFLAGS = \
-@@ -245,7 +245,7 @@
- libtotem_gmp_plugin_la_LIBADD = \
- libtotempluginviewer_helper.la \
- $(DBUS_LIBS) \
-- $(MOZILLA_LIBS) \
-+ $(BROWSER_PLUGIN_LIBS) \
- $(LIBXPCOMGLUE_S)
-
- libtotem_gmp_plugin_la_LDFLAGS = \
-@@ -305,7 +305,7 @@
- libtotem_complex_plugin_la_LIBADD = \
- libtotempluginviewer_helper.la \
- $(DBUS_LIBS) \
-- $(MOZILLA_LIBS) \
-+ $(BROWSER_PLUGIN_LIBS) \
- $(LIBXPCOMGLUE_S)
-
- libtotem_complex_plugin_la_LDFLAGS = \
-@@ -365,7 +365,7 @@
- libtotem_narrowspace_plugin_la_LIBADD = \
- libtotempluginviewer_helper.la \
- $(DBUS_LIBS) \
-- $(MOZILLA_LIBS) \
-+ $(BROWSER_PLUGIN_LIBS) \
- $(LIBXPCOMGLUE_S)
-
- libtotem_narrowspace_plugin_la_LDFLAGS = \
-@@ -425,7 +425,7 @@
- libtotem_mully_plugin_la_LIBADD = \
- libtotempluginviewer_helper.la \
- $(DBUS_LIBS) \
-- $(MOZILLA_LIBS) \
-+ $(BROWSER_PLUGIN_LIBS) \
- $(LIBXPCOMGLUE_S)
-
- libtotem_mully_plugin_la_LDFLAGS = \
More information about the arch-commits
mailing list