upg glib2 zlib
This commit is contained in:
parent
33f379a5a6
commit
0ce2545e40
7 changed files with 70 additions and 72 deletions
|
|
@ -8,23 +8,23 @@
|
|||
#pkgbase=glib2
|
||||
#pkgname=(glib2 glib2-docs)
|
||||
pkgname=glib2
|
||||
pkgver=2.78.3
|
||||
pkgver=2.78.4
|
||||
pkgrel=01
|
||||
pkgdesc="Low level core library"
|
||||
#url="https://wiki.gnome.org/Projects/GLib"
|
||||
url="https://gitlab.gnome.org/GNOME/glib"
|
||||
depends=(pcre2 libffi util-linux-libs zlib) # libsysprof-capture)
|
||||
makedepends=(gettext shared-mime-info python libelf git util-linux
|
||||
meson dbus gtk3)
|
||||
#checkdepends=(desktop-file-utils glib2)
|
||||
depends=(libffi pcre2 util-linux-libs zlib) # libsysprof-capture
|
||||
makedepends=(gettext git libelf meson python shared-mime-info util-linux libxslt) #libsysprof-capture
|
||||
checkdepends=(desktop-file-utils glib2)
|
||||
#options=(debug staticlibs) ### uncomment this to have the debug pkg produced
|
||||
options=(staticlibs)
|
||||
_commit=03f7c1fbf3a3784cb4c3604f83ca3645e9225577 # tags/2.78.3^0
|
||||
_commit=00edb7f7453a43cff343f9e99d49f2e421e4345c # tags/2.78.4^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
|
||||
gio-querymodules.hook
|
||||
glib-compile-schemas.hook)
|
||||
"git+https://gitlab.gnome.org/GNOME/gvdb.git"
|
||||
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
|
||||
gio-querymodules.hook
|
||||
glib-compile-schemas.hook)
|
||||
# docbook.xsl::https://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl)
|
||||
|
||||
pkgver() {
|
||||
cd glib
|
||||
|
|
@ -37,21 +37,20 @@ prepare() {
|
|||
# Suppress noise from glib-compile-schemas.hook
|
||||
git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
|
||||
|
||||
# # Unbreak Firefox
|
||||
# # https://gitlab.gnome.org/GNOME/glib/-/issues/3196
|
||||
# git cherry-pick -n b097adf18aedbb13b3d0e4cf260c3fede8d8995e
|
||||
|
||||
git submodule init
|
||||
git submodule set-url subprojects/gvdb "$srcdir/gvdb"
|
||||
git -c protocol.file.allow=always submodule update
|
||||
}
|
||||
|
||||
build() {
|
||||
# use fat LTO objects for static libraries
|
||||
CFLAGS+=' -ffat-lto-objects -g3'
|
||||
CXXFLAGS+=' -ffat-lto-objects -g3'
|
||||
# Produce more debug info: GLib has a lot of useful macros
|
||||
# CFLAGS+=" -g3"
|
||||
# CXXFLAGS+=" -g3"
|
||||
|
||||
# use fat LTO objects for static libraries
|
||||
CFLAGS+=' -ffat-lto-objects'
|
||||
CXXFLAGS+=' -ffat-lto-objects'
|
||||
|
||||
CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
|
||||
arch-meson glib build \
|
||||
--default-library both \
|
||||
-D glib_debug=disabled \
|
||||
|
|
@ -59,6 +58,7 @@ build() {
|
|||
-D sysprof=disabled \
|
||||
-D man=true \
|
||||
-D gtk_doc=false
|
||||
|
||||
meson compile -C build
|
||||
}
|
||||
|
||||
|
|
@ -73,8 +73,8 @@ build() {
|
|||
#package_glib2() {
|
||||
package() {
|
||||
depends+=(libmount.so libffi.so)
|
||||
provides+=(libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so
|
||||
libgthread-2.0.so)
|
||||
|
||||
provides+=(libg{lib,io,module,object,thread}-2.0.so)
|
||||
optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report'
|
||||
'libelf: gresource inspection tool')
|
||||
|
||||
|
|
@ -82,6 +82,7 @@ package() {
|
|||
|
||||
install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
|
||||
# install -D gio-querymodules.script "$pkgdir/usr/share/libalpm/scripts/gio-querymodules"
|
||||
touch "$pkgdir/usr/lib/gio/modules/.keep"
|
||||
|
||||
python -m compileall -d /usr/share/glib-2.0/codegen \
|
||||
"$pkgdir/usr/share/glib-2.0/codegen"
|
||||
|
|
@ -93,14 +94,12 @@ package() {
|
|||
# # Split docs
|
||||
# mkdir -p docs/usr/share
|
||||
# mv {"$pkgdir",docs}/usr/share/gtk-doc
|
||||
#
|
||||
}
|
||||
|
||||
#package_glib2-docs() {
|
||||
# pkgdesc="Documentation for GLib"
|
||||
# depends=()
|
||||
# license+=(custom)
|
||||
|
||||
# license+=(LicenseRef-Public-Domain)
|
||||
# mv -t "$pkgdir" docs/*
|
||||
# install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 glib/docs/reference/COPYING
|
||||
#}
|
||||
|
|
@ -109,15 +108,15 @@ package() {
|
|||
|
||||
arch=(x86_64)
|
||||
|
||||
license=(LGPL)
|
||||
license=(LGPL-2.1-or-later)
|
||||
|
||||
validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall (https://endlessos.org/) <pwithnall@endlessos.org>
|
||||
|
||||
sha256sums=(SKIP
|
||||
SKIP
|
||||
sha256sums=(SKIP # glib
|
||||
SKIP # gvdb
|
||||
7f8ee5db60987f0d0feba84643e1cf988c98a294a681fb8d4fce1a5b2c25d1d3 # 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
|
||||
557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8 # gio-querymodules.hook
|
||||
64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25) # glib-compile-schemas.hook
|
||||
# 06cfa9a2549c408abb6c0f699cba5e94e81e5235f934a68f03d43f88263cb19f) # docbook.xsl
|
||||
|
||||
## fdb1d6809b849aab5c7b370df007a5c3f896d36c6fd73c26c73130657cc5c54b glib2-2.78.3-01-x86_64.pkg.tar.lz
|
||||
|
||||
## 853acb903ca87b4f03306df5779481f4d430ed9d256381474238337c2e1a59ef glib2-2.78.4-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
|
||||
# Maintainer: Fabian Bornschein <fabiscafe@archlinux.org>
|
||||
# Contributor: Jan de Groot <jgc@archlinux.org>
|
||||
|
||||
pkgbase=glib2
|
||||
|
|
@ -6,11 +7,11 @@ pkgname=(
|
|||
glib2
|
||||
glib2-docs
|
||||
)
|
||||
pkgver=2.78.3
|
||||
pkgver=2.78.4
|
||||
pkgrel=1
|
||||
pkgdesc="Low level core library"
|
||||
url="https://gitlab.gnome.org/GNOME/glib"
|
||||
license=(LGPL)
|
||||
license=(LGPL-2.1-or-later)
|
||||
arch=(x86_64)
|
||||
depends=(
|
||||
libffi
|
||||
|
|
@ -38,7 +39,7 @@ options=(
|
|||
debug
|
||||
staticlibs
|
||||
)
|
||||
_commit=03f7c1fbf3a3784cb4c3604f83ca3645e9225577 # tags/2.78.3^0
|
||||
_commit=00edb7f7453a43cff343f9e99d49f2e421e4345c # tags/2.78.4^0
|
||||
source=(
|
||||
"git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
|
||||
"git+https://gitlab.gnome.org/GNOME/gvdb.git"
|
||||
|
|
@ -125,7 +126,7 @@ package_glib2() {
|
|||
package_glib2-docs() {
|
||||
pkgdesc+=" - documentation"
|
||||
depends=()
|
||||
license+=(custom)
|
||||
license+=(LicenseRef-Public-Domain)
|
||||
|
||||
mv -t "$pkgdir" docs/*
|
||||
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 glib/docs/reference/COPYING
|
||||
|
|
|
|||
11
glib2/deps
11
glib2/deps
|
|
@ -1,15 +1,8 @@
|
|||
git
|
||||
gettext
|
||||
shared-mime-info
|
||||
meson
|
||||
desktop-file-utils
|
||||
gtk3
|
||||
at-spi2-core
|
||||
python
|
||||
shared-mime-info
|
||||
libxslt
|
||||
cmake
|
||||
valgrind
|
||||
gtk-doc
|
||||
libglvnd
|
||||
graphite
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
real 4m24.412s
|
||||
user 14m46.615s
|
||||
sys 1m9.144s
|
||||
real 3m22.833s
|
||||
user 10m39.602s
|
||||
sys 0m48.837s
|
||||
|
||||
|
|
|
|||
|
|
@ -9,20 +9,19 @@ pkgbase=zlib
|
|||
pkgname=(zlib minizip)
|
||||
pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
|
||||
epoch=1
|
||||
pkgver=1.3
|
||||
pkgrel=02
|
||||
pkgver=1.3.1
|
||||
pkgrel=01
|
||||
url="https://www.zlib.net/"
|
||||
depends=('glibc')
|
||||
makedepends=('automake' 'autoconf')
|
||||
options=('staticlibs') # needed by binutils testsuite
|
||||
#options=('staticlibs' 'debug') ## uncomment this to have the debug pkg produced
|
||||
source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc}
|
||||
zlib-1.3-CVE-2023-45853.patch::https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c.patch)
|
||||
|
||||
source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc})
|
||||
# zlib-1.3-CVE-2023-45853.patch::https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c.patch)
|
||||
|
||||
prepare() {
|
||||
cd $pkgbase-$pkgver/contrib/minizip
|
||||
patch -Np3 < "${srcdir}/zlib-1.3-CVE-2023-45853.patch"
|
||||
# patch -Np3 < "${srcdir}/zlib-1.3-CVE-2023-45853.patch"
|
||||
cp Makefile Makefile.orig
|
||||
cp ../README.contrib readme.txt
|
||||
autoreconf -fiv
|
||||
|
|
@ -70,14 +69,24 @@ license=(Zlib)
|
|||
|
||||
validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA')
|
||||
|
||||
sha256sums=(ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e # zlib-1.3.tar.gz
|
||||
bf1e20cc852e179fa38093565c3910d5ad9cd44eee4c45dd7e5445adcc0be1c3 # zlib-1.3.tar.gz.asc
|
||||
7aa0221bf62796c29ae665ef3dd138489e1995b7095924dc035104959da13417) # zlib-1.3-CVE-2023-45853.patch
|
||||
sha512sums=(580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f # zlib-1.3.1.tar.gz
|
||||
02e6e9c4087a5e9eae160df76b8ff3f3c9623ca5cb06a1d26079688b17787a38c22fbf583d4af407d5f903fc53c526e718d0168a7536fd55fe813d4c7182db97) #zlib-1.3.1.tar.gz.asc
|
||||
|
||||
#sha512sums=('1e8e70b362d64a233591906a1f50b59001db04ca14aaffad522198b04680be501736e7d536b4191e2f99767e7001ca486cd802362cca2be05d5d409b83ea732d'
|
||||
# SKIP)
|
||||
#b2sums=('42d109223801a493de6d52e7343403d7fc3234a6ca816425fe41ac9c18019b01b93841acd28a235e99f2256a6a17f93624e96b2ddb58d588c8190a6bedb82910'
|
||||
# 'SKIP')
|
||||
|
||||
sha256sums=(9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 # zlib-1.3.1.tar.gz
|
||||
57266943f4c8f8a3c653e0f33ceb90c1207ea1f96b0b3f22ecf47581d2e67c99) # zlib-1.3.1.tar.gz.asc
|
||||
|
||||
# 7aa0221bf62796c29ae665ef3dd138489e1995b7095924dc035104959da13417) # zlib-1.3-CVE-2023-45853.patch
|
||||
|
||||
# Note to packager:
|
||||
ls -l *pkg.tar.lz
|
||||
echo "you must rename this package to meet SF naming before you move to the repo"
|
||||
echo "mv $pkgname-$epoch:$pkgver-$pkgrel-$arch.pkg.tar.lz $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz"
|
||||
#ls -l *pkg.tar.lz
|
||||
#echo "you must rename this package to meet SF naming before you move to the repo"
|
||||
#echo "mv $pkgname-$epoch:$pkgver-$pkgrel-$arch.pkg.tar.lz $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz"
|
||||
|
||||
## d3bae1f9b26c620178649e3e09b270be99853107a0c4554e5fde5ebe7727e4bf minizip-1_1.3.1-01-x86_64.pkg.tar.lz
|
||||
## 429181638eed54acf1bbb29a48228c20cefd71f14502c7fd5897d54d3891e4b7 zlib-1_1.3.1-01-x86_64.pkg.tar.lz
|
||||
|
||||
## 731add84f49cc773541fd2da4056215265b339daf7957eaed9ee78e60d2185f4 minizip-1_1.3-02-x86_64.pkg.tar.lz
|
||||
## adcb4679cd923d0367ca16a7937610f727cdf33bd06a7a4be7e075cd33978e62 zlib-1_1.3-02-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
pkgbase=zlib
|
||||
pkgname=(zlib minizip)
|
||||
epoch=1
|
||||
pkgver=1.3
|
||||
pkgrel=2
|
||||
pkgver=1.3.1
|
||||
pkgrel=1
|
||||
pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
|
||||
arch=(x86_64)
|
||||
license=(Zlib)
|
||||
|
|
@ -15,19 +15,15 @@ options=(
|
|||
staticlibs # needed by binutils testsuite
|
||||
debug
|
||||
)
|
||||
source=(https://github.com/madler/zlib/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
|
||||
zlib-1.3-CVE-2023-45853.patch::https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c.patch)
|
||||
sha512sums=('3868ac4da5842dd36c9dad794930675b9082ce15cbd099ddb79c0f6bd20a24aa8f33a123f378f26fe0ae02d91f31f2994dccaac565cedeaffed7b315e6ded2a2'
|
||||
'SKIP'
|
||||
'77de58fec1875b72ba47e2c21ff5cafd3251924baf047b4eb520fdecc63e9414c34d9224dae86982161d7e4f867120c6a7f4c5165adf6b090205513865e82e09')
|
||||
b2sums=('5fe0f32339267348a313f23a21e9588bdb180b7415be303c85f5f169444d019e5f176ef7322f6e64297c360acc2a6041c50e2f66d1860e5c392d8970990f176a'
|
||||
'SKIP'
|
||||
'bba55b9074c6ac863b5dc65c3a087a2f5b9190e69106d9b2009ec3bd89e20a940091cb10464b3014c46c3c2e5248d578169164dfb9096b8ebcea08de4feee442')
|
||||
source=(https://github.com/madler/zlib/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc})
|
||||
sha512sums=('1e8e70b362d64a233591906a1f50b59001db04ca14aaffad522198b04680be501736e7d536b4191e2f99767e7001ca486cd802362cca2be05d5d409b83ea732d'
|
||||
'SKIP')
|
||||
b2sums=('42d109223801a493de6d52e7343403d7fc3234a6ca816425fe41ac9c18019b01b93841acd28a235e99f2256a6a17f93624e96b2ddb58d588c8190a6bedb82910'
|
||||
'SKIP')
|
||||
validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') # Mark Adler <madler@alumni.caltech.edu>
|
||||
|
||||
prepare() {
|
||||
cd $pkgbase-$pkgver/contrib/minizip
|
||||
patch -Np3 < "${srcdir}/zlib-1.3-CVE-2023-45853.patch"
|
||||
cp Makefile Makefile.orig
|
||||
cp ../README.contrib readme.txt
|
||||
autoreconf -fiv
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
real 0m15.388s
|
||||
user 0m13.875s
|
||||
sys 0m1.209s
|
||||
real 0m21.195s
|
||||
user 0m17.915s
|
||||
sys 0m2.887s
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue