From 6655528d2faba6ea4a3b375b7ad5a0e03ffc4684 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sat, 2 Dec 2017 09:54:27 +0000
Subject: [PATCH] Use custom X11 methods on UI bridges on all systems with X11

---
 source/bridges-ui/CarlaBridgeToolkitGtk.cpp |  4 ++--
 source/bridges-ui/CarlaBridgeToolkitQt.cpp  | 11 +++++------
 source/bridges-ui/Makefile                  | 15 +++------------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/source/bridges-ui/CarlaBridgeToolkitGtk.cpp b/source/bridges-ui/CarlaBridgeToolkitGtk.cpp
index 714932f82..14cfc9655 100644
--- a/source/bridges-ui/CarlaBridgeToolkitGtk.cpp
+++ b/source/bridges-ui/CarlaBridgeToolkitGtk.cpp
@@ -1,6 +1,6 @@
 /*
  * Carla Bridge Toolkit, Gtk version
- * Copyright (C) 2011-2014 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2011-2017 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -19,7 +19,7 @@
 
 #include <gtk/gtk.h>
 
-#if defined(CARLA_OS_LINUX) && defined(HAVE_X11)
+#ifdef HAVE_X11
 # define USE_CUSTOM_X11_METHODS
 # include <gdk/gdkx.h>
 #endif
diff --git a/source/bridges-ui/CarlaBridgeToolkitQt.cpp b/source/bridges-ui/CarlaBridgeToolkitQt.cpp
index c5756fb3b..bb2e51dd2 100644
--- a/source/bridges-ui/CarlaBridgeToolkitQt.cpp
+++ b/source/bridges-ui/CarlaBridgeToolkitQt.cpp
@@ -27,12 +27,11 @@
 #else
 # include <QtGui/QApplication>
 # include <QtGui/QMainWindow>
-#endif
-
-#if defined(CARLA_OS_LINUX) && defined(HAVE_X11) && QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-# define USE_CUSTOM_X11_METHODS
-# include <QtGui/QX11Info>
-# include <X11/Xlib.h>
+# ifdef HAVE_X11
+#  define USE_CUSTOM_X11_METHODS
+#  include <QtGui/QX11Info>
+#  include <X11/Xlib.h>
+# endif
 #endif
 
 CARLA_BRIDGE_START_NAMESPACE
diff --git a/source/bridges-ui/Makefile b/source/bridges-ui/Makefile
index 61cd3774d..55f8134c8 100644
--- a/source/bridges-ui/Makefile
+++ b/source/bridges-ui/Makefile
@@ -25,10 +25,6 @@ endif
 BUILD_CXX_FLAGS  += -DBUILD_BRIDGE -DBUILD_BRIDGE_UI -I. -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/utils -isystem $(CWD)/modules
 LINK_FLAGS       += $(WATER_LIBS)
 
-ifneq ($(HAIKU),true)
-LINK_FLAGS       += -lpthread
-endif
-
 # ----------------------------------------------------------------------------------------------------------------------------
 
 BUILD_GTK2_FLAGS    = $(BUILD_CXX_FLAGS) -DBRIDGE_GTK2 $(shell pkg-config --cflags gtk+-2.0)
@@ -47,26 +43,20 @@ BUILD_X11_FLAGS     = $(BUILD_CXX_FLAGS) -DBRIDGE_X11 $(X11_FLAGS)
 LINK_X11_FLAGS      = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS)
 
 BUILD_COCOA_FLAGS   = $(BUILD_CXX_FLAGS) -DBRIDGE_COCOA -ObjC++
-LINK_COCOA_FLAGS    = $(LINK_FLAGS) -framework Cocoa -framework IOKit -framework QuartzCore $(LIBDL_LIBS)
+LINK_COCOA_FLAGS    = $(LINK_FLAGS) -framework Cocoa $(LIBDL_LIBS)
 
 BUILD_WINDOWS_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_HWND
 LINK_WINDOWS_FLAGS  = $(LINK_FLAGS) -static -mwindows
 
-ifeq ($(LINUX),true)
 ifeq ($(HAVE_X11),true)
 LINK_GTK2_FLAGS += -lX11
 LINK_GTK3_FLAGS += -lX11
 LINK_QT4_FLAGS  += -lX11
 endif
-endif
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(MACOS_OR_WIN32),true)
-HAVE_QT4 = false
-HAVE_QT5 = false
-endif
-
+ifneq ($(MACOS_OR_WIN32),true)
 ifeq ($(HAVE_GTK2),true)
 TARGETS += ui_lv2-gtk2
 endif
@@ -86,6 +76,7 @@ endif
 ifeq ($(HAVE_X11),true)
 TARGETS += ui_lv2-x11
 endif
+endif
 
 ifeq ($(MACOS),true)
 TARGETS += ui_lv2-cocoa