Fix icon on KDE Wayland

3 files changed, 6 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8fb0ec62137..906130c68ec5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -61,17 +61,15 @@ pkgbase = firefox-developer-edition-kde
 	source = firefox-install-dir.patch
 	source = psutil.patch
 	source = mozilla-kde.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/master/mozilla-kde.patch
-	source = firefox-branded-icons.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/master/firefox/firefox-branded-icons.patch
 	source = firefox-kde.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/master/firefox/firefox-kde.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha256sums = 7944cf62e046902b903b3e1c36a63eff81d1441332df9f63eaaec93220691176
 	sha256sums = SKIP
-	sha256sums = 67e1934ed8ac0fb4bb020cde11157956151e4c48ec5405783763a5fe4b887e6d
+	sha256sums = 9b6c3cbc5a441acf1b66dc97f5787968ef78a056066c79fec598aaf35e5117f2
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
 	sha256sums = 99dccc8a955bee85ce69c02a32888f7d79ba7dd0fe5aa6aaf6f52102286d544c
 	sha256sums = f811e6408fa8900bed80055403dec889e0249681bba2b85911f96571595f78ce
 	sha256sums = bc5397bbccf158e12e058646ab88a636040ba810e5f8270a2efa914e3b8b52d0
-	sha256sums = bcedaf4feb3ec56c86cb3b99c0fa99c3f38090485454d4beacf23bd90056433a
 	sha256sums = da420deac6bfdcbf0bba31011ec23be31cdc5ab10f95a6fef5a2d6d6defc739d
 
 pkgname = firefox-developer-edition-kde
diff --git a/PKGBUILD b/PKGBUILD
index 4e94be527e8d..e7d4a0aed5eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,16 +38,14 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-
         psutil.patch
         # https://github.com/openSUSE/firefox-maintenance
         mozilla-kde.patch::$_patchurl/mozilla-kde.patch
-        firefox-branded-icons.patch::$_patchurl/firefox/firefox-branded-icons.patch
         firefox-kde.patch::$_patchurl/firefox/firefox-kde.patch)
 sha256sums=('7944cf62e046902b903b3e1c36a63eff81d1441332df9f63eaaec93220691176'
             'SKIP'
-            '67e1934ed8ac0fb4bb020cde11157956151e4c48ec5405783763a5fe4b887e6d'
+            '9b6c3cbc5a441acf1b66dc97f5787968ef78a056066c79fec598aaf35e5117f2'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
             '99dccc8a955bee85ce69c02a32888f7d79ba7dd0fe5aa6aaf6f52102286d544c'
             'f811e6408fa8900bed80055403dec889e0249681bba2b85911f96571595f78ce'
             'bc5397bbccf158e12e058646ab88a636040ba810e5f8270a2efa914e3b8b52d0'
-            'bcedaf4feb3ec56c86cb3b99c0fa99c3f38090485454d4beacf23bd90056433a'
             'da420deac6bfdcbf0bba31011ec23be31cdc5ab10f95a6fef5a2d6d6defc739d')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
@@ -102,7 +100,7 @@ ac_add_options --with-distribution-id=org.archlinux
 ac_add_options --with-unsigned-addon-scopes=app,system
 ac_add_options --allow-addon-sideload
 export MOZILLA_OFFICIAL=1
-export MOZ_APP_REMOTINGNAME=${_pkgname//-/}
+export MOZ_APP_REMOTINGNAME=firefox-developer-edition
 
 # Keys
 ac_add_options --with-google-location-service-api-keyfile=${PWD@Q}/google-api-key
diff --git a/firefox-developer-edition.desktop b/firefox-developer-edition.desktop
index 505b8369d0d3..7378d3c84eee 100644
--- a/firefox-developer-edition.desktop
+++ b/firefox-developer-edition.desktop
@@ -112,7 +112,7 @@ Keywords[uk]=Internet;WWW;Browser;Web;Explorer;Інтернет;мережа;п�
 Keywords[vi]=Internet;WWW;Browser;Web;Explorer;Trình duyệt;Trang web
 Keywords[zh_CN]=Internet;WWW;Browser;Web;Explorer;网页;浏览;上网;火狐;Firefox;ff;互联网;网站;
 Keywords[zh_TW]=Internet;WWW;Browser;Web;Explorer;網際網路;網路;瀏覽器;上網;網頁;火狐
-Exec=/usr/lib/firefox-developer-edition/firefox %u
+Exec=/usr/lib/firefox-developer-edition/firefox --class="firefox-developer-edition" %u
 Icon=firefox-developer-edition
 Terminal=false
 X-MultipleArgs=false
@@ -229,7 +229,7 @@ Name[wo]=Palanteer bu bees
 Name[xh]=Ifestile entsha
 Name[zh_CN]=新建窗口
 Name[zh_TW]=開新視窗
-Exec=/usr/lib/firefox-developer-edition/firefox --new-window %u
+Exec=/usr/lib/firefox-developer-edition/firefox --class="firefox-developer-edition" --new-window %u
 
 [Desktop Action new-private-window]
 Name=New Private Window
@@ -337,4 +337,4 @@ Name[wo]=Panlanteeru biir bu bees
 Name[xh]=Ifestile yangasese entsha
 Name[zh_CN]=新建隐私浏览窗口
 Name[zh_TW]=新增隱私視窗
-Exec=/usr/lib/firefox-developer-edition/firefox --private-window %u
+Exec=/usr/lib/firefox-developer-edition/firefox --class="firefox-developer-edition" --private-window %u