upg aom gcr gcr-4 pahole seatd

2024-06-12 16:09:56 +03:00 · 2024-06-12 16:09:56 +03:00 · d63e22e313
commit d63e22e313
parent 8fc2366c28
22 changed files with 283 additions and 134 deletions
--- a/aom/PKGBUILD
+++ b/aom/PKGBUILD
@ -8,11 +8,11 @@
 #pkgbase=aom
 #pkgname=(aom aom-docs)
 pkgname=(aom)
-pkgver=3.9.0
+pkgver=3.9.1
 pkgrel=01
 pkgdesc="Alliance for Open Media video codec"
 url="https://aomedia.org/"
-depends=(gcc-libs)
+depends=(gcc-libs glibc)
 makedepends=(cmake doxygen ninja yasm)
 source=(https://storage.googleapis.com/aom-releases/libaom-$pkgver.tar.gz{,.asc})

@ -31,6 +31,12 @@ build() {
    -D ENABLE_TESTS=0
  )

+#  # arch: upstream wants this off
+#  # joborun: but we tried without removing the FORTIFY=3 and it builds, it feels safer this way
+#  # although upstream may disagree, tough!
+#  CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=0}"
+#  CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=0}"
+
  cmake -S libaom-$pkgver -B build -G Ninja "${cmake_options[@]}"
  cmake --build build
 }
@ -61,11 +67,11 @@ license=(BSD-3-Clause)

 validpgpkeys=(B002F08B74A148DAA01F7123A48E86DB0B830498) # AOMedia release signing key <av1-discuss@aomedia.org>

-b2sums=('4c68b58f6a8e347ee912e309a030804c4a3cc99714e2aaf127add63222df3056c7cf4b6c50f4861557b0892739035149b5e002e25272882eff55cde5d9b745b7'
+b2sums=('2f983a4a563e16120aa8937e059f4cd267fb60b6d4148f952f1e664a50b84bc0d8ba7629231b60e4263963d97559a819752a4fa0dcf2427c9f94036716221324'
         'SKIP')

-sha256sums=(a662e22299752547488c8e1412c0b41981efa8dbb1a25c696ded7ba9c472e919  # libaom-3.9.0.tar.gz
-	ba6ac7520def7446e9a97f0ac148811f678f33486fb959788916d000a5a1ff4c) # libaom-3.9.0.tar.gz.asc
+sha256sums=(dba99fc1c28aaade28dda59821166b2fa91c06162d1bc99fde0ddaad7cecc50e  # libaom-3.9.1.tar.gz
+	f70b719f09954bb48fd584ac769cb7ee946bdee144e9532e6644852a616cba20) # libaom-3.9.1.tar.gz.asc

-##  89425235edc337ef3104a83fb78c151d406a077d908bb1021b580ac241f88a91  aom-3.9.0-01-x86_64.pkg.tar.lz
+##  efeeab740bd543125a920abc705c9d952ea7f7c4888470cb50ab29e7f429018e  aom-3.9.1-01-x86_64.pkg.tar.lz

--- a/aom/PKGBUILD-arch
+++ b/aom/PKGBUILD-arch
@ -6,7 +6,7 @@ pkgname=(
  aom
  aom-docs
 )
-pkgver=3.9.0
+pkgver=3.9.1
 pkgrel=1
 pkgdesc="Alliance for Open Media video codec"
 url="https://aomedia.org/"
@ -14,6 +14,7 @@ arch=(x86_64)
 license=(BSD-3-Clause)
 depends=(
  gcc-libs
+  glibc
 )
 makedepends=(
  cmake
@ -24,7 +25,7 @@ makedepends=(
 source=(
  https://storage.googleapis.com/aom-releases/libaom-$pkgver.tar.gz{,.asc}
 )
-b2sums=('4c68b58f6a8e347ee912e309a030804c4a3cc99714e2aaf127add63222df3056c7cf4b6c50f4861557b0892739035149b5e002e25272882eff55cde5d9b745b7'
+b2sums=('2f983a4a563e16120aa8937e059f4cd267fb60b6d4148f952f1e664a50b84bc0d8ba7629231b60e4263963d97559a819752a4fa0dcf2427c9f94036716221324'
        'SKIP')
 validpgpkeys=(
  B002F08B74A148DAA01F7123A48E86DB0B830498 # AOMedia release signing key <av1-discuss@aomedia.org>
@ -45,6 +46,10 @@ build() {
    -D ENABLE_TESTS=0
  )

+  # upstream wants this off
+  CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=0}"
+  CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=0}"
+
  cmake -S libaom-$pkgver -B build -G Ninja "${cmake_options[@]}"
  cmake --build build
 }
--- a/cups/PKGBUILD
+++ b/cups/PKGBUILD
@ -7,8 +7,8 @@

 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=2.4.8
-pkgrel=02
+pkgver=2.4.9
+pkgrel=01
 epoch=2
 url="https://openprinting.github.io/cups/"
 makedepends=('acl' 'pam' 'gnutls' 'cups-filters' 'colord' 
@ -21,8 +21,7 @@ source=(https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-$
        cups-2.4.0-statedir.patch
        # bugfixes
        cups-freebind.patch
-        guid.patch
-        0001-Fix-HTTP-query-in-web-interface-fixes-954.patch)
+        guid.patch)
 #options=(!makeflags)

 prepare() {
@ -40,9 +39,6 @@ prepare() {
  # FS#56818 - https://github.com/apple/cups/issues/5236
  patch -Np1 -i "${srcdir}"/guid.patch

-  # Fix HTTP query in web interface - #1
-  patch -Np1 -i "${srcdir}"/0001-Fix-HTTP-query-in-web-interface-fixes-954.patch
-
  # Rebuild configure script
  aclocal -I config-scripts
  autoconf -I config-scripts
@ -189,17 +185,17 @@ validpgpkeys=(7082A0A50A2E92640F3880E0E4522DCC9B246FF7 # Zdenek Dohnal (The old
 	845464660B686AAB36540B6F999559A027815955) # "Michael R Sweet <michael.r.sweet@gmail.com>"
 #	7ADB58203CA5F046F28025B215AA6A7F4D4227D7) # "Zdenek Dohnal (Associate Software Engineer) <zdohnal@redhat.com>"
  
-sha256sums=(75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0  # cups-2.4.8-source.tar.gz
-	90b77f587d1d452279e51141fbbe7c34afd929d4215d251f4a0433bcc01052e6  # cups-2.4.8-source.tar.gz.sig
+sha256sums=(38fbf4535a10554113e013d54fedda03ee88007ea6a9761d626a04e1e4489e8c  # cups-2.4.9-source.tar.gz
+	bf692097f69ff845ba826a2795ca664d089d2f02dcfc10131e2e0b36c862e133  # cups-2.4.9-source.tar.gz.sig
 	d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9  # cups.logrotate
 	57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5  # cups.pam
 	06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2  # cups.sysusers
 	f0b15192952c151b1843742c87850ff3a7d0f3ba5dd236ed16623ef908472ad7  # cups-2.4.0-statedir.patch
 	3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d  # cups-freebind.patch
-	1b1c3268bdff6627b78070b6cd9abec6ef41572c27abbafccb237199f7137653  # guid.patch
-	2fb4bf61c2c9322d4f3595553d2aa637fee375cc93383922494fd7f76f013e84) # 0001-Fix-HTTP-query-in-web-interface-fixes-954.patch
+	1b1c3268bdff6627b78070b6cd9abec6ef41572c27abbafccb237199f7137653) # guid.patch
+ 

-##  125176d5ad2f694999240792c53e2bfcd0edee65124cdf90b4e235b43545e9c2  cups-2_2.4.8-02-x86_64.pkg.tar.lz
-##  0201965221cfef6add3f90a95cfe6d1681a8e7d55a0ecbbbba32641eff222fd1  libcups-2_2.4.8-02-x86_64.pkg.tar.lz
+##  75badf82f035b59e73869dcaf4dc50b96a8077469bb8c56a454feda230a8d6ff  cups-2_2.4.9-01-x86_64.pkg.tar.lz
+##  2279cdca50640dcbb1da7f4754cf893ff6ae7c6076442e9830c0eefa8a8ca3dc  libcups-2_2.4.9-01-x86_64.pkg.tar.lz


--- a/cups/PKGBUILD-arch
+++ b/cups/PKGBUILD-arch
@ -2,8 +2,8 @@

 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=2.4.8
-pkgrel=2
+pkgver=2.4.9
+pkgrel=1
 epoch=2
 arch=('x86_64')
 license=('Apache-2.0 WITH LLVM-exception AND BSD-3-Clause AND Zlib AND BSD-2-Clause')
@ -19,17 +19,15 @@ source=(https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-$
        # bugfixes
        cups-freebind.patch
        guid.patch
-        0001-Fix-HTTP-query-in-web-interface-fixes-954.patch
 )
-sha256sums=('75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0'
+sha256sums=('38fbf4535a10554113e013d54fedda03ee88007ea6a9761d626a04e1e4489e8c'
            'SKIP'
            'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
            '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
            '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2'
            'f0b15192952c151b1843742c87850ff3a7d0f3ba5dd236ed16623ef908472ad7'
            '3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d'
-            '1b1c3268bdff6627b78070b6cd9abec6ef41572c27abbafccb237199f7137653'
-            '2fb4bf61c2c9322d4f3595553d2aa637fee375cc93383922494fd7f76f013e84')
+            '1b1c3268bdff6627b78070b6cd9abec6ef41572c27abbafccb237199f7137653')
 #validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security@cups.org>
 #validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org <security@cups.org>"
 #validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet <michael.r.sweet@gmail.com>"
@ -52,9 +50,6 @@ prepare() {
  # FS#56818 - https://github.com/apple/cups/issues/5236
  patch -Np1 -i "${srcdir}"/guid.patch

-  # Fix HTTP query in web interface - #1
-  patch -Np1 -i "${srcdir}"/0001-Fix-HTTP-query-in-web-interface-fixes-954.patch
-
  # Rebuild configure script
  aclocal -I config-scripts
  autoconf -I config-scripts
--- a/gcr-4/PKGBUILD
+++ b/gcr-4/PKGBUILD
@ -8,26 +8,26 @@
 #pkgbase=gcr-4
 #pkgname=(gcr-4 gcr-4-docs)
 pkgname=(gcr-4)
-pkgver=4.2.1
-pkgrel=02
+pkgver=4.3.0
+pkgrel=01
 pkgdesc="A library for bits of crypto UI and parsing w/o systemd"
 url="https://gitlab.gnome.org/GNOME/gcr"
-depends=(glib2 libgcrypt p11-kit libsecret openssh)
-makedepends=(gobject-introspection vala git gi-docgen meson gtk4)
-_commit=7f9dfb291ac475beac911c3868bebd4561267a82  # tags/4.2.1^0
-source=("git+https://gitlab.gnome.org/GNOME/gcr.git#commit=$_commit")
+makedepends=(gobject-introspection vala git gi-docgen meson gtk4 glib2-devel)
+#_commit=7f9dfb291ac475beac911c3868bebd4561267a82  # tags/4.2.1^0
+#source=("git+https://gitlab.gnome.org/GNOME/gcr.git#commit=$_commit")
+source=("git+https://gitlab.gnome.org/GNOME/gcr.git?signed#tag=$pkgver")

-pkgver() {
-  cd gcr
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
+#pkgver() {
+#  cd gcr
+#  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+#}

 prepare() {
  cd gcr
 }

 build() {
-  arch-meson gcr build -D systemd=disabled
+  arch-meson gcr build -D systemd=disabled -D crypto=gnutls
  meson compile -C build
 }

@ -37,6 +37,7 @@ check() {
 }

 package_gcr-4() {
+  depends=(glib2 glibc gnutls libp11-kit libsecret openssh)
  optdepends=('gtk4: gcr-viewer-gtk4')
  provides=(libgck-2.so libgcr-4.so)
 #  install=gcr-4.install   ##  enables systemd ssh sockets for systemctl
@ -61,7 +62,14 @@ arch=(x86_64)

 license=(LGPL-2.1-or-later)

+validpgpkeys=(EF3226243ABEFC1A828BC5B46A2AC2B52126D946  # Dhanuka Warusadura <dhanuka@gnome.org>
+	  A7C626E13F9AD776776BD9CA1D8A57CF2E8D36A3) # Niels De Graef (nielsdg) <nielsdegraef@gmail.com>
+
+b2sums=('32e952b36530e18a63fb9c4d348575282adc48c2738846a40ec3a2207f1ede731c3e791bd123818e82bc628a17366fd8e68bff2ffdefcc166dd15cd18d29926c')
 sha256sums=(SKIP)

-##  71c5ebba7f0aaf11ae82faab4c6a60f843a998646ea681647f446f5724c53848  gcr-4-4.2.1-02-x86_64.pkg.tar.lz
-
+##  
+##  
+##  
+##  
+##  
--- a/gcr-4/PKGBUILD-arch
+++ b/gcr-4/PKGBUILD-arch
@ -6,43 +6,48 @@ pkgname=(
  gcr-4
  gcr-4-docs
 )
-pkgver=4.2.1
-pkgrel=2
+pkgver=4.3.0
+pkgrel=1
 pkgdesc="A library for bits of crypto UI and parsing"
 url="https://gitlab.gnome.org/GNOME/gcr"
 arch=(x86_64)
 license=(LGPL-2.1-or-later)
 depends=(
  glib2
-  libgcrypt
+  glibc
+  gnutls
+  libp11-kit
  libsecret
  openssh
-  p11-kit
-  systemd
+  systemd-libs
 )
 makedepends=(
  gi-docgen
  git
+  glib2-devel
  gobject-introspection
  gtk4
  meson
+  systemd
  vala
 )
-_commit=7f9dfb291ac475beac911c3868bebd4561267a82  # tags/4.2.1^0
-source=("git+https://gitlab.gnome.org/GNOME/gcr.git#commit=$_commit")
-b2sums=('SKIP')
-
-pkgver() {
-  cd gcr
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
+source=("git+https://gitlab.gnome.org/GNOME/gcr.git?signed#tag=$pkgver")
+b2sums=('32e952b36530e18a63fb9c4d348575282adc48c2738846a40ec3a2207f1ede731c3e791bd123818e82bc628a17366fd8e68bff2ffdefcc166dd15cd18d29926c')
+validpgpkeys=(
+  EF3226243ABEFC1A828BC5B46A2AC2B52126D946 # Dhanuka Warusadura <dhanuka@gnome.org>
+  A7C626E13F9AD776776BD9CA1D8A57CF2E8D36A3 # Niels De Graef (nielsdg) <nielsdegraef@gmail.com>
+)

 prepare() {
  cd gcr
 }

 build() {
-  arch-meson gcr build
+  local meson_options=(
+    -D crypto=gnutls
+  )
+
+  arch-meson gcr build "${meson_options[@]}"
  meson compile -C build
 }

--- a/gcr-4/deps
+++ b/gcr-4/deps
@ -1,16 +1,11 @@
+git
+meson
 gobject-introspection
 vala
 gi-docgen
 gtk4
+glib2-devel
 openssh
-git
-meson
-gettext
-libgit2
-libjpeg-turbo
-at-spi2-core
-graphite
-rav1e
-libglvnd
+aom


--- a/gcr-4/deps.0
+++ b/gcr-4/deps.0
@ -0,0 +1,17 @@
+gobject-introspection
+vala
+gi-docgen
+gtk4
+openssh
+git
+meson
+gettext
+libgit2
+libjpeg-turbo
+at-spi2-core
+graphite
+rav1e
+libglvnd
+glib2-devel
+
+
--- a/gcr-4/key
+++ b/gcr-4/key
@ -0,0 +1 @@
+gpg --recv-key 6A2AC2B52126D946
--- a/gcr/PKGBUILD
+++ b/gcr/PKGBUILD
@ -9,19 +9,19 @@
 #pkgname=(gcr gcr-docs)
 pkgname=gcr
 pkgver=3.41.2
-pkgrel=01
+pkgrel=02
 pkgdesc="A library for bits of crypto UI and parsing w/o systemd"
 url="https://gitlab.gnome.org/GNOME/gcr"
-depends=(gtk3 libgcrypt p11-kit openssh libsecret)
-makedepends=(gobject-introspection vala libxslt git gi-docgen meson)
+makedepends=(gobject-introspection vala libxslt git gi-docgen meson glib2-devel)
 # options=(debug)  ###  remove this to have the debug pkg produced
-_commit=cd63e8a0378e13ba0aa15c2a68d1070fa62e6532  # tags/3.41.2^0
-source=("git+https://gitlab.gnome.org/GNOME/gcr.git#commit=$_commit")
+#_commit=cd63e8a0378e13ba0aa15c2a68d1070fa62e6532  # tags/3.41.2^0
+#source=("git+https://gitlab.gnome.org/GNOME/gcr.git#commit=$_commit")
+source=("git+https://gitlab.gnome.org/GNOME/gcr.git?signed#tag=$pkgver")

-pkgver() {
-  cd gcr
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
+#pkgver() {
+#  cd gcr
+#  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+#}

 prepare() {
  cd gcr
@ -42,6 +42,10 @@ check() {

 #package_gcr() {
 package() {
+  depends=(gtk3 libgcrypt openssh libsecret
+           cairo dconf gdk-pixbuf2 glib2 glibc
+           hicolor-icon-theme libp11-kit pango)
+
  provides=(libgck-1.so libgcr-{base,ui}-3.so)
 #  install=gcr.install   ##  enables systemd ssh sockets for systemctl

@ -53,7 +57,10 @@ package() {

 #package_gcr-docs() {
 #  pkgdesc+=" (documentation)"
-#  depends=()
+#  depends=(gtk3 libgcrypt openssh libsecret
+#          cairo dconf gdk-pixbuf2 glib2 glibc
+#          hicolor-icon-theme libp11-kit pango)
+#
 #
 #  mv doc/* "$pkgdir"
 #}
@ -64,6 +71,11 @@ arch=(x86_64)

 license=(LGPL-2.1-or-later)

+validpgpkeys=(EF3226243ABEFC1A828BC5B46A2AC2B52126D946  # Dhanuka Warusadura <dhanuka@gnome.org>
+	  A7C626E13F9AD776776BD9CA1D8A57CF2E8D36A3) # Niels De Graef (nielsdg) <nielsdegraef@gmail.com>
+
+b2sums=('8fee923174d0b350a924994d6fada63c2deac46859f62b09cd7adca971ab47ae4c5f82b69a03e203254da695f46f05457c9a081923010e1437dec035d28f07ed')
 sha256sums=(SKIP)
 
-##  dc62d7660e7e6f7b555c079c5fce079d8eeced150792e10394db0d268b9bde11  gcr-3.41.2-01-x86_64.pkg.tar.lz
+##  
+##  
--- a/gcr/PKGBUILD-arch
+++ b/gcr/PKGBUILD-arch
@ -7,34 +7,40 @@ pkgname=(
  gcr-docs
 )
 pkgver=3.41.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for bits of crypto UI and parsing"
 url="https://gitlab.gnome.org/GNOME/gcr"
 arch=(x86_64)
 license=(LGPL-2.1-or-later)
 depends=(
+  cairo
+  dconf
+  gdk-pixbuf2
+  glib2
+  glibc
  gtk3
+  hicolor-icon-theme
  libgcrypt
+  libp11-kit
  libsecret
  openssh
-  p11-kit
+  pango
 )
 makedepends=(
  gi-docgen
  git
+  glib2-devel
  gobject-introspection
  libxslt
  meson
  vala
 )
-_commit=cd63e8a0378e13ba0aa15c2a68d1070fa62e6532  # tags/3.41.2^0
-source=("git+https://gitlab.gnome.org/GNOME/gcr.git#commit=$_commit")
-b2sums=('SKIP')
-
-pkgver() {
-  cd gcr
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
+source=("git+https://gitlab.gnome.org/GNOME/gcr.git?signed#tag=$pkgver")
+b2sums=('8fee923174d0b350a924994d6fada63c2deac46859f62b09cd7adca971ab47ae4c5f82b69a03e203254da695f46f05457c9a081923010e1437dec035d28f07ed')
+validpgpkeys=(
+  EF3226243ABEFC1A828BC5B46A2AC2B52126D946 # Dhanuka Warusadura <dhanuka@gnome.org>
+  A7C626E13F9AD776776BD9CA1D8A57CF2E8D36A3 # Niels De Graef (nielsdg) <nielsdegraef@gmail.com>
+)

 prepare() {
  cd gcr
--- a/gcr/deps
+++ b/gcr/deps
@ -9,5 +9,6 @@ libgit2
 libjpeg-turbo
 at-spi2-core
 openssh
+glib2-devel


--- a/gcr/key
+++ b/gcr/key
@ -0,0 +1 @@
+gpg --recv-key 1D8A57CF2E8D36A3
--- a/pahole/0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch
+++ b/pahole/0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch
@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Tue, 11 Jun 2024 23:57:52 +0200
+Subject: [PATCH] CMakeLists.txt: Install ostra.py into Python3_SITELIB dir
+
+Otherwise ostra-cg won't be able to find it. I'm not sure what
+the "/usr/share/dwarves/runtime/python/" directory is supposed to be.
+
+Signed-off-by: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ca1bf2173a7..ca997bc040c5 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -188,7 +188,7 @@ install(FILES dwarves.h dwarves_emit.h dwarves_reorganize.h
+ install(FILES man-pages/pahole.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/)
+ if(Python3_FOUND)
+ 	install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+-	install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python)
+	install(FILES ostra/python/ostra.py DESTINATION ${Python3_SITELIB})
+ endif()
+ install(PROGRAMS btfdiff fullcircle DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+ install(FILES lib/Makefile lib/ctracer_relay.c lib/ctracer_relay.h lib/linux.blacklist.cu
--- a/pahole/PKGBUILD
+++ b/pahole/PKGBUILD
@ -7,20 +7,20 @@

 pkgbase=pahole
 pkgname=(pahole ostra-cg)
-pkgver=1.26
-pkgrel=02
+pkgver=1.27
+pkgrel=01
 epoch=1
 pkgdesc="Pahole and other DWARF utils"
 url="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
 makedepends=(bash cmake libelf ninja python python-matplotlib zlib glibc)
 source=(https://fedorapeople.org/~acme/dwarves/dwarves-$pkgver.tar.{xz,sign}
-	python.diff)
+	0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch)

 prepare() {
  cd dwarves-$pkgver

  # https://bugs.archlinux.org/task/70013
-  patch -Np1 -i ../python.diff
+  patch -Np1 -i ../0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch
 }

 build() {
@ -80,14 +80,14 @@ license=(GPL-2.0-only)

 validpgpkeys=(2DBF5BAA46FB4DED338A335BD65016F35352AA40)  # Arnaldo Carvalho de Melo <acme@kernel.org>

-b2sums=('cb86bf964f22633432e80d335937379c2096877c6130f49dbe03f2653b7c932bb1c5d87621ac93383be9e4f35294a4f95aadb6392491fb782812db519b39b666'
+b2sums=('0a0f8ec8bf26240e17dc3319e76e16299514d662a79b25c4c962f723127f55d185d557adba7230d23b2e2b38fc62044aaa3474a458dc3df2000260637f995121'
         'SKIP'
-        'd423eb1e05b634516ae1cf652e291fd559650b00b016ed35d0f2bd8ccb04ffd9e1ed1c53e95d86039d656651633792932544de1871a09cb8b4953fa8026492e9')
+        '02962095407cdbf191428884b83c3392e39d4acdad0c6a952655daec8b871bab8962c3716c9479192118eef81afe412203ac46600a2d702733254c6d7219f7d2')

-sha256sums=(ad4c08339850e404609e2808012580b7e98366d2b91054bb93fe6dca94651fb4  # dwarves-1.26.tar.xz
-	67c02c3714cd778b4c4b5c5ea808f6921ee9bf855d1ea6a816943d73037c4c1e  # dwarves-1.26.tar.sign
-	b208e4fc49c11caaa7fb3fdc8840ecb0cdb84e6d73312a97f6e68f9eb81dd622) # python.diff
+sha256sums=(81e227af6fe6a3228d64211a80209f7cd86022a6bd48c53302124cef76154505  # dwarves-1.27.tar.xz
+	da406e9776fe3c111490747127f8ae1a1ac062d01cb6aaea4baedac9fcf30525  # dwarves-1.27.tar.sign
+	345a2fe5502f5699c9d1ae994c2d3fe6ec1558f58d406816820e1c44d352ccca) # 0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch

-##  7af7dd0926996f7e63af1f80873dd61c43b390059711048eaa5ad75cac15ba31  ostra-cg-1:1.26-02-x86_64.pkg.tar.lz
-##  bb4561f540eb9b9d87da41caed13b26addf7358b42352540dd7619a047c2c78b  pahole-1:1.26-02-x86_64.pkg.tar.lz
+##  a82f3126b278ce1803c07665be1c0abbc6f6a811ce386e0cb973129ebdf70db7  ostra-cg-1_1.27-01-x86_64.pkg.tar.lz
+##  af430caa6efc56bd253a59bde9c616488a1a0cc4131df35faf078314766e5a53  pahole-1_1.27-01-x86_64.pkg.tar.lz

--- a/pahole/PKGBUILD-arch
+++ b/pahole/PKGBUILD-arch
@ -5,8 +5,8 @@ pkgname=(
  pahole
  ostra-cg
 )
-pkgver=1.26
-pkgrel=2
+pkgver=1.27
+pkgrel=1
 epoch=1
 pkgdesc="Pahole and other DWARF utils"
 url="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
@ -24,11 +24,11 @@ makedepends=(
 )
 source=(
  https://fedorapeople.org/~acme/dwarves/dwarves-$pkgver.tar.{xz,sign}
-  python.diff
+  0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch
 )
-b2sums=('cb86bf964f22633432e80d335937379c2096877c6130f49dbe03f2653b7c932bb1c5d87621ac93383be9e4f35294a4f95aadb6392491fb782812db519b39b666'
+b2sums=('0a0f8ec8bf26240e17dc3319e76e16299514d662a79b25c4c962f723127f55d185d557adba7230d23b2e2b38fc62044aaa3474a458dc3df2000260637f995121'
        'SKIP'
-        'd423eb1e05b634516ae1cf652e291fd559650b00b016ed35d0f2bd8ccb04ffd9e1ed1c53e95d86039d656651633792932544de1871a09cb8b4953fa8026492e9')
+        '02962095407cdbf191428884b83c3392e39d4acdad0c6a952655daec8b871bab8962c3716c9479192118eef81afe412203ac46600a2d702733254c6d7219f7d2')
 validpgpkeys=(
  2DBF5BAA46FB4DED338A335BD65016F35352AA40  # Arnaldo Carvalho de Melo <acme@kernel.org>
 )
@ -37,7 +37,7 @@ prepare() {
  cd dwarves-$pkgver

  # https://bugs.archlinux.org/task/70013
-  patch -Np1 -i ../python.diff
+  patch -Np1 -i ../0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch
 }

 build() {
--- a/pahole/time
+++ b/pahole/time
@ -1,6 +1,6 @@


-real	0m16.583s
-user	0m27.463s
-sys	0m1.838s
- 
+real	0m13.434s
+user	0m32.125s
+sys	0m2.996s
+ D
--- a/seatd/PKGBUILD
+++ b/seatd/PKGBUILD
@ -7,26 +7,34 @@

 pkgname=seatd
 pkgver=0.8.0
-pkgrel=02
-pkgdesc="A minimal seat management daemon, and a universal seat management library"
-url="https://sr.ht/~kennylevinsen/seatd/"
-provides=("libseat.so")
+pkgrel=03  # we rebuilt this from git instead of tarball added a note about runit seatd svc
+pkgdesc="Seat management daemon and a universal seat management library"
+conflicts=(seatd-git libseat)
+provides=("seatd" "libseat.so")
 replaces=("libseat")
-makedepends=('meson' 'ninja' 'scdoc')
-source=("$pkgname-$pkgver.tar.gz::https://git.sr.ht/~kennylevinsen/seatd/archive/$pkgver.tar.gz"
+makedepends=(meson ninja scdoc git)
+url="https://git.sr.ht/~kennylevinsen/seatd"
+source=("git+$url#tag=${pkgver}"
 	"sysuser.conf")
+install=$pkgname.install
+
+#pkgver() {
+#  cd $pkgname
+#  printf 'r%d.%s' \
+#    $(git rev-list --count HEAD) \
+#    $(git rev-parse HEAD | head -c10)
+#}

 build() {
-    mkdir build
-    meson --prefix=/usr \
-          --buildtype=plain \
-          -Dexamples="disabled" \
-          -Dserver="enabled" \
-          -Dlibseat-logind="disabled" \
-          -Dman-pages="enabled" \
-          "$pkgname-$pkgver" \
-          build
-    ninja -C build
+  mkdir -p build
+  arch-meson seatd build \
+	--prefix=/usr \
+	--buildtype=plain \
+	-Dexamples="disabled" \
+	-Dserver="enabled" \
+	-Dlibseat-logind="disabled" \
+	-Dman-pages="enabled"
+  ninja -C build
 }

 check() {
@ -34,13 +42,8 @@ check() {
 }

 package() {
-    DESTDIR="$pkgdir/" ninja -C build install
-    install -Dm644 "$pkgname-$pkgver/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/"
-
-#    # Allow users in the "seat" group to access seatd, and provide a service
-#    # that will be necessary for e.g. wlroots-based seat management
-#    install -Dm644 "seatd-$pkgver/contrib/systemd/seatd.service" \
-#            -t "$pkgdir/usr/lib/systemd/system/"
+  DESTDIR="$pkgdir" ninja -C build install
+    install -Dm644 "$pkgname/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/"
    install -Dm644 "sysuser.conf" "$pkgdir/usr/lib/sysusers.d/seatd.conf"
 }

@ -50,7 +53,8 @@ arch=(x86_64)

 license=('MIT')

-sha256sums=(a562a44ee33ccb20954a1c1ec9a90ecb2db7a07ad6b18d0ac904328efbcf65a0  # seatd-0.8.0.tar.gz
+sha256sums=(SKIP
+	# a562a44ee33ccb20954a1c1ec9a90ecb2db7a07ad6b18d0ac904328efbcf65a0  # seatd-0.8.0.tar.gz
 	e833292adf5da25b5258a5209c258f0e4c12e1d6fe81cf228fd0cfb575080d78) # sysuser.conf

-##  6b997cc29e49a43493a4f4564af13ef3bb342f1bcedcc67388895338e4001aa1  seatd-0.8.0-02-x86_64.pkg.tar.lz
+##  0afb572709b0dd8639a8eb672fb8d6c4cb8f3300a56d619a301b576fc512abde  seatd-0.8.0-03-x86_64.pkg.tar.lz
--- a/seatd/PKGBUILD-tarball
+++ b/seatd/PKGBUILD-tarball
@ -0,0 +1,53 @@
+#!/usr/bin/bash
+# JOBoRun		: Jwm OpenBox Obarun RUNit
+# Maintainer	: Joe Bo Run <joborun@disroot.org>
+# PkgSource		: url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
+# Website		: https://pozol.eu
+#-----------------------------------------| DESCRIPTION |---------------------------------------
+
+pkgname=seatd
+pkgver=0.8.0
+pkgrel=03
+pkgdesc="A minimal seat management daemon, and a universal seat management library"
+url="https://sr.ht/~kennylevinsen/seatd/"
+provides=("libseat.so")
+replaces=("libseat")
+makedepends=('meson' 'ninja' 'scdoc')
+source=("$pkgname-$pkgver.tar.gz::https://git.sr.ht/~kennylevinsen/seatd/archive/$pkgver.tar.gz"
+	"sysuser.conf")
+install=seatd.install
+
+build() {
+    mkdir build
+    meson --prefix=/usr \
+          --buildtype=plain \
+          -Dexamples="disabled" \
+          -Dserver="enabled" \
+          -Dlibseat-logind="disabled" \
+          -Dman-pages="enabled" \
+          "$pkgname-$pkgver" \
+          build
+    ninja -C build
+}
+
+check() {
+    ninja -C build test
+}
+
+package() {
+    DESTDIR="$pkgdir/" ninja -C build install
+    install -Dm644 "$pkgname-$pkgver/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/"
+    install -Dm644 "sysuser.conf" "$pkgdir/usr/lib/sysusers.d/seatd.conf"
+#    # Allow users in the "seat" group to access seatd, and provide a service
+#    # that will be necessary for e.g. wlroots-based seat management
+}
+
+#---- arch license gpg-key & sha256sums ----
+
+arch=(x86_64)
+
+license=('MIT')
+
+sha256sums=(a562a44ee33ccb20954a1c1ec9a90ecb2db7a07ad6b18d0ac904328efbcf65a0  # seatd-0.8.0.tar.gz
+	e833292adf5da25b5258a5209c258f0e4c12e1d6fe81cf228fd0cfb575080d78) # sysuser.conf
+
--- a/seatd/clean
+++ b/seatd/clean
@ -1 +1 @@
-rm -rf {src,pkg,seatd*tar.gz}
+rm -rf {src,pkg,seatd}
--- a/seatd/deps
+++ b/seatd/deps
@ -1,5 +1,6 @@
 meson
 ninja
 scdoc
+git


--- a/seatd/seatd.install
+++ b/seatd/seatd.install
@ -0,0 +1,17 @@
+post_install() {
+
+    echo "seatd from runit-service-scripts does not require dbus to be running for seatd to run"
+    echo "if you want to ensure dbus is running copy the script from /usr/lib/runit/sv/seatd "
+    echo "to /etc/runit/sv/ and uncomment the line in run for the  dbus check"
+    echo "to activate runit supervision use the following command as root"
+    echo "sudo ln -sf /etc/runit/sv/seatd /etc/runit/runsvdir/default/"
+    echo "if you are not running dbus in your system use the original script as"
+    echo "sudo ln -sf /usr/lib/runit/sv/seatd /etc/runit/runsvdir/default/"
+
+}
+
+post_upgrade() {
+
+    post_install
+}
+