Browse Source

Delete/refresh old patches

tags/2018-04-16
falkTX 8 years ago
parent
commit
89486cc8c4
5 changed files with 6 additions and 80 deletions
  1. +0
    -48
      libs/juce/patches/core_always-print-leak-objs.patch
  2. +6
    -32
      libs/juce/patches/fix-for-temporary-windows.patch
  3. +0
    -0
      libs/juce/patches/fix-old-mingw-build.patch.bak
  4. +0
    -0
      libs/juce/patches/mingw-fixes.patch.bak
  5. +0
    -0
      libs/juce/patches/mingw-fixes_2.patch.bak

+ 0
- 48
libs/juce/patches/core_always-print-leak-objs.patch View File

@@ -1,48 +0,0 @@
diff --git a/modules/juce_core/memory/juce_LeakedObjectDetector.h b/modules/juce_core/memory/juce_LeakedObjectDetector.h
index 248e7bc..74b7779 100644
--- a/modules/juce_core/memory/juce_LeakedObjectDetector.h
+++ b/modules/juce_core/memory/juce_LeakedObjectDetector.h
@@ -29,6 +29,7 @@
#ifndef JUCE_LEAKEDOBJECTDETECTOR_H_INCLUDED
#define JUCE_LEAKEDOBJECTDETECTOR_H_INCLUDED
+#define DBG2(dbgtext) { juce::String str; str << dbgtext; std::cout << str.toRawUTF8() << std::endl; }
//==============================================================================
/**
@@ -55,7 +56,7 @@ public:
{
if (--(getCounter().numObjects) < 0)
{
- DBG ("*** Dangling pointer deletion! Class: " << getLeakedObjectClassName());
+ DBG2 ("*** Dangling pointer deletion! Class: " << getLeakedObjectClassName());
/** If you hit this, then you've managed to delete more instances of this class than you've
created.. That indicates that you're deleting some dangling pointers.
@@ -68,7 +69,7 @@ public:
your object management. Tut, tut. Always, always use ScopedPointers, OwnedArrays,
ReferenceCountedObjects, etc, and avoid the 'delete' operator at all costs!
*/
- jassertfalse;
+ //jassertfalse;
}
}
@@ -83,7 +84,7 @@ private:
{
if (numObjects.value > 0)
{
- DBG ("*** Leaked objects detected: " << numObjects.value << " instance(s) of class " << getLeakedObjectClassName());
+ DBG2 ("*** Leaked objects detected: " << numObjects.value << " instance(s) of class " << getLeakedObjectClassName());
/** If you hit this, then you've leaked one or more objects of the type specified by
the 'OwnerClass' template parameter - the name should have been printed by the line above.
@@ -92,7 +93,7 @@ private:
your object management. Tut, tut. Always, always use ScopedPointers, OwnedArrays,
ReferenceCountedObjects, etc, and avoid the 'delete' operator at all costs!
*/
- jassertfalse;
+ //jassertfalse;
}
}

+ 6
- 32
libs/juce/patches/fix-for-temporary-windows.patch View File

@@ -1,21 +1,8 @@
diff --git a/modules/juce_gui_basics/misc/juce_DropShadower.cpp b/modules/juce_gui_basics/misc/juce_DropShadower.cpp
index c6d0d77..18b706d 100644
--- a/modules/juce_gui_basics/misc/juce_DropShadower.cpp
+++ b/modules/juce_gui_basics/misc/juce_DropShadower.cpp
@@ -31,7 +31,7 @@ public:
setVisible (true);
setInterceptsMouseClicks (false, false);
- if (comp->isOnDesktop())
+ if (! comp->isOnDesktop())
{
setSize (1, 1); // to keep the OS happy by not having zero-size windows
addToDesktop (ComponentPeer::windowIgnoresMouseClicks
diff --git a/modules/juce_gui_basics/native/juce_linux_Windowing.cpp b/modules/juce_gui_basics/native/juce_linux_Windowing.cpp
index 7573f8a..ff1993c 100644
--- a/modules/juce_gui_basics/native/juce_linux_Windowing.cpp
+++ b/modules/juce_gui_basics/native/juce_linux_Windowing.cpp
@@ -2879,8 +2879,9 @@ private:
diff --git a/modules/juce_gui_basics/native/juce_linux_Windowing.cpp b/modules/juce_gui_basics/native/juce_linux_Windowing.cpp
index 7573f8a..ff1993c 100644
--- a/modules/juce_gui_basics/native/juce_linux_Windowing.cpp
+++ b/modules/juce_gui_basics/native/juce_linux_Windowing.cpp
@@ -2879,8 +2879,9 @@ private:
{
Atom netHints [2];
@@ -27,7 +14,7 @@ index 7573f8a..ff1993c 100644
netHints [0] = Atoms::getIfExists ("_NET_WM_WINDOW_TYPE_COMBO");
else
netHints [0] = Atoms::getIfExists ("_NET_WM_WINDOW_TYPE_NORMAL");
@@ -2930,7 +2931,7 @@ private:
@@ -2930,7 +2931,7 @@ private:
swa.border_pixel = 0;
swa.background_pixmap = None;
swa.colormap = colormap;
@@ -36,16 +23,3 @@ index 7573f8a..ff1993c 100644
swa.event_mask = getAllEventsMask();
windowH = XCreateWindow (display, parentToAddTo != 0 ? parentToAddTo : root,
diff --git a/modules/juce_gui_basics/widgets/juce_Slider.cpp b/modules/juce_gui_basics/widgets/juce_Slider.cpp
index 75f9c1c..4e07676 100644
--- a/modules/juce_gui_basics/widgets/juce_Slider.cpp
+++ b/modules/juce_gui_basics/widgets/juce_Slider.cpp
@@ -868,7 +868,7 @@ public:
if (parentForPopupDisplay != nullptr)
parentForPopupDisplay->addChildComponent (popup);
else
- popup->addToDesktop (0);
+ popup->addToDesktop (ComponentPeer::windowIsTemporary);
popup->setVisible (true);
}

libs/juce/patches/fix-old-mingw-build.patch → libs/juce/patches/fix-old-mingw-build.patch.bak View File


libs/juce/patches/mingw-fixes.patch → libs/juce/patches/mingw-fixes.patch.bak View File


libs/juce/patches/mingw-fixes_2.patch → libs/juce/patches/mingw-fixes_2.patch.bak View File


Loading…
Cancel
Save