Changeset 109218 in vbox

Timestamp:

May 9, 2025 9:19:32 AM (10 days ago)

Author:

vboxsync

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

168796

Message:

Packaging: More fixes for RPATH replacement during RPM and DEB build, bugref:10450.

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/rules (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (1 diff)

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

@@ -297 +297 @@
         mv $(addprefix $(archdir)/,additions/VBoxGuestAdditions.iso) $(prefix)/usr/share/$(package)
         mv $(archdir) $(prefix)/usr/lib/$(package)
-        if [ -f $(prefix)/usr/lib/$(package)/libQt6CoreVBox.so.6 ]; then \
+        if [ -f $(prefix)/usr/lib/$(package)/libQt6CoreVBox.so.6 ]; then
             $(vboxroot)/tools/linux.$(chrarch)/bin/chrpath \
                 --keepgoing --replace /usr/lib/$(package) \
                 $(prefix)/usr/lib/$(package)/*.so.6 \
-                $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \
-                $(prefix)/usr/lib/$(package)/plugins/platformthemes/*.so; \
-                $(prefix)/usr/lib/$(package)/plugins/sqldrivers/*.so; \
-                $(prefix)/usr/lib/$(package)/plugins/styles/*.so; \
-                $(prefix)/usr/lib/$(package)/plugins/wayland-shell-integration/*.so; \
-            echo "[Paths]" > $(prefix)/usr/lib/$(package)/qt.conf; \
-            echo "Plugins = /usr/lib/$(package)/plugins" >> $(prefix)/usr/lib/$(package)/qt.conf; \
+                $(prefix)/usr/lib/$(package)/plugins/platforms/*.so \
+                $(prefix)/usr/lib/$(package)/plugins/platformthemes/*.so \
+                $(prefix)/usr/lib/$(package)/plugins/sqldrivers/*.so \
+                $(prefix)/usr/lib/$(package)/plugins/styles/*.so \
+                $(prefix)/usr/lib/$(package)/plugins/wayland-shell-integration/*.so \
+                $(prefix)/usr/lib/$(package)/plugins/wayland-decoration-client/*.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) && \

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

@@ -216 +216 @@
     $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/sqldrivers/*.so \
     $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/styles/*.so \
-    $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/wayland-shell-integration/*.so || true
+    $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/wayland-shell-integration/*.so \
+    $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/wayland-decoration-client/*.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