[arch-commits] Commit in pantheon-videos/trunk (2 files)

[Maxime Gauduin]

    Date: Thursday, June 21, 2018 @ 08:07:37
  Author: alucryd
Revision: 344261

upgpkg: pantheon-videos 0.2.6-1

Modified:
  pantheon-videos/trunk/PKGBUILD
Deleted:
  pantheon-videos/trunk/remove-glib-application-set-default.patch

-------------------------------------------+
 PKGBUILD                                  |   31 +++++++---------------------
 remove-glib-application-set-default.patch |   22 -------------------
 2 files changed, 8 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-21 08:04:09 UTC (rev 344260)
+++ PKGBUILD	2018-06-21 08:07:37 UTC (rev 344261)
@@ -3,7 +3,7 @@
 # Contributor: Ner0 <darkelfdarkelf666 at yahoo.co.uk>
 
 pkgname=pantheon-videos
-pkgver=0.2.5
+pkgver=0.2.6
 pkgrel=1
 pkgdesc='The Pantheon Video Player'
 arch=('x86_64')
@@ -10,39 +10,24 @@
 url='https://github.com/elementary/videos'
 license=('GPL3')
 groups=('pantheon')
-depends=('clutter' 'clutter-gst' 'clutter-gtk' 'gdk-pixbuf2' 'glib2' 'glibc'
+depends=('clutter' 'clutter-gst' 'clutter-gtk' 'gdk-pixbuf2' 'glib2'
          'gst-plugins-base-libs' 'gstreamer' 'gtk3' 'libgee' 'libx11'
          'libgranite.so')
-makedepends=('cmake' 'intltool' 'vala')
-replaces=('audience')
-provides=('audience')
-conflicts=('audience')
+makedepends=('git' 'intltool' 'meson' 'vala')
 optdepends=('gst-plugins-base: "Base" plugin libraries'
             'gst-plugins-good: "Good" plugin libraries'
             'gst-plugins-bad: "Bad" plugin libraries'
             'gst-plugins-ugly: "Ugly" plugin libraries')
-source=("pantheon-videos-${pkgver}.tar.gz::https://github.com/elementary/videos/archive/${pkgver}.tar.gz")
-sha256sums=('4f22565033f5c44380d215c5f9c3672a8a2ad75d81af0e06b7b5a4bf18522207')
+source=("pantheon-videos::git+https://github.com/elementary/videos.git#tag=${pkgver}")
+sha256sums=('SKIP')
 
-prepare() {
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
-}
-
 build() {
-  cd build
-
-  cmake ../videos-${pkgver} \
-    -DCMAKE_BUILD_TYPE='Release' \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DGSETTINGS_COMPILE='OFF'
-  make
+  arch-meson pantheon-videos build
+  ninja -C build
 }
 
 package() {
-  make DESTDIR="${pkgdir}" -C build install
+  DESTDIR="${pkgdir}" ninja -C build install
 }
 
 # vim: ts=2 sw=2 et:

Deleted: remove-glib-application-set-default.patch
===================================================================
--- remove-glib-application-set-default.patch	2018-06-21 08:04:09 UTC (rev 344260)
+++ remove-glib-application-set-default.patch	2018-06-21 08:07:37 UTC (rev 344261)
@@ -1,22 +0,0 @@
-From c09f272d9f27e4c0d6671a70a9bee2f77ac9687b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin at elementary.io>
-Date: Sat, 4 Nov 2017 16:15:02 +0100
-Subject: [PATCH] GLib.Application.set_default is useless when there is only
- one instance (#47)
-
----
- src/Audience.vala | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/Audience.vala b/src/Audience.vala
-index 15dcb3b..557fd76 100644
---- a/src/Audience.vala
-+++ b/src/Audience.vala
-@@ -59,7 +59,6 @@ namespace Audience {
-             Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
-             this.flags |= GLib.ApplicationFlags.HANDLES_OPEN;
-             settings = new Settings ();
--            set_default ();
-         }
- 
-         private static App app; // global App instance