Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=b72f199bf83b9421deb3bd7f493d6cfd9088df6f
commit b72f199bf83b9421deb3bd7f493d6cfd9088df6f
Author: crazy <cr...@frugalware.org>
Date: Tue Feb 13 00:24:46 2018 +0100
totem-3.26.0-2-x86_64
* fix package
diff --git a/source/gnome/totem/FrugalBuild b/source/gnome/totem/FrugalBuild
index 80539ea..e6036d0 100644
--- a/source/gnome/totem/FrugalBuild
+++ b/source/gnome/totem/FrugalBuild
@@ -5,7 +5,7 @@
pkgname=totem
pkgver=3.26.0
-pkgrel=1
+pkgrel=2
pkgdesc="Movie player for GNOME based on Xine"
depends=('gst1-plugins-base>=1.12.2-2' 'gst1-plugins-base-oil>=1.12.2-2'
'clutter-gst3>=3.0.24-2' 'clutter-gtk>=1.8.4-2'
'gsettings-desktop-schemas>=3.24.1-2' \
'gst1-plugins-good>=1.9.2-2' 'gst1-plugins-bad-soundtouch>=1.9.2-2'
'pygobject3>=3.26.0' \
@@ -20,6 +20,7 @@ _F_gnome_doc="y"
_F_gnome_ext=".tar.xz"
_F_gnome_devel="n"
Finclude gnome gnome-scriptlet meson
+source+=(fix-meson-vala.patch)
url="http://www.gnome.org/projects/totem/";
subpkgs=("$pkgname-plugins")
@@ -42,21 +43,12 @@ subreplaces+=('')
subprovides+=('')
subconflicts+=('')
-sha1sums=('f388f9a1d380516170f636a472de259a495c7d24')
+sha1sums=('f388f9a1d380516170f636a472de259a495c7d24' \
+ 'c9a6a50c271a0ba226ea37d620dc34de439cfd6f')
build() {
- #Fcd
-
- #export BROWSER_PLUGIN_DIR=/usr/lib/mozilla/plugins
-
- #Fmake \
- # --enable-nautilus=yes \
- # --disable-debug \
- # --enable-python=yes \
- # PYLINT=$(type -P true) APPSTREAM_XML=$(type -P true)
- #Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1
-
+ unset MAKEFLAGS
Meson_build
# plugins package
Fsplit totem-plugins /usr/lib/totem/plugins
diff --git a/source/gnome/totem/fix-meson-vala.patch
b/source/gnome/totem/fix-meson-vala.patch
new file mode 100644
index 0000000..61e7fff
--- /dev/null
+++ b/source/gnome/totem/fix-meson-vala.patch
@@ -0,0 +1,51 @@
+@@ -, +, @@
+ src/meson.build | 11 +++++++++--
+ src/plugins/meson.build | 4 +---
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+--- a/src/meson.build
++++ a/src/meson.build
+@@ -317,8 +317,6 @@ if have_gir
+
+ gir_incs = [
+ 'Gio-2.0',
+- 'GLib-2.0',
+- 'GObject-2.0',
+ 'Gtk-3.0',
+ 'TotemPlParser-1.0'
+ ]
+@@ -345,6 +343,15 @@ if have_gir
+ install_dir_typelib: typelib_dir,
+ extra_args: gir_extra_args
+ )
++
++ if have_vala
++ libtotem_vapi = gnome.generate_vapi(
++ 'totem',
++ sources: libtotem_gir[0],
++ packages: ['gio-2.0', 'gtk+-3.0', 'TotemPlParser-1.0'],
++ install: false,
++ )
++ endif
+ endif
+
+ subdir('plugins')
+--- a/src/plugins/meson.build
++++ a/src/plugins/meson.build
+@@ -115,7 +115,7 @@ if plugins_option != 'none'
+
+ if have_vala
+ plugins_vala_deps = [
+- declare_dependency(sources: libtotem_gir)
++ libtotem_vapi
+ ]
+
+ plugins_vala_flags = [
+@@ -125,8 +125,6 @@ if plugins_option != 'none'
+ ]
+
+ plugins_vala_args = [
+- '--girdir=' + join_paths(meson.build_root(), 'src'),
+- '--pkg=@0@-@1@'.format(totem_gir_ns, totem_api_version)
+ ]
+
+ plugins += [
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
