Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions srcpkgs/an/template
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Template file for 'an'
pkgname=an
version=1.2
revision=12
revision=13
build_style=gnu-makefile
makedepends="icu-devel"
depends="words-en"
short_desc="Very fast anagram generator"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="https://packages.debian.org/sid/an"
distfiles="${DEBIAN_SITE}/main/a/an/an_${version}.orig.tar.xz"
checksum=b925d57d80bd0d83b755f5b8d78e6d5bf05eb059ec84a7d8fbb77b18c73b17a5
distfiles="${DEBIAN_SITE}/main/a/an/an_${version}.orig.tar.gz"
checksum=b81a8db74cdfdf39e6ca7dd752cf4722435d2fb7fb3a1b971d4f4fae5142db2b

post_extract() {
sed -i "s|usr/games|usr/bin|g" Makefile
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/geary/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'geary'
pkgname=geary
version=46.0
revision=2
revision=3
build_helper="gir"
build_style=meson
configure_args="-Dprofile=release -Dcontractor=enabled"
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/gnustep-base/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'gnustep-base'
pkgname=gnustep-base
version=1.31.1
revision=1
revision=2
build_style=gnu-configure
hostmakedepends="gnustep-make gcc-objc pkg-config which tar"
makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
Expand All @@ -12,7 +12,7 @@
homepage="http://www.gnustep.org/"
distfiles="https://github.com/gnustep/libs-base/releases/download/base-${version//./_}/gnustep-base-${version}.tar.gz"
checksum=e7546f1c978a7c75b676953a360194a61e921cb45a4804497b4f346a460545cd
make_check=extended

Check failure on line 15 in srcpkgs/gnustep-base/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint

explain why the tests fail

nocross="objc doesn't get cross build at present within gcc"
case "$XBPS_TARGET_MACHINE" in
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/gnustep-gui/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'gnustep-gui'
pkgname=gnustep-gui
version=0.32.0
revision=1
revision=2
build_style=gnu-configure
hostmakedepends="gnustep-make pkg-config tar"
makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
Expand Down
1 change: 0 additions & 1 deletion srcpkgs/icu-libs

This file was deleted.

12 changes: 12 additions & 0 deletions srcpkgs/kdb/patches/cmake-4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- a/cmake/modules/SetKDbCMakePolicies.cmake
+++ b/cmake/modules/SetKDbCMakePolicies.cmake
@@ -8,9 +8,6 @@ cmake_policy(SET CMP0048 NEW) # for PROJ
cmake_policy(SET CMP0053 NEW) # TODO remove, temporary fix for a bug in Qt 5.8's Qt5ModuleLocation.cmake
# "Simplify variable reference and escape sequence evaluation"

-if(POLICY CMP0059) # Don’t treat DEFINITIONS as a built-in directory property.
- cmake_policy(SET CMP0059 OLD)
-endif()
if(POLICY CMP0063) # Honor visibility properties for all target types (since cmake 3.3)
cmake_policy(SET CMP0063 NEW)
endif()
10 changes: 4 additions & 6 deletions srcpkgs/kdb/template
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Template file for 'kdb'
pkgname=kdb
version=3.2.0
revision=10
revision=11
build_style=cmake
hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons python3"
configure_args="-DCMAKE_CXX_STANDARD=17"
hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons python3
qt5-qmake qt5-host-tools python3"
makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
sqlite-devel"
short_desc="Database connectivity and creation framework"
Expand All @@ -13,10 +15,6 @@ homepage="http://www.kexi-project.org/"
distfiles="${KDE_SITE}/kdb/src/kdb-${version}.tar.xz"
checksum=8f8983bc8d143832dc14bc2003ba6af1af27688e477c0c791fd61445464f2069

if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools python3"
fi

kdb-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
Expand Down
14 changes: 14 additions & 0 deletions srcpkgs/kiwix-lib/patches/icu-78.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,10 @@ if (compiler.get_id() == 'gcc' and build
else
thread_dep = dependency('', required:false)
endif
-libicu_dep = dependency('icu-i18n', static:static_deps)
+libicu_dep = [
+ dependency('icu-i18n', static:static_deps),
+ dependency('icu-uc', static:static_deps)
+]
pugixml_dep = dependency('pugixml', static:static_deps)
libcurl_dep = dependency('libcurl', static:static_deps)
microhttpd_dep = dependency('libmicrohttpd', static:static_deps)
2 changes: 1 addition & 1 deletion srcpkgs/kiwix-lib/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'kiwix-lib'
pkgname=kiwix-lib
version=14.0.0
revision=2
revision=3
build_style=meson
hostmakedepends="pkg-config"
makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
Expand Down
1 change: 0 additions & 1 deletion srcpkgs/libicu73-devel

This file was deleted.

33 changes: 0 additions & 33 deletions srcpkgs/libicu73/patches/standardize-vtzone-output.patch

This file was deleted.

124 changes: 0 additions & 124 deletions srcpkgs/libicu73/template

This file was deleted.

2 changes: 1 addition & 1 deletion srcpkgs/liblcf/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'liblcf'
pkgname=liblcf
version=0.8.1
revision=1
revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="expat-devel icu-devel inih-devel"
Expand Down
53 changes: 53 additions & 0 deletions srcpkgs/mozjs115/patches/022-python-3.14.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
--- a/python/mozbuild/mozbuild/frontend/reader.py
+++ b/python/mozbuild/mozbuild/frontend/reader.py
@@ -477,7 +477,7 @@ class TemplateFunction(object):
return c(
ast.Subscript(
value=c(ast.Name(id=self._global_name, ctx=ast.Load())),
- slice=c(ast.Index(value=c(ast.Str(s=node.id)))),
+ slice=c(ast.Index(value=c(ast.Constant(value=node.id)))),
ctx=node.ctx,
)
)
@@ -1010,7 +1010,7 @@ class BuildReader(object):
else:
# Others
assert isinstance(target.slice, ast.Index)
- assert isinstance(target.slice.value, ast.Str)
+ assert isinstance(target.slice.value, ast.Constant)
key = target.slice.value.s

return name, key
@@ -1019,10 +1019,10 @@ class BuildReader(object):
value = node.value
if isinstance(value, ast.List):
for v in value.elts:
- assert isinstance(v, ast.Str)
+ assert isinstance(v, ast.Constant)
yield v.s
else:
- assert isinstance(value, ast.Str)
+ assert isinstance(value, ast.Constant)
yield value.s

assignments = []
--- a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
+++ b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
@@ -336,15 +336,13 @@ def assignment_node_to_source_filename_l
"""
if isinstance(node.value, ast.List) and "elts" in node.value._fields:
for f in node.value.elts:
- if not isinstance(f, ast.Constant) and not isinstance(f, ast.Str):
+ if not isinstance(f, ast.Constant):
log(
"Found non-constant source file name in list: ",
ast_get_source_segment(code, f),
)
return []
- return [
- f.value if isinstance(f, ast.Constant) else f.s for f in node.value.elts
- ]
+ return [f.value for f in node.value.elts]
elif isinstance(node.value, ast.ListComp):
# SOURCES += [f for f in foo if blah]
log("Could not find the files for " + ast_get_source_segment(code, node.value))
11 changes: 11 additions & 0 deletions srcpkgs/mozjs115/patches/023-icu-78.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -1104,7 +1104,7 @@ set_define(
# ======================================================
system_lib_option("--with-system-icu", help="Use system ICU")

-system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1", when="--with-system-icu")
+system_icu = pkg_check_modules("MOZ_ICU", "icu-uc icu-i18n >= 73.1", when="--with-system-icu")


@depends("--with-system-icu")
4 changes: 2 additions & 2 deletions srcpkgs/mozjs115/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'mozjs115'
pkgname=mozjs115
version=115.8.0
revision=1
revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
Expand All @@ -12,7 +12,7 @@ configure_args="--disable-jemalloc --disable-strip --disable-tests \
--with-system-nspr --with-system-zlib --enable-hardening --enable-release"
hostmakedepends="make pkg-config python3 python3-setuptools python3-six perl m4
rust cargo llvm19 clang19"
makedepends="libicu73-devel libffi-devel nspr-devel python3-devel readline-devel
makedepends="icu-devel libffi-devel nspr-devel python3-devel readline-devel
zlib-devel rust-std"
checkdepends="python3"
short_desc="SpiderMonkey JavaScript interpreter and library (115.x)"
Expand Down
11 changes: 11 additions & 0 deletions srcpkgs/mozjs128/patches/023-icu-78.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -1305,7 +1305,7 @@ def enable_system_icu_option(enable_syst
return enable_system_icu


-system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1", when="--with-system-icu")
+system_icu = pkg_check_modules("MOZ_ICU", "icu-uc icu-i18n >= 73.1", when="--with-system-icu")


@depends(enable_system_icu_option)
Loading
Loading