Date: Monday, April 10, 2023 @ 13:43:56
  Author: heftig
Revision: 1444359

3.4.6-2: py 3.11 rebuild

Modified:
  rhythmbox/trunk/PKGBUILD

----------+
 PKGBUILD |   88 +++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-04-10 13:43:10 UTC (rev 1444358)
+++ PKGBUILD    2023-04-10 13:43:56 UTC (rev 1444359)
@@ -4,31 +4,60 @@
 
 pkgname=rhythmbox
 pkgver=3.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Music playback and management application"
+url="https://wiki.gnome.org/Apps/Rhythmbox";
 arch=(x86_64)
 license=(GPL)
-url="https://wiki.gnome.org/Apps/Rhythmbox";
-depends=(dconf gst-plugins-base gst-plugins-good libsoup json-glib libnotify
-         libpeas media-player-info totem-plparser tdb python-gobject libgudev
-         grilo)
-makedepends=(brasero gobject-introspection vala libdmapsharing lirc libgpod
-             libmtp zeitgeist gtk-doc yelp-tools git meson)
-checkdepends=(check xorg-server-xvfb)
-optdepends=('gst-plugins-ugly: Extra media codecs'
-            'gst-plugins-bad: Extra media codecs'
-            'gst-libav: Extra media codecs'
-            'brasero: Audio CD Recorder plugin'
-            'libdmapsharing: DAAP Music Sharing plugin'
-            'grilo-plugins: Grilo media browser plugin'
-            'lirc: LIRC plugin'
-            'libgpod: Portable Players - iPod plugin'
-            'libmtp: Portable Players - MTP plugin'
-            'gvfs-mtp: Portable Players - Android plugin'
-            'zeitgeist: Zeitgeist logging plugin')
+depends=(
+  dconf
+  grilo
+  gst-plugins-base
+  gst-plugins-good
+  json-glib
+  libgudev
+  libnotify
+  libpeas
+  libsoup
+  media-player-info
+  python-gobject
+  tdb
+  totem-plparser
+)
+makedepends=(
+  brasero
+  git
+  gobject-introspection
+  gtk-doc
+  libdmapsharing
+  libgpod
+  libmtp
+  lirc
+  meson
+  vala
+  yelp-tools
+  zeitgeist
+)
+checkdepends=(
+  check
+  xorg-server-xvfb
+)
+optdepends=(
+  'brasero: Audio CD Recorder plugin'
+  'grilo-plugins: Grilo media browser plugin'
+  'gst-libav: Extra media codecs'
+  'gst-plugins-bad: Extra media codecs'
+  'gst-plugins-ugly: Extra media codecs'
+  'gvfs-mtp: Portable Players - Android plugin'
+  'libdmapsharing: DAAP Music Sharing plugin'
+  'libgpod: Portable Players - iPod plugin'
+  'libmtp: Portable Players - MTP plugin'
+  'lirc: LIRC plugin'
+  'zeitgeist: Zeitgeist logging plugin'
+)
 _commit=1b14819fc3937d9f03edd8dac092228cb4589240  # tags/v3.4.6^0
 source=("git+https://gitlab.gnome.org/GNOME/rhythmbox.git#commit=$_commit";)
-sha512sums=('SKIP')
+b2sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -38,8 +67,12 @@
 prepare() {
   cd $pkgname
 
-  # Allow building with a newer version of meson
-  sed -i '/unsupported version of meson/d' meson.build
+  # Simplify setup in check()
+  git cherry-pick -n 2d36c6b1895c7478bd73bd82c9ba1e896c7bb55d
+
+  # Fix tests
+  git cherry-pick -n 37c9c9f46753fbac63dc6ca06b4a36822c896fbe \
+                     6e8e2754f1ebfa77dfa09d814663990e68db622d
 }
 
 build() {
@@ -47,13 +80,10 @@
   meson compile -C build
 }
 
-check() (
-  glib-compile-schemas "${GSETTINGS_SCHEMA_DIR:=$PWD/$pkgname/data}"
-  export GSETTINGS_SCHEMA_DIR GSETTINGS_BACKEND=memory CK_TIMEOUT_MULTIPLIER=3
-
+check() {
   xvfb-run -s '-nolisten local' \
-    meson test -C build --print-errorlogs
-)
+    meson test -C build --print-errorlogs -t 3
+}
 
 package() {
   meson install -C build --destdir "$pkgdir"
@@ -61,3 +91,5 @@
   python -m compileall -d /usr/lib "$pkgdir/usr/lib"
   python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
 }
+
+# vim:set sw=2 sts=-1 et:

Reply via email to