Changeset 18907 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 15, 2009 3:22:27 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/Additions: mouse wheel fix for Xorg 1.5.x

Location:

trunk/src/VBox/Additions

Files:

• solaris/Installer/postinstall.sh (modified) (1 diff)
• solaris/Makefile.kmk (modified) (2 diffs)
• x11/Installer/x11config15sol.pl (added)

trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

@@ -213 +213 @@
         rm -f $vboxadditions_path/$xorgconf_unfit
     fi
-
-    $vboxadditions_path/x11config.pl
+    case "$xorgversion" in
+        7.1.* | 7.2.* | 6.9.* | 7.0.* | 1.3.* )
+            $vboxadditions_path/x11config.pl
+            ;;
+        1.5.* )
+            $vboxadditions_path/x11config15sol.pl
+            ;;
+    esac
 fi
 

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

@@ -154 +154 @@
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl \
+                $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15sol.pl \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11restore.pl \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf \
@@ -187 +188 @@
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient                    $(SOLARIS_ADD_INST_DIR)/1099.vboxclient
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl                         $(SOLARIS_ADD_INST_DIR)/x11config.pl
+        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15sol.pl                    $(SOLARIS_ADD_INST_DIR)/x11config15sol.pl
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11restore.pl                        $(SOLARIS_ADD_INST_DIR)/x11restore.pl
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf                    $(SOLARIS_ADD_INST_DIR)/solaris_xorg.conf