Changeset 67782 in vbox

Timestamp:

Jul 4, 2017 7:24:55 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

116697

Message:

Qt5: also install xcbglintegrations/libqxcb-glx-integration.so on X11 hosts

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Installer/linux/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/linux/debian/rules (modified) (2 diffs)
• src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (1 diff)
• src/VBox/Installer/solaris/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -5867 +5867 @@
     VBOX_QT_LEGACY_LIBS = \
      $(if $(VBOX_LD_HAS_LIBXCB),,libxcb.so.1 libX11.so.6 libX11-xcb.so.1)
-    VBOX_QT_PLUGINS = plugins/platforms/libqxcb.so
+    VBOX_QT_PLUGINS = \
+      plugins/platforms/libqxcb.so \
+      plugins/xcbglintegrations/libqxcb-glx-integration.so
    else ifeq ($(KBUILD_TARGET), win)
     VBOX_QT_MOD += \

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -519 +519 @@
         $(if $(VBOX_WITH_ORACLE_QT), \
           archive/plugins/platforms \
+          archive/plugins/xcbglintegrations \
           archive/legacy,) \
         $(if $(VBOX_WITH_PYTHON),\

trunk/src/VBox/Installer/linux/debian/rules

@@ -272 +272 @@
                 $(prefix)/usr/lib/$(package)/*.so.5 \
                 $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \
+                $(prefix)/usr/lib/$(package)/plugins/xcbglintegrations/*.so; \
             echo "[Paths]" > $(prefix)/usr/lib/$(package)/qt.conf; \
             echo "Plugins = /usr/lib/$(package)/plugins" >> $(prefix)/usr/lib/$(package)/qt.conf; \
@@ -315 +316 @@
             $(addprefix --exclude=lib,$(addsuffix VBox.so.5,\
               Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport Qt5OpenGL Qt5DBus Qt5XcbQpa Qt5X11Extras)) \
-            --exclude=libqxcb.so
+            --exclude=libqxcb.so --exclude=libqxcb-glx-integration.so
 endif
         mkdir -p $(current)/debian/$(verpkg)-dbg/usr/lib/$(package)

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -173 +173 @@
   $RPM_BUILD_ROOT/usr/lib/virtualbox/chrpath --keepgoing --replace /usr/lib/virtualbox \
     $RPM_BUILD_ROOT/usr/lib/virtualbox/*.so.5 \
-    $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/platforms/*.so || true
+    $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/platforms/*.so \
+    $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/xcbglintegrations/*.so || true
   echo "[Paths]" > $RPM_BUILD_ROOT/usr/lib/virtualbox/qt.conf
   echo "Plugins = /usr/lib/virtualbox/plugins" >> $RPM_BUILD_ROOT/usr/lib/virtualbox/qt.conf

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -355 +355 @@
           libQt5WidgetsVBox.so.5 \
           plugins/platforms/libqxcb.so \
+          plugins/xcbglintegrations/libqxcb-glx-integration.so \
           $(if $(VBOX_GUI_USE_QGL),libQt5OpenGLVBox.so.5,)
   endif