[arch-commits] Commit in (11 files)

Balló György bgyorgy at archlinux.org
Mon Mar 11 17:12:49 UTC 2019


    Date: Monday, March 11, 2019 @ 17:12:48
  Author: bgyorgy
Revision: 439780

Use meson consistently in my packages

Modified:
  budgie-desktop/trunk/PKGBUILD
  deja-dup/trunk/PKGBUILD
  eolie/trunk/PKGBUILD
  feedreader/trunk/PKGBUILD
  gnome-mpv/trunk/PKGBUILD
  gnome-multi-writer/trunk/PKGBUILD
  libmanette/trunk/PKGBUILD
  phodav/trunk/PKGBUILD
  pitivi/trunk/PKGBUILD
  retro-gtk/trunk/PKGBUILD
  sparkleshare/trunk/PKGBUILD

-----------------------------------+
 budgie-desktop/trunk/PKGBUILD     |    2 +-
 deja-dup/trunk/PKGBUILD           |    2 +-
 eolie/trunk/PKGBUILD              |    2 +-
 feedreader/trunk/PKGBUILD         |    2 +-
 gnome-mpv/trunk/PKGBUILD          |    2 +-
 gnome-multi-writer/trunk/PKGBUILD |   15 +++------------
 libmanette/trunk/PKGBUILD         |   12 +++---------
 phodav/trunk/PKGBUILD             |    2 +-
 pitivi/trunk/PKGBUILD             |    9 +++------
 retro-gtk/trunk/PKGBUILD          |   12 +++---------
 sparkleshare/trunk/PKGBUILD       |    2 +-
 11 files changed, 19 insertions(+), 43 deletions(-)

Modified: budgie-desktop/trunk/PKGBUILD
===================================================================
--- budgie-desktop/trunk/PKGBUILD	2019-03-11 16:25:08 UTC (rev 439779)
+++ budgie-desktop/trunk/PKGBUILD	2019-03-11 17:12:48 UTC (rev 439780)
@@ -72,7 +72,7 @@
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C build install
+	DESTDIR="$pkgdir" meson install -C build
 
 	cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
 	make DESTDIR="$pkgdir" install

Modified: deja-dup/trunk/PKGBUILD
===================================================================
--- deja-dup/trunk/PKGBUILD	2019-03-11 16:25:08 UTC (rev 439779)
+++ deja-dup/trunk/PKGBUILD	2019-03-11 17:12:48 UTC (rev 439780)
@@ -28,5 +28,5 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
 }

Modified: eolie/trunk/PKGBUILD
===================================================================
--- eolie/trunk/PKGBUILD	2019-03-11 16:25:08 UTC (rev 439779)
+++ eolie/trunk/PKGBUILD	2019-03-11 17:12:48 UTC (rev 439780)
@@ -38,5 +38,5 @@
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C build install
+	DESTDIR="$pkgdir" meson install -C build
 }

Modified: feedreader/trunk/PKGBUILD
===================================================================
--- feedreader/trunk/PKGBUILD	2019-03-11 16:25:08 UTC (rev 439779)
+++ feedreader/trunk/PKGBUILD	2019-03-11 17:12:48 UTC (rev 439780)
@@ -38,5 +38,5 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
 }

Modified: gnome-mpv/trunk/PKGBUILD
===================================================================
--- gnome-mpv/trunk/PKGBUILD	2019-03-11 16:25:08 UTC (rev 439779)
+++ gnome-mpv/trunk/PKGBUILD	2019-03-11 17:12:48 UTC (rev 439780)
@@ -21,5 +21,5 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
 }

Modified: gnome-multi-writer/trunk/PKGBUILD
===================================================================
--- gnome-multi-writer/trunk/PKGBUILD	2019-03-11 16:25:08 UTC (rev 439779)
+++ gnome-multi-writer/trunk/PKGBUILD	2019-03-11 17:12:48 UTC (rev 439780)
@@ -14,20 +14,11 @@
 source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
 sha256sums=('098c1586962698c86e586925d9ea52262eaa17dbe2bab74230f2dff8a45ad0cb')
 
-prepare() {
-	mkdir build
-}
-
 build() {
-	cd build
-	meson ../$pkgname-$pkgver \
-		--prefix=/usr \
-                --libexecdir=lib/$pkgname \
-		--buildtype=release
-	ninja
+  arch-meson $pkgname-$pkgver build
+  ninja -C build
 }
 
 package() {
-	cd build
-	DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" meson install -C build
 }

Modified: libmanette/trunk/PKGBUILD
===================================================================
--- libmanette/trunk/PKGBUILD	2019-03-11 16:25:08 UTC (rev 439779)
+++ libmanette/trunk/PKGBUILD	2019-03-11 17:12:48 UTC (rev 439780)
@@ -12,17 +12,11 @@
 source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
 sha256sums=('8b1b9fbaf84f1e383141a5715a2494f507e62313721ad993c39a868fc5ccf7d2')
 
-prepare() {
-  mkdir build
-}
-
 build() {
-  cd build
-  meson --prefix=/usr --buildtype=release ../$pkgname-$pkgver
-  ninja
+  arch-meson $pkgname-$pkgver build
+  ninja -C build
 }
 
 package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" meson install -C build
 }

Modified: phodav/trunk/PKGBUILD
===================================================================
--- phodav/trunk/PKGBUILD	2019-03-11 16:25:08 UTC (rev 439779)
+++ phodav/trunk/PKGBUILD	2019-03-11 17:12:48 UTC (rev 439780)
@@ -25,7 +25,7 @@
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C build install
+	DESTDIR="$pkgdir" meson install -C build
 
 	install -dm755 "$pkgdir/etc/conf.d/"
 	echo 'SPICE_WEBDAVD_EXTRA_ARGS=""' > "$pkgdir/etc/conf.d/spice-webdavd"

Modified: pitivi/trunk/PKGBUILD
===================================================================
--- pitivi/trunk/PKGBUILD	2019-03-11 16:25:08 UTC (rev 439779)
+++ pitivi/trunk/PKGBUILD	2019-03-11 17:12:48 UTC (rev 439780)
@@ -21,7 +21,6 @@
 sha256sums=('cb6f8a831383e698c2117ca7caec77b8167a6b2e2b0fb9c375e6a4f7c815b757')
 
 prepare() {
-  mkdir -p build
   cd $pkgname-$pkgver
 
   # Don't use legacy path for AppStream metainfo file
@@ -30,12 +29,10 @@
 }
 
 build() {
-  cd build
-  meson --prefix=/usr --buildtype=release ../$pkgname-$pkgver
-  ninja
+  arch-meson $pkgname-$pkgver build
+  ninja -C build
 }
 
 package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" meson install -C build
 }

Modified: retro-gtk/trunk/PKGBUILD
===================================================================
--- retro-gtk/trunk/PKGBUILD	2019-03-11 16:25:08 UTC (rev 439779)
+++ retro-gtk/trunk/PKGBUILD	2019-03-11 17:12:48 UTC (rev 439780)
@@ -15,17 +15,11 @@
 source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
 sha256sums=('f3c65e52da19f96dedc33e20ea899bf94e914cc8f85ad12e9957d09421bed8c8')
 
-prepare() {
-  mkdir build
-}
-
 build() {
-  cd build
-  meson --prefix=/usr --buildtype=release ../$pkgname-$pkgver
-  ninja
+  arch-meson $pkgname-$pkgver build
+  ninja -C build
 }
 
 package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" meson install -C build
 }

Modified: sparkleshare/trunk/PKGBUILD
===================================================================
--- sparkleshare/trunk/PKGBUILD	2019-03-11 16:25:08 UTC (rev 439779)
+++ sparkleshare/trunk/PKGBUILD	2019-03-11 17:12:48 UTC (rev 439780)
@@ -51,5 +51,5 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
 }


More information about the arch-commits mailing list