Skip to content

Commit

Permalink
www/librewolf: Update to 123.0-1
Browse files Browse the repository at this point in the history
 switch to unity-menubar from archlinux,
 since it is not currently maintained by upstream.

PR:	277807
Approved by:	freebsd@sysctl.cz (maintainer)
  • Loading branch information
jsm222 committed Mar 22, 2024
1 parent 6832fb6 commit 8608214
Show file tree
Hide file tree
Showing 20 changed files with 16,863 additions and 8,636 deletions.
17 changes: 8 additions & 9 deletions www/librewolf/Makefile
@@ -1,13 +1,10 @@
PORTNAME= librewolf
DISTVERSION= 117.0.1-1
PORTREVISION= 7
DISTVERSION= 123.0.1-1
CATEGORIES= www wayland
MASTER_SITES= https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${DISTVERSION:R}-1/
DISTNAME= ${PORTNAME}-${DISTVERSION:R}-1.source.
EXTRACT_SUFX= tar.gz

PATCH_SITES= https://gitlab.com/librewolf-community/browser/source/-/raw/5a211f7bad8dcf188a96b408cc143082df8d30a8/
PATCHFILES= patches/unity_kde/unity-menubar.patch?inline=false:-p1
MAINTAINER= freebsd@sysctl.cz
COMMENT= Custom version of Firefox, focused on privacy, security and freedom
WWW= https://librewolf.net/
Expand All @@ -16,20 +13,22 @@ LICENSE= MPL20
LICENSE_FILE= ${WRKSRC}/LICENSE

BUILD_DEPENDS= nspr>=4.32:devel/nspr \
nss>=3.84:security/nss \
icu>=71.1:devel/icu \
nss>=3.95:security/nss \
icu>=73.1:devel/icu \
libevent>=2.1.8:devel/libevent \
harfbuzz>=4.4.1:print/harfbuzz \
harfbuzz>=8.3.0:print/harfbuzz \
graphite2>=1.3.14:graphics/graphite2 \
png>=1.6.37:graphics/png \
png>=1.6.39:graphics/png \
dav1d>=1.0.0:multimedia/dav1d \
libvpx>=1.12.0:multimedia/libvpx \
libvpx>=1.14.0:multimedia/libvpx \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
v4l_compat>0:multimedia/v4l_compat \
autoconf2.13:devel/autoconf2.13 \
nasm:devel/nasm \
yasm:devel/yasm \
zip:archivers/zip
EXTRA_PATCHES= ${FILESDIR}/unity-menubar.patch:-p1


.include "${.CURDIR}/../../www/firefox/Makefile.options"

Expand Down
8 changes: 3 additions & 5 deletions www/librewolf/distinfo
@@ -1,5 +1,3 @@
TIMESTAMP = 1696616618
SHA256 (librewolf-117.0-1.source.tar.gz) = 446e9479547dceda58cbcdc2f9f503539086ddb193c8b1206b7c736cd56e44c3
SIZE (librewolf-117.0-1.source.tar.gz) = 903353725
SHA256 (patches/unity_kde/unity-menubar.patch?inline=false) = ff6e224ed0eb3c9d4c3ae92acd9cd04d750e0bcc6be1fa64ccc1317abcc13711
SIZE (patches/unity_kde/unity-menubar.patch?inline=false) = 163548
TIMESTAMP = 1710878981
SHA256 (librewolf-123.0-1.source.tar.gz) = e3209efbddd0c0a79bc62cb9c5cc57b816816bf32a24e8e476e07879c2791314
SIZE (librewolf-123.0-1.source.tar.gz) = 965610712
37 changes: 9 additions & 28 deletions www/librewolf/files/patch-bug1559213
Expand Up @@ -11,10 +11,10 @@ Date: Thu Jun 13 11:53:00 2019 -0700
4 files changed, 34 insertions(+), 3 deletions(-)

diff --git config/external/moz.build config/external/moz.build
index a0877c9d717e..5caa2036e0ec 100644
index 2fc8df57992e..63d18e50a961 100644
--- config/external/moz.build
+++ config/external/moz.build
@@ -45,8 +45,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
@@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
external_dirs += ["media/libvpx"]

if CONFIG["MOZ_AV1"]:
Expand All @@ -26,30 +26,11 @@ index a0877c9d717e..5caa2036e0ec 100644

if not CONFIG["MOZ_SYSTEM_PNG"]:
external_dirs += ["media/libpng"]
diff --git config/system-headers.mozbuild config/system-headers.mozbuild
index d9489c8f15e4..4d2f15e18c1c 100644
--- config/system-headers.mozbuild
+++ config/system-headers.mozbuild
@@ -1291,6 +1291,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
'proxy.h',
]

+if CONFIG['MOZ_SYSTEM_AV1']:
+ system_headers += [
+ 'aom/aom_decoder.h',
+ 'aom/aomdx.h',
+ 'aom/aom_image.h',
+ 'dav1d/dav1d.h',
+ ]
+
if CONFIG['MOZ_SYSTEM_LIBVPX']:
system_headers += [
'vpx_mem/vpx_mem.h',
diff --git dom/media/platforms/moz.build dom/media/platforms/moz.build
index c71f22a22eee..efbd523b1225 100644
index 5c6e25b3980b..ce99ebfb6d3f 100644
--- dom/media/platforms/moz.build
+++ dom/media/platforms/moz.build
@@ -80,6 +80,11 @@ if CONFIG["MOZ_AV1"]:
@@ -81,6 +81,11 @@ if CONFIG["MOZ_AV1"]:
"agnostic/AOMDecoder.cpp",
"agnostic/DAV1DDecoder.cpp",
]
Expand All @@ -62,10 +43,10 @@ index c71f22a22eee..efbd523b1225 100644
if CONFIG["MOZ_OMX"]:
EXPORTS += [
diff --git media/ffvpx/libavcodec/moz.build media/ffvpx/libavcodec/moz.build
index 5675c28234a1..56344e5e4c98 100644
index 761fc8cf4cd9..793a5b8697a8 100644
--- media/ffvpx/libavcodec/moz.build
+++ media/ffvpx/libavcodec/moz.build
@@ -109,10 +109,14 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
@@ -120,10 +120,14 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
'vp9recon.c',
'vpx_rac.c',
]
Expand All @@ -85,10 +66,10 @@ index 5675c28234a1..56344e5e4c98 100644
LOCAL_INCLUDES += ['/media/mozva']
SOURCES += [
diff --git toolkit/moz.configure toolkit/moz.configure
index 2e56fa46ce59..23e30935c4bc 100644
index f93a5d64fec8..814357f4e979 100644
--- toolkit/moz.configure
+++ toolkit/moz.configure
@@ -745,7 +745,23 @@ def av1(value):
@@ -744,7 +744,23 @@ def av1(value):
return True


Expand All @@ -113,7 +94,7 @@ index 2e56fa46ce59..23e30935c4bc 100644
def dav1d_asm(target):
if target.cpu in ("aarch64", "x86", "x86_64"):
return True
@@ -761,6 +777,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
@@ -760,6 +776,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
set_define("MOZ_DAV1D_ASM", dav1d_asm)
set_config("MOZ_AV1", av1)
set_define("MOZ_AV1", av1)
Expand Down

0 comments on commit 8608214

Please sign in to comment.