upg glib2 procps-ng
This commit is contained in:
parent
dc9f1dab8c
commit
d021420f7f
7 changed files with 72 additions and 18 deletions
|
@ -8,7 +8,7 @@
|
|||
#pkgbase=glib2
|
||||
#pkgname=(glib2 glib2-docs)
|
||||
pkgname=glib2
|
||||
pkgver=2.76.4
|
||||
pkgver=2.76.5
|
||||
pkgrel=01
|
||||
pkgdesc="Low level core library"
|
||||
url="https://wiki.gnome.org/Projects/GLib"
|
||||
|
@ -18,7 +18,7 @@ makedepends=(gettext shared-mime-info python libelf git util-linux
|
|||
#checkdepends=(desktop-file-utils glib2)
|
||||
#options=(debug staticlibs) ### uncomment this to have the debug pkg produced
|
||||
options=(staticlibs)
|
||||
_commit=f522c3f94d67493c58e9b0e27a7862c2e7ec105b # tags/2.76.4^0
|
||||
_commit=f0171c9eccdf9ebeabb074d4683fc9cfc41f4e60 # tags/2.76.5^0
|
||||
source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
|
||||
"git+https://gitlab.gnome.org/GNOME/gvdb.git"
|
||||
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
|
||||
|
@ -123,4 +123,4 @@ sha256sums=(SKIP
|
|||
557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8 # gio-querymodules.hook
|
||||
64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25) # glib-compile-schemas.hook
|
||||
|
||||
## 23f663eef2f62cc38f49e76bff3615d6f24bc29d8b989becc43d8db6f9026b48 glib2-2.76.4-01-x86_64.pkg.tar.lz
|
||||
## 8bd417b3f771007d7a2cf8f8660a55409b47b7a34aa08be302c9ee142d55b380 glib2-2.76.5-01-x86_64.pkg.tar.lz
|
||||
|
|
|
@ -6,7 +6,7 @@ pkgname=(
|
|||
glib2
|
||||
glib2-docs
|
||||
)
|
||||
pkgver=2.76.4
|
||||
pkgver=2.76.5
|
||||
pkgrel=1
|
||||
pkgdesc="Low level core library"
|
||||
url="https://wiki.gnome.org/Projects/GLib"
|
||||
|
@ -38,7 +38,7 @@ options=(
|
|||
debug
|
||||
staticlibs
|
||||
)
|
||||
_commit=f522c3f94d67493c58e9b0e27a7862c2e7ec105b # tags/2.76.4^0
|
||||
_commit=f0171c9eccdf9ebeabb074d4683fc9cfc41f4e60 # tags/2.76.5^0
|
||||
source=(
|
||||
"git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
|
||||
"git+https://gitlab.gnome.org/GNOME/gvdb.git"
|
||||
|
|
|
@ -9,5 +9,6 @@ libxslt
|
|||
cmake
|
||||
valgrind
|
||||
gtk-doc
|
||||
libglvnd
|
||||
|
||||
|
||||
|
|
43
procps-ng/0001-build-sys-Add-systemd-elogind-to-w.patch
Normal file
43
procps-ng/0001-build-sys-Add-systemd-elogind-to-w.patch
Normal file
|
@ -0,0 +1,43 @@
|
|||
From ca004d4657d5e8b468a4552ede429be53193a3a9 Mon Sep 17 00:00:00 2001
|
||||
From: Craig Small <csmall@dropbear.xyz>
|
||||
Date: Thu, 31 Aug 2023 22:24:23 +1000
|
||||
Subject: build-sys: Add systemd/elogind to w
|
||||
|
||||
Depending on the compiler flags, w needs to be explictly linked
|
||||
to libsystemd or elogind even though libproc2 is linked to it.
|
||||
|
||||
Signed-off-by: Craig Small <csmall@dropbear.xyz>
|
||||
---
|
||||
Makefile.am | 7 +++++++
|
||||
NEWS | 3 +++
|
||||
2 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index f70c8fb1..ddfc0141 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -149,6 +149,13 @@ endif
|
||||
|
||||
dist_man_MANS += man/w.1
|
||||
src_w_SOURCES = src/w.c local/fileutils.c
|
||||
+src_w_LDADD = $(LDADD)
|
||||
+if WITH_SYSTEMD
|
||||
+src_w_LDADD += @SYSTEMD_LIBS@
|
||||
+endif
|
||||
+if WITH_ELOGIND
|
||||
+src_w_LDADD += @ELOGIND_LIBS@
|
||||
+endif
|
||||
else
|
||||
EXTRA_DIST += man/w.1
|
||||
endif
|
||||
diff --git a/NEWS b/NEWS
|
||||
index 3f2158d4..4ad9f74e 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -1,3 +1,6 @@
|
||||
+procps-ng-NEXT
|
||||
+---------------
|
||||
+
|
||||
procps-ng-4.0.4
|
||||
---------------
|
||||
* library (API & ABI unchanged)
|
|
@ -6,22 +6,24 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=procps-ng
|
||||
pkgver=4.0.3
|
||||
pkgrel=02
|
||||
pkgver=4.0.4
|
||||
pkgrel=01
|
||||
pkgdesc='Utilities for monitoring your system and its processes w/o systemd'
|
||||
url='https://gitlab.com/procps-ng/procps'
|
||||
depends=(glibc ncurses libncursesw.so)
|
||||
|
||||
conflicts=(procps sysvinit-tools)
|
||||
provides=(procps sysvinit-tools libproc2.so)
|
||||
replaces=(procps sysvinit-tools)
|
||||
options=('!emptydirs')
|
||||
source=(https://downloads.sourceforge.net/project/$pkgname/Production/${pkgname}-${pkgver}.tar.xz{,.asc}
|
||||
'sysctl.conf')
|
||||
# 0001-build-sys-Add-systemd-elogind-to-w.patch)
|
||||
|
||||
|
||||
prepare() {
|
||||
cd procps-ng-$pkgver
|
||||
sed 's:<ncursesw/:<:g' -i src/watch.c
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
build() {
|
||||
|
@ -55,9 +57,8 @@ license=(GPL LGPL)
|
|||
|
||||
validpgpkeys=(5D2FB320B825D93904D205193938F96BDF50FEA5) # Craig Small <csmall@debian.org>
|
||||
|
||||
sha256sums=(303c8ec4f96ae18d8eaef86c2bd0986938764a45dc505fe0a0af868c674dba92 # procps-ng-4.0.3.tar.xz
|
||||
954700968c51367407cfdd0e13398038a127b716a5cb0996c354928b646a6700 # procps-ng-4.0.3.tar.xz.asc
|
||||
sha256sums=(22870d6feb2478adb617ce4f09a787addaf2d260c5a8aa7b17d889a962c5e42e # procps-ng-4.0.4.tar.xz
|
||||
ff4787b2f45cc99d06e7c6d8e00a55d45ba942a3cc7e1f3ef6720b0dd091e077 # procps-ng-4.0.4.tar.xz.asc
|
||||
1bba9d009539f9fe18c19f5c4f4272da276f5c13c8b21e7291baf2374deb5d24) # sysctl.conf
|
||||
|
||||
## bcb188dc9595e95e3dabd6241f030dca709478ce0b5fadb1d6047599786a10da procps-ng-4.0.3-02-x86_64.pkg.tar.lz
|
||||
|
||||
## e8b208e66a6e7819265b94bc04b97d654b5ac2cc6f345537ccc9054adda80c01 procps-ng-4.0.4-01-x86_64.pkg.tar.lz
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
# Contributor: Eric Bélanger <eric@archlinux.org>
|
||||
|
||||
pkgname=procps-ng
|
||||
pkgver=4.0.3
|
||||
pkgver=4.0.4
|
||||
pkgrel=1
|
||||
pkgdesc='Utilities for monitoring your system and its processes'
|
||||
url='https://gitlab.com/procps-ng/procps'
|
||||
|
@ -18,15 +18,20 @@ provides=(procps sysvinit-tools libproc2.so)
|
|||
replaces=(procps sysvinit-tools)
|
||||
options=('!emptydirs')
|
||||
validpgpkeys=('5D2FB320B825D93904D205193938F96BDF50FEA5') # Craig Small <csmall@debian.org>
|
||||
source=(https://downloads.sourceforge.net/project/$pkgname/Production/${pkgname}-${pkgver}.tar.xz{,.asc})
|
||||
sha256sums=('303c8ec4f96ae18d8eaef86c2bd0986938764a45dc505fe0a0af868c674dba92'
|
||||
'SKIP')
|
||||
b2sums=('138995397aa2ae742a457a4b2ddd65f67ba29d2eb9bd330a6e44f3cb65e93fc87122f3bd4cc8d10c0d73c7981a3d0d0472949d2d3b83c582cd0376c713698d1f'
|
||||
'SKIP')
|
||||
source=(https://downloads.sourceforge.net/project/$pkgname/Production/${pkgname}-${pkgver}.tar.xz{,.asc}
|
||||
0001-build-sys-Add-systemd-elogind-to-w.patch)
|
||||
sha256sums=('22870d6feb2478adb617ce4f09a787addaf2d260c5a8aa7b17d889a962c5e42e'
|
||||
'SKIP'
|
||||
'77ed82ad684c71319704080a09c7d65efa1b06db4f35b240de7c30fef4caafc5')
|
||||
b2sums=('63b972666ef9e92042be96739ffa15c787d0346b2d3ffcb0d240b0a4e999dc90024b2c5b058df683dd9d2c436ceb812abd0b115cc877a6ca1023988b86de443f'
|
||||
'SKIP'
|
||||
'021b64fac3b48175ec67d180fc294c674088ece483f0ab358c2cfbdbd519ac6dea13274a66624beda79b00c0c770441e7f8369f3a75a90f7cafd469508a81e16')
|
||||
|
||||
prepare() {
|
||||
cd procps-ng-$pkgver
|
||||
sed 's:<ncursesw/:<:g' -i src/watch.c
|
||||
patch -Np1 < ../0001-build-sys-Add-systemd-elogind-to-w.patch
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
@ -1,2 +1,6 @@
|
|||
|
||||
|
||||
|
||||
autoconf
|
||||
gettext
|
||||
automake
|
||||
|
|
Loading…
Reference in a new issue