linux

Timestamp:

Mar 29, 2021 8:36:56 PM (4 years ago)

Author:

vboxsync

Message:

Installer/linux: bugref:9532: Excessive xcb/xkbinput legacy stuff which was necessary for Qt 5.6.x.

Location:

trunk/src/VBox/Installer/linux

Files:

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

-              r88318
+              r88319
         $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm) \
         icons
- VBOX_LNX_NO_STRIP += \
-        $(if $(VBOX_WITH_ORACLE_QT),$(VBOX_QT_PLUGINS)) \
-        $(addprefix legacy/,$(VBOX_QT_LEGACY_LIBS))
 endif
 …
           archive/plugins/platforms \
           archive/plugins/sqldrivers \
+          archive/plugins/xcbglintegrations \
+          archive/legacy,) \
+          archive/plugins/xcbglintegrations,) \
         $(if $(VBOX_WITH_PYTHON),\
           archive/sdk/installer \

-              r84947
+              r88319
     fi
-    # Create legacy symlinks if necesary for Qt5/xcb stuff.
-    if [ -d $INSTALLATION_DIR/legacy ]; then
-        if ! /sbin/ldconfig -p | grep -q "\<libxcb\.so\.1\>"; then
-            for f in `ls -1 $INSTALLATION_DIR/legacy/`; do
-                ln -s $INSTALLATION_DIR/legacy/$f $INSTALLATION_DIR/$f
-                echo $INSTALLATION_DIR/$f >> $CONFIG_DIR/$CONFIG_FILES
-            done
-        fi
-    fi
     # Icons
     cur=`pwd`

-              r88318
+              r88319
   rm $RPM_BUILD_ROOT/usr/lib/virtualbox/chrpath
 fi
-if [ -d $RPM_BUILD_ROOT/usr/lib/virtualbox/legacy ]; then
-  mv $RPM_BUILD_ROOT/usr/lib/virtualbox/legacy/* $RPM_BUILD_ROOT/usr/lib/virtualbox
-  rmdir $RPM_BUILD_ROOT/usr/lib/virtualbox/legacy
-fi
 ln -s ../VBoxVMM.so $RPM_BUILD_ROOT/usr/lib/virtualbox/components/VBoxVMM.so
 for i in VBoxHeadless VBoxNetDHCP VBoxNetNAT VBoxNetAdpCtl; do

Note: See TracChangeset for help on using the changeset viewer.