Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save depau/a1193a86228a9b0f5cf7291b28373e7f to your computer and use it in GitHub Desktop.
Save depau/a1193a86228a9b0f5cf7291b28373e7f to your computer and use it in GitHub Desktop.
Patches for obs-xdg-portal-git
From 81b4613a576e031e15be98f4b27ffdd262f2676d Mon Sep 17 00:00:00 2001
From: Davide Depau <[email protected]>
Date: Wed, 13 May 2020 19:30:08 +0200
Subject: [PATCH 1/3] Set the non-git package as provided by this package
---
.SRCINFO | 2 ++
PKGBUILD | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.SRCINFO b/.SRCINFO
index 4ae00fb..0beed18 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,8 @@ pkgbase = obs-xdg-portal-git
makedepends = git
depends = obs-studio
depends = gst-plugins-base-libs
+ provides = obs-xdg-portal
+ conflicts = obs-xdg-portal
source = git+https://gitlab.gnome.org/feaneron/obs-xdg-portal
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index ff5b10f..e34ab36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,8 @@
# Maintainer: Rafael Fontenelle <[email protected]>
-pkgname=obs-xdg-portal-git
+# Contributor: Davide Depau <[email protected]>
+
+_pkgname="obs-xdg-portal"
+pkgname="${_pkgname}-git"
pkgver=0.1.2
pkgrel=1
pkgdesc="OBS Studio plugin using the Desktop portal for Wayland & X11 screencasting"
@@ -8,6 +11,8 @@ url="https://gitlab.gnome.org/feaneron/obs-xdg-portal"
license=('GPL')
depends=('obs-studio' 'gst-plugins-base-libs')
makedepends=('meson' 'git')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
source=("git+$url")
md5sums=('SKIP')
--
2.26.2
From 708902b4a9b37679c2c4e8c63d6e0a4fae4020ca Mon Sep 17 00:00:00 2001
From: Davide Depau <[email protected]>
Date: Wed, 13 May 2020 19:34:28 +0200
Subject: [PATCH 2/3] Use pkgver as documented in VCS package guidelines
---
.SRCINFO | 4 ++--
PKGBUILD | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.SRCINFO b/.SRCINFO
index 0beed18..8e27adc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = obs-xdg-portal-git
pkgdesc = OBS Studio plugin using the Desktop portal for Wayland & X11 screencasting
- pkgver = 0.1.2
+ pkgver = 0.1.2.r0.gfc5876a
pkgrel = 1
url = https://gitlab.gnome.org/feaneron/obs-xdg-portal
arch = x86_64
@@ -11,7 +11,7 @@ pkgbase = obs-xdg-portal-git
depends = gst-plugins-base-libs
provides = obs-xdg-portal
conflicts = obs-xdg-portal
- source = git+https://gitlab.gnome.org/feaneron/obs-xdg-portal
+ source = obs-xdg-portal::git+https://gitlab.gnome.org/feaneron/obs-xdg-portal
md5sums = SKIP
pkgname = obs-xdg-portal-git
diff --git a/PKGBUILD b/PKGBUILD
index e34ab36..ebb0303 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname="obs-xdg-portal"
pkgname="${_pkgname}-git"
-pkgver=0.1.2
+pkgver=0.1.2.r0.gfc5876a
pkgrel=1
pkgdesc="OBS Studio plugin using the Desktop portal for Wayland & X11 screencasting"
arch=(x86_64)
@@ -13,12 +13,12 @@ depends=('obs-studio' 'gst-plugins-base-libs')
makedepends=('meson' 'git')
provides=("${_pkgname}")
conflicts=("${_pkgname}")
-source=("git+$url")
+source=("${_pkgname}::git+$url")
md5sums=('SKIP')
pkgver() {
- cd "obs-xdg-portal"
- git describe --tags | sed 's/-/+/g'
+ cd "${_pkgname}"
+ git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
--
2.26.2
From 576ac33bec3b07ab64a1fe3c407383f8800c0119 Mon Sep 17 00:00:00 2001
From: Davide Depau <[email protected]>
Date: Wed, 13 May 2020 19:39:49 +0200
Subject: [PATCH 3/3] Use arch-meson
---
PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/PKGBUILD b/PKGBUILD
index ebb0303..4c5febf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ pkgver() {
}
build() {
- meson --prefix /usr --buildtype=plain "obs-xdg-portal" build
+ arch-meson "${_pkgname}" build
ninja -C build
}
--
2.26.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment