upgrades and added gyp

This commit is contained in:
joborun linux 2022-03-31 04:01:44 +03:00
parent 69de08075b
commit b501e66300
26 changed files with 343 additions and 38 deletions

View File

@ -7,7 +7,9 @@
pkgname=at-spi2-core
pkgver=2.44.0
pkgrel=01
pkgrel=02
# Arch replaced makedependency from libsystemd to systemd, the reason for the rerun 2.44.0-2
# Let's see if it makes a difference to us :) :P
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
url="https://gitlab.gnome.org/GNOME/at-spi2-core"
arch=(x86_64)
@ -35,6 +37,7 @@ build() {
check() {
# memory test fails without desktop
# broker fails to launch without journald
# # Aaahhh journald must be running for the check to pass --- yawn yawn and again!
dbus-run-session meson test -C build --print-errorlogs || :
}

View File

@ -3,13 +3,13 @@
pkgname=at-spi2-core
pkgver=2.44.0
pkgrel=1
pkgrel=2
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
url="https://gitlab.gnome.org/GNOME/at-spi2-core"
arch=(x86_64)
license=(GPL2)
depends=(dbus glib2 libxtst libsystemd)
makedepends=(gobject-introspection git gtk-doc meson dbus-broker systemd)
depends=(dbus glib2 libxtst systemd)
makedepends=(gobject-introspection git gtk-doc meson dbus-broker)
optdepends=('dbus-broker: Alternative bus implementation')
options=(debug)
_commit=f38e40e8685400ddb66759aa009e18c12c898de4 # tags/AT_SPI2_CORE_2_44_0^0

View File

@ -3,4 +3,3 @@ gobject-introspection
git
gtk-doc
meson

View File

@ -1,5 +1,4 @@
real 0m29.920s
user 0m26.991s
sys 0m2.480s
real 0m26.241s
user 0m22.917s
sys 0m2.471s

View File

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=cmake
pkgver=3.22.3
pkgver=3.23.0
pkgrel=01
pkgdesc='A cross-platform open-source make system'
arch=('x86_64')
@ -44,4 +44,4 @@ package() {
license=('custom')
sha256sums=(9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0) # cmake-3.22.3.tar.gz
sha256sums=(5ab0a12f702f44013be7e19534cd9094d65cc9fe7b2cd0f8c9e5318e0fe4ac82) # cmake-3.23.0.tar.gz

View File

@ -3,7 +3,7 @@
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=cmake
pkgver=3.22.3
pkgver=3.23.0
pkgrel=1
pkgdesc='A cross-platform open-source make system'
arch=('x86_64')
@ -13,7 +13,7 @@ depends=('curl' 'libarchive' 'hicolor-icon-theme' 'jsoncpp' 'libjsoncpp.so' 'lib
makedepends=('qt6-base' 'python-sphinx' 'emacs')
optdepends=('qt6-base: cmake-gui')
source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
sha512sums=('a35003468153b99770ac6bbdeaa611a231a1104560da36aca0f393b8b71dbb44d854378504d2ec6b4af615f78efe18d91453fe15a1b7ec58129aa0289a5a1507')
sha512sums=('bcde8f2bf2fff6c4ab37a28c115b4b53d5fef0d4e38305420966cbd9f0026a4ffdcd4137f917a83458c1f380a137f7a7bd78f6fbd4d92fdcc5cf1dfbe4c02003')
build() {
cd ${pkgname}-${pkgver}

View File

@ -1,5 +1,5 @@
real 12m2.381s
user 41m22.338s
sys 1m37.571s
real 9m51.679s
user 34m50.795s
sys 1m32.376s

View File

@ -5,7 +5,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=cups-filters
pkgver=1.28.12
pkgver=1.28.13
pkgrel=01
pkgdesc="OpenPrinting CUPS Filters"
arch=('x86_64')
@ -59,4 +59,4 @@ package() {
license=('custom')
sha256sums=(46e2ea3d884ad222bb863ce6511e59cf390ef8e835295be44a80e500b2a33a3a) # cups-filters-1.28.12.tar.xz
sha256sums=(87282b86de32307afa8b2f920585c7fff0b675625ae712b79f3bfc4a06c3ef70) # cups-filters-1.28.13.tar.xz

View File

@ -1,7 +1,7 @@
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=cups-filters
pkgver=1.28.12
pkgver=1.28.13
pkgrel=1
pkgdesc="OpenPrinting CUPS Filters"
arch=('x86_64')
@ -18,7 +18,7 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv
'docx2txt: to convert Microsoft OOXML text from DOCX files')
backup=(etc/cups/cups-browsed.conf)
source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz)
sha256sums=('46e2ea3d884ad222bb863ce6511e59cf390ef8e835295be44a80e500b2a33a3a')
sha256sums=('87282b86de32307afa8b2f920585c7fff0b675625ae712b79f3bfc4a06c3ef70')
build() {
cd "$pkgname"-$pkgver

53
gyp/PKGBUILD Normal file
View File

@ -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=gyp
pkgver=20190716.fcd686f1
pkgrel=07
pkgdesc='"Generate Your Projects" Meta-Build system'
arch=(any)
url="https://gyp.gsrc.io/"
depends=(python ninja)
makedepends=(git python-setuptools)
_commit=fcd686f1880fa52a1ee78d3e98af1b88cb334528 # changes/82/1701782/5
source=("git+https://chromium.googlesource.com/external/gyp#commit=$_commit"
gyp-fips.patch gyp-fix-cmake.patch gyp-python38.patch gyp-python39.patch)
pkgver() {
cd $pkgname
# Commit date + short rev
echo $(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD).$(git rev-parse --short HEAD)
}
prepare() {
cd $pkgname
# Python 3 fixes from Fedora
git apply -3 ../*.patch
}
build() {
cd $pkgname
python setup.py build
}
package() {
cd $pkgname
python setup.py install --root="$pkgdir" --optimize=1 --skip-build
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
}
#---- license gpg-key sha256sums ----
license=(custom:BSD)
sha256sums=(SKIP
43022909aa2f320bdc0cc5813734f42bd6ef2ac4372821bf5757f753c7a3c277 # gyp-fips.patch
8610250f946ee070c5182cc87cd23cdd9f66a47ec57a98049bb2aaae4a1e09e6 # gyp-fix-cmake.patch
6580f0f02f430f1ba4aa7e8e2d32203dcb3d6f07f1de5287d0fb33ab2ed1cc30 # gyp-python38.patch
06b9092eea1513a70f8c5213ba2dc7f550cf5ddf6ee0bb801ea0cda290e3a6f9) # gyp-python39.patch

44
gyp/PKGBUILD-arch Normal file
View File

@ -0,0 +1,44 @@
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
pkgname=gyp
pkgver=20190716.fcd686f1
pkgrel=7
pkgdesc='"Generate Your Projects" Meta-Build system'
arch=(any)
url="https://gyp.gsrc.io/"
license=(custom:BSD)
depends=(python ninja)
makedepends=(git python-setuptools)
_commit=fcd686f1880fa52a1ee78d3e98af1b88cb334528 # changes/82/1701782/5
source=("git+https://chromium.googlesource.com/external/gyp#commit=$_commit"
gyp-fips.patch gyp-fix-cmake.patch gyp-python38.patch gyp-python39.patch)
sha256sums=('SKIP'
'43022909aa2f320bdc0cc5813734f42bd6ef2ac4372821bf5757f753c7a3c277'
'8610250f946ee070c5182cc87cd23cdd9f66a47ec57a98049bb2aaae4a1e09e6'
'6580f0f02f430f1ba4aa7e8e2d32203dcb3d6f07f1de5287d0fb33ab2ed1cc30'
'06b9092eea1513a70f8c5213ba2dc7f550cf5ddf6ee0bb801ea0cda290e3a6f9')
pkgver() {
cd $pkgname
# Commit date + short rev
echo $(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD).$(git rev-parse --short HEAD)
}
prepare() {
cd $pkgname
# Python 3 fixes from Fedora
git apply -3 ../*.patch
}
build() {
cd $pkgname
python setup.py build
}
package() {
cd $pkgname
python setup.py install --root="$pkgdir" --optimize=1 --skip-build
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
}

1
gyp/clean Normal file
View File

@ -0,0 +1 @@
rm -rf {src,pkg,gyp}

4
gyp/deps Normal file
View File

@ -0,0 +1,4 @@
python
ninja
git
python-setuptools

35
gyp/gyp-fips.patch Normal file
View File

@ -0,0 +1,35 @@
diff --git a/pylib/gyp/generator/make.py b/pylib/gyp/generator/make.py
index 997eec08..06c763db 100644
--- a/pylib/gyp/generator/make.py
+++ b/pylib/gyp/generator/make.py
@@ -1774,7 +1774,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
# Hash the target name to avoid generating overlong filenames.
cmdstring = (command if command else self.target).encode('utf-8')
- cmddigest = hashlib.sha1(cmdstring).hexdigest()
+ cmddigest = hashlib.sha1(cmdstring, usedforsecurity=False).hexdigest()
intermediate = "%s.intermediate" % (cmddigest)
self.WriteLn('%s: %s' % (' '.join(outputs), intermediate))
self.WriteLn('\t%s' % '@:');
diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py
index bf04e567..631ef7f2 100644
--- a/pylib/gyp/generator/ninja.py
+++ b/pylib/gyp/generator/ninja.py
@@ -751,7 +751,7 @@ class NinjaWriter(object):
if self.flavor == 'win':
# WriteNewNinjaRule uses unique_name for creating an rsp file on win.
extra_bindings.append(('unique_name',
- hashlib.md5(outputs[0]).hexdigest()))
+ hashlib.md5(outputs[0], usedforsecurity=False).hexdigest()))
self.ninja.build(outputs, rule_name, self.GypPathToNinja(source),
implicit=inputs,
@@ -2388,7 +2388,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
qualified_target_for_hash = gyp.common.QualifiedTarget(build_file, name,
toolset)
qualified_target_for_hash = qualified_target_for_hash.encode('utf-8')
- hash_for_rules = hashlib.md5(qualified_target_for_hash).hexdigest()
+ hash_for_rules = hashlib.md5(qualified_target_for_hash, usedforsecurity=False).hexdigest()
base_path = os.path.dirname(build_file)
obj = 'obj'

33
gyp/gyp-fix-cmake.patch Normal file
View File

@ -0,0 +1,33 @@
--- a/pylib/gyp/generator/cmake.py
+++ b/pylib/gyp/generator/cmake.py
@@ -40,9 +40,9 @@
try:
# maketrans moved to str in python3.
+ _maketrans = str.maketrans
+except AttributeError:
_maketrans = string.maketrans
-except NameError:
- _maketrans = str.maketrans
generator_default_variables = {
'EXECUTABLE_PREFIX': '',
@@ -281,7 +281,7 @@
dirs = set(dir for dir in (os.path.dirname(o) for o in outputs) if dir)
if int(action.get('process_outputs_as_sources', False)):
- extra_sources.extend(zip(cmake_outputs, outputs))
+ extra_sources.extend(list(zip(cmake_outputs, outputs)))
# add_custom_command
output.write('add_custom_command(OUTPUT ')
@@ -987,7 +987,7 @@
# XCode settings
xcode_settings = config.get('xcode_settings', {})
- for xcode_setting, xcode_value in xcode_settings.viewitems():
+ for xcode_setting, xcode_value in xcode_settings.items():
SetTargetProperty(output, cmake_target_name,
"XCODE_ATTRIBUTE_%s" % xcode_setting, xcode_value,
'' if isinstance(xcode_value, str) else ' ')

63
gyp/gyp-python38.patch Normal file
View File

@ -0,0 +1,63 @@
commit 7b0a3fd85beb67c990da3fb1b690444a27a6ee42
Author: Tom Hughes <tom@compton.nu>
Date: Fri Aug 23 09:33:14 2019 +0100
Fix python 3.8 warnings
diff --git a/pylib/gyp/input.py b/pylib/gyp/input.py
index 42c279cf..013231dc 100644
--- a/pylib/gyp/input.py
+++ b/pylib/gyp/input.py
@@ -1181,7 +1181,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
if variable_name in variables:
# If the variable is already set, don't set it.
continue
- if the_dict_key is 'variables' and variable_name in the_dict:
+ if the_dict_key == 'variables' and variable_name in the_dict:
# If the variable is set without a % in the_dict, and the_dict is a
# variables dict (making |variables| a varaibles sub-dict of a
# variables dict), use the_dict's definition.
diff --git a/test/lib/TestCmd.py b/test/lib/TestCmd.py
index 1ec50933..457694c8 100644
--- a/test/lib/TestCmd.py
+++ b/test/lib/TestCmd.py
@@ -283,7 +283,7 @@ if os.name in ('posix', 'nt'):
else:
tempfile.template = 'testcmd.'
-re_space = re.compile('\s')
+re_space = re.compile(r'\s')
_Cleanup = []
@@ -882,7 +882,7 @@ class TestCmd(object):
#self.diff_function = difflib.unified_diff
self._dirlist = []
self._preserve = {'pass_test': 0, 'fail_test': 0, 'no_result': 0}
- if 'PRESERVE' in os.environ and os.environ['PRESERVE'] is not '':
+ if 'PRESERVE' in os.environ and os.environ['PRESERVE'] != '':
self._preserve['pass_test'] = os.environ['PRESERVE']
self._preserve['fail_test'] = os.environ['PRESERVE']
self._preserve['no_result'] = os.environ['PRESERVE']
@@ -1103,7 +1103,7 @@ class TestCmd(object):
the temporary working directories to be preserved for all
conditions.
"""
- if conditions is ():
+ if len(conditions) == 0:
conditions = ('pass_test', 'fail_test', 'no_result')
for cond in conditions:
self._preserve[cond] = 1
diff --git a/test/lib/TestGyp.py b/test/lib/TestGyp.py
index cba2d3cc..43865ee1 100644
--- a/test/lib/TestGyp.py
+++ b/test/lib/TestGyp.py
@@ -742,7 +742,7 @@ def FindVisualStudioInstallation():
build_tool = None
if not build_tool:
args1 = ['reg', 'query',
- 'HKLM\Software\Microsoft\VisualStudio\SxS\VS7',
+ r'HKLM\Software\Microsoft\VisualStudio\SxS\VS7',
'/v', '15.0', '/reg:32']
build_tool = subprocess.check_output(args1).decode(
'utf-8', 'ignore').strip().split(b'\r\n').pop().split(b' ').pop()

55
gyp/gyp-python39.patch Normal file
View File

@ -0,0 +1,55 @@
diff --git a/pylib/gyp/common.py b/pylib/gyp/common.py
index b268d229..03c99cab 100644
--- a/pylib/gyp/common.py
+++ b/pylib/gyp/common.py
@@ -4,7 +4,6 @@
from __future__ import with_statement
-import collections
import errno
import filecmp
import os.path
@@ -12,6 +11,11 @@ import re
import tempfile
import sys
+try:
+ from collections.abc import MutableSet
+except ImportError:
+ from collections import MutableSet
+
# A minimal memoizing decorator. It'll blow up if the args aren't immutable,
# among other "problems".
@@ -494,7 +498,7 @@ def uniquer(seq, idfun=None):
# Based on http://code.activestate.com/recipes/576694/.
-class OrderedSet(collections.MutableSet):
+class OrderedSet(MutableSet):
def __init__(self, iterable=None):
self.end = end = []
end += [None, end, end] # sentinel node for doubly linked list
diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py
index 843e7067..327fe8d2 100644
--- a/pylib/gyp/generator/msvs.py
+++ b/pylib/gyp/generator/msvs.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import collections
+from collections import OrderedDict
import copy
import ntpath
import os
@@ -195,7 +195,7 @@ def _ConvertSourcesToFilterHierarchy(sources, prefix=None, excluded=None,
if not prefix: prefix = []
result = []
excluded_result = []
- folders = collections.OrderedDict()
+ folders = OrderedDict()
# Gather files into the final result, excluded, or folders.
for s in sources:
if len(s) == 1:

4
gyp/time Normal file
View File

@ -0,0 +1,4 @@
real 0m37.819s
user 0m5.338s
sys 0m1.205s

View File

@ -5,7 +5,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=libwacom
pkgver=2.1.0
pkgver=2.2.0
pkgrel=01
pkgdesc="Library to identify Wacom tablets and their features"
arch=('x86_64')
@ -41,5 +41,6 @@ license=('MIT')
validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') ## E23B7E70B467F0BF: "Peter Hutterer (Who-T) <office@who-t.net>
sha256sums=(b900899589c4c1f83e6671a2383a3437cfa70c3a275cb266bddbbc6c4eaf71a2 # libwacom-2.1.0.tar.xz
4916a44160dfa92666333c172c141b26af250362f16f3b58df5422cbe25f3aba) # libwacom-2.1.0.tar.xz.sig
# https://github.com/linuxwacom/libwacom/releases
sha256sums=(e62ac9edb522d36ad2fa99adca35ddc02067383d4668eeaa13d7efccc30bb8c8 # libwacom-2.2.0.tar.xz
eceb9c20c958e897c69e94b9bce3674ed464c225e4d90cfa29c9c5ae293e5c04) # libwacom-2.2.0.tar.xz.sig

View File

@ -1,7 +1,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=libwacom
pkgver=2.1.0
pkgver=2.2.0
pkgrel=1
pkgdesc="Library to identify Wacom tablets and their features"
arch=('x86_64')
@ -13,7 +13,8 @@ checkdepends=('python-pytest' 'python-libevdev' 'python-pyudev')
optdepends=('python-libevdev: for libwacom-show-stylus')
validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF')
source=(https://github.com/linuxwacom/libwacom/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig})
sha512sums=('9da7a6467ee9d853fca8d7b58528cb7c7a2f28f4074dba76e1d76cd6c134d800e1f8ad672b997af96f8712fc407d7d64cbdd1bcb4d8ae67965217786bbabca4a'
# https://github.com/linuxwacom/libwacom/releases
sha256sums=('e62ac9edb522d36ad2fa99adca35ddc02067383d4668eeaa13d7efccc30bb8c8'
'SKIP')
build() {

View File

@ -1 +1,6 @@
meson libgudev python-pytest python-libevdev python-pyudev
meson
libgudev
python-pytest
python-libevdev
python-pyudev
libxml2

View File

@ -1,4 +1,4 @@
real 0m14.382s
user 0m7.758s
sys 0m3.715s
real 0m5.605s
user 0m6.705s
sys 0m1.013s

View File

@ -6,14 +6,15 @@
pkgbase=vte3
pkgname=(vte3 vte-common)
pkgver=0.66.2
pkgver=0.68.0
pkgrel=01
pkgdesc="Virtual Terminal Emulator widget"
url="https://wiki.gnome.org/Apps/Terminal/VTE"
arch=(x86_64)
depends=(gtk3 pcre2 gnutls fribidi)
makedepends=(gobject-introspection vala git gtk-doc gperf meson)
_commit=6a0a9fed4d54122df31c13d601b1509597a36f2b # tags/0.66.2^0
# _commit=6a0a9fed4d54122df31c13d601b1509597a36f2b # tags/0.66.2^0 # fallback commit
_commit=0f438924f9f8a858b1b82434c876e31c2de180d4 # tags/0.68.0^0
source=("git+https://gitlab.gnome.org/GNOME/vte.git#commit=$_commit")
pkgver() {
@ -67,4 +68,4 @@ package_vte-common() {
license=(LGPL)
sha256sums=('SKIP')
sha256sums=(SKIP)

View File

@ -3,7 +3,7 @@
pkgbase=vte3
pkgname=(vte3 vte-common)
pkgver=0.66.2
pkgver=0.68.0
pkgrel=1
pkgdesc="Virtual Terminal Emulator widget"
url="https://wiki.gnome.org/Apps/Terminal/VTE"
@ -11,7 +11,8 @@ arch=(x86_64)
license=(LGPL)
depends=(gtk3 pcre2 gnutls fribidi systemd)
makedepends=(gobject-introspection vala git gtk-doc gperf meson)
_commit=6a0a9fed4d54122df31c13d601b1509597a36f2b # tags/0.66.2^0
options=(debug)
_commit=0f438924f9f8a858b1b82434c876e31c2de180d4 # tags/0.68.0^0
source=("git+https://gitlab.gnome.org/GNOME/vte.git#commit=$_commit")
sha256sums=('SKIP')

View File

@ -7,3 +7,4 @@ gtk-doc
gperf
meson
ttf-liberation
at-spi2-core

View File

@ -1,3 +1,5 @@
real 1m0.879s
user 2m29.398s
sys 0m8.141s
real 1m26.263s
user 2m23.440s
sys 0m9.137s