diff --git a/brotli/.footprint b/brotli/.footprint index 0582280ba..e6c89201a 100644 --- a/brotli/.footprint +++ b/brotli/.footprint @@ -6,31 +6,29 @@ drwxr-xr-x root/root usr/include/brotli/ -rw-r--r-- root/root usr/include/brotli/decode.h -rw-r--r-- root/root usr/include/brotli/encode.h -rw-r--r-- root/root usr/include/brotli/port.h +-rw-r--r-- root/root usr/include/brotli/shared_dictionary.h -rw-r--r-- root/root usr/include/brotli/types.h drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libbrotlicommon-static.a lrwxrwxrwx root/root usr/lib/libbrotlicommon.so -> libbrotlicommon.so.1 -lrwxrwxrwx root/root usr/lib/libbrotlicommon.so.1 -> libbrotlicommon.so.1.0.9 --rwxr-xr-x root/root usr/lib/libbrotlicommon.so.1.0.9 --rw-r--r-- root/root usr/lib/libbrotlidec-static.a +lrwxrwxrwx root/root usr/lib/libbrotlicommon.so.1 -> libbrotlicommon.so.1.1.0 +-rwxr-xr-x root/root usr/lib/libbrotlicommon.so.1.1.0 lrwxrwxrwx root/root usr/lib/libbrotlidec.so -> libbrotlidec.so.1 -lrwxrwxrwx root/root usr/lib/libbrotlidec.so.1 -> libbrotlidec.so.1.0.9 --rwxr-xr-x root/root usr/lib/libbrotlidec.so.1.0.9 --rw-r--r-- root/root usr/lib/libbrotlienc-static.a +lrwxrwxrwx root/root usr/lib/libbrotlidec.so.1 -> libbrotlidec.so.1.1.0 +-rwxr-xr-x root/root usr/lib/libbrotlidec.so.1.1.0 lrwxrwxrwx root/root usr/lib/libbrotlienc.so -> libbrotlienc.so.1 -lrwxrwxrwx root/root usr/lib/libbrotlienc.so.1 -> libbrotlienc.so.1.0.9 --rwxr-xr-x root/root usr/lib/libbrotlienc.so.1.0.9 +lrwxrwxrwx root/root usr/lib/libbrotlienc.so.1 -> libbrotlienc.so.1.1.0 +-rwxr-xr-x root/root usr/lib/libbrotlienc.so.1.1.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libbrotlicommon.pc -rw-r--r-- root/root usr/lib/pkgconfig/libbrotlidec.pc -rw-r--r-- root/root usr/lib/pkgconfig/libbrotlienc.pc drwxr-xr-x root/root usr/lib/python3.10/ drwxr-xr-x root/root usr/lib/python3.10/site-packages/ -drwxr-xr-x root/root usr/lib/python3.10/site-packages/Brotli-1.0.9-py3.10.egg-info/ --rw-r--r-- root/root usr/lib/python3.10/site-packages/Brotli-1.0.9-py3.10.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.10/site-packages/Brotli-1.0.9-py3.10.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.10/site-packages/Brotli-1.0.9-py3.10.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.10/site-packages/Brotli-1.0.9-py3.10.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.10/site-packages/Brotli-1.1.0-py3.10.egg-info/ +-rw-r--r-- root/root usr/lib/python3.10/site-packages/Brotli-1.1.0-py3.10.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.10/site-packages/Brotli-1.1.0-py3.10.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.10/site-packages/Brotli-1.1.0-py3.10.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.10/site-packages/Brotli-1.1.0-py3.10.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.10/site-packages/__pycache__/ -rw-r--r-- root/root usr/lib/python3.10/site-packages/__pycache__/brotli.cpython-310.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.10/site-packages/__pycache__/brotli.cpython-310.pyc diff --git a/brotli/.signature b/brotli/.signature index 0fdc39621..b5343fbab 100644 --- a/brotli/.signature +++ b/brotli/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ajmxBowpkL3ILeL7a3J9+YTJfg6cU5ovB8H8S9geCGvZa14LX0sktp2BVHsVyK8z6YK2798px5HXuZhcWkTgwg= -SHA256 (Pkgfile) = 4bff1f6862601d9b3eedaef1d2e69aafc66fe8d576e16dfd87bfcb0056db0635 -SHA256 (.footprint) = f268d7e8e75523d42a14c6279fe29d053fd2dcf2b4cc19a8906d360731956bf7 -SHA256 (brotli-v1.0.9.tar.gz) = f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46 -SHA256 (runtime-linker-path.patch) = 0b1c8045b4fa745e620b5c1a75377f9cda839fbb07c90bf3358b583866f063ee +RWSE3ohX2g5d/USgZsJHms6lToBb5GElZqt7wI4F+g9vXwUHQat7zQwx1kYrEo5sfYtiJ0CvIcFSQtmm6g7avSUYSgui3xaU9AI= +SHA256 (Pkgfile) = 0335d911c50ed2fecdcece611ffb578138fb27f657a233110dd2048f87bffabd +SHA256 (.footprint) = cf3216778723e27bab2cee860739d312baf16805c542d39ce5624c473ad5c94b +SHA256 (brotli-v1.1.0.tar.gz) = e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff diff --git a/brotli/Pkgfile b/brotli/Pkgfile index 485d286d9..e96f12f3d 100644 --- a/brotli/Pkgfile +++ b/brotli/Pkgfile @@ -4,15 +4,11 @@ # Depends on: name=brotli -version=1.0.9 -release=2 -source=(https://github.com/google/$name/archive/v$version/$name-v$version.tar.gz - runtime-linker-path.patch) +version=1.1.0 +release=1 +source=(https://github.com/google/$name/archive/v$version/$name-v$version.tar.gz) build() { - # https://github.com/google/brotli/commit/09b0992b6acb7faa6fd3b23f9bc036ea117230fc - patch -d $name-$version -p1 -i $SRC/runtime-linker-path.patch - cmake -S $name-$version -B build -G Ninja \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_INSTALL_PREFIX=/usr \ diff --git a/brotli/runtime-linker-path.patch b/brotli/runtime-linker-path.patch deleted file mode 100644 index 18ddaf458..000000000 --- a/brotli/runtime-linker-path.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 09b0992b6acb7faa6fd3b23f9bc036ea117230fc Mon Sep 17 00:00:00 2001 -From: Eugene Kliuchnikov -Date: Wed, 2 Sep 2020 11:38:26 +0200 -Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)" - (#838) - -This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1. ---- - scripts/libbrotlicommon.pc.in | 2 +- - scripts/libbrotlidec.pc.in | 2 +- - scripts/libbrotlienc.pc.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in -index 10ca969e..2a8cf7a3 100644 ---- a/scripts/libbrotlicommon.pc.in -+++ b/scripts/libbrotlicommon.pc.in -@@ -7,5 +7,5 @@ Name: libbrotlicommon - URL: https://github.com/google/brotli - Description: Brotli common dictionary library - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -R${libdir} -lbrotlicommon -+Libs: -L${libdir} -lbrotlicommon - Cflags: -I${includedir} -diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in -index e7c3124f..6f8ef2e4 100644 ---- a/scripts/libbrotlidec.pc.in -+++ b/scripts/libbrotlidec.pc.in -@@ -7,6 +7,6 @@ Name: libbrotlidec - URL: https://github.com/google/brotli - Description: Brotli decoder library - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -R${libdir} -lbrotlidec -+Libs: -L${libdir} -lbrotlidec - Requires.private: libbrotlicommon >= 1.0.2 - Cflags: -I${includedir} -diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in -index 4dd0811b..2098afe2 100644 ---- a/scripts/libbrotlienc.pc.in -+++ b/scripts/libbrotlienc.pc.in -@@ -7,6 +7,6 @@ Name: libbrotlienc - URL: https://github.com/google/brotli - Description: Brotli encoder library - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -R${libdir} -lbrotlienc -+Libs: -L${libdir} -lbrotlienc - Requires.private: libbrotlicommon >= 1.0.2 - Cflags: -I${includedir}