up to 5.2.2
authorJan Palus <atler@pld-linux.org>
Mon, 13 Nov 2017 20:11:49 +0000 (21:11 +0100)
committerJan Palus <atler@pld-linux.org>
Sat, 25 Nov 2017 12:30:30 +0000 (13:30 +0100)
- 18-system-xorg and linux-4.14 patches no longer required
- renumbered patches

16-no-update.patch
18-system-xorg.patch [deleted file]
VirtualBox.spec

index fd06789..b6d70f4 100644 (file)
@@ -26,13 +26,13 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
 @@ -1033,8 +1033,6 @@
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-     connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), SIGNAL(triggered()),
-             gNetworkManager, SLOT(show()), Qt::UniqueConnection);
--    connect(action(UIActionIndex_M_Application_S_CheckForUpdates), SIGNAL(triggered()),
--            gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection);
+     connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), &UIAction::triggered,
+             gNetworkManager, &UINetworkManager::show, Qt::UniqueConnection);
+-    connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered,
+-            gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection);
  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-     connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()),
-             &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
+     connect(action(UIActionIndex_M_Application_S_ResetWarnings), &UIAction::triggered,
+             &msgCenter(), &UIMessageCenter::sltResetSuppressedMessages, Qt::UniqueConnection);
 --- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h.orig   2015-07-09 20:13:36.439757556 +0200
 +++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h        2015-07-09 20:13:40.446396985 +0200
 @@ -62,7 +62,6 @@
diff --git a/18-system-xorg.patch b/18-system-xorg.patch
deleted file mode 100644 (file)
index a5279a6..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Build the X.Org driver only for the selected system X Server version.
-Author: Michael Meskes <meskes@debian.org>, Felix Geyer <fgeyer@debian.org>
-
---- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-@@ -40,8 +40,8 @@ LIBRARIES += \
-       VBoxGuestR3LibShared
- ifndef VBOX_ONLY_TESTSUITE
-  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
--  LIBRARIES += \
--      VBoxGuestR3LibXFree86
-+#  LIBRARIES += \
-+#     VBoxGuestR3LibXFree86
-  endif
- endif
- LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-@@ -63,18 +63,12 @@ VBoxOGL_TEMPLATE       = VBOXCROGLR3GUES
- VBoxOGL_INCS           = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-  VBoxOGL_INCS     += \
--      $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
--      $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
--      $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
--      $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
--      $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
--      $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
--      $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
--      $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
--      $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
--      $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-+      /usr/include/x11 \
-+      /usr/include/xorg \
-+      /usr/include/pixman-1 \
-       $(VBOX_MESA_INCS) \
--      $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
-+      /usr/include/drm \
-+      /usr/include/libdrm
-  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
- endif
-@@ -204,10 +198,10 @@ VBoxOGL_LIBS = \
-       $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-  VBoxOGL_LIBS += \
--      $(PATH_STAGE_LIB)/libXcomposite.so \
--      $(PATH_STAGE_LIB)/libXdamage.so \
--      $(PATH_STAGE_LIB)/libXfixes.so \
--      $(PATH_STAGE_LIB)/libXext.so
-+      Xcomposite \
-+      Xdamage \
-+      Xfixes \
-+      Xext
-  ifdef VBoxOGL_FAKEDRI
-   VBoxOGL_LIBS += \
-       dl
index 9e3b18a..0019e3f 100644 (file)
@@ -47,14 +47,14 @@ exit 1
 Summary:       VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox - wirtualizator sprzętu x86
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       5.1.30
+Version:       5.2.2
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: 4dadcb625f72b8b36a374a52526c682a
+# Source0-md5: 98733fd3dc74487ef5e66cb13be4a685
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: e9d77afca12e2fad2616963b1cb199c9
+# Source1-md5: 712dbeb12ac0ba49ec2bac3ad26dabc4
 Source2:       vboxservice.init
 Source3:       vboxservice.service
 Source4:       vboxservice.sysconfig
@@ -75,14 +75,12 @@ Patch7:             lightdm-greeter-makefile.patch
 Patch8:                lightdm-greeter-g++-link.patch
 Patch9:                pld-guest.patch
 Patch10:       16-no-update.patch
-Patch11:       18-system-xorg.patch
-Patch12:       %{pname}-all-translations.patch
-Patch13:       x32.patch
-Patch14:       %{pname}-no-scrextend.patch
-Patch15:       %{pname}-multipython.patch
-Patch16:       %{pname}-lightdm-1.19.2.patch
-Patch17:       %{pname}-no-vboxvideo.patch
-Patch18:       linux-4.14.patch
+Patch11:       %{pname}-all-translations.patch
+Patch12:       x32.patch
+Patch13:       %{pname}-no-scrextend.patch
+Patch14:       %{pname}-multipython.patch
+Patch15:       %{pname}-lightdm-1.19.2.patch
+Patch16:       %{pname}-no-vboxvideo.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -130,7 +128,7 @@ BuildRequires:      fakeroot
 BuildRequires: gcc >= 5:3.2.3
 %{?with_webservice:BuildRequires:      gsoap-devel}
 BuildRequires: issue
-BuildRequires: kBuild >= 0.1.9998.2814
+BuildRequires: kBuild >= 0.1.9998.3093
 BuildRequires: libIDL-devel
 BuildRequires: libcap-static
 BuildRequires: libdrm-devel
@@ -534,16 +532,14 @@ cd ../..\
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 %if %{with all_langs}
-%patch12 -p0
+%patch11 -p0
 %endif
+%patch12 -p1
 %patch13 -p1
-%patch14 -p1
+%patch14 -p0
 %patch15 -p0
 %patch16 -p0
-%patch17 -p0
-%patch18 -p0
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
        -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -557,10 +553,10 @@ cd ../..\
 %if %{with kernel}
 install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers}
 cd PLD-MODULE-BUILD
-../src/VBox/Additions/linux/export_modules guest-modules.tar.gz
+../src/VBox/Additions/linux/export_modules.sh guest-modules.tar.gz
 tar -zxf guest-modules.tar.gz -C GuestDrivers
 
-../src/VBox/HostDrivers/linux/export_modules host-modules.tar.gz --without-hardening
+../src/VBox/HostDrivers/linux/export_modules.sh host-modules.tar.gz --without-hardening
 tar -zxf host-modules.tar.gz -C HostDrivers
 cd -
 %endif
@@ -584,6 +580,7 @@ VBOX_BUILD_PUBLISHER=_PLD
 VBOX_VERSION_STRING=$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)_PLD
 XSERVER_VERSION=%(rpm -q --queryformat '%{V}\n' xorg-xserver-server-devel | awk -F. '{ print $1 $2 }' 2>/dev/null || echo ERROR)
 VBOX_USE_SYSTEM_XORG_HEADERS=1
+VBOX_USE_SYSTEM_GL_HEADERS=1
 %if %{with lightdm}
 VBOX_WITH_LIGHTDM_GREETER=1
 VBOX_WITH_LIGHTDM_GREETER_PACKING=1
@@ -690,7 +687,7 @@ cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/vbox
 %if %{with lightdm}
 install -d $RPM_BUILD_ROOT%{_datadir}/xgreeters
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_sbindir}}/vbox-greeter
-cp -p %{objdir}/Additions/Installer/linux/share/VBoxGuestAdditions/vbox-greeter.desktop $RPM_BUILD_ROOT%{_datadir}/xgreeters
+cp -p %{objdir}/Additions/Installer/linux/other/vbox-greeter.desktop $RPM_BUILD_ROOT%{_datadir}/xgreeters
 %endif
 
 %if %{with dkms}
@@ -711,11 +708,6 @@ install -p %{SOURCE5} $RPM_BUILD_ROOT/sbin/mount.vdi
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/autorun.sh
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/runasroot.sh
 
-# scripts to setup modules, x11 and service. we have covered that in our packages
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd-service
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd-x11
-
 # unknown - checkme
 %if 1
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPInstall
@@ -970,12 +962,19 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
 %endif
 %dir %{_libdir}/%{pname}/tools
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTCat
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTChMod
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTDbgSymCache
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTHttp
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTIsoMaker
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTKrnlModInfo
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTLdrFlt
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTLs
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTManifest
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTMkDir
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTRm
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTRmDir
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTShutdown
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTSignTool
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTTar
@@ -1018,6 +1017,8 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %attr(755,root,root) %{_libdir}/%{pname}/components/VBoxXPCOMIPCC.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxSysInfo.sh
 
+%{_libdir}/%{pname}/UnattendedTemplates
+
 %dir %{_datadir}/%{pname}
 
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/*.rules
@@ -1041,10 +1042,10 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %lang(en) %{_datadir}/%{pname}/nls/*_en.qm
 %lang(es) %{_datadir}/%{pname}/nls/*_es.qm
 %lang(eu) %{_datadir}/%{pname}/nls/*_eu.qm
-%lang(fi) %{_datadir}/%{pname}/nls/*_fa_IR.qm
+%lang(fa) %{_datadir}/%{pname}/nls/*_fa.qm
 %lang(fi) %{_datadir}/%{pname}/nls/*_fi.qm
 %lang(fr) %{_datadir}/%{pname}/nls/*_fr.qm
-%lang(gl_ES) %{_datadir}/%{pname}/nls/*_gl_ES.qm
+%lang(gl) %{_datadir}/%{pname}/nls/*_gl.qm
 %lang(he) %{_datadir}/%{pname}/nls/*_he.qm
 %lang(hu) %{_datadir}/%{pname}/nls/*_hu.qm
 %lang(id) %{_datadir}/%{pname}/nls/*_id.qm
This page took 0.917647 seconds and 4 git commands to generate.