[arch-commits] Commit in rhythmbox/trunk (PKGBUILD)

2022-06-23 Thread Jan Steffens via arch-commits 
Date: Thursday, June 23, 2022 @ 11:44:53
  Author: heftig
Revision: 449357

3.4.6-1

Modified:
  rhythmbox/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-06-23 10:39:42 UTC (rev 449356)
+++ PKGBUILD2022-06-23 11:44:53 UTC (rev 449357)
@@ -3,7 +3,7 @@
 # Contributor: Giovanni Scafora 
 
 pkgname=rhythmbox
-pkgver=3.4.5
+pkgver=3.4.6
 pkgrel=1
 pkgdesc="Music playback and management application"
 arch=(x86_64)
@@ -27,7 +27,7 @@
 'gvfs-mtp: Portable Players - Android plugin'
 'zeitgeist: Zeitgeist logging plugin')
 options=(debug)
-_commit=015ce7418d2bc6486f51f8fc0c21a4514fcbc50a  # tags/v3.4.5^0
+_commit=1b14819fc3937d9f03edd8dac092228cb4589240  # tags/v3.4.6^0
 source=("git+https://gitlab.gnome.org/GNOME/rhythmbox.git#commit=$_commit;)
 sha512sums=('SKIP')
 
@@ -44,9 +44,7 @@
 }
 
 build() {
-  arch-meson $pkgname build \
--D gtk_doc=true \
--D tests=true
+  arch-meson $pkgname build -D gtk_doc=true
   meson compile -C build
 }

[arch-commits] Commit in rhythmbox/trunk (PKGBUILD)

2022-05-02 Thread Jan Steffens via arch-commits 
Date: Monday, May 2, 2022 @ 16:54:11
  Author: heftig
Revision: 12

3.4.5-1

Modified:
  rhythmbox/trunk/PKGBUILD

--+
 PKGBUILD |   58 +++---
 1 file changed, 23 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-02 16:28:35 UTC (rev 11)
+++ PKGBUILD2022-05-02 16:54:11 UTC (rev 12)
@@ -1,9 +1,10 @@
-# Maintainer: Jan de Groot 
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Jan de Groot 
 # Contributor: Giovanni Scafora 
 
 pkgname=rhythmbox
-pkgver=3.4.4
-pkgrel=5
+pkgver=3.4.5
+pkgrel=1
 pkgdesc="Music playback and management application"
 arch=(x86_64)
 license=(GPL)
@@ -11,8 +12,8 @@
 depends=(dconf gst-plugins-base gst-plugins-good libsoup json-glib libnotify
  libpeas media-player-info totem-plparser tdb python-gobject libgudev
  grilo)
-makedepends=(itstool intltool brasero gobject-introspection vala libdmapsharing
- lirc libgpod libmtp zeitgeist gtk-doc yelp-tools git)
+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'
@@ -25,54 +26,41 @@
 'libmtp: Portable Players - MTP plugin'
 'gvfs-mtp: Portable Players - Android plugin'
 'zeitgeist: Zeitgeist logging plugin')
-_commit=473a28752bfd6260d74f41e3b0d737f71495f4a8  # tags/v3.4.4^0
+options=(debug)
+_commit=015ce7418d2bc6486f51f8fc0c21a4514fcbc50a  # tags/v3.4.5^0
 source=("git+https://gitlab.gnome.org/GNOME/rhythmbox.git#commit=$_commit;)
 sha512sums=('SKIP')
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/^v//;s/-/+/g'
+  git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
 
-  # https://bugs.archlinux.org/task/68537
-  git cherry-pick -n 3360f18d15cd6fabcadac56bc07d4ca133fa661f
-
-  NOCONFIGURE=1 ./autogen.sh
+  # Allow building with a newer version of meson
+  sed -i '/unsupported version of meson/d' meson.build
 }
 
 build() {
-  cd $pkgname
-  ./configure \
---prefix=/usr \
---sysconfdir=/etc \
---localstatedir=/var \
---libexecdir=/usr/lib/rhythmbox \
---disable-browser-plugin \
---disable-static \
---disable-more-warnings \
---enable-daap \
---enable-gtk-doc \
---enable-python \
---enable-vala \
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
+  arch-meson $pkgname build \
+-D gtk_doc=true \
+-D tests=true
+  meson compile -C build
 }
 
 check() (
-  cd $pkgname
-  glib-compile-schemas "${GSETTINGS_SCHEMA_DIR:=$PWD/data}"
+  glib-compile-schemas "${GSETTINGS_SCHEMA_DIR:=$PWD/$pkgname/data}"
   export GSETTINGS_SCHEMA_DIR GSETTINGS_BACKEND=memory CK_TIMEOUT_MULTIPLIER=3
-  xvfb-run -s '-nolisten local' make check
+
+  xvfb-run -s '-nolisten local' \
+meson test -C build --print-errorlogs
 )
 
 package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins"
+  meson install -C build --destdir "$pkgdir"
+
+  python -m compileall -d /usr/lib "$pkgdir/usr/lib"
+  python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
 }

[arch-commits] Commit in rhythmbox/trunk (PKGBUILD)

2021-12-02 Thread Evangelos Foutras via arch-commits 
Date: Thursday, December 2, 2021 @ 23:37:37
  Author: foutrelis
Revision: 430504

upgpkg: rhythmbox 3.4.4-5: Python 3.10 rebuild

Modified:
  rhythmbox/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-12-02 23:36:55 UTC (rev 430503)
+++ PKGBUILD2021-12-02 23:37:37 UTC (rev 430504)
@@ -3,7 +3,7 @@
 
 pkgname=rhythmbox
 pkgver=3.4.4
-pkgrel=4
+pkgrel=5
 pkgdesc="Music playback and management application"
 arch=(x86_64)
 license=(GPL)

[arch-commits] Commit in rhythmbox/trunk (PKGBUILD)

2021-05-05 Thread Jan Steffens via arch-commits 
Date: Wednesday, May 5, 2021 @ 19:30:48
  Author: heftig
Revision: 414413

3.4.4-4: FS#42280 reenable zeitgeist plugin

Modified:
  rhythmbox/trunk/PKGBUILD

--+
 PKGBUILD |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-05-05 17:58:10 UTC (rev 414412)
+++ PKGBUILD2021-05-05 19:30:48 UTC (rev 414413)
@@ -3,15 +3,16 @@
 
 pkgname=rhythmbox
 pkgver=3.4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Music playback and management application"
 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=(itstool intltool brasero gobject-introspection vala grilo 
libdmapsharing lirc libgpod
- libmtp gtk-doc yelp-tools git)
+depends=(dconf gst-plugins-base gst-plugins-good libsoup json-glib libnotify
+ libpeas media-player-info totem-plparser tdb python-gobject libgudev
+ grilo)
+makedepends=(itstool intltool brasero gobject-introspection vala libdmapsharing
+ lirc libgpod libmtp zeitgeist gtk-doc yelp-tools git)
 checkdepends=(check xorg-server-xvfb)
 optdepends=('gst-plugins-ugly: Extra media codecs'
 'gst-plugins-bad: Extra media codecs'
@@ -22,7 +23,8 @@
 'lirc: LIRC plugin'
 'libgpod: Portable Players - iPod plugin'
 'libmtp: Portable Players - MTP plugin'
-'gvfs-mtp: Portable Players - Android plugin')
+'gvfs-mtp: Portable Players - Android plugin'
+'zeitgeist: Zeitgeist logging plugin')
 _commit=473a28752bfd6260d74f41e3b0d737f71495f4a8  # tags/v3.4.4^0
 source=("git+https://gitlab.gnome.org/GNOME/rhythmbox.git#commit=$_commit;)
 sha512sums=('SKIP')
@@ -62,18 +64,15 @@
   make
 }
 
-check() {
+check() (
   cd $pkgname
-  glib-compile-schemas --targetdir=tests 
--schema-file=data/org.gnome.rhythmbox.gschema.xml
-  GSETTINGS_BACKEND=memory \
-  GSETTINGS_SCHEMA_DIR="$PWD/tests" \
-  CK_TIMEOUT_MULTIPLIER=3 \
-  xvfb-run -a -n 63 make check
-}
+  glib-compile-schemas "${GSETTINGS_SCHEMA_DIR:=$PWD/data}"
+  export GSETTINGS_SCHEMA_DIR GSETTINGS_BACKEND=memory CK_TIMEOUT_MULTIPLIER=3
+  xvfb-run -s '-nolisten local' make check
+)
 
 package() {
   cd $pkgname
   make DESTDIR="$pkgdir" install
   rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins"
-  rm -r "$pkgdir/usr/lib/rhythmbox/plugins/rbzeitgeist"
 }

[arch-commits] Commit in rhythmbox/trunk (PKGBUILD)

2021-04-21 Thread Jan Steffens via arch-commits 
Date: Wednesday, April 21, 2021 @ 12:38:47
  Author: heftig
Revision: 412969

3.4.4-3: FS#68537

Modified:
  rhythmbox/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-04-21 12:07:35 UTC (rev 412968)
+++ PKGBUILD2021-04-21 12:38:47 UTC (rev 412969)
@@ -3,7 +3,7 @@
 
 pkgname=rhythmbox
 pkgver=3.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Music playback and management application"
 arch=(x86_64)
 license=(GPL)
@@ -34,6 +34,10 @@
 
 prepare() {
   cd $pkgname
+
+  # https://bugs.archlinux.org/task/68537
+  git cherry-pick -n 3360f18d15cd6fabcadac56bc07d4ca133fa661f
+
   NOCONFIGURE=1 ./autogen.sh
 }