From 98fa38eb5620328667ed573c7b7f1ac39ce6e6cb Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:01:46 +0000 Subject: [PATCH 01/15] httpdirfs: auto updated to 1.2.7-16 --- repo/httpdirfs/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo/httpdirfs/PKGBUILD b/repo/httpdirfs/PKGBUILD index bd3baa7..c93e0ab 100644 --- a/repo/httpdirfs/PKGBUILD +++ b/repo/httpdirfs/PKGBUILD @@ -2,7 +2,7 @@ pkgname=httpdirfs pkgver=1.2.7 -pkgrel=15 +pkgrel=16 pkgdesc="A filesystem which allows you to mount HTTP directory listings" arch=('x86_64') url="https://github.com/fangfufu/httpdirfs" From 2f0354ac1a3ab0e5f37a68e5600f82d0686ff807 Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:02:02 +0000 Subject: [PATCH 02/15] sacd-extract-git: auto updated to 0.3.9.3.r117.g96084ff-16 --- repo/sacd-extract-git/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo/sacd-extract-git/PKGBUILD b/repo/sacd-extract-git/PKGBUILD index 7f54e23..ba2436d 100644 --- a/repo/sacd-extract-git/PKGBUILD +++ b/repo/sacd-extract-git/PKGBUILD @@ -2,7 +2,7 @@ pkgname=sacd-extract-git _pkgname=sacd-ripper pkgver=0.3.9.3.r117.g96084ff -pkgrel=15 +pkgrel=16 pkgdesc="Extract DSDIFF files, DSF files or RAW ISO from SACD" arch=('i686' 'pentium4' 'x86_64') url="https://github.com/EuFlo/sacd-ripper" From 4a074431f1ccd78e447388f8b0fab404f19df0f0 Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:02:49 +0000 Subject: [PATCH 03/15] rbenv: auto updated to 1.3.0-1 --- repo/rbenv/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/repo/rbenv/PKGBUILD b/repo/rbenv/PKGBUILD index 5a393ca..13314e0 100644 --- a/repo/rbenv/PKGBUILD +++ b/repo/rbenv/PKGBUILD @@ -1,10 +1,11 @@ -# Maintainer: Chris Down +# Maintainer: Pranav Sharma +# Contributor: Chris Down # Contributor: Vladimir Chizhov # Contributor: Jochen Schalanda # Contributor: Ichimonji10 pkgname=rbenv -pkgver=1.2.0 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="Simple Ruby version manager" arch=('any') url="https://github.com/rbenv/rbenv" @@ -15,7 +16,7 @@ conflicts=('rbenv-git') install="rbenv.install" noextract=("v${pkgver}") source=("https://github.com/rbenv/rbenv/tarball/v${pkgver}") -md5sums=('3ef4eea80b9a4f85f3978beb25665a2a') +md5sums=('a7a67a60320cde5616b3a532a24f3756') build() { cd $srcdir From eedc25f10eb56c16e1beb2f1bc8674ac0b219dda Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:03:53 +0000 Subject: [PATCH 04/15] ruby-build: auto updated to 20241213-1 --- repo/ruby-build/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo/ruby-build/PKGBUILD b/repo/ruby-build/PKGBUILD index 15520b2..92dd72c 100644 --- a/repo/ruby-build/PKGBUILD +++ b/repo/ruby-build/PKGBUILD @@ -3,7 +3,7 @@ # Contributer: Vincent Demeester # Contributer: Alex Ogier pkgname=ruby-build -pkgver=20240612 +pkgver=20241213 pkgrel=1 _file="${pkgname}-v${pkgver}.tar.gz" pkgdesc="Compile and install Ruby" @@ -16,7 +16,7 @@ optdepends=( 'libyaml: install recent versions of mri' ) source=($_file::$url/archive/v$pkgver.tar.gz) -sha512sums=('84f60ae40df435a3be459d33fc93b81f62721428b656f60ac4c424aa904b5b8c4900e50aa522908827df79cb1499baba53e845fba964d67fa98daa24735cc335') +sha512sums=('3b2de461e9b098d8c06888dd75f6b4c440a855a961f63ec9550d0d718b3f84cda83b7aafaff37bf99fb89650a40d83347f3cc3b1d7be6648afaa92b939d01562') build() { cd $srcdir From 91226bbb3966f31ae455f0894add7f9c0bcb9c26 Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:04:24 +0000 Subject: [PATCH 05/15] code-marketplace: auto updated to 1.95.0-1 --- repo/code-marketplace/PKGBUILD | 4 +-- repo/code-marketplace/patch.json | 13 +++++++-- repo/code-marketplace/update.py | 50 +++++++++++++++++++++++--------- 3 files changed, 49 insertions(+), 18 deletions(-) diff --git a/repo/code-marketplace/PKGBUILD b/repo/code-marketplace/PKGBUILD index c18e311..a3b2eb0 100644 --- a/repo/code-marketplace/PKGBUILD +++ b/repo/code-marketplace/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Sainnhe Park pkgname=code-marketplace -pkgver=1.90.0 +pkgver=1.95.0 pkgrel=1 pkgdesc='Enable vscode marketplace in Code OSS' arch=('any') @@ -14,7 +14,7 @@ source=('code-marketplace.hook' 'patch.json') md5sums=('ce502275aa945985182b51420fc6037c' '9ed6f3972479ab6d3d053e7c47ead55a' - '56531cac5e74070cde3229c0a5e1503b') + '63fcab1dcfb25eacc2697cae3d650ff3') package() { install -Dm 644 "${srcdir}"/code-marketplace.hook "${pkgdir}"/usr/share/libalpm/hooks/code-marketplace.hook diff --git a/repo/code-marketplace/patch.json b/repo/code-marketplace/patch.json index a780862..1209ad1 100644 --- a/repo/code-marketplace/patch.json +++ b/repo/code-marketplace/patch.json @@ -504,10 +504,12 @@ "GitHub.copilot": { "onFileOpen": [ { - "pathGlob": "{**/*.ts,**/*.tsx,**/*.js,**/*.py,**/*.go,**/*.rb}" + "pathGlob": "{**/*.ts,**/*.tsx,**/*.js,**/*.jsx,**/*.py,**/*.go,**/*.rb,**/*.html,**/*.css,**/*.php,**/*.cpp,**/*.vue,**/*.c,**/*.sql,**/*.java,**/*.cs,**/*.rs,**/*.dart,**/*.ps,**/*.ps1,**/*.tex}" } ], - "onSettingsEditorOpen": {} + "onSettingsEditorOpen": { + "descriptionOverride": "GitHub Copilot is an AI pair programmer tool that helps you write code faster and smarter." + } }, "GitHub.vscode-github-actions": { "onFileOpen": [ @@ -539,6 +541,13 @@ "important": true } ] + }, + "Redis.redis-for-vscode": { + "onFileOpen": [ + { + "pathGlob": "{**/redis.*,**/redis-server.*,**/redis_*,**/redisinsight.*}" + } + ] } }, "keymapExtensionTips": [ diff --git a/repo/code-marketplace/update.py b/repo/code-marketplace/update.py index baa936d..a5058ab 100755 --- a/repo/code-marketplace/update.py +++ b/repo/code-marketplace/update.py @@ -1,11 +1,14 @@ #!/usr/bin/env python3 -# This script can update the content of ./patch.json to the latest version -# Usage: ./update.py /path/to/extracted/produce.json -# Where /path/to/extracted/produce.json is extracted from the latest version of official vscode release +# This script will update the ./patch.json to match the official release +# Usage: ./update.py +# Where is the version of the official release -import sys import json +import os +import shutil +import subprocess +import sys key_list = [ "extensionsGallery", @@ -19,19 +22,38 @@ key_list = [ "extensionAllowedBadgeProviders", "extensionAllowedBadgeProvidersRegex", "msftInternalDomains", - "linkProtectionTrustedDomains" + "linkProtectionTrustedDomains", ] -product_path = sys.argv[1] -patch_path = "patch.json" -with open(product_path, "r") as product_file: - product_data = json.load(product_file) +def fetch_product_json(version: str): + """Download official release and extract it, then copy product.json to project root""" + url = f"https://update.code.visualstudio.com/{version}/linux-x64/stable" + download_cmd = ["curl", "-fSL", "-o", "code.tgz", url] + subprocess.run(download_cmd) + extract_cmd = ["tar", "xvf", "code.tgz"] + subprocess.run(extract_cmd) + shutil.copy(src="./VSCode-linux-x64/resources/app/product.json", dst=".") + shutil.rmtree("./VSCode-linux-x64") + os.remove("code.tgz") -patch_data = {} -for key in key_list: - patch_data[key] = product_data[key] +def update_package(): + """Update the package""" + with open("./product.json", "r") as product_file: + product_data = json.load(product_file) -with open(patch_path, "w") as patch_file: - json.dump(patch_data, patch_file, indent='\t') + patch_data = {} + + for key in key_list: + patch_data[key] = product_data[key] + + with open("./patch.json", "w") as patch_file: + json.dump(patch_data, patch_file, indent="\t") + + subprocess.run(["updpkgsums", "./PKGBUILD"]) + + +version = sys.argv[1] +fetch_product_json(version) +update_package() From aa437724315d4c5bd7d07585f3e2d84b189b4297 Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:04:24 +0000 Subject: [PATCH 06/15] smem: auto updated to 1.5-6 --- repo/smem/0001-Fix-xrange-in-Python-3.patch | 12 ++++++++++++ repo/smem/PKGBUILD | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 repo/smem/0001-Fix-xrange-in-Python-3.patch diff --git a/repo/smem/0001-Fix-xrange-in-Python-3.patch b/repo/smem/0001-Fix-xrange-in-Python-3.patch new file mode 100644 index 0000000..342ca72 --- /dev/null +++ b/repo/smem/0001-Fix-xrange-in-Python-3.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -ura smem-1.5/smem smem-1.5.new/smem +--- smem-1.5/smem 2015-05-15 12:52:02.000000000 -0500 ++++ smem-1.5.new/smem 2024-10-13 02:55:19.670091304 -0500 +@@ -646,7 +646,7 @@ + + pl = [] + ind = numpy.arange(len(l)) +- for n in xrange(len(rc)): ++ for n in range(len(rc)): + pl.append(pylab.bar(ind + offset + width * n, + [x[1][rc[n]] for x in l], width, color=gc(n))) + diff --git a/repo/smem/PKGBUILD b/repo/smem/PKGBUILD index a811455..dc3e1ec 100644 --- a/repo/smem/PKGBUILD +++ b/repo/smem/PKGBUILD @@ -6,15 +6,24 @@ pkgname=smem pkgver=1.5 -pkgrel=5 +pkgrel=6 pkgdesc="Generate reports on memory usage." url="https://www.selenic.com/smem/" license=("GPL") depends=('python') optdepends=('python-matplotlib: for chart generation') arch=('x86_64') -source=("$pkgname-$pkgver.tgz::https://www.selenic.com/repo/smem/archive/$pkgver.tar.gz") -sha256sums=('5c3907b0ac9d3252cbbc5cb9ebe93f0c2b602df67376d9050c09146871822293') +source=( + "$pkgname-$pkgver.tgz::https://www.selenic.com/repo/smem/archive/$pkgver.tar.gz" + "0001-Fix-xrange-in-Python-3.patch" +) +sha256sums=('5c3907b0ac9d3252cbbc5cb9ebe93f0c2b602df67376d9050c09146871822293' + 'efa7c105a60d0a345aec981c534d79c8c1e35988d527bd3a8e28a728c5de8ea8') + +prepare() { + cd "$pkgname-$pkgver" + patch -N -p1 -i ../0001-Fix-xrange-in-Python-3.patch +} build() { cd "$srcdir/$pkgname-$pkgver" From 9d87d033a3cebd0aed66b37466acd84470973554 Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:04:42 +0000 Subject: [PATCH 07/15] alhp-mirrorlist: auto updated to 20241215-1 --- repo/alhp-mirrorlist/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo/alhp-mirrorlist/PKGBUILD b/repo/alhp-mirrorlist/PKGBUILD index 6988ffe..92cdd33 100644 --- a/repo/alhp-mirrorlist/PKGBUILD +++ b/repo/alhp-mirrorlist/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Giovanni Harting <539@idlegandalf.com> pkgname=alhp-mirrorlist -pkgver=20240615 +pkgver=20241215 pkgrel=1 pkgdesc='ALHP mirror list for use by pacman' arch=(any) @@ -12,7 +12,7 @@ backup=( 'etc/pacman.d/alhp-mirrorlist.ipfs' ) source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") -b2sums=('181a3d7c71fe37eb25c560b3e8d4cb29e96b105781bb007799d7e117e8bde9ced7c58024ef0e4947ee5e4cc347c40595a867f79c1d03c186e6fa53198b66631d') +b2sums=('4e1972517b13febd5369eb574e87b571199480f46cb62f9cbd93a46a28a9db2ff46b3cf719ecb4d2edd5a57d8afd42a9e984a6b560cd739f808fdbb4aaf045e8') package() { install -Dm644 alhp-mirrorlist/mirrorlist "$pkgdir"/etc/pacman.d/alhp-mirrorlist From e1ec715f3fd53f1be05fdd142f4b3896afdd900e Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:05:25 +0000 Subject: [PATCH 08/15] quarto-cli: auto updated to 1.6.39-16 --- repo/quarto-cli/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo/quarto-cli/PKGBUILD b/repo/quarto-cli/PKGBUILD index 2d6a0b1..d5b3a38 100644 --- a/repo/quarto-cli/PKGBUILD +++ b/repo/quarto-cli/PKGBUILD @@ -3,7 +3,7 @@ pkgname=quarto-cli pkgver=1.6.39 -pkgrel=15 +pkgrel=16 #_pkgbasename=quarto-cli _denodomver="0.1.41-alpha-artifacts" _denover="2.0.4-1" From f1ddaedecf7ccd0d03fabdf40faa73f6ef11ec14 Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:05:28 +0000 Subject: [PATCH 09/15] vdhcoapp-git: auto updated to 2.0.20.r4.gf8cc614-16 --- repo/vdhcoapp-git/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo/vdhcoapp-git/PKGBUILD b/repo/vdhcoapp-git/PKGBUILD index 636f7c7..e1d2e2e 100644 --- a/repo/vdhcoapp-git/PKGBUILD +++ b/repo/vdhcoapp-git/PKGBUILD @@ -6,7 +6,7 @@ _pkgname="vdhcoapp" pkgname="$_pkgname-git" pkgver=2.0.20.r4.gf8cc614 -pkgrel=15 +pkgrel=16 pkgdesc="Companion application for Video DownloadHelper browser add-on" url="https://github.com/aclap-dev/vdhcoapp" license=('GPL-2.0-or-later') From 5e71f1a3a6eeb4226d9df8f19dfda573b8c6b705 Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:06:10 +0000 Subject: [PATCH 10/15] informant: auto updated to 0.6.0-1 --- repo/informant/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo/informant/PKGBUILD b/repo/informant/PKGBUILD index dee2c98..17e329b 100644 --- a/repo/informant/PKGBUILD +++ b/repo/informant/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Bradford Smith pkgname=informant -pkgver=0.5.1 +pkgver=0.6.0 pkgrel=1 pkgdesc="An Arch Linux News reader and pacman hook" arch=('any') @@ -12,7 +12,7 @@ makedepends=('python-setuptools') depends=('python' 'python-docopt' 'python-dateutil' 'python-feedparser' 'python-html2text' 'python-cachecontrol' 'python-lockfile' 'python-psutil') source=("https://github.com/bradford-smith94/$pkgname/archive/v$pkgver.tar.gz") options=(zipman) -sha256sums=('2c88b1303fd623eef390e7bcfafeb40f45b847a7f88514726e36c66f6763c53e') +sha256sums=('aa1acb6677c70f389aee64efa706ae0c87c6339ae18d501f83fefa1c8bb750b4') build() { From e359dd3566c3b3a276e4663d369e84e5f242dbe5 Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:06:28 +0000 Subject: [PATCH 11/15] an-anime-game-launcher-bin: auto updated to 3.13.0-1 --- repo/an-anime-game-launcher-bin/PKGBUILD | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/repo/an-anime-game-launcher-bin/PKGBUILD b/repo/an-anime-game-launcher-bin/PKGBUILD index 20e99b0..7ef8e85 100644 --- a/repo/an-anime-game-launcher-bin/PKGBUILD +++ b/repo/an-anime-game-launcher-bin/PKGBUILD @@ -2,11 +2,11 @@ # Contributor: Marie Piontek pkgname=an-anime-game-launcher-bin -pkgver=3.10.0 +pkgver=3.13.0 pkgrel=1 pkgdesc="A Launcher for a specific anime game with auto-patching, discord rpc and time tracking" url="https://github.com/an-anime-team/an-anime-game-launcher" -conflicts=("an-anime-game-launcher-git") +conflicts=("an-anime-game-launcher-git" "an-anime-game-launcher") provides=("an-anime-game-launcher") arch=("x86_64") license=("GPL3") @@ -14,7 +14,6 @@ license=("GPL3") depends=( "libadwaita" "xdg-desktop-portal" - "xdelta3" "libwebp" "p7zip" "git" @@ -35,7 +34,7 @@ source=( ) md5sums=( - 'f6c7fc6e1076f4db7ced0dc59ff315c0' + '35050295b9225647323ada0afb76245b' 'c1a5499b80a55d3d238ef5c5d2c93c99' 'f0cfe73897e8f49e92e0dfc41326fb0b' ) From 641b49fc49f7386e0bf93854cae94e5d4e2e72b6 Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:07:37 +0000 Subject: [PATCH 12/15] vdhcoapp-bin: auto updated to 2.0.20-2 --- repo/vdhcoapp-bin/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo/vdhcoapp-bin/PKGBUILD b/repo/vdhcoapp-bin/PKGBUILD index 78058cd..7d89919 100644 --- a/repo/vdhcoapp-bin/PKGBUILD +++ b/repo/vdhcoapp-bin/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=vdhcoapp pkgname="$_pkgname-bin" -pkgver=2.0.19 +pkgver=2.0.20 pkgrel=2 arch=('x86_64') pkgdesc="Companion application for Video DownloadHelper browser add-on (binary version)" @@ -19,7 +19,7 @@ conflicts=('vdhcoapp') source=("$_pkgname-$pkgver-linux-$arch.deb::https://github.com/aclap-dev/$_pkgname/releases/download/v${pkgver}/$_pkgname-linux-$arch.deb") -sha256sums=('496d341eef326f3fb6f0ddf825b309d6e18a4ddb7f1bec7fe74d9282ae94dfc4') +sha256sums=('312423d4ad54bf8bf391efa3669a4aafa7c98d9aaf1fe4af3d5b5014c28f4730') prepare() { mkdir -p "$srcdir/$pkgname" From 02766f084b207e80e1ff667bd1abe2507d70704c Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:11:20 +0000 Subject: [PATCH 13/15] nutstore-experimental: auto updated to 6.3.6-1 --- repo/nutstore-experimental/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo/nutstore-experimental/PKGBUILD b/repo/nutstore-experimental/PKGBUILD index a598dc9..9f10829 100644 --- a/repo/nutstore-experimental/PKGBUILD +++ b/repo/nutstore-experimental/PKGBUILD @@ -1,7 +1,7 @@ #Maintainer: Bhoppi Chaw pkgname=nutstore-experimental -pkgver=6.3.0 +pkgver=6.3.6 pkgrel=1 pkgdesc='Nutstore experimental version.' arch=(x86_64) @@ -20,7 +20,7 @@ source=(nutstore license) source_x86_64=("https://pkg-cdn.jianguoyun.com/static/exe/ex/$pkgver/nutstore_client-$pkgver-linux-x86_64-public.tar.gz") sha256sums=('a4aa358d45b306cbeac449f2256f00a5b81a95197394eba7efa96eaae820cf5b' 'd320e071403cdad44881beb880f5ccfa8ec0a625718a9f572dce0cc9fff81ade') -sha256sums_x86_64=('38a2a6a80577c12c5168615f23cfe5a9ed3442e4dd18e8fe6651bf806bc1d758') +sha256sums_x86_64=('09739a9798a4ac59922a1d82f5dd5d088b46965b75a1d644d88af24594543522') build() { cd $srcdir/gnome-config From c9966718bed400f2e78b14238222c2e39870f99b Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:26:57 +0000 Subject: [PATCH 14/15] android-studio: auto updated to 2024.2.1.12-1 --- repo/android-studio/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repo/android-studio/PKGBUILD b/repo/android-studio/PKGBUILD index b7d1759..5fb37ed 100644 --- a/repo/android-studio/PKGBUILD +++ b/repo/android-studio/PKGBUILD @@ -10,7 +10,7 @@ # Maintainer: Kordian Bruck pkgname=android-studio -pkgver=2024.1.1.11 +pkgver=2024.2.1.12 pkgrel=1 pkgdesc="The official Android IDE (Stable branch)" arch=('i686' 'x86_64') @@ -25,7 +25,7 @@ options=('!strip') source=("https://dl.google.com/dl/android/studio/ide-zips/$pkgver/android-studio-$pkgver-linux.tar.gz" "$pkgname.desktop" "license.html") -sha256sums=('d8fa8ecfe415b44513350901501e2a0f429ca033cf1805054b1c816c4a704565' +sha256sums=('4df51ac7d73e45203383418a537c9562c58bef6ab80d4074cd98acb387e5caa6' '73cd2dde1d0f99aaba5baad1e2b91c834edd5db3c817f6fb78868d102360d3c4' '9a7563f7fb88c9a83df6cee9731660dc73a039ab594747e9e774916275b2e23e') @@ -39,7 +39,7 @@ package() { # Install the application install -d $pkgdir/{opt/$pkgname,usr/bin} cp -a bin lib jbr plugins license LICENSE.txt build.txt product-info.json $pkgdir/opt/$pkgname - ln -s /opt/android-studio/bin/studio.sh $pkgdir/usr/bin/$pkgname + ln -s /opt/android-studio/bin/studio $pkgdir/usr/bin/$pkgname # Copy licenses install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" From 509d9ee295f0704e79790383e328676549ce4dc4 Mon Sep 17 00:00:00 2001 From: Lilac Date: Sat, 21 Dec 2024 07:30:51 +0000 Subject: [PATCH 15/15] ttf-ms-win10-auto: auto updated to 10.0.19042.789-7 --- repo/ttf-ms-win10-auto/PKGBUILD | 105 +++++++++++++++++++++----------- 1 file changed, 68 insertions(+), 37 deletions(-) diff --git a/repo/ttf-ms-win10-auto/PKGBUILD b/repo/ttf-ms-win10-auto/PKGBUILD index d7f62f0..e3686d1 100644 --- a/repo/ttf-ms-win10-auto/PKGBUILD +++ b/repo/ttf-ms-win10-auto/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: RubenKelevra +# Contributor: jprt # Contributor: Zepman # Contributor: Michael Lass # Contributor: Doug Newgard @@ -7,22 +8,23 @@ # BUILD INSTRUCTIONS: # ------------------- # -# Please note, that usage of Microsoft fonts outside running Windows -# system is prohibited by EULA (although in certain countries EULA is invalid). -# Please consult Microsoft license before using fonts. +# Please note that the usage of Microsoft fonts outside the Windows system is prohibited +# by EULA (although in certain countries, EULA is invalid). +# Please consult the Microsoft license before using fonts. # -# This PKGBUILD attempts to download fonts directly from Microsoft, by -# retrieving selective parts of the Windows 10 Enterprise 90-day evaluation -# edition. This only works if the user is allowed to mount filesystems through -# udisks2. This is determined by Polkit, which by default only allows users to -# do this when they are logged in locally (e.g. not through SSH). +# This PKGBUILD attempts to download fonts directly from Microsoft, by retrieving +# selective parts of the Windows 10 Enterprise 90-day evaluation edition. This only works +# if the user is allowed to mount filesystems through udisks2. This is determined by +# Polkit, which by default only allows users to do this when they are logged in locally +# (e.g., not through SSH). # -# If it is possible to download fonts directly, around 200 MiB of data will be -# downloaded. Downloading the fonts this way can take 8-20 minutes, even on a -# fast connection. Be patient. Note that for tis method, it is necessary to -# mount an HTTP source and an ISO file as a loop device using FUSE. If the -# build fails, it might be that these must be unmounted manually. This can be -# done with: +# If it is possible to download fonts directly, around 200 MB of data will be downloaded. +# Downloading the fonts this way can take 8–20 minutes, even on a fast connection. Be +# patient. Note that for this method, it is necessary to mount an HTTP source and an ISO +# file as a loop device using FUSE. If the build fails, it might be that these must be +# unmounted manually. If you rerun the build, this cleanup is done automatically. +# +# To clean up manually run: # # $ udisksctl unmount -b /dev/loop0 # $ udisksctl loop-delete -b /dev/loop0 @@ -31,41 +33,41 @@ # Replace /dev/loop0 with the relevant loop device, which is reported during # package build. # -# For the download, HTTP is used instead of HTTPS due to that httpfs2 does not -# support modern TLS versions. A file integrity check is performed after -# download. Due to the unconventional way that the data is downloaded, the -# verification is done in prepare(). +# For the download, HTTP is used instead of HTTPS because httpfs2 does not support modern +# TLS versions. A file integrity check is performed after the download. Due to the +# unconventional way that the data is downloaded, the verification is done in prepare(). # -# If fonts cannot be downloaded directly, the ISO fill will be fully -# downloaded. Due to that install.wim will be extracted from the ISO, it is -# assumed that twice its size (almost 8 GiB) is necessary as temporary disk -# space. A free disk space check is performed before the ISO is downloaded. +# If fonts cannot be downloaded directly, the ISO fill will be fully downloaded. Due to +# that install.wim will be extracted from the ISO, it is assumed that twice its size +# (almost 8 GiB) is necessary as temporary disk space. A free disk space check is +# performed before the ISO is downloaded. # -# Please ignore any 'ln' errors when building this package. This is expected -# behavior. +# Please ignore any 'ln' errors when building this package. This is expected behavior. # -# If for some reason you want to download the full ISO file, please visit: +# If, for some reason, you want to download the full ISO file, please visit: # # http://www.microsoft.com/en-us/evalcenter/evaluate-windows-10-enterprise # -# This package is based on ttf-ms-win10. Use that package if font files from -# a local source need to be used. +# This package is based on ttf-ms-win10. Use that package if font files from a local +# source need to be used. # # ttf-ms-win10 is considered to be upstream for this package, which is why its # maintainers and contributors are added as contributors to this package. -# Without their effort this package would not exist, nor be updated. +# Without their effort, this package would not exist or be updated. # + + pkgbase=ttf-ms-win10-auto pkgname=($pkgbase{,-japanese,-korean,-sea,-thai,-zh_cn,-zh_tw,-other}) pkgver=10.0.19042.789 -pkgrel=6 +pkgrel=7 arch=(any) url='http://www.microsoft.com/typography/fonts/product.aspx?PID=164' license=(custom) provides=(ttf-font ttf-ms-win10) conflicts=(ttf-vista-fonts ttf-ms-win11-auto ttf-ms-win11) -makedepends=(udisks2 p7zip httpfs2-2gbplus) +makedepends=(udisks2 p7zip httpfs2-2gbplus wget udftools util-linux) # URL of ISO file from which to extract the fonts. # Must be HTTP due to limitations of httpfs2. @@ -392,14 +394,30 @@ prepare() { if [ $_mount ]; then echo "allowed" + + echo "- Checking for old loop devices created by by this package" + for loop_device in $(losetup --list | grep "${pkgbase}" | awk '{print $1}') + do + echo -ne " - deleting '$loop_device'..." + udisksctl loop-delete -b "$loop_device" + echo " done." + done + + for fuse_mount_points in $(cat /etc/mtab | grep "${pkgbase}" | awk '{print $2}') + do + echo -ne " - unmounting '$fuse_mount_points'..." + fusermount -u "$fuse_mount_points" + echo " done." + done + echo "- Downloading fonts directly" mkdir -p mnt/http echo " - Mounting HTTP file" httpfs2 -c /dev/null "$_iso" mnt/http echo " - Creating loop device" _isoFile="mnt/http/$(echo "$_iso" | awk -F "/" '{print $NF}')" - _loopDev=$(udisksctl loop-setup -r -f "${_isoFile}" --no-user-interaction | awk '{print $NF}') - _loopDev=${_loopDev::-1} + _loopDev=$(udisksctl loop-setup -r -f "${_isoFile}" --no-user-interaction 2>/dev/null | awk '{print $NF}') + _loopDev=$(losetup --list | grep "$_isoFile" | awk '{print $1}') echo " - Mounting loop device: $_loopDev" _mountpoint=$(udisksctl mount -t udf -b "$_loopDev" --no-user-interaction | awk '{print $NF}') echo " - Loop device mounted as ISO at: $_mountpoint" @@ -410,10 +428,23 @@ prepare() { echo " - Unmounting loop device $_loopDev as ISO at: $_mountpoint" udisksctl unmount -b "$_loopDev" --no-user-interaction - echo " - Deleting loop device: $_loopDev" - udisksctl loop-delete -b "$_loopDev" --no-user-interaction - echo " - Unmounting HTTP file" - fusermount -uz mnt/http + + echo " - Deleting loop devices..." + for loop_device in $(losetup --list | grep "${pkgbase}" | awk '{print $1}') + do + echo -ne " - deleting '$loop_device'..." + udisksctl loop-delete -b "$loop_device" + echo " done." + done + + echo " - Unmounting HTTP files..." + for fuse_mount_points in $(cat /etc/mtab | grep "${pkgbase}" | awk '{print $2}') + do + echo -ne " - unmounting '$fuse_mount_points'..." + fusermount -u "$fuse_mount_points" + echo " done." + done + rmdir -p mnt/http else echo "not allowed" @@ -431,7 +462,7 @@ prepare() { fi echo " - Downloading ISO" - curl -JLO "$_iso" + wget --no-verbose -c --tries=20 --waitretry=20 --timeout=60 "$_iso" echo " - Extracting Windows installation image" 7z x $(echo "$_iso" | awk -F "/" '{print $NF}') sources/install.wim