112.0-1

4 files changed, 13 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72c71b7aa056..ca099f6f52d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-appmenu
 	pkgdesc = Firefox from extra with appmenu patch
-	pkgver = 111.0
+	pkgver = 112.0
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -44,31 +44,27 @@ pkgbase = firefox-appmenu
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
-	provides = firefox=111.0
+	provides = firefox=112.0
 	conflicts = firefox
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
 	options = !lto
 	options = !debug
-	source = https://archive.mozilla.org/pub/firefox/releases/111.0/source/firefox-111.0.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/111.0/source/firefox-111.0.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/112.0/source/firefox-112.0.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/112.0/source/firefox-112.0.source.tar.xz.asc
 	source = firefox.desktop
 	source = identity-icons-brand.svg
-	source = https://raw.githubusercontent.com/nikatar/AUR/master/0001-Bug-1819374-Squashed-ffmpeg-6.0-update.patch
-	source = 0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch
 	source = fix-wayland-build.patch
 	source = unity-menubar.patch
 	source = fix_csd_window_buttons.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = e1006c0872aa7eb30fb5a689413957f1e5fc8d2048b1637bf6f6fafdbd4ea55f
+	sha256sums = eb19185f7bfa5c3b0c73edaa57160b44bf3bb2139db83539809607486b8075d9
 	sha256sums = SKIP
 	sha256sums = 34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
-	sha256sums = 802f9271a5f7c0ab581baae8c46fd5b29598025ee93bb2dac6b456f8e0ae6acc
-	sha256sums = be9ba079a931d5e881ce38430d418cc834e8c6b157af6c79ea267998caece806
 	sha256sums = 46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25
-	sha256sums = ff6e224ed0eb3c9d4c3ae92acd9cd04d750e0bcc6be1fa64ccc1317abcc13711
+	sha256sums = 74440d292e76426ac5cba9058a6f86763c37a9aa61b7afc47771140f1f53870b
 	sha256sums = e08d0bc5b7e562f5de6998060e993eddada96d93105384960207f7bdf2e1ed6e
 
 pkgname = firefox-appmenu
diff --git a/0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch b/0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch
deleted file mode 100644
index b0381041d9ae..000000000000
--- a/0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: stransky <stransky@redhat.com>
-Date: Thu, 9 Mar 2023 13:16:19 +0000
-Subject: [PATCH] Bug 1820416 Use correct FFVPX headers from ffmpeg 6.0
- r=padenot
-
-Differential Revision: https://phabricator.services.mozilla.com/D172116
----
- dom/media/platforms/ffmpeg/ffvpx/moz.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dom/media/platforms/ffmpeg/ffvpx/moz.build b/dom/media/platforms/ffmpeg/ffvpx/moz.build
-index 188b866fc9de..cda0960787a5 100644
---- a/dom/media/platforms/ffmpeg/ffvpx/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffvpx/moz.build
-@@ -20,7 +20,7 @@ SOURCES += [
- ]
- LOCAL_INCLUDES += [
-     "..",
--    "../ffmpeg59/include",
-+    "../ffmpeg60/include",
-     "/media/mozva",
- ]
- 
diff --git a/PKGBUILD b/PKGBUILD
index b85f6d844c90..6a98b6f71ab7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=firefox-appmenu
 _pkgname=firefox
-pkgver=111.0
+pkgver=112.0
 pkgrel=1
 pkgdesc="Firefox from extra with appmenu patch"
 arch=(x86_64)
@@ -30,19 +30,15 @@ options=(!emptydirs !makeflags !strip !lto !debug)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         $_pkgname.desktop
         identity-icons-brand.svg
-        https://raw.githubusercontent.com/nikatar/AUR/master/0001-Bug-1819374-Squashed-ffmpeg-6.0-update.patch
-        0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch
         fix-wayland-build.patch
         unity-menubar.patch
         fix_csd_window_buttons.patch)
-sha256sums=('e1006c0872aa7eb30fb5a689413957f1e5fc8d2048b1637bf6f6fafdbd4ea55f'
+sha256sums=('eb19185f7bfa5c3b0c73edaa57160b44bf3bb2139db83539809607486b8075d9'
             'SKIP'
             '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
-            '802f9271a5f7c0ab581baae8c46fd5b29598025ee93bb2dac6b456f8e0ae6acc'
-            'be9ba079a931d5e881ce38430d418cc834e8c6b157af6c79ea267998caece806'
             '46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25'
-            'ff6e224ed0eb3c9d4c3ae92acd9cd04d750e0bcc6be1fa64ccc1317abcc13711'
+            '74440d292e76426ac5cba9058a6f86763c37a9aa61b7afc47771140f1f53870b'
             'e08d0bc5b7e562f5de6998060e993eddada96d93105384960207f7bdf2e1ed6e')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
@@ -62,13 +58,6 @@ prepare() {
   mkdir mozbuild
   cd firefox-$pkgver
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1819374
-  patch -Np1 -i ../0001-Bug-1819374-Squashed-ffmpeg-6.0-update.patch
-
-  # https://bugs.archlinux.org/task/77796
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1820416
-  patch -Np1 -i ../0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch
-
   #https://aur.archlinux.org/packages/firefox-appmenu nicman32 comment 2021-08-16
   patch -Np1 -i ../fix-wayland-build.patch
 
diff --git a/unity-menubar.patch b/unity-menubar.patch
index 979f7fc96861..531c28f1017b 100644
--- a/unity-menubar.patch
+++ b/unity-menubar.patch
@@ -105,8 +105,8 @@
 +pref("ui.use_unity_menubar", true);
 +#endif
  
- pref("browser.display.force_inline_alttext", false); // true = force ALT text for missing images to be layed out inline
- // 0 = no external leading,
+ // min font device pixel size at which to turn on high quality
+ pref("browser.display.auto_quality_min_font_size", 20);
 --- a/toolkit/content/xul.css
 +++ b/toolkit/content/xul.css
 @@ -229,6 +229,13 @@ toolbox {
@@ -3006,7 +3006,7 @@
 +#endif /* __nsMenuItem_h__ */
 --- /dev/null
 +++ b/widget/gtk/nsMenuObject.cpp
-@@ -0,0 +1,664 @@
+@@ -0,0 +1,653 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -3091,7 +3091,6 @@
 +    nsMenuObject *mOwner;
 +    RefPtr<imgRequestProxy> mImageRequest;
 +    nsCOMPtr<nsIURI> mURI;
-+    nsIntRect mImageRect;
 +};
 +
 +NS_IMPL_ISUPPORTS(nsMenuObjectIconLoader, imgINotificationObserver)
@@ -3145,10 +3144,6 @@
 +        return;
 +    }
 +
-+    if (!mImageRect.IsEmpty()) {
-+        img = ImageOps::Clip(img, mImageRect);
-+    }
-+
 +    int32_t width, height;
 +    img->GetWidth(&width);
 +    img->GetHeight(&height);
@@ -3183,7 +3178,6 @@
 +    dom::Document *doc = mOwner->ContentNode()->OwnerDoc();
 +
 +    nsCOMPtr<nsIURI> uri;
-+    nsIntRect imageRect;
 +    imgRequestProxy *imageRequest = nullptr;
 +
 +    nsAutoString uriString;
@@ -3206,9 +3200,6 @@
 +        imageRequest = list->mListStyleImage.GetImageRequest();
 +        if (imageRequest) {
 +            imageRequest->GetURI(getter_AddRefs(uri));
-+            auto& rect = list->mImageRegion.AsRect();
-+            imageRect = rect.ToLayoutRect().ToNearestPixels(
-+                            pc->AppUnitsPerDevPixel());
 +        }
 +    }
 +
@@ -3226,7 +3217,7 @@
 +
 +    bool same;
 +    if (mURI && NS_SUCCEEDED(mURI->Equals(uri, &same)) && same &&
-+        (!imageRequest || imageRect == mImageRect)) {
++        !imageRequest) {
 +        return;
 +    }
 +
@@ -3238,10 +3229,8 @@
 +    mURI = uri;
 +
 +    if (imageRequest) {
-+        mImageRect = imageRect;
 +        imageRequest->Clone(this, nullptr, getter_AddRefs(mImageRequest));
 +    } else {
-+        mImageRect.SetEmpty();
 +        nsCOMPtr<nsILoadGroup> loadGroup = doc->GetDocumentLoadGroup();
 +        RefPtr<imgLoader> loader =
 +            nsContentUtils::GetImgLoaderForDocument(doc);