From c42601cc58e0b9b4e349942eeabbea0edfcbd4fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 10 May 2013 16:34:19 -0300 Subject: virtualbox-libre: fixing more freedom issues on the source code --- libre/virtualbox-libre/PKGBUILD | 2 +- libre/virtualbox-libre/libre.patch | 518 +++++++++++++++++++++++++++---------- 2 files changed, 384 insertions(+), 136 deletions(-) (limited to 'libre') diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index e167382d1..d4ce2d2ae 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -108,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '8db59591250dd0c7b395a394caa4f246' + '83533961112b83393b7e080370dc9100' '50387fba578646a9d29de3f917a199d2') prepare() { diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index 1e91c5b96..552acb9c7 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ --- VirtualBox-4.2.12.orig/Config.kmk 2013-04-12 07:33:55.000000000 -0300 -+++ VirtualBox-4.2.12/Config.kmk 2013-05-09 22:45:16.882436950 -0300 ++++ VirtualBox-4.2.12/Config.kmk 2013-05-10 15:03:20.817944799 -0300 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -10,23 +10,7 @@ # Install paths ## @todo This will change after 4.1 is branched off! # What is now 'bin' and 'lib' will be moved down under 'staged/', except on -@@ -94,7 +91,6 @@ - INST_SYS = $(INST_BIN) - INST_TESTCASE = $(INST_BIN)testcase/ - INST_ADDITIONS = $(INST_BIN)additions/ -- INST_ADDITIONS_ISO = $(INST_BIN) - - # other paths - INST_TESTSUITE = testsuite/ -@@ -119,7 +115,6 @@ - INST_SYS = $(INST_BIN) - INST_TESTCASE = $(INST_BIN)testcase/ - INST_ADDITIONS = $(INST_BIN)additions/ -- INST_ADDITIONS_ISO = $(INST_ADDITIONS) - - INST_TESTSUITE = testsuite/ - INST_LIB = lib/ -@@ -129,18 +124,13 @@ +@@ -129,9 +126,6 @@ endif INST_DOC = doc/ @@ -36,16 +20,15 @@ INST_PACKAGES = packages/ VBOX_PATH_SDK = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK)) - VBOX_PATH_DIST = $(patsubst %/,%,$(PATH_STAGE)/$(INST_DIST)) - VBOX_PATH_TESTSUITE = $(patsubst %/,%,$(PATH_STAGE)/$(INST_TESTSUITE)) +@@ -140,7 +134,6 @@ VBOX_PATH_ADDITIONS = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS)) --VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO)) + VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO)) VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB)) -VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL)) VBOX_PATH_PACKAGES = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES)) -@@ -215,7 +205,6 @@ +@@ -215,7 +208,6 @@ export VBOX_ADDITIONS_SH_MODE = release export VBOX_DOCUMENTATION_SH_MODE = release export VBOX_EFI_SH_MODE = release @@ -53,16 +36,7 @@ endif # Some info on the vendor -@@ -313,7 +302,7 @@ - endif - # Don't create the additions ISO. - # (Used by the additions build server, don't invert it.) --#VBOX_WITHOUT_ADDITIONS_ISO = 1 -+ VBOX_WITHOUT_ADDITIONS_ISO = 1 - ## @} - - ## @name Documentation -@@ -368,8 +357,6 @@ +@@ -368,8 +360,6 @@ VBOX_WITH_USB = 1 # Enable the USB 1.1 controller plus virtual USB HID devices. VBOX_WITH_VUSB = 1 @@ -71,7 +45,7 @@ # Enable the ISCSI feature. VBOX_WITH_ISCSI = 1 # Enable INIP support in the ISCSI feature. -@@ -441,9 +428,6 @@ +@@ -441,9 +431,6 @@ ifdef VBOX_WITH_USB VBOX_WITH_VUSB = 1 endif @@ -81,7 +55,7 @@ ifdef VBOX_WITH_PCI_PASSTHROUGH VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1 endif -@@ -584,8 +568,6 @@ +@@ -584,8 +571,6 @@ if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win) VBOX_WITH_CROGL = 1 endif @@ -90,7 +64,7 @@ # Enable S3 support (requires libcurl) VBOX_WITH_S3 = 1 # Enable Host=>Guest Drag'n'Drop -@@ -625,17 +607,6 @@ +@@ -625,17 +610,6 @@ endif ## @} @@ -108,7 +82,7 @@ ## @name Misc ## @{ # Enable Seamless mode -@@ -826,14 +797,6 @@ +@@ -826,14 +800,6 @@ # Skip stuff. # @@ -123,7 +97,7 @@ # VBOX_QUICK can be used by core developers to speed to the build ifdef VBOX_QUICK # undefine variables by assigning blank. -@@ -888,7 +851,6 @@ +@@ -888,7 +854,6 @@ VBOX_WITH_TESTSUITE= VBOX_WITH_QTGUI= VBOX_WITH_USB= @@ -131,7 +105,7 @@ VBOX_WITH_DOCS= VBOX_WITH_PDM_ASYNC_COMPLETION= VBOX_WITH_KCHMVIEWER= -@@ -910,7 +872,6 @@ +@@ -910,7 +875,6 @@ VBOX_WITH_CROGL= VBOX_WITH_DEBUGGER= VBOX_WITH_DOCS= @@ -139,7 +113,7 @@ VBOX_WITH_HARDENING= VBOX_WITH_HEADLESS= VBOX_WITH_HGCM= -@@ -983,7 +944,7 @@ +@@ -983,7 +947,7 @@ # # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set. # @@ -148,7 +122,7 @@ , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x)))) if $(words $(VBOX_ONLY_BUILD)) > 1 $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD)) -@@ -1001,9 +962,6 @@ +@@ -1001,9 +965,6 @@ # ifdef VBOX_OSE VBOX_WITH_VRDP= @@ -158,7 +132,7 @@ VBOX_WITH_PCI_PASSTHROUGH_IMPL= VBOX_WITH_OS2_ADDITIONS_BIN= VBOX_WITH_SECURELABEL= -@@ -1135,10 +1093,6 @@ +@@ -1135,10 +1096,6 @@ VBOX_WITH_KCHMVIEWER= endif @@ -169,7 +143,7 @@ # # Mark OSE builds clearly, helps figuring out limitations more easily. # -@@ -1743,9 +1697,6 @@ +@@ -1743,9 +1700,6 @@ # bin2c (convert binary files into C arrays) VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE) @@ -179,7 +153,7 @@ # VBoxCmp (simple /bin/cmp with more sensible output) VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE) -@@ -2633,13 +2584,6 @@ +@@ -2633,13 +2587,6 @@ SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE) endif @@ -193,7 +167,7 @@ SDK_VBOX_BLD_OPENSSL = . SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL SDK_VBOX_BLD_OPENSSL_LIBS ?= \ -@@ -4100,99 +4044,6 @@ +@@ -4100,99 +4047,6 @@ TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin)) @@ -419,68 +393,8 @@ echo echo "Successfully generated '$CNF' and '$ENV'." --- VirtualBox-4.2.12.orig/Makefile.kmk 2013-04-12 07:33:55.000000000 -0300 -+++ VirtualBox-4.2.12/Makefile.kmk 2013-05-09 23:09:45.756804164 -0300 -@@ -177,40 +177,6 @@ - INSTALLS += buildserver-additions - endif - --# --# Install additions iso from the build server. --# The $(CP)/$(RM) stuff can be replaced by a simple $(TOUCH) once that has --# been added to kBuild. --# --buildserver-additions_INST = $(INST_ADDITIONS_ISO) --buildserver-additions_MODE = 0644 --buildserver-additions_SOURCES = $(PATH_TARGET)/VBoxGuestAdditions.iso --buildserver-additions_CLEANS = \ -- $(buildserver-additions_0_OUTDIR)/unpacked.ts \ -- $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip \ -- $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip.tmp \ -- $(PATH_TARGET)/VBoxGuestAdditions.iso -- --$$(buildserver-additions_0_OUTDIR)/unpacked.ts +| $(PATH_TARGET)/VBoxGuestAdditions.iso: \ -- $$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip -- $(call MSG_L1,Unpacking additions archive) -- $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -o $< -d $(PATH_TARGET) -- $(APPEND) -t $@ "done" -- --$$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip: $(VBOX_SVN_REV_KMK) $(PATH_DEVTOOLS)/bin/additions.sh | $$(dir $$@) -- $(RM) -f $@ $@.tmp -- ifneq ($(KBUILD_HOST),win) -- $(SHELL) $(PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename $@.tmp -- else -- $(KMK) --affinity 1 -f $(MAKEFILE) buildserver-additions-affinity-hack -- endif -- $(CP) -f $@.tmp $@ -- $(RM) -f $@.tmp -- -- ifeq ($(KBUILD_HOST),win) --buildserver-additions-affinity-hack: -- $(SHELL) $(PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip.tmp -- endif - endif # VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER - - -@@ -327,18 +293,6 @@ - ifn1of ($(KBUILD_TARGET), l4 linux win) - VBOX_PATH_STAGED ?= . - -- # Additions. -- ifndef VBOX_WITH_LINUX_ADDITIONS -- ifndef VBOX_WITH_WIN32_ADDITIONS -- ifneq ($(wildcard $(VBOX_PATH_STAGED)/VBoxGuestAdditions.iso),) -- INSTALLS += staged-additions -- staged-additions_INST = $(INST_ADDITIONS_ISO) -- staged-additions_MODE = 0644 -- staged-additions_SOURCES = $(VBOX_PATH_STAGED)/VBoxGuestAdditions.iso -- endif -- endif -- endif -- - # guesttool.exe - ifndef VBOX_WITH_WIN32_ADDITIONS - ifneq ($(wildcard $(VBOX_PATH_STAGED)/guesttool.exe),) -@@ -388,7 +342,6 @@ ++++ VirtualBox-4.2.12/Makefile.kmk 2013-05-10 15:04:21.967970195 -0300 +@@ -388,7 +388,6 @@ include/VBox \ include/VBox/vmm \ include/VBox/com \ @@ -488,25 +402,7 @@ include/VBox/HostServices \ include/VBox/GuestHost \ include/VBox/HGSMI \ -@@ -983,17 +936,8 @@ - - additions-packing: - + $(KMK) VBOX_ONLY_ADDITIONS=1 \ -- VBOX_WITH_ADDITIONS_ISO.freebsd.amd64= \ -- VBOX_WITH_ADDITIONS_ISO.freebsd.x86= \ -- VBOX_WITH_ADDITIONS_ISO.linux.amd64= \ -- VBOX_WITH_ADDITIONS_ISO.linux.x86=1 \ - VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1 \ -- VBOX_WITH_ADDITIONS_ISO.os2.x86=1 \ -- VBOX_WITH_ADDITIONS_ISO.solaris.amd64=1 \ -- VBOX_WITH_ADDITIONS_ISO.solaris.x86=1 \ - VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 \ -- VBOX_WITH_ADDITIONS_ISO.win.amd64=1 \ -- VBOX_WITH_ADDITIONS_ISO.win.x86=1 \ - -C src/VBox/Additions \ - $(VBOX_PATH_ADDITIONS)/VBoxGuestAdditions.zip - -@@ -1010,200 +954,6 @@ +@@ -1010,200 +1009,6 @@ # @@ -1105,14 +1001,366 @@ else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS # ---- VirtualBox-4.2.12.orig/src/VBox/Additions/Makefile.kmk 2013-04-12 07:34:09.000000000 -0300 -+++ VirtualBox-4.2.12/src/VBox/Additions/Makefile.kmk 2013-05-09 23:06:58.029922668 -0300 -@@ -42,7 +42,7 @@ - # - # ==> All we have to worry about is what to do on the target we're on. - # --VBOX_WITH_ADDITIONS_ISO.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = 1 -+VBOX_WITH_ADDITIONS_ISO.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = 0 +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp 2013-04-12 07:37:59.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp 2013-05-10 16:26:44.137679260 -0300 +@@ -1829,166 +1829,12 @@ + "available on this virtual machine, and shared folders " + "cannot be used without them. To use shared folders inside " + "the virtual machine, please install the Guest Additions " +- "if they are not installed, or re-install them if they are " +- "not working correctly, by selecting Install Guest Additions " +- "from the Devices menu. " ++ "if they are not installed." + "If they are installed but the machine is not yet fully started " + "then shared folders will be available once it is.

"), + "remindAboutGuestAdditionsAreNotActive"); + } - # Include sub-makefiles. - include $(PATH_SUB_CURRENT)/common/Makefile.kmk +-bool UIMessageCenter::cannotFindGuestAdditions() +-{ +- return messageYesNo(mainMachineWindowShown(), Question, +- tr("

Could not find the VirtualBox Guest Additions " +- "CD image file.

Do you wish to " +- "download this CD image from the Internet?

")); +-} +- +-void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) +-{ +- message(mainMachineWindowShown(), Error, +- tr("

Could not insert the VirtualBox Guest Additions " +- "installer CD image into the virtual machine %1, as the machine " +- "has no CD/DVD-ROM drives. Please add a drive using the " +- "storage page of the virtual machine settings dialog.

") +- .arg(strMachineName)); +-} +- +-bool UIMessageCenter::confirmDownloadAdditions(const QString &strUrl, qulonglong uSize) +-{ +- QLocale loc(VBoxGlobal::languageId()); +- return messageOkCancel(networkManagerOrMainMachineWindowShown(), Question, +- tr("

Are you sure you want to download the VirtualBox " +- "Guest Additions CD image from " +- "%2 " +- "(size %3 bytes)?

").arg(strUrl).arg(strUrl).arg(loc.toString(uSize)), +- 0, /* pcszAutoConfirmId */ +- tr("Download", "additions")); +-} +- +-bool UIMessageCenter::confirmMountAdditions(const QString &strUrl, const QString &strSrc) +-{ +- return messageOkCancel(networkManagerOrMainMachineWindowShown(), Question, +- tr("

The VirtualBox Guest Additions CD image has been " +- "successfully downloaded from " +- "%2 " +- "and saved locally as %3.

" +- "

Do you wish to register this CD image and mount it " +- "on the virtual CD/DVD drive?

") +- .arg(strUrl).arg(strUrl).arg(strSrc), +- 0, /* pcszAutoConfirmId */ +- tr("Mount", "additions")); +-} +- +-void UIMessageCenter::warnAboutAdditionsCantBeSaved(const QString &strTarget) +-{ +- message(networkManagerOrMainMachineWindowShown(), Error, +- tr("

Failed to save the downloaded file as %1.

") +- .arg(QDir::toNativeSeparators(strTarget))); +-} +- +-bool UIMessageCenter::askAboutUserManualDownload(const QString &strMissedLocation) +-{ +- return messageOkCancel(mainWindowShown(), Question, +- tr("

Could not find the VirtualBox User Manual " +- "%1.

Do you wish to " +- "download this file from the Internet?

") +- .arg(strMissedLocation), +- 0, /* Auto-confirm Id */ +- tr("Download", "additions")); +-} +- +-bool UIMessageCenter::confirmUserManualDownload(const QString &strURL, qulonglong uSize) +-{ +- QLocale loc(VBoxGlobal::languageId()); +- return messageOkCancel(networkManagerOrMainWindowShown(), Question, +- tr("

Are you sure you want to download the VirtualBox " +- "User Manual from " +- "%2 " +- "(size %3 bytes)?

").arg(strURL).arg(strURL).arg(loc.toString(uSize)), +- 0, /* Auto-confirm Id */ +- tr("Download", "additions")); +-} +- +-void UIMessageCenter::warnAboutUserManualDownloaded(const QString &strURL, const QString &strTarget) +-{ +- message(networkManagerOrMainWindowShown(), Warning, +- tr("

The VirtualBox User Manual has been " +- "successfully downloaded from " +- "%2 " +- "and saved locally as %3.

") +- .arg(strURL).arg(strURL).arg(strTarget)); +-} +- +-void UIMessageCenter::warnAboutUserManualCantBeSaved(const QString &strURL, const QString &strTarget) +-{ +- message(networkManagerOrMainWindowShown(), Error, +- tr("

The VirtualBox User Manual has been " +- "successfully downloaded from " +- "%2 " +- "but can't be saved locally as %3.

" +- "

Please choose another location for that file.

") +- .arg(strURL).arg(strURL).arg(strTarget)); +-} +- +-bool UIMessageCenter::proposeDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion) +-{ +- return messageOkCancel(mainWindowShown(), +- Question, +- tr("

You have an old version (%1) of the %2 installed.

" +- "

Do you wish to download latest one from the Internet?

") +- .arg(strExtPackVersion).arg(strExtPackName), +- 0, /* Auto-confirm Id */ +- tr("Download", "extension pack")); +-} +- +-bool UIMessageCenter::requestUserDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion, const QString &strVBoxVersion) +-{ +- return message(mainWindowShown(), Info, +- tr("

You have version %1 of the %2 installed.

" +- "

You should download and install version %3 of this extension pack from Oracle!

") +- .arg(strExtPackVersion).arg(strExtPackName).arg(strVBoxVersion), +- 0, /* Auto-confirm Id */ +- QIMessageBox::Ok | QIMessageBox::Default, +- 0, +- 0, +- tr("Ok", "extension pack")); +-} +- +-bool UIMessageCenter::confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize) +-{ +- QLocale loc(VBoxGlobal::languageId()); +- return messageOkCancel(networkManagerOrMainWindowShown(), Question, +- tr("

Are you sure you want to download the %1 " +- "from %2 (size %3 bytes)?

") +- .arg(strExtPackName, strURL, loc.toString(uSize)), +- 0, /* Auto-confirm Id */ +- tr("Download", "extension pack")); +-} +- +-bool UIMessageCenter::proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) +-{ +- return messageOkCancel(networkManagerOrMainWindowShown(), Question, +- tr("

The %1 has been " +- "successfully downloaded from %2 " +- "and saved locally as %3.

" +- "

Do you wish to install this extension pack?

") +- .arg(strExtPackName, strFrom, strTo), +- 0, /* Auto-confirm Id */ +- tr ("Install", "extension pack")); +-} +- +-void UIMessageCenter::warnAboutExtentionPackCantBeSaved(const QString &strExtPackName, const QString &strFrom, const QString &strTo) +-{ +- message(networkManagerOrMainWindowShown(), Error, +- tr("

The %1 has been " +- "successfully downloaded from %2 " +- "but can't be saved locally as %3.

" +- "

Please choose another location for that file.

") +- .arg(strExtPackName, strFrom, strTo)); +-} +- + void UIMessageCenter::cannotConnectRegister(QWidget *pParent, + const QString &strUrl, + const QString &strReason) +@@ -2572,162 +2418,6 @@ + formatErrorInfo(progress.GetErrorInfo())); + } + +-void UIMessageCenter::cannotUpdateGuestAdditions(const CProgress &progress, +- QWidget *pParent /* = NULL */) const +-{ +- AssertWrapperOk(progress); +- +- message(pParent ? pParent : mainWindowShown(), +- Error, +- tr("Failed to update Guest Additions. The Guest Additions installation image will be mounted to provide a manual installation."), +- formatErrorInfo(progress.GetErrorInfo())); +-} +- +-void UIMessageCenter::cannotOpenExtPack(const QString &strFilename, +- const CExtPackManager &extPackManager, +- QWidget *pParent) +-{ +- message(pParent ? pParent : mainWindowShown(), +- Error, +- tr("Failed to open the Extension Pack %1.").arg(strFilename), +- formatErrorInfo(extPackManager)); +-} +- +-void UIMessageCenter::badExtPackFile(const QString &strFilename, +- const CExtPackFile &extPackFile, +- QWidget *pParent) +-{ +- message(pParent ? pParent : mainWindowShown(), +- Error, +- tr("Failed to open the Extension Pack %1.").arg(strFilename), +- "" + extPackFile.GetWhyUnusable()); +-} +- +-void UIMessageCenter::cannotInstallExtPack(const QString &strFilename, +- const CExtPackFile &extPackFile, +- const CProgress &progress, +- QWidget *pParent) +-{ +- if (!pParent) +- pParent = mainWindowShown(); +- QString strErrInfo = !extPackFile.isOk() || progress.isNull() +- ? formatErrorInfo(extPackFile) : formatErrorInfo(progress.GetErrorInfo()); +- message(pParent, +- Error, +- tr("Failed to install the Extension Pack %1.").arg(strFilename), +- strErrInfo); +-} +- +-void UIMessageCenter::cannotUninstallExtPack(const QString &strPackName, const CExtPackManager &extPackManager, +- const CProgress &progress, QWidget *pParent) +-{ +- if (!pParent) +- pParent = mainWindowShown(); +- QString strErrInfo = !extPackManager.isOk() || progress.isNull() +- ? formatErrorInfo(extPackManager) : formatErrorInfo(progress.GetErrorInfo()); +- message(pParent, +- Error, +- tr("Failed to uninstall the Extension Pack %1.").arg(strPackName), +- strErrInfo); +-} +- +-bool UIMessageCenter::confirmInstallingPackage(const QString &strPackName, const QString &strPackVersion, +- const QString &strPackDescription, QWidget *pParent) +-{ +- return messageOkCancel(pParent ? pParent : mainWindowShown(), +- Question, +- tr("

You are about to install a VirtualBox extension pack. " +- "Extension packs complement the functionality of VirtualBox and can contain system level software " +- "that could be potentially harmful to your system. Please review the description below and only proceed " +- "if you have obtained the extension pack from a trusted source.

" +- "

" +- "" +- "" +- "" +- "
Name:  %1
Version:  %2
Description:  %3

") +- .arg(strPackName).arg(strPackVersion).arg(strPackDescription), +- 0, +- tr("&Install")); +-} +- +-bool UIMessageCenter::confirmReplacePackage(const QString &strPackName, const QString &strPackVersionNew, +- const QString &strPackVersionOld, const QString &strPackDescription, +- QWidget *pParent) +-{ +- if (!pParent) +- pParent = pParent ? pParent : mainWindowShown(); /* this is boring stuff that messageOkCancel should do! */ +- +- QString strBelehrung = tr("Extension packs complement the functionality of VirtualBox and can contain " +- "system level software that could be potentially harmful to your system. " +- "Please review the description below and only proceed if you have obtained " +- "the extension pack from a trusted source."); +- +- QByteArray ba1 = strPackVersionNew.toUtf8(); +- QByteArray ba2 = strPackVersionOld.toUtf8(); +- int iVerCmp = RTStrVersionCompare(ba1.constData(), ba2.constData()); +- +- bool fRc; +- if (iVerCmp > 0) +- fRc = messageOkCancel(pParent, +- Question, +- tr("

An older version of the extension pack is already installed, would you like to upgrade? " +- "

%1

" +- "

" +- "" +- "" +- "" +- "" +- "
Name:  %2
New Version:  %3
Current Version:  %4
Description:  %5

") +- .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), +- 0, +- tr("&Upgrade")); +- else if (iVerCmp < 0) +- fRc = messageOkCancel(pParent, +- Question, +- tr("

An newer version of the extension pack is already installed, would you like to downgrade? " +- "

%1

" +- "

" +- "" +- "" +- "" +- "" +- "
Name:  %2
New Version:  %3
Current Version:  %4
Description:  %5

") +- .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), +- 0, +- tr("&Downgrade")); +- else +- fRc = messageOkCancel(pParent, +- Question, +- tr("

The extension pack is already installed with the same version, would you like reinstall it? " +- "

%1

" +- "

" +- "" +- "" +- "" +- "
Name:  %2
Version:  %3
Description:  %4

") +- .arg(strBelehrung).arg(strPackName).arg(strPackVersionOld).arg(strPackDescription), +- 0, +- tr("&Reinstall")); +- return fRc; +-} +- +-bool UIMessageCenter::confirmRemovingPackage(const QString &strPackName, QWidget *pParent) +-{ +- return messageOkCancel(pParent ? pParent : mainWindowShown(), +- Question, +- tr("

You are about to remove the VirtualBox extension pack %1.

" +- "

Are you sure you want to proceed?

").arg(strPackName), +- 0, +- tr("&Remove")); +-} +- +-void UIMessageCenter::notifyAboutExtPackInstalled(const QString &strPackName, QWidget *pParent) +-{ +- message(pParent ? pParent : mainWindowShown(), +- Info, +- tr("The extension pack
%1
was installed successfully.").arg(strPackName)); +-} +- + void UIMessageCenter::warnAboutIncorrectPort(QWidget *pParent) const + { + message(pParent, Error, +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-04-12 07:38:01.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-10 16:28:40.334715798 -0300 +@@ -650,27 +650,6 @@ + } + }; + +-class PerformInstallGuestToolsAction : public UIActionSimple +-{ +- Q_OBJECT; +- +-public: +- +- PerformInstallGuestToolsAction(QObject *pParent) +- : UIActionSimple(pParent, ":/guesttools_16px.png", ":/guesttools_disabled_16px.png") +- { +- retranslateUi(); +- } +- +-protected: +- +- void retranslateUi() +- { +- setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Install Guest Additions...")), gMS->shortcut(UIMachineShortcuts::InstallGuestAdditionsShortcut))); +- setStatusTip(QApplication::translate("UIActionPool", "Mount the Guest Additions installation image")); +- } +-}; +- + #ifdef VBOX_WITH_DEBUGGER_GUI + class MenuDebugAction : public UIActionMenu + { -- cgit v1.2.3-2-g168b From de79e6be763363fd7f5817846e52e355c0eaef22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 10 May 2013 17:07:01 -0300 Subject: virtualbox-libre: fixing issues on the patch --- libre/virtualbox-libre/PKGBUILD | 2 +- libre/virtualbox-libre/libre.patch | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index d4ce2d2ae..4cf483641 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -108,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '83533961112b83393b7e080370dc9100' + '7c5eca076af3d0601f5321f99b815b9c' '50387fba578646a9d29de3f917a199d2') prepare() { diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index 552acb9c7..c3e2e4ad4 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1335,7 +1335,7 @@ { message(pParent, Error, --- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-04-12 07:38:01.000000000 -0300 -+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-10 16:28:40.334715798 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-10 17:03:11.087825690 -0300 @@ -650,27 +650,6 @@ } }; @@ -1364,3 +1364,11 @@ #ifdef VBOX_WITH_DEBUGGER_GUI class MenuDebugAction : public UIActionMenu { +@@ -889,7 +868,6 @@ + m_pool[UIActionIndexRuntime_Simple_NetworkAdaptersDialog] = new ShowNetworkAdaptersDialogAction(this); + m_pool[UIActionIndexRuntime_Simple_SharedFoldersDialog] = new ShowSharedFoldersDialogAction(this); + m_pool[UIActionIndexRuntime_Toggle_VRDEServer] = new ToggleVRDEServerAction(this); +- m_pool[UIActionIndexRuntime_Simple_InstallGuestTools] = new PerformInstallGuestToolsAction(this); + + #ifdef VBOX_WITH_DEBUGGER_GUI + /* 'Debug' actions: */ -- cgit v1.2.3-2-g168b From 6db7164f5f1790319ca3c4dd3b5d8fda9729949a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 11 May 2013 15:11:36 -0300 Subject: linux-libre-lts-kmod-alx-3.9rc4.2-1: updating version --- libre/linux-libre-lts-kmod-alx/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index c8c40e338..58662b78b 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.76 +_kernver=3.0.77 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') -_version=v3.8-rc7 -_pkgver=3.8-rc7-1-u -pkgver=3.8rc7.1 -pkgrel=14 +_version=v3.9-rc4 +_pkgver=3.9-rc4-2-su +pkgver=3.9rc4.2 +pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' @@ -19,7 +19,7 @@ provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz) -md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') +md5sums=('a00e82e212fe7533c9059e5b78cc3c1c') package() { -- cgit v1.2.3-2-g168b From c68cba61a1553c3955136183def7329978cf8e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 11 May 2013 15:38:00 -0300 Subject: cgminer-libre-3.1.1-1: updating version --- libre/cgminer-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 5f7c62ca2..1a132ff27 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90344 2013-05-11 16:51:20Z fyan $ # Maintainer: Felix Yan # Contributor: monson # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.1.0 +pkgver=3.1.1 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -sha512sums=('486163017b722bb38cb42dfa5c72b57ac4c96ff0584da630f985d2f22c75418284af420a325aa82419b59dca29646b66f8c678eba7a0f36dc044207ac18c9b6c' +sha512sums=('f95db6ab14fe35ed19c1af152c6eb979787e966afad250252053bf11abe8293dfe857a7a2abfd9e33b60a190b310193a03151eb67a9db255a2a929660278ad62' '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') -- cgit v1.2.3-2-g168b From f0659a2d3623adbeddbb80befe4f8ebeae069f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 11 May 2013 16:19:29 -0300 Subject: kdelibs-libre-4.10.3-3: Fix a crash when closing various apps --- libre/kdelibs-libre/PKGBUILD | 10 +++++++--- libre/kdelibs-libre/fix-xfreepixmap-call.patch | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 libre/kdelibs-libre/fix-xfreepixmap-call.patch (limited to 'libre') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 0ebbd68c2..96c8530a3 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184821 2013-05-09 08:05:42Z andrea $ +# $Id: PKGBUILD 185044 2013-05-10 17:08:02Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.10.3 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -23,11 +23,13 @@ conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'qt4.patch' - 'security-fix.patch' 'khtml-fsdg.diff') + 'security-fix.patch' 'fix-xfreepixmap-call.patch' + 'khtml-fsdg.diff') sha1sums=('aa154998e227121be82f5b04442e908e7dece01b' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' '506562009a667f18481be0d2c5035b181fce38bb' + '556c5473219d8208ec920f46c08bf61fda5b60d9' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -41,6 +43,8 @@ build() { # KDEBUG#319428 patch -p1 -i "${srcdir}"/security-fix.patch + # KDEBUG#319137 + patch -p1 -i "${srcdir}"/fix-xfreepixmap-call.patch cd ../ diff --git a/libre/kdelibs-libre/fix-xfreepixmap-call.patch b/libre/kdelibs-libre/fix-xfreepixmap-call.patch new file mode 100644 index 000000000..5f5354633 --- /dev/null +++ b/libre/kdelibs-libre/fix-xfreepixmap-call.patch @@ -0,0 +1,24 @@ +commit 9323adac35d40da69e3cb18504340e984c4afd05 +Author: Anne-Marie Mahfouf +Date: Fri May 10 17:12:33 2013 +0200 + + Fix crash when quitting apps + + Backport to 4.10 branch + + CCBUG: 319137 + +diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp +index b54fb1a..1925670 100644 +--- a/plasma/private/dialogshadows.cpp ++++ b/plasma/private/dialogshadows.cpp +@@ -336,6 +336,9 @@ void DialogShadows::Private::freeX11Pixmaps() + { + #ifdef Q_WS_X11 + foreach (const QPixmap &pixmap, m_shadowPixmaps) { ++ if (!QX11Info::display()) { ++ return; ++ } + if (!pixmap.isNull()) { + XFreePixmap(QX11Info::display(), pixmap.handle()); + } -- cgit v1.2.3-2-g168b From 5e67439bffdfc3fed5aa26efd95f736d0f6cfe90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 11 May 2013 16:28:33 -0300 Subject: calibre-libre-0.9.30-1: updating version --- libre/calibre-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index baa7db081..d5128f90f 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90259 2013-05-10 15:53:35Z jelle $ # Maintainer: jelle van der Waa # Maintainer: Daniel Wallace # Contributor: Giovanni Scafora @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.28 +pkgver=0.9.30 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('c2825950cb3c94f5d3fe3c00de2c57e5' +md5sums=('4b0e4aeb0ebac5d5319a97cbd5163deb' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') -- cgit v1.2.3-2-g168b From 936a8361b0e95e978bb957e5226e739999b22625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 11 May 2013 16:50:28 -0300 Subject: clementine-libre-1.1.1-8: libimobiledevice rebuild --- libre/clementine-libre/PKGBUILD | 19 +++++++++++-------- .../clementine-1.1.1-libimobiledevice-fix.patch | 12 ++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch (limited to 'libre') diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index d7ef13b69..0daf90aec 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90335 2013-05-11 16:04:01Z tomegun $ #Maintainer: Stéphane Gaudreault #Contributor: BlackEagle #Contributor: Dany Martineau @@ -9,15 +9,15 @@ _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=7 +pkgrel=8 pkgdesc="A music player and library organizer, without spotify support" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64') depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'projectm' - 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice' + 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice' 'chromaprint' 'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs') -makedepends=('cmake' 'boost' 'mesa-libgl') +makedepends=('cmake' 'boost' 'mesa') optdepends=('gstreamer0.10-base-plugins: for more open formats' 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' 'gstreamer0.10-bad-libre-plugins: for use with "Bad" plugin libraries' @@ -26,14 +26,15 @@ replaces=('clementine') conflicts=('clementine') provides=("clementine=$pkgver") source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz - remove-and-disable-spotify.patch) -sha1sums=('f8d3e9c8f54ac488323ab5a629c9accbe256378e' - '4d336b6a42100a268e4d905b9596453f396fb649') + 'clementine-1.1.1-libimobiledevice-fix.patch' + 'remove-and-disable-spotify.patch') install=clementine.install build() { cd "${srcdir}/${_pkgname}-${pkgver}" + patch -Np1 < "$srcdir"/clementine-1.1.1-libimobiledevice-fix.patch + # Remove nonfree spotify references on files patch -Np1 -i ../remove-and-disable-spotify.patch @@ -49,7 +50,7 @@ build() { # Create a blank file due that is a dependency for clementine touch data/schema/schema-30.sql - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0 make } @@ -57,3 +58,5 @@ package() { cd "${srcdir}/${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } +md5sums=('28e4afb822388bd337a761db8f86febf' + '736df6cd828a3172701f63c8dc978cb9') diff --git a/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch b/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch new file mode 100644 index 000000000..da7722fcb --- /dev/null +++ b/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch @@ -0,0 +1,12 @@ +diff -up clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix clementine-1.1.1/src/devices/imobiledeviceconnection.h +--- clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix 2013-04-23 14:44:56.932661018 -0400 ++++ clementine-1.1.1/src/devices/imobiledeviceconnection.h 2013-04-23 14:46:44.033657190 -0400 +@@ -51,7 +51,7 @@ private: + idevice_t device_; + afc_client_t afc_; + +- uint16_t afc_port_; ++ lockdownd_service_descriptor_t afc_port_; + }; + + #endif // IMOBILEDEVICECONNECTION_H -- cgit v1.2.3-2-g168b