2:15 a.m.
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13000
Modified Files:
VirtualBox-4.2.0-VBoxGuestLib.patch
VirtualBox-4.2.0-libcxx.patch VirtualBox.spec
Removed Files:
VirtualBox-4.2.0-xorg17.patch
Log Message:
* Tue Jan 15 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-2
- Re enable_docs after add some BuildRequires of new texlive.
- VBoxGuestLib is not need for new X11-xorg, so no compile instead patch source to
build with system sources.
- Delete source bundles before patching sources and adjustments on the corresponding
patches.
- VirtualBox-4.2.0-libcxx.patch minor imporvements.
VirtualBox-4.2.0-VBoxGuestLib.patch:
Makefile.kmk | 2 ++
1 file changed, 2 insertions(+)
Index: VirtualBox-4.2.0-VBoxGuestLib.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-4.2.0-VBoxGuestLib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.2.0-VBoxGuestLib.patch 23 Sep 2012 14:33:25 -0000 1.1
+++ VirtualBox-4.2.0-VBoxGuestLib.patch 16 Jan 2013 02:15:40 -0000 1.2
@@ -1,125 +1,16 @@
-VBoxGuestR3LibRuntimeXF86.cpp:
-Inspired from
http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-ser...
-xalloc.c and verrorf.c
-Author: Sérgio Basto <sergio(a)serjux.com>
-
---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.xorg17 2012-08-03
13:28:42.000000000 +0100
-+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2012-09-09 01:05:45.271905105
+0100
-@@ -187,11 +187,9 @@ VBoxGuestR3LibXFree86_SOURCES = \
- VBoxGuestR3LibVideo.cpp \
- VBoxGuestR3LibRuntimeXF86.cpp
- VBoxGuestR3LibXFree86_INCS = \
-- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common/ \
-- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
-- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
-- $(VBOX_PATH_X11_XFREE_4_3)/include \
-- $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
-+ /usr/share/xorg-x11-server-source/hw/xfree86/common/ \
-+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
-+ /usr/share/xorg-x11-server-source/include
+--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2012-12-27
16:42:00.199621337 +0000
++++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2012-12-27 16:43:06.605220980
+0000
+@@ -39,11 +39,13 @@ LIBRARIES += \
+ VBoxGuestR3Lib \
+ VBoxGuestR3LibShared
+ ifndef VBOX_ONLY_TESTSUITE
++ifndef VBOX_USE_SYSTEM_XORG_HEADERS
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
+ LIBRARIES += \
+ VBoxGuestR3LibXFree86
+ endif
+ endif
++endif
+ LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
- VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
-
----
./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp.xorg17 2011-01-14
20:15:34.000000000 +0000
-+++ ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp 2012-09-09
01:04:03.198818717 +0100
-@@ -34,20 +34,55 @@
- #include <iprt/log.h>
- #include <iprt/mem.h>
- #include <iprt/string.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <math.h>
-+#include <ctype.h>
- extern "C" {
- # define XFree86LOADER
--# include <xf86_ansic.h>
- # include <errno.h>
- # undef size_t
- }
-
-+/** Provide an VErrorF function when used stand-alone. */
-+void VErrorF(const char *format, va_list args)
-+{
-+ vfprintf(stderr, format, args); /* RATS: We assume the format string
-+ * is trusted, since it is always
-+ * from a log message in our code. */
-+}
-+
-+/* When using this file as part of a stand-alone (i.e., non-X-Server
-+ * program, then the ultimate output routines have to be defined. */
-+
-+/** Provide an ErrorF function when used stand-alone. */
-+void ErrorF(const char *format, ...)
-+{
-+ va_list args;
-+
-+ va_start(args, format);
-+ vfprintf(stderr, format, args); /* RATS: We assume the format string
-+ * is trusted, since it is always
-+ * from a log message in our code. */
-+ va_end(args);
-+}
-+
-+void *xalloc(unsigned long n)
-+{
-+ if (!n)
-+ n = 1;
-+ return malloc(n);
-+}
-+
- /* This is risky as it restricts call to the ANSI format type specifiers. */
- RTDECL(size_t) RTStrPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat,
...)
- {
- va_list args;
- int cbRet;
- va_start(args, pszFormat);
-- cbRet = xf86vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
-+ cbRet = vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
- va_end(args);
- return cbRet >= 0 ? cbRet : 0;
- }
-@@ -55,8 +90,8 @@ RTDECL(size_t) RTStrPrintf(char *pszBuff
- RTDECL(int) RTStrToUInt32Ex(const char *pszValue, char **ppszNext, unsigned uBase,
uint32_t *pu32)
- {
- char *pszNext = NULL;
-- xf86errno = 0;
-- unsigned long ul = xf86strtoul(pszValue, &pszNext, uBase);
-+ errno = 0;
-+ unsigned long ul = strtoul(pszValue, &pszNext, uBase);
- if (ppszNext)
- *ppszNext = pszNext;
- if (RT_UNLIKELY(pszValue == pszNext))
-@@ -65,11 +100,11 @@ RTDECL(int) RTStrToUInt32Ex(const char *
- ul = UINT32_MAX;
- if (pu32)
- *pu32 = (uint32_t) ul;
-- if (RT_UNLIKELY(xf86errno == EINVAL))
-+ if (RT_UNLIKELY(errno == EINVAL))
- return VERR_INVALID_PARAMETER;
-- if (RT_UNLIKELY(xf86errno == ERANGE))
-+ if (RT_UNLIKELY(errno == ERANGE))
- return VWRN_NUMBER_TOO_BIG;
-- if (RT_UNLIKELY(xf86errno))
-+ if (RT_UNLIKELY(errno))
- /* RTErrConvertFromErrno() is not available */
- return VERR_UNRESOLVED_ERROR;
- if (RT_UNLIKELY(*pszValue == '-'))
-@@ -77,7 +112,7 @@ RTDECL(int) RTStrToUInt32Ex(const char *
- if (RT_UNLIKELY(*pszNext))
- {
- while (*pszNext)
-- if (!xf86isspace(*pszNext))
-+ if (!isspace(*pszNext))
- return VWRN_TRAILING_CHARS;
- return VWRN_TRAILING_SPACES;
- }
-@@ -135,6 +170,6 @@ RTDECL(void *) RTMemTmpAllocTag(size_t
-
- RTDECL(void) RTMemTmpFree(void *pv)
- {
-- xfree(pv);
-+ free(pv);
- }
VirtualBox-4.2.0-libcxx.patch:
./src/VBox/Runtime/Makefile.kmk | 2 +-
./src/libs/kStuff/Makefile.kmk | 2 +-
Config.kmk | 4 ++--
b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +-
b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +---
b/src/VBox/HostDrivers/Support/Makefile.kmk | 2 +-
b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------
b/src/VBox/HostDrivers/win/Makefile.kmk | 2 +-
b/src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +-
b/src/VBox/Installer/win/Resources/Makefile.kmk | 2 +-
configure | 2 +-
src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +-
src/VBox/Installer/win/Stub/Makefile.kmk | 2 +-
src/VBox/Storage/testcase/Makefile.kmk | 2 +-
src/libs/liblzf-3.4/Makefile.kmk | 2 +-
15 files changed, 21 insertions(+), 23 deletions(-)
Index: VirtualBox-4.2.0-libcxx.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-4.2.0-libcxx.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VirtualBox-4.2.0-libcxx.patch 23 Sep 2012 14:33:25 -0000 1.2
+++ VirtualBox-4.2.0-libcxx.patch 16 Jan 2013 02:15:40 -0000 1.3
@@ -4,13 +4,25 @@
distribution. Doesn't work with trunk glibc heading towards 2.11 anyways.
Static linking is not really supported anyways.
-Was From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 Mon Sep 17 00:00:00 2001
+Was From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9
+Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Fri, 18 Jun 2010 10:58:14 +0200
-diff --git a/Config.kmk b/Config.kmk
-index 0ea34d8..2ec388c 100644
+
+Redo for VirtualBox-4.2.x
+Sérgio Basto <sergio(a)serjux.com>
+
--- a/Config.kmk
+++ b/Config.kmk
+@@ -2588,7 +2588,7 @@ else
+ VBOX_SUFF_OBJ = $(SUFF_OBJ)
+ endif
+ VBOXW32GUEST_SUFF_LIB = .lib
+-VBOXLNX32GUEST_SUFF_LIB = .a
++VBOXLNX32GUEST_SUFF_LIB = .so
+
+ #
+ # SDKs for external libraries.
@@ -3163,7 +3163,7 @@ TEMPLATE_VBOXR3EXE_LIBS = pthread m rt dl
TEMPLATE_VBOXR3EXE_LIBS = \
$(L4_LIBDIR)/libvboxserver.s.so \
@@ -20,8 +32,6 @@
$(L4_LIBDIR)/libdl.s.so \
$(L4_LIBDIR)/libuc.0.s.so
else ifeq ($(KBUILD_TARGET),os2)
-diff --git a/configure b/configure
-index 987cf1b..75d556c 100755
--- a/configure
+++ b/configure
@@ -2582,7 +2582,7 @@ fi
@@ -57,8 +67,6 @@
ifdef VBOX_X11_SEAMLESS_GUEST
VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
VBoxClient_SOURCES += \
-diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk
b/src/VBox/Frontends/VirtualBox/Makefile.kmk
-index ed0163b..2ee8418 100644
--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
@@ -957,7 +957,7 @@ endif # darwin
@@ -81,7 +89,6 @@
SUPR3Static_EXTENDS = SUPR3
#
-diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
--- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.libcxx 2012-08-29 15:13:46.000000000
+0100
+++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2012-09-02 02:49:31.198721147 +0100
@@ -143,7 +143,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
@@ -171,8 +178,6 @@
VBoxRes_DEPS = $(VBOX_SVN_REV_KMK)
VBoxRes_SOURCES = \
dummy.cpp \
-diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk
b/src/VBox/Installer/win/Stub/Makefile.kmk
-index a8f89eb..6cf55cc 100644
--- a/src/VBox/Installer/win/Stub/Makefile.kmk
+++ b/src/VBox/Installer/win/Stub/Makefile.kmk
@@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk
@@ -184,8 +189,6 @@
TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE)
PROGRAMS.x86 += VBoxStub
-diff --git a/src/VBox/Storage/testcase/Makefile.kmk
b/src/VBox/Storage/testcase/Makefile.kmk
-index f935b05..40f6bf2 100644
--- a/src/VBox/Storage/testcase/Makefile.kmk
+++ b/src/VBox/Storage/testcase/Makefile.kmk
@@ -68,7 +68,7 @@ ifdef VBOX_WITH_TESTCASES
@@ -197,8 +200,6 @@
vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3
vbox-img_SOURCES = \
vbox-img.cpp \
-diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk
-index 44088fa..0afe89a 100644
--- a/src/libs/liblzf-3.4/Makefile.kmk
+++ b/src/libs/liblzf-3.4/Makefile.kmk
@@ -33,7 +33,7 @@ VBox-liblzf_SOURCES = \
@@ -210,18 +211,25 @@
VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE)
VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS)
VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86)
-diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk
-index fde8b7c..405d354 100644
---- a/src/libs/zlib-1.2.6/Makefile.kmk
-+++ b/src/libs/zlib-1.2.6/Makefile.kmk
-@@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \
- inftrees.c \
- inffast.c
-
--VBox-zlib-static_TEMPLATE = VBOXR3STATIC
-+VBox-zlib-static_TEMPLATE = VBOXR3EXE
- VBox-zlib-static_DEFS = $(VBox-zlib_DEFS)
- VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES)
+--- ./src/VBox/Runtime/Makefile.kmk.orig 2012-12-27 18:33:44.262413863 +0000
++++ ./src/VBox/Runtime/Makefile.kmk 2012-12-27 18:34:26.856820592 +0000
+@@ -211,7 +211,7 @@ endif
+ #
+ # RuntimeR3 - Static Runtime for Ring-3 executables.
+ #
+-RuntimeR3_TEMPLATE = VBoxR3Static
++RuntimeR3_TEMPLATE = VBOXR3EXE
+ RuntimeR3_SDKS = VBOX_LIBXML2 VBOX_OPENSSL VBOX_BOOST ## @todo why is BOOST and
XML2 here? r3/xml.cpp is not in this lib...
+ RuntimeR3_SDKS.win = $(VBOX_WINPSDK) $(VBOX_WINDDK)
+ RuntimeR3_DEFS = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE
RT_WITH_VBOX RT_NO_GIP
+--- ./src/libs/kStuff/Makefile.kmk.orig 2012-12-27 18:36:01.629728244 +0000
++++ ./src/libs/kStuff/Makefile.kmk 2012-12-27 18:36:11.876827415 +0000
+@@ -75,7 +75,7 @@ VBox-kStuff_SOURCES = \
+ # The library for static linking.
+ #
+ LIBRARIES += VBox-kStuffStatic
+-VBox-kStuffStatic_TEMPLATE = VBoxR3Static
++VBox-kStuffStatic_TEMPLATE = VBOXR3EXE
+ VBox-kStuffStatic_EXTENDS = VBox-kStuff
+
---
-1.7.1
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- VirtualBox.spec 26 Dec 2012 06:02:33 -0000 1.26
+++ VirtualBox.spec 16 Jan 2013 02:15:40 -0000 1.27
@@ -19,15 +19,15 @@
#global enable_webservice 0
#endif
-%if 0%{?fedora} < 18
+#if 0%{?fedora} < 18
%global enable_docs 1
-%else
-%global enable_docs 0
-%endif
+#else
+#global enable_docs 0
+#endif
Name: VirtualBox
Version: 4.2.6
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -76,6 +76,14 @@
BuildRequires: mkisofs
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
+%if 0%{?fedora} >= 18
+BuildRequires: doxygen-latex
+BuildRequires: texlive-collection-fontsrecommended
+BuildRequires: texlive-ec
+BuildRequires: texlive-ucs
+BuildRequires: texlive-tabulary
+BuildRequires: texlive-fancybox
+%endif
BuildRequires: boost-devel
#BuildRequires: liblzf-devel
BuildRequires: libxml2-devel
@@ -195,6 +203,20 @@
%setup -qn %{name}-%{version}%{prereltag}
find -name '*.py[co]' -delete
+# Remove prebuilt binary tools
+%if 0%{?fedora} < 16
+rm -rf kBuild
+%endif
+rm -rf tools
+# Remove bundle X11 sources and some lib sources, before patching.
+rm -rf src/VBox/Additions/x11/x11include
+rm -rf src/VBox/Additions/x11/x11stubs
+rm -rf src/libs/boost-1.37.0/
+#rm -rf src/libs/liblzf-3.4/
+rm -rf src/libs/libxml2-2.6.31/
+rm -rf src/libs/libpng-1.2.8/
+rm -rf src/libs/zlib-1.2.6/
+
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
@@ -212,24 +234,8 @@
%if 0%{?fedora} < 17
%patch25 -p1 -b .xorg111
%endif
-
%patch26 -p1 -b .nobundles
-# Remove prebuilt binary tools
-%if 0%{?fedora} < 16
-rm -rf kBuild
-%endif
-rm -rf tools
-
-# Remove some bundle X11 sources.
-rm -rf src/VBox/Additions/x11/x11include
-rm -rf src/VBox/Additions/x11/x11stubs
-rm -rf src/libs/boost-1.37.0/
-#rm -rf src/libs/liblzf-3.4/
-rm -rf src/libs/libxml2-2.6.31/
-rm -rf src/libs/libpng-1.2.8/
-rm -rf src/libs/zlib-1.2.6/
-
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -608,6 +614,13 @@
%changelog
+* Tue Jan 15 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-2
+- Re enable_docs after add some BuildRequires of new texlive.
+- VBoxGuestLib is not need for new X11-xorg, so no compile instead patch source to
+ build with system sources.
+- Delete source bundles before patching sources and adjustments on the corresponding
patches.
+- VirtualBox-4.2.0-libcxx.patch minor imporvements.
+
* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
- New upstream release.
- Fix some changelog dates.
--- VirtualBox-4.2.0-xorg17.patch DELETED ---