From 3fb69d5da46a5dd4ad71bc2e8622bd7ed4a483e5 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Fri, 30 Sep 2022 01:03:25 +0300 Subject: [PATCH] upg gnumeric goffice --- gnumeric/PKGBUILD | 11 +++++++---- gnumeric/PKGBUILD-arch | 6 +++--- gnumeric/PKGBUILD-aur | 4 ++-- gnumeric/deps | 1 - gnumeric/time | 9 ++++++--- goffice/PKGBUILD | 6 ++++-- goffice/PKGBUILD-arch | 4 ++-- goffice/deps | 1 + 8 files changed, 25 insertions(+), 17 deletions(-) diff --git a/gnumeric/PKGBUILD b/gnumeric/PKGBUILD index 5b5a7c0..9946c86 100644 --- a/gnumeric/PKGBUILD +++ b/gnumeric/PKGBUILD @@ -6,22 +6,24 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=gnumeric -pkgver=1.12.52 -pkgrel=02 +pkgver=1.12.53 +pkgrel=01 pkgdesc="A GNOME-less spreadsheet program" arch=('x86_64') url="http://www.gnumeric.org/" depends=('goffice') makedepends=('intltool' 'itstool' 'yelp-tools') +#_commit=858ea03fa5efd3beccc82e8dc269f35b76133d94 conflicts=('gnumeric-minimal') provides=('gnumeric') options=('libtool') source=(https://gitlab.gnome.org/GNOME/gnumeric/-/archive/GNUMERIC_${pkgver//./_}/gnumeric-GNUMERIC_${pkgver//./_}.tar.bz2 revert-warnings.patch) +#source=("git+https://gitlab.gnome.org/GNOME/gnumeric.git#commit=$_commit" +# revert-warnings.patch) prepare() { cd ${pkgname}-GNUMERIC_${pkgver//./_} -# cd $pkgname patch -Np0 -i ../revert-warnings.patch NOCONFIGURE=1 ./autogen.sh } @@ -48,6 +50,7 @@ package() { license=('GPL') -sha256sums=(5b2743c3a440a3a062e19cf41590951b2b86ae7f7a987f0955eeea0a1002f5f2 # gnumeric-GNUMERIC_1_12_52.tar.bz2 +sha256sums=(295a6c68b37c2c771eab27c929018eb9b1e12b52013988df23fddfe3455bfbd4 # gnumeric-GNUMERIC_1_12_53.tar.bz2 bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53) # revert-warnings.patch + diff --git a/gnumeric/PKGBUILD-arch b/gnumeric/PKGBUILD-arch index 0f1b482..d856be6 100644 --- a/gnumeric/PKGBUILD-arch +++ b/gnumeric/PKGBUILD-arch @@ -2,8 +2,8 @@ # Contributor: Kritoke pkgname=gnumeric -pkgver=1.12.52 -pkgrel=2 +pkgver=1.12.53 +pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('x86_64') url="http://www.gnumeric.org/" @@ -15,7 +15,7 @@ optdepends=('python-gobject: for python plugin support' 'perl: for perl plugin support' 'psiconv: for Psion 5 file support' 'yelp: for viewing the help manual') -_commit=02c7f1447a1832d8a4d40654b5a77d5990b0a341 +_commit=858ea03fa5efd3beccc82e8dc269f35b76133d94 source=("git+https://gitlab.gnome.org/GNOME/gnumeric.git#commit=$_commit" revert-warnings.patch) sha256sums=('SKIP' diff --git a/gnumeric/PKGBUILD-aur b/gnumeric/PKGBUILD-aur index 78e27ac..46ed2a8 100644 --- a/gnumeric/PKGBUILD-aur +++ b/gnumeric/PKGBUILD-aur @@ -4,7 +4,7 @@ pkgname=gnumeric-minimal _pkgname=gnumeric -_minorver=52 +_minorver=53 pkgver=1.12.${_minorver} pkgrel=1 pkgdesc="A GNOME-less spreadsheet program" @@ -17,7 +17,7 @@ conflicts=('gnumeric') provides=('gnumeric') options=('libtool') source=(https://gitlab.gnome.org/GNOME/gnumeric/-/archive/GNUMERIC_${pkgver//./_}/gnumeric-GNUMERIC_${pkgver//./_}.tar.bz2) -sha256sums=('5b2743c3a440a3a062e19cf41590951b2b86ae7f7a987f0955eeea0a1002f5f2') +sha256sums=('295a6c68b37c2c771eab27c929018eb9b1e12b52013988df23fddfe3455bfbd4') build() { cd ${_pkgname}-GNUMERIC_${pkgver//./_} diff --git a/gnumeric/deps b/gnumeric/deps index a348f7e..549f3c8 100644 --- a/gnumeric/deps +++ b/gnumeric/deps @@ -9,4 +9,3 @@ bison goffice - diff --git a/gnumeric/time b/gnumeric/time index 6a1b8eb..23a6e8c 100644 --- a/gnumeric/time +++ b/gnumeric/time @@ -1,3 +1,6 @@ -real 2m50.571s -user 6m25.047s -sys 0m30.467s + + +real 6m5.680s +user 4m46.211s +sys 0m27.122s + diff --git a/goffice/PKGBUILD b/goffice/PKGBUILD index dfc852d..e32a7f4 100644 --- a/goffice/PKGBUILD +++ b/goffice/PKGBUILD @@ -6,14 +6,14 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=goffice -pkgver=0.10.52 +pkgver=0.10.53 pkgrel=01 pkgdesc="A GLib/GTK+ set of document-centric objects and charting library" url="https://git.gnome.org/browse/goffice" arch=(x86_64) depends=(librsvg gtk3 libgsf libspectre libxslt lasem) makedepends=(intltool gtk-doc gobject-introspection autoconf-archive git) -_commit=ea3daf5637c054f58ac8174de65d0d06217c6b33 +_commit=eb6f2c83afb5320bbdf472293237be8c80675fd3 source=("git+https://gitlab.gnome.org/GNOME/goffice.git#commit=$_commit") pkgver() { @@ -45,3 +45,5 @@ package() { license=(GPL) sha256sums=('SKIP') + + diff --git a/goffice/PKGBUILD-arch b/goffice/PKGBUILD-arch index 66d1d52..8ee33a2 100644 --- a/goffice/PKGBUILD-arch +++ b/goffice/PKGBUILD-arch @@ -2,7 +2,7 @@ # Contributor: Aaron Griffin pkgname=goffice -pkgver=0.10.52 +pkgver=0.10.53 pkgrel=1 pkgdesc="A GLib/GTK+ set of document-centric objects and charting library" url="https://git.gnome.org/browse/goffice" @@ -10,7 +10,7 @@ arch=(x86_64) license=(GPL) depends=(librsvg gtk3 libgsf libspectre libxslt lasem) makedepends=(intltool gtk-doc gobject-introspection autoconf-archive git) -_commit=ea3daf5637c054f58ac8174de65d0d06217c6b33 +_commit=eb6f2c83afb5320bbdf472293237be8c80675fd3 source=("git+https://gitlab.gnome.org/GNOME/goffice.git#commit=$_commit") sha256sums=('SKIP') diff --git a/goffice/deps b/goffice/deps index db2b46e..c9b9323 100644 --- a/goffice/deps +++ b/goffice/deps @@ -12,3 +12,4 @@ git automake gettext +