Changeset 61485 in vbox

Timestamp:

Jun 6, 2016 9:55:02 AM (9 years ago)

Author:

vboxsync

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

107815

Message:

deb/rpm: attemp to 1) fix wrong installation path of nls (/usr/lib/nls => /usr/share/nls), 2) wrong RPATH in shipped Qt libraries and 3) missing qt.conf for shipped Qt libraries

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/rules (modified) (2 diffs)
• rpm/VirtualBox.tmpl.spec (modified) (2 diffs)

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

@@ -221 +221 @@
         $(if $(NOQT),,cp $(archdir)/icons/128x128/virtualbox.png \
            $(prefix)/usr/share/pixmaps/virtualbox.png)
+        $(if $(NOQT),,mv $(archdir)/nls $(prefix)/usr/share/$(package))
         $(if $(NOQT),,cd $(archdir)/icons; for i in *; do \
         for j in $$i/virtualbox.*; do \
@@ -281 +282 @@
 endif
         mv $(archdir) $(prefix)/usr/lib/$(package)
+        if [ -f $(prefix)/usr/lib/$(package)/libQt5CoreVBox.so.5 ]; then \
+            chrpath --keepgoing --replace /usr/lib/$(package) \
+                $(prefix)/usr/lib/$(package)/*.so.5; \
+                $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \
+            echo "[Paths]" > $(prefix)/usr/lib/$(package)/qt.conf; \
+            echo "Plugins = /usr/lib/$(package)/plugins" >> $(prefix)/usr/lib/$(package)/qt.conf; \
+        fi
         export VBOX_INSTALL_PATH=/usr/lib/$(package) && \
             cd $(builddir)/bin/sdk/installer && \

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

@@ -85 +85 @@
 mv VBox.sh $RPM_BUILD_ROOT/usr/bin/VBox
 mv VBoxSysInfo.sh $RPM_BUILD_ROOT/usr/share/virtualbox
+mv nls $RPM_BUILD_ROOT/usr/share/virtualbox
 cp icons/128x128/virtualbox.png $RPM_BUILD_ROOT/usr/share/pixmaps/virtualbox.png
 cd icons
@@ -165 +166 @@
 %endif
 mv * $RPM_BUILD_ROOT/usr/lib/virtualbox
+if [ -f $RPM_BUILD_ROOT/usr/lib/virtualbox/libQt5CoreVBox.so.5 ]; then
+  chrpath --keepgoing --replace /usr/lib/virtualbox \
+    $RPM_BUILD_ROOT/usr/lib/virtualbox/*.so.5 \
+    $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/platforms/*.so
+  echo "[Paths]" > $RPM_BUILD_ROOT/usr/lib/virtualbox/qt.conf
+  echo "Plugins = /usr/lib/virtualbox/plugins" >> $RPM_BUILD_ROOT/usr/lib/virtualbox/qt.conf
+fi
 ln -s ../VBoxVMM.so $RPM_BUILD_ROOT/usr/lib/virtualbox/components/VBoxVMM.so
 for i in VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetNAT VBoxNetAdpCtl; do