Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-03-22 23:08:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

depends: qt: remove uneeded patch

Browse source
This commit is contained in:
tobtoht 2023-02-12 00:55:11 +01:00
parent 7c704560b2
commit 51fbdcf716
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
2 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/depends/packages/qt.mk
View file

@ -10,7 +10,6 @@ $(package)_linux_dependencies=openssl native_qt freetype fontconfig libxcb libxk
$(package)_qt_libs=corelib network widgets gui plugins testlib $(package)_qt_libs=corelib network widgets gui plugins testlib
$(package)_linguist_tools = lrelease lupdate lconvert $(package)_linguist_tools = lrelease lupdate lconvert
$(package)_patches = aarch64Toolchain.cmake $(package)_patches = aarch64Toolchain.cmake
$(package)_patches += cocoa-no-badge.patch
$(package)_patches += dont_hardcode_pwd.patch $(package)_patches += dont_hardcode_pwd.patch
$(package)_patches += fast_fixed_dtoa_no_optimize.patch $(package)_patches += fast_fixed_dtoa_no_optimize.patch
$(package)_patches += gnueabihfToolchain.cmake $(package)_patches += gnueabihfToolchain.cmake
@ -262,9 +261,6 @@ define $(package)_preprocess_cmds
mv $($(package)_patch_dir)/MacToolchain.cmake . && \ mv $($(package)_patch_dir)/MacToolchain.cmake . && \
mv $($(package)_patch_dir)/aarch64Toolchain.cmake . && \ mv $($(package)_patch_dir)/aarch64Toolchain.cmake . && \
mv $($(package)_patch_dir)/gnueabihfToolchain.cmake . && \ mv $($(package)_patch_dir)/gnueabihfToolchain.cmake . && \
cd qtbase && \
patch -p1 -i $($(package)_patch_dir)/cocoa-no-badge.patch && \
cd .. && \
cd qtmultimedia && \ cd qtmultimedia && \
patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \ patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \ patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \

28
contrib/depends/patches/qt/cocoa-no-badge.patch
View file

@ -1,28 +0,0 @@
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h
index 256b7b36ad..c6d73e3c06 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.h
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.h
@@ -90,7 +90,6 @@ public:
void clearToolbars();
void setApplicationIcon(const QIcon &icon) const override;
- void setApplicationBadge(qint64 number) override;
void beep() const override;
void quit() const override;
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 2ec225cbea..b17ab38b10 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -438,11 +438,6 @@ void QCocoaIntegration::setApplicationIcon(const QIcon &icon) const
NSApp.applicationIconImage = [NSImage imageFromQIcon:icon withSize:fallbackSize];
}
-void QCocoaIntegration::setApplicationBadge(qint64 number)
-{
- NSApp.dockTile.badgeLabel = number ? [NSString stringWithFormat:@"%" PRId64, number] : nil;
-}
-
void QCocoaIntegration::beep() const
{
NSBeep();