[PR PATCH] nss: update to 3.89.1.

[PR PATCH] nss: update to 3.89.1.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages nss-update
https://github.com/void-linux/void-packages/pull/43813

nss: update to 3.89.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43813.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-update-43813.patch --]
[-- Type: text/x-diff, Size: 1111 bytes --]

From 63a96c2235803c35113f44956463864c0831cd98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 May 2023 22:52:39 +0700
Subject: [PATCH] nss: update to 3.89.1.

---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9faceae76235..6fda2a8425eb 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.35
 
 pkgname=nss
-version=3.89
+version=3.89.1
 revision=1
 hostmakedepends="perl which"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=55c37a3f4da010d0574fb8b39264cb1e7b4ce9e6c2954c1c7ecf9f41ee00bed5
+checksum=3adaedb9e70c3c5f40603bf60a01e336190a6dbe01929d395f16b01fe84a0156
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

Re: [PR PATCH] [Updated] nss: update to 3.89.1.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages nss-update
https://github.com/void-linux/void-packages/pull/43813

nss: update to 3.89.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43813.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-update-43813.patch --]
[-- Type: text/x-diff, Size: 4838 bytes --]

From 2dee97687bad77caa74fb6caeba116c737fccedf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 May 2023 22:52:39 +0700
Subject: [PATCH 1/2] nss: update to 3.89.1.

---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9faceae76235..6fda2a8425eb 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.35
 
 pkgname=nss
-version=3.89
+version=3.89.1
 revision=1
 hostmakedepends="perl which"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=55c37a3f4da010d0574fb8b39264cb1e7b4ce9e6c2954c1c7ecf9f41ee00bed5
+checksum=3adaedb9e70c3c5f40603bf60a01e336190a6dbe01929d395f16b01fe84a0156
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 2e9e4d4d6dbb37a9997c7b35cfa00c86997db288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 10 May 2023 08:51:03 +0700
Subject: [PATCH 2/2] qytdl: force using yt_dlp

Fix #43814
---
 srcpkgs/qytdl/patches/force-yt-dlp.patch | 67 ++++++++++++++++++++++++
 srcpkgs/qytdl/template                   |  3 +-
 2 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/qytdl/patches/force-yt-dlp.patch

diff --git a/srcpkgs/qytdl/patches/force-yt-dlp.patch b/srcpkgs/qytdl/patches/force-yt-dlp.patch
new file mode 100644
index 000000000000..de37c69c2a07
--- /dev/null
+++ b/srcpkgs/qytdl/patches/force-yt-dlp.patch
@@ -0,0 +1,67 @@
+--- a/src/config.py
++++ b/src/config.py
+@@ -11,7 +11,7 @@ def default_opts():
+             "profile" : "auto",
+             "fallback" : ["auto"],
+             "duplicates" : "false",
+-            "module" : "youtube_dl",
++            "module" : "yt_dlp",
+             "playlistFolder" : "true",
+             "theme" : "default",
+             }
+@@ -64,7 +64,7 @@ def write_config( opts ):
+                 "download_path" : opts.get( "downloadPath", userPath ),
+                 "\n# Which system installation (module) used to download": None,
+                 "# (youtube_dl, yt_dlp, etc.)" : None,
+-                "module" : opts.get( "module", "youtube_dl" ),
++                "module" : "yt_dlp",
+                 "\n# Allow duplicate URLs into queue (true/false)" : None,
+                 "allow_duplicates" : opts.get( "duplicates", "false" ),
+                 "\n# Each playlist gets its own subdirectory (true/false)" : None,
+@@ -125,7 +125,7 @@ def read_options( opts ):
+     ##  Default section
+     section = cfg[ "DEFAULT" ]
+     opts[ "downloadPath" ] = section.get( "download_path", userPath )
+-    opts[ "module" ] = section.get( "module", "youtube_dl" )
++    opts[ "module" ] = "yt_dlp"
+     opts[ "duplicates" ] = section.get( "allow_duplicates", "false" )
+     opts[ "playlistFolder" ] = section.get( "playlist_folder", "true" )
+ 
+--- a/src/main_widget.py
++++ b/src/main_widget.py
+@@ -330,9 +330,9 @@ class MainWidget( QWidget ):
+                 print( "Module:\t%s" % opts[ "module" ] )
+ 
+         except ImportError:
+-            ydl_module = youtube_dl
++            ydl_module = yt_dlp
+             if self.debug:
+-                print( "Module:\tyoutube_dl")
++                print( "Module:\tyt_dlp")
+ 
+         ydl_opts = self.ydl_opts( profile )
+ 
+@@ -539,9 +539,9 @@ class MainWidget( QWidget ):
+ 
+             ##  Just grab this here for convenience's sake
+             if not self.debug:
+-                ydl = youtube_dl.YoutubeDL( { "quiet" : True } )
++                ydl = yt_dlp.YoutubeDL( { "quiet" : True } )
+             else:
+-                ydl = youtube_dl.YoutubeDL()
++                ydl = yt_dlp.YoutubeDL()
+ 
+             for url in urls:
+ 
+--- a/src/util.py
++++ b/src/util.py
+@@ -1,7 +1,7 @@
+ from __future__ import unicode_literals
+ import sys, os
+-import youtube_dl
+-from youtube_dl.utils import DownloadError
++import yt_dlp
++from yt_dlp.utils import DownloadError
+ 
+ ####    RE-ENABLE if you want to enable possible internal YDL
+ #import internal_ydl
diff --git a/srcpkgs/qytdl/template b/srcpkgs/qytdl/template
index 66013cab1b2d..1bbccb582c23 100644
--- a/srcpkgs/qytdl/template
+++ b/srcpkgs/qytdl/template
@@ -1,8 +1,7 @@
 # Template file for 'qytdl'
 pkgname=qytdl
 version=1.6
-revision=1
-build_style=gnu-makefile
+revision=2
 pycompile_dirs="usr/share/qytdl/src"
 depends="desktop-file-utils python3-PyQt5 yt-dlp"
 short_desc="Simple Qt (PyQt5) frontend to Youtube-DL"

Re: [PR PATCH] [Merged]: nss: update to 3.89.1.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]

There's a merged pull request on the void-packages repository

nss: update to 3.89.1.
https://github.com/void-linux/void-packages/pull/43813

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->