From e6738757e969e874a55097c792234c740be162b1 Mon Sep 17 00:00:00 2001
From: joborun <joborun@disroot.org>
Date: Sat, 13 Apr 2024 14:35:50 +0300
Subject: [PATCH] upg dbus-broker xf86-video-nouveau

---
 dbus-broker/PKGBUILD             | 16 ++++++----------
 dbus-broker/PKGBUILD-arch        | 13 ++++++++-----
 dbus-broker/deps                 |  1 +
 xf86-video-nouveau/PKGBUILD      | 12 +++++++-----
 xf86-video-nouveau/PKGBUILD-arch | 10 ++++++----
 xf86-video-nouveau/deps          |  2 ++
 6 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/dbus-broker/PKGBUILD b/dbus-broker/PKGBUILD
index 4857f06..34c6b64 100644
--- a/dbus-broker/PKGBUILD
+++ b/dbus-broker/PKGBUILD
@@ -8,21 +8,17 @@
 pkgname=dbus-broker
 # pkgbase=dbus-broker
 #pkgname=(dbus-broker dbus-broker-units)
-pkgver=35
-pkgrel=02
+pkgver=36
+pkgrel=01
 pkgdesc="Linux D-Bus Message Broker w/o systemd"
 url="https://github.com/bus1/dbus-broker/wiki"
-depends=(expat audit libcap-ng)
+depends=(expat audit libcap-ng dbus)
 makedepends=(meson python-docutils)
 #options=(debug) ###   uncomment this line to have debug pkg produced
 source=(https://github.com/bus1/dbus-broker/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc})
-#  patch is for systemd sockets and services
-#  0001-units-Enable-statically.patch)
 
 prepare() {
   cd $pkgname-$pkgver
-#  patch is for systemd sockets and services
-#  patch -Np1 -i ../0001-units-Enable-statically.patch
 }
 
 build() {
@@ -77,8 +73,8 @@ validpgpkeys=(BE5FBC8C9C1C9F60A4F0AEAE7A4F3A09EBDEFF26) # David Herrmann <dh.her
 
 license=("Apache-2.0")
 
-sha256sums=(d50daa31ff33f48693194596ea2aeb1a925183b59cdc82a550774e5c43982252  # dbus-broker-35.tar.xz
-	00d52c28ce46ad4d53a1c131f3c2755f5494d141405ce234241d50f457418c4f) # dbus-broker-35.tar.xz.asc
-#	a37cedf7fef8f513f4a79c9893c677ff68dd5184b3918a57c3ec0b0383ea6cb5) # 0001-units-Enable-statically.patch
+sha256sums=(d333d99bd2688135b6d6961e7ad1360099d186078781c87102230910ea4e162b  # dbus-broker-36.tar.xz
+	1482dec1feed235de1d8339b39730bfb37e68a84287b1dbf0012eb7a2e46adac) # dbus-broker-36.tar.xz.asc
 
+##  624353d874b1d41d5c0203fec87f081d1f31d9b6df4ff9952a962ed6c71e1c90  dbus-broker-36-01-x86_64.pkg.tar.lz
 
diff --git a/dbus-broker/PKGBUILD-arch b/dbus-broker/PKGBUILD-arch
index dd387c4..76839bd 100644
--- a/dbus-broker/PKGBUILD-arch
+++ b/dbus-broker/PKGBUILD-arch
@@ -6,8 +6,8 @@ pkgname=(
   dbus-broker
   dbus-broker-units
 )
-pkgver=35
-pkgrel=2
+pkgver=36
+pkgrel=1
 pkgdesc="Linux D-Bus Message Broker"
 url="https://github.com/bus1/dbus-broker/wiki"
 arch=(x86_64)
@@ -27,7 +27,7 @@ source=(
   https://github.com/bus1/dbus-broker/releases/download/v$pkgver/$pkgbase-$pkgver.tar.xz{,.asc}
   0001-units-Enable-statically.patch
 )
-b2sums=('2c270197d76ec157bf2fd8eb561b49cea2739d656fac8129c4ecdd0bbd5804f8e4e427414cb5f209eef4c22cf9559fc409170476d8df0e1d252c0b5aa2288e01'
+b2sums=('84a805982f038f0d9fe62b7f34de8ecbbdbd9b889edba05ab182f00116612545d2bf44d6ea0c6b5e121591a5ab3d2f0f6d5fa3dd413e8c36fe3494e35ac050f3'
         'SKIP'
         'c6ad58146a76dbb62548029cf84403ccba355a9ce74b8e081a27a6e3bf4535809741f0621b8a1396cbcb5be55434a90c169829c9b443952477e838c1036b84af')
 validpgpkeys=(
@@ -35,7 +35,7 @@ validpgpkeys=(
 )
 
 # https://github.com/bus1/dbus-broker/releases
-sha256sums=('d50daa31ff33f48693194596ea2aeb1a925183b59cdc82a550774e5c43982252'
+sha256sums=('d333d99bd2688135b6d6961e7ad1360099d186078781c87102230910ea4e162b'
             'SKIP'
             'a37cedf7fef8f513f4a79c9893c677ff68dd5184b3918a57c3ec0b0383ea6cb5')
 
@@ -85,7 +85,10 @@ package_dbus-broker() {
 
 package_dbus-broker-units() {
   pkgdesc+=" - Service units"
-  depends=(dbus-broker)
+  depends=(
+    dbus
+    dbus-broker
+  )
   provides=(dbus-units)
   conflicts=(dbus-daemon-units)
 
diff --git a/dbus-broker/deps b/dbus-broker/deps
index 83f1919..face929 100644
--- a/dbus-broker/deps
+++ b/dbus-broker/deps
@@ -1,5 +1,6 @@
 cmake
 meson
 python-docutils
+dbus
 
 
diff --git a/xf86-video-nouveau/PKGBUILD b/xf86-video-nouveau/PKGBUILD
index 33c6e70..5d08d5c 100644
--- a/xf86-video-nouveau/PKGBUILD
+++ b/xf86-video-nouveau/PKGBUILD
@@ -7,10 +7,10 @@
 
 pkgname=xf86-video-nouveau
 pkgver=1.0.17
-pkgrel=02
+pkgrel=03
 pkgdesc="Open Source 3D acceleration driver for nVidia cards"
 url="https://nouveau.freedesktop.org/"
-depends=('mesa')
+depends=('mesa' 'libdrm' 'glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=25.2')
 conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<25' 'X-ABI-VIDEODRV_VERSION>=26')
 groups=('xorg-drivers')
@@ -30,7 +30,7 @@ build() {
   # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
   export CFLAGS=${CFLAGS/-fno-plt}
   export CXXFLAGS=${CXXFLAGS/-fno-plt}
-  export LDFLAGS=${LDFLAGS/,-z,now}
+  export LDFLAGS=${LDFLAGS/-Wl,-z,now}
 
   ./configure --prefix=/usr
   make
@@ -39,13 +39,15 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
 
 #---- arch license gpg-key & sha256sums ----
 
 arch=(x86_64)
 
-license=('GPL')
+license=('MIT')
 
 validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst <maarten@debian.org>
 validpgpkeys+=('C9FA6B58BC799041500F769AC5469FB8758F9C2B') # "Lyude Paul <lyude@redhat.com>"
@@ -55,5 +57,5 @@ sha256sums=(499322e27a55c8183166bf2dd1e47d085eb834143e0d7036baba8427b90c156b # x
 	a20ed54d80990906940149cdeb0594373e7f0033778689277b8335b8c87c8929 # xf86-video-nouveau-1.0.17.tar.bz2.sig
 	1a24074aa7ae3226100e9fc4d58c911e23f64e32109c0516228b91e303d1d658) #  xorg-server-21.1.diff
 
-##  7129e19774a3627babb1959dea48f1a3235d8e80d0e17ab52e8b01a01a98f0f6  xf86-video-nouveau-1.0.17-02-x86_64.pkg.tar.xz
+##  8cab2a00cc4da000d429b3aba4c12f8aa69cac6b39d738ed89dcf39d0e4054be  xf86-video-nouveau-1.0.17-03-x86_64.pkg.tar.lz
 
diff --git a/xf86-video-nouveau/PKGBUILD-arch b/xf86-video-nouveau/PKGBUILD-arch
index 3dcf9aa..cfbd0dc 100644
--- a/xf86-video-nouveau/PKGBUILD-arch
+++ b/xf86-video-nouveau/PKGBUILD-arch
@@ -3,12 +3,12 @@
 
 pkgname=xf86-video-nouveau
 pkgver=1.0.17
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source 3D acceleration driver for nVidia cards"
 arch=('x86_64')
 url="https://nouveau.freedesktop.org/"
-license=('GPL')
-depends=('systemd-libs' 'mesa')
+license=('MIT')
+depends=('systemd-libs' 'mesa' 'libdrm' 'glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=25.2' 'systemd')
 conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<25' 'X-ABI-VIDEODRV_VERSION>=26')
 groups=('xorg-drivers')
@@ -34,7 +34,7 @@ build() {
   # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
   export CFLAGS=${CFLAGS/-fno-plt}
   export CXXFLAGS=${CXXFLAGS/-fno-plt}
-  export LDFLAGS=${LDFLAGS/,-z,now}
+  export LDFLAGS=${LDFLAGS/-Wl,-z,now}
 
   ./configure --prefix=/usr
   make
@@ -43,4 +43,6 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/xf86-video-nouveau/deps b/xf86-video-nouveau/deps
index e2f4f81..328983f 100644
--- a/xf86-video-nouveau/deps
+++ b/xf86-video-nouveau/deps
@@ -1,3 +1,5 @@
 mesa
 xorg-server
 xorg-server-devel
+
+