diff options
24 files changed, 825 insertions, 41 deletions
diff --git a/community-testing/virtualbox/10-vboxdrv.rules b/community-testing/virtualbox/10-vboxdrv.rules new file mode 100644 index 000000000..37403ae2f --- /dev/null +++ b/community-testing/virtualbox/10-vboxdrv.rules @@ -0,0 +1,5 @@ +KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1" +SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" +SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/community-testing/virtualbox/18-system-xorg.patch b/community-testing/virtualbox/18-system-xorg.patch new file mode 100644 index 000000000..4a28b93b6 --- /dev/null +++ b/community-testing/virtualbox/18-system-xorg.patch @@ -0,0 +1,277 @@ +Description: Build the X.Org driver only for the selected system X Server version. +Author: Michael Meskes <meskes@debian.org>, Felix Geyer <debfx-pkg@fobos.de> + +diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +--- 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 +diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk +--- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk ++++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk +@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL + 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)/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)/1.3/xorg \ ++ /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 + +diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk +--- a/src/VBox/Additions/x11/Makefile.kmk ++++ b/src/VBox/Additions/x11/Makefile.kmk +@@ -17,6 +17,10 @@ + SUB_DEPTH = ../../../.. + include $(KBUILD_PATH)/subheader.kmk + ++ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110) ++ XSERVER_VERSION := 17 ++endif ++ + # Include sub-makefiles. + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) + include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk +diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk ++++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +@@ -23,7 +23,6 @@ include $(KBUILD_PATH)/subheader.kmk + # vboxmouse_drv + # + if1of ($(KBUILD_TARGET), linux) +- SYSMODS += vboxmouse_drv + vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD + vboxmouse_drv_DEFS.linux = linux + vboxmouse_drv_DEFS.x86 += __i386__ +@@ -59,7 +58,6 @@ endif + # + # vboxmouse_drv_70 + # +-DLLS += vboxmouse_drv_70 + vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_70_DEFS = \ + XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE +@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \ + # + # vboxmouse_drv_71 + # +-DLLS += vboxmouse_drv_71 + vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) + vboxmouse_drv_71_INCS := \ +@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \ + # + # vboxmouse_drv_13 + # +-DLLS += vboxmouse_drv_13 + vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_13_INCS := \ +@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \ + # + # vboxmouse_drv_14 + # +-DLLS += vboxmouse_drv_14 + vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_14_INCS := \ +@@ -126,7 +121,6 @@ endif + # + # vboxmouse_drv_15 + # +-DLLS += vboxmouse_drv_15 + vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_15_INCS := \ +@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \ + # + # vboxmouse_drv_16 + # +-DLLS += vboxmouse_drv_16 + vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_16_INCS := \ +@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \ + # + # vboxmouse_drv_17 + # +-DLLS += vboxmouse_drv_17 + vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \ + # + # vboxmouse_drv_18 + # +-DLLS += vboxmouse_drv_18 + vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \ + # + # vboxmouse_drv_19 + # +-DLLS += vboxmouse_drv_19 + vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \ + # + # vboxmouse_drv_110 + # +-DLLS += vboxmouse_drv_110 + vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \ + vboxmouse_15.c + + ++vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv ++vboxmouse_drv_$(XSERVER_VERSION)_INCS := \ ++ /usr/include/x11 \ ++ /usr/include/xorg \ ++ /usr/include/pixman-1 ++DLLS += vboxmouse_drv_$(XSERVER_VERSION) ++ ++ + # Check the undefined symbols in the X.Org modules against lists of allowed + # symbols. Not very elegant, but it will catch problems early. + ifdef VBOX_WITH_TESTCASES +diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ++++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +@@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk + # vboxvideo_drv + # + if1of ($(KBUILD_TARGET), linux) +- SYSMODS += vboxvideo_drv + endif # target linux + vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD + vboxvideo_drv_DEFS.linux = linux +@@ -89,7 +88,6 @@ endif # target linux + # base keywords instead of using .solaris or .linux. + # Also it is *important* to use := and not = when deriving a property. + # +-DLLS += vboxvideo_drv_70 + vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD + if1of ($(KBUILD_TARGET), linux) + vboxvideo_drv_70_CFLAGS += \ +@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES) + # + # vboxvideo_drv_71 + # +-DLLS += vboxvideo_drv_71 + vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS) +@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES) + # + # vboxvideo_drv_13 + # +-DLLS += vboxvideo_drv_13 + vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13 +@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \ + # + # vboxvideo_drv_14 + # +-DLLS += vboxvideo_drv_14 + vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS) +@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES) + # + # vboxvideo_drv_15 + # +-DLLS += vboxvideo_drv_15 + vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \ +@@ -192,7 +186,6 @@ endif + # + # vboxvideo_drv_16 + # +-DLLS += vboxvideo_drv_16 + vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_17 + # +-DLLS += vboxvideo_drv_17 + vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_18 + # +-DLLS += vboxvideo_drv_18 + vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_19 + # +-DLLS += vboxvideo_drv_19 + vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_110 + # +-DLLS += vboxvideo_drv_110 + vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \ + vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES) + + ++vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv ++vboxvideo_drv_$(XSERVER_VERSION)_INCS := \ ++ /usr/include/xorg \ ++ /usr/include/x11 \ ++ /usr/include/pixman-1 \ ++ /usr/include/X11/dri \ ++ /usr/include/drm \ ++ /usr/include/libdrm ++vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include ++DLLS += vboxvideo_drv_$(XSERVER_VERSION) ++ ++# required for lenny backports ++ifeq ($(XSERVER_VERSION),14) ++ vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg ++endif ++ ++ + # Check the undefined symbols in the X.Org modules against lists of allowed + # symbols. Not very elegant, but it will catch problems early. + ifdef VBOX_WITH_TESTCASES diff --git a/community-testing/virtualbox/60-vboxguest.rules b/community-testing/virtualbox/60-vboxguest.rules new file mode 100644 index 000000000..6285f7249 --- /dev/null +++ b/community-testing/virtualbox/60-vboxguest.rules @@ -0,0 +1,2 @@ +ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" +ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/community-testing/virtualbox/LocalConfig.kmk b/community-testing/virtualbox/LocalConfig.kmk new file mode 100644 index 000000000..d0e939ad4 --- /dev/null +++ b/community-testing/virtualbox/LocalConfig.kmk @@ -0,0 +1,19 @@ +VBOX_WITH_ADDITION_DRIVERS = +VBOX_WITH_INSTALLER = 1 +VBOX_WITH_LINUX_ADDITIONS = 1 +VBOX_WITH_X11_ADDITIONS = 1 +VBOX_WITH_TESTCASES = +VBOX_WITH_TESTSUITE = +VBOX_WITH_ORIGIN := +VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox +VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox +VBOX_PATH_APP_DOCS := /usr/share/virtualbox +VBOX_WITH_REGISTRATION_REQUEST = +VBOX_WITH_UPDATE_REQUEST = +VBOX_WITH_VNC := 1 +VBOX_BLD_PYTHON = python2 +VBOX_JAVA_HOME = /opt/java +VBOX_GCC_WERR = +VBOX_GCC_WARN = diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD new file mode 100644 index 000000000..d989f61e0 --- /dev/null +++ b/community-testing/virtualbox/PKGBUILD @@ -0,0 +1,217 @@ +# $Id: PKGBUILD 47272 2011-05-20 17:46:19Z ibiru $ +#Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgbase=virtualbox +pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') +pkgver=4.0.8 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://virtualbox.org' +license=('GPL' 'custom') +makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' +'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' +'xorg-server-devel' 'xf86driproto' 'libxcomposite') +[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') +source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 + http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf + virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch + 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh + 18-system-xorg.patch + change_default_driver_dir.patch) +_kernver=2.6.39-ARCH + +build() { + cd "$srcdir/VirtualBox-${pkgver}_OSE" + + patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch" + patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" + patch -Np1 -i "$srcdir/vboxdrv-reference.patch" + patch -Np1 -i "$srcdir/18-system-xorg.patch" + patch -Np1 -i "$srcdir/change_default_driver_dir.patch" + + cp "$srcdir/LocalConfig.kmk" . + + ./configure --disable-docs \ + --enable-webservice \ + --enable-vde \ + --with-linux=/usr/src/linux-${_kernver} + source ./env.sh + kmk all + + export KERN_DIR=/usr/src/linux-${_kernver} + make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" + make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo" + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" +} + +package_virtualbox() { + pkgdesc="Powerful x86 virtualization for enterprise as well as home use" + depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'kernel26-headers' 'gcc' 'make') + optdepends=('libxt: for shared clipboard' + 'python2: for python support' + 'qt: for VirtualBox GUI' + 'vde2: Virtual Distributed Ethernet support' + 'virtualbox-sdk: developer kit') + + replaces=('virtualbox-ose') + conflicts=('virtualbox-ose') + install=virtualbox.install + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls} + + #doc + install -m 0644 "$srcdir/UserManual.pdf" "$pkgdir/usr/share/virtualbox/UserManual.pdf" + + #Binaries and Wrapper with Launchers + install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox" + ln -sf VBox "$pkgdir/usr/bin/VBoxHeadless" + ln -sf VBox "$pkgdir/usr/bin/vboxheadless" + ln -sf VBox "$pkgdir/usr/bin/VBoxManage" + ln -sf VBox "$pkgdir/usr/bin/vboxmanage" + ln -sf VBox "$pkgdir/usr/bin/VBoxSDL" + ln -sf VBox "$pkgdir/usr/bin/vboxsdl" + ln -sf VBox "$pkgdir/usr/bin/VirtualBox" + ln -sf VBox "$pkgdir/usr/bin/virtualbox" + ln -sf VBox "$pkgdir/usr/bin/vboxwebsrv" + + install -m 0755 VBoxTunctl "$pkgdir/usr/bin" + + #components + install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components" + + #lib + install -m 0755 *.so "$pkgdir/usr/lib/virtualbox" + install -m 0644 *.gc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox" + + #setuid root binaries + install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox" + #other binaries + install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox" + + #language + install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls" + + #useless scripts + install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox" + + #icons + install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png" + + pushd icons + for i in *; do + install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" + cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" + done + popd + + #desktop + install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop" + install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml" + + #install configuration + mkdir -p "$pkgdir/etc/vbox" + echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg" + + #udev and licence + install -D -m 0644 "$srcdir/VirtualBox-${pkgver}_OSE/COPYING" \ + "$pkgdir/usr/share/licenses/virtualbox/LICENSE" + install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ + "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules" + + #sources for modules + cp -r src ${pkgdir}/usr/lib/virtualbox + #install compilation script + install -D -m 755 "${srcdir}/vboxdrv.sh" "${pkgdir}/etc/rc.d/vboxdrv" +} + +package_virtualbox-sdk() { + pkgdesc=" VirtualBox Software Developer Kit (SDK)" + + mkdir -p "$pkgdir/usr/lib/virtualbox" + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + + install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" + #python sdk + pushd sdk/installer + VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}" + popd + rm -rf sdk/installer + mv sdk "$pkgdir/usr/lib/virtualbox" +} +package_virtualbox-guest-additions(){ + pkgdesc="VirtualBox user-space tools for Linux guests" + depends=("virtualbox-guest-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr') + replaces=('virtualbox-ose-additions') + conflicts=('virtualbox-ose-additions') + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" + + install -d "$pkgdir/usr/bin" + install -d "$pkgdir/sbin" + install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" + install -m755 mount.vboxsf "$pkgdir/sbin" + + install -m644 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \ + "$pkgdir"/etc/X11/xorg.conf.d/50-vboxmouse.conf + install -m644 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules \ + "$pkgdir"/lib/udev/rules.d/70-xorg-vboxmouse.rules + install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ + "$pkgdir"/usr/bin/VBoxClient-all + install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ + "$pkgdir"/etc/xdg/autostart/vboxclient.desktop + install -D vboxmouse_drv.so \ + "$pkgdir/usr/lib/xorg/modules/input/vboxmouse.so" + install -D vboxvideo_drv.so \ + "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" + install -d "$pkgdir/usr/lib/xorg/modules/dri" + install -m755 VBoxOGL*.so "$pkgdir/usr/lib" + ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" + install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so" + +} +package_virtualbox-guest-modules(){ + pkgdesc="VirtualBox kernel modules for Linux guests" + license=('GPL') + install=virtualbox-guest-modules.install + depends=('kernel26>=2.6.39' 'kernel26<2.6.40') + replaces=('virtualbox-ose-additions-modules') + conflicts=('virtualbox-ose-additions-modules') + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" + + cd vboxguest + install -D -m644 vboxguest.ko \ + "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko" + + cd ../vboxsf + install -D -m644 vboxsf.ko \ + "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko" + + cd ../vboxvideo + install -D -m644 vboxvideo.ko \ + "$pkgdir/lib/modules/$_kernver/misc/vboxvideo.ko" + + install -D -m 0644 "$srcdir/60-vboxguest.rules" \ + "$pkgdir/lib/udev/rules.d/60-vboxguest.rules" + + sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install" +} +md5sums=('a3e81289f2357fcf4bbe3e77805f38b6' + '39712ccbc16b04c1cda209ae16446bf2' + '44efb3c4be214daa453a317d527f1f30' + '32a232b43852b9a08cb11a7bcd64b347' + '5f85710e0b8606de967716ded7b2d351' + 'ed1341881437455d9735875ddf455fbe' + '9bde5b7dfba5abcd49768052c5409800' + 'c1a07f044c476a190af8486fe78bee0f' + '47da2e88de582bb2bab14580a3aa47b1' + '8a22b33c9dfaf8fb79bb2d26304e650b' + 'ac43f7cf44b934d8dbdbc3bb6f7879ad') diff --git a/community-testing/virtualbox/change_default_driver_dir.patch b/community-testing/virtualbox/change_default_driver_dir.patch new file mode 100644 index 000000000..71930f062 --- /dev/null +++ b/community-testing/virtualbox/change_default_driver_dir.patch @@ -0,0 +1,18 @@ +diff -Nur VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +--- VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-05-18 04:28:14.545495222 -0700 ++++ VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-05-18 04:29:57.945499707 -0700 +@@ -36,13 +36,8 @@ + //#define DEBUG_DRI_CALLS + + //@todo this could be different... +-#ifdef RT_ARCH_AMD64 +-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri" ++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" + # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-#else +-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri" +-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-#endif + + #ifdef DEBUG_DRI_CALLS + #define SWDRI_SHOWNAME(pext, func) \ diff --git a/community-testing/virtualbox/vboxdrv-reference.patch b/community-testing/virtualbox/vboxdrv-reference.patch new file mode 100644 index 000000000..e7a9179a9 --- /dev/null +++ b/community-testing/virtualbox/vboxdrv-reference.patch @@ -0,0 +1,45 @@ +diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp +--- VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 03:31:05.000000000 -0700 ++++ VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 11:10:00.503832646 -0700 +@@ -75,9 +75,8 @@ + "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " + "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " + "module by executing<br/><br/>" +- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" +- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " +- "package first. This package keeps track of Linux kernel changes and " ++ " <font color=blue>'/etc/rc.d/vboxdrv setup'</font><br/><br/>" ++ "as root. This package keeps track of Linux kernel changes and" + "recompiles the vboxdrv kernel module if necessary." + ); + +@@ -92,7 +91,7 @@ + "The VirtualBox kernel modules do not match this version of " + "VirtualBox. The installation of VirtualBox was apparently not " + "successful. Executing<br/><br/>" +- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" ++ " <font color=blue>'/etc/rc.d/vboxdrv setup'</font><br/><br/>" + "may correct this. Make sure that you do not mix the " + "OSE version and the PUEL version of VirtualBox." + ); +diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh +--- VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh 2011-04-21 03:31:18.000000000 -0700 ++++ VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-04-21 11:10:00.503832646 -0700 +@@ -34,7 +34,7 @@ + available for the current kernel (`uname -r`) or it failed to + load. Please recompile the kernel module and install it by + +- sudo /etc/init.d/vboxdrv setup ++ /etc/rc.d/vboxdrv setup + + You will not be able to start VMs until this problem is fixed. + EOF +@@ -42,7 +42,7 @@ + cat << EOF + WARNING: The character device /dev/vboxdrv does not exist. Try + +- sudo /etc/init.d/vboxdrv restart ++ /etc/rc.d/vboxdrv restart + + and if that is not successful, try to re-install the package. + diff --git a/community-testing/virtualbox/vboxdrv.sh b/community-testing/virtualbox/vboxdrv.sh new file mode 100755 index 000000000..8de14b97f --- /dev/null +++ b/community-testing/virtualbox/vboxdrv.sh @@ -0,0 +1,80 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/vbox/vbox.cfg + +MODLIST=() +LOG="/var/log/vbox-install.log" + +if [ -n "$INSTALL_DIR" ]; then + VBOXMANAGE="$INSTALL_DIR/VBoxManage" + BUILDVBOXDRV="$INSTALL_DIR/src/vboxdrv/build_in_tmp" + BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxnetflt/build_in_tmp" + BUILDVBOXNETADP="$INSTALL_DIR/src/vboxnetadp/build_in_tmp" +else + echo "missing vbox.cfg" + exit 0 +fi + +case "$1" in + setup) + stat_busy "Unloading VirtualBox kernel modules" + for module in vbox{netflt,netadp,drv}; do + if grep -q "^${module}" /proc/modules; then + MODLIST+=($module) + modprobe -r $module + fi + done + stat_done + for p in /lib/modules/*; do + if [ ! -d "$p/kernel" ]; then + if [ -e "$p/misc/vboxdrv.ko" ]; then + stat_busy "Removing old VirtualBox kernel modules from $p" + rm -f "$p/misc/vbox"{drv,netadp,netflt}.ko 2>/dev/null + rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null + stat_done + fi + fi + done + if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then + stat_busy "Removing old VirtualBox netadp kernel module" + find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null + stat_done + fi + if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then + stat_busy "Removing old VirtualBox netflt kernel module" + find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null + stat_done + fi + if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then + stat_busy "Removing old VirtualBox kernel module" + find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null + stat_done + fi + stat_busy "Recompiling VirtualBox kernel modules" + if ! $BUILDVBOXDRV \ + --save-module-symvers /tmp/vboxdrv-Module.symvers \ + --no-print-directory install > $LOG 2>&1; then + echo "Look at $LOG to find out what went wrong" + fi + if ! $BUILDVBOXNETFLT \ + --use-module-symvers /tmp/vboxdrv-Module.symvers \ + --no-print-directory install >> $LOG 2>&1; then + echo "Look at $LOG to find out what went wrong" + fi + if ! $BUILDVBOXNETADP \ + --use-module-symvers /tmp/vboxdrv-Module.symvers \ + --no-print-directory install >> $LOG 2>&1; then + echo "Look at $LOG to find out what went wrong" + fi + stat_done + stat_busy "Reloading VirtualBox kernel modules" + for module in "${MODLIST[@]}"; do + modprobe $module + done + stat_done + ;; + *) + echo "usage: $0 {setup}" +esac diff --git a/community-testing/virtualbox/virtualbox-4-makeself-check.patch b/community-testing/virtualbox/virtualbox-4-makeself-check.patch new file mode 100644 index 000000000..e1fcb8c2f --- /dev/null +++ b/community-testing/virtualbox/virtualbox-4-makeself-check.patch @@ -0,0 +1,10 @@ +--- VirtualBox-4.0.0_OSE/configure ++++ VirtualBox-4.0.0_OSE/configure +@@ -2527,7 +2527,6 @@ + check_compiler_h + [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit + # tools/common/makeself* +- [ $OSE -ge 1 ] && check_makeself + fi + + [ -n "$SETUP_WINE" ] && setup_wine diff --git a/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch b/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch new file mode 100644 index 000000000..8b0d59123 --- /dev/null +++ b/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch @@ -0,0 +1,10 @@ +--- VirtualBox-4.0.0_OSE/configure ++++ VirtualBox-4.0.0_OSE/configure +@@ -2499,7 +2499,6 @@ + # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs + # [ "$OS" != "darwin" ] && check_yasm + [ "$OS" != "darwin" ] && check_xsltproc +-[ "$OS" != "darwin" ] && check_mkisofs + + # the libraries + [ "$OS" != "darwin" ] && check_pthread diff --git a/community-testing/virtualbox/virtualbox-guest-modules.install b/community-testing/virtualbox/virtualbox-guest-modules.install new file mode 100644 index 000000000..ae05bd1ba --- /dev/null +++ b/community-testing/virtualbox/virtualbox-guest-modules.install @@ -0,0 +1,24 @@ +KERNEL_VERSION='2.6.39-ARCH' + +post_install() { + cat << EOM + +===> virtualbox-guest-modules post-install message: +===> +===> You may want to load vboxguest, vboxsf and vboxvideo +===> +===> To load them automatically, add them +===> to the MODULES array in /etc/rc.conf. + +EOM + + depmod -v $KERNEL_VERSION >/dev/null 2>&1 +} + +post_remove() { + depmod -v $KERNEL_VERSION >/dev/null 2>&1 +} + +post_upgrade() { + depmod -v $KERNEL_VERSION >/dev/null 2>&1 +} diff --git a/community-testing/virtualbox/virtualbox.install b/community-testing/virtualbox/virtualbox.install new file mode 100644 index 000000000..e70757685 --- /dev/null +++ b/community-testing/virtualbox/virtualbox.install @@ -0,0 +1,65 @@ +utils() { + if [ -x usr/bin/update-mime-database ]; then + update-mime-database usr/share/mime > /dev/null 2>&1 + fi + + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1 + fi + + if [ -x usr/bin/update-desktop-database ]; then + usr/bin/update-desktop-database -q + fi +} + +post_install() { + getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers + /bin/cat << EOF + +===> In order to run VirtualBox, you have to be in the 'vboxusers' group. +===> +===> If you want to be able to install guest additions, you have to install +===> 'virtualbox-additions' package. +===> +===> You must load vboxdrv module before starting VirtualBox: +===> # modprobe vboxdrv +===> +===> You must load vboxnetflt for Host Interface Networking: +===> # modprobe vboxnetflt +===> +===> You must load vboxnetadp for Host-Only networking: +===> # modprobe vboxnetadp +===> +===> To load it automatically, add vboxdrv module +===> to the MODULES array in /etc/rc.conf. + +*** To compile the modules do /etc/rc.d/vboxdrv setup *** + +EOF + utils +} + +post_upgrade() { + getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers + /bin/cat << EOF +===> You must reload vboxdrv module before starting VirtualBox: +===> # modprobe vboxdrv +===> +===> You must reload vboxnetflt for Host Interface Networking: +===> # modprobe vboxnetflt +===> +===> You must reload vboxnetadp for Host-Only networking: +===> # modprobe vboxnetadp +===> +===> To load it automatically, add vboxdrv module +===> to the MODULES array in /etc/rc.conf. + +*** To recompile the modules do /etc/rc.d/vboxdrv setup *** +EOF + utils +} + +post_remove() { + groupdel vboxusers >/dev/null 2>&1 || true + utils +} diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD index 7e119f6a8..df7348d10 100644 --- a/community/nautilus-actions/PKGBUILD +++ b/community/nautilus-actions/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46806 2011-05-12 16:08:55Z ibiru $ +# $Id: PKGBUILD 47289 2011-05-20 18:44:43Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Tor Krill <tor@krill.nu> pkgname=nautilus-actions -pkgver=3.1.2 +pkgver=3.1.3 pkgrel=1 pkgdesc="Configures programs to be launched when files are selected in Nautilus" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('intltool' 'gnome-doc-utils') install=nautilus-actions.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/3.1/$pkgname-$pkgver.tar.bz2) -sha256sums=('868c0f87cc80ee31074dcf4df736757655e396a9eafc19cd81b3dd05e4f940ac') +sha256sums=('d7cab5b1a75f4cbeb68e7d2bfe4834ee13890abf6cab9254326f871ee07c9924') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index ce8c45a12..99ccde3a0 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 47184 2011-05-18 12:02:51Z ibiru $ +# $Id: PKGBUILD 47286 2011-05-20 18:13:22Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 290d71e6c..82527b34d 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119918 2011-04-16 22:59:51Z bisson $ +# $Id: PKGBUILD 124404 2011-05-20 15:01:13Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=2.5.0 +pkgver=2.5.1 pkgrel=1 pkgdesc='Lightweight, GTK2-based advanced audio player focused on audio quality' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL3') depends=('gtk2' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('unzip: zipped skins support') source=("http://distfiles.atheme.org/$pkgname-$pkgver.tgz") -sha1sums=('df76909c83a69b42197dab0702e0846295eceb1f') +sha1sums=('886e1cde03069b3dee15a6df04e3e8f5934018f1') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD index ce36e895a..a880f0dc7 100644 --- a/extra/fontforge/PKGBUILD +++ b/extra/fontforge/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 110943 2011-02-23 09:57:15Z bisson $ +# $Id: PKGBUILD 124359 2011-05-20 08:42:23Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fontforge pkgver=20110222 -pkgrel=1 +pkgrel=2 pkgdesc='Outline and bitmap font editor' arch=('i686' 'x86_64') url='http://fontforge.sourceforge.net' @@ -23,11 +23,11 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ --enable-type3 \ - --enable-double \ --enable-devicetables \ --with-regular-link \ --with-python=python2 \ - --enable-pyextension + --enable-pyextension \ + make } diff --git a/extra/git/ChangeLog b/extra/git/ChangeLog index 8ed0884fe..76298e68f 100644 --- a/extra/git/ChangeLog +++ b/extra/git/ChangeLog @@ -1,4 +1,21 @@ -Simple version bumps are ommitted from the following ChangeLog. +Simple version bumps are omitted from the following ChangeLog. + +2011-05-05 Dan McGee <dan@archlinux.org> + Version 1.7.5.1-1 + * Byte compile emacs files (FS#20874) + * Respect CFLAGS/LDFLAGS (FS#23963) + +2011-04-27 Dan McGee <dan@archlinux.org> + Version 1.7.5-1 + * Add missing optdepends for git send-email (FS#20923) + +2011-01-05 Dan McGee <dan@archlinux.org> + Version 1.7.3.5-1 + * More flexible git-daemon RC scripts (FS#20575) + +2010-10-01 Allan McRae <allan@archlinux.org> + Version 1.7.3.1-2 + * Python 2/3 rebuild 2010-06-29 Dan McGee <dan@archlinux.org> Version 1.7.1.1-1 diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 213ff2908..f03e2c7ea 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122647 2011-05-05 13:19:03Z dan $ +# $Id: PKGBUILD 124414 2011-05-20 16:19:11Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.5.1 +pkgver=1.7.5.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -75,11 +75,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('a49291116e3b0564e069ae989e4db6fb' - 'cb0ec1095fbdf5b4935d5c43194b976a' +md5sums=('f79ab8fe79b35346b499f131cbf381a4' + '43fc5538f137231f5c96e7da5eb6c934' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('a1d4a1c59300e68fbc493a2cbe9257048d4d6f4363924bf34f38c413a825f80c' - '9d8ab1487df85ca596f3f6718d6a7831868abd9b98035a65c71d7f45af4aac8e' +sha256sums=('65dbb9789a1ff8aa7e4f7e156b9ce36ef101810608ed55a297156348d70f9349' + '8521210a77809d189a3fe72e2bd13df50ecf8ec58e7098ec1655dfdb4086b6ca' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 99056b0f7..f627a10f2 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 120584 2011-04-25 17:40:10Z ibiru $ +#$Id: PKGBUILD 124399 2011-05-20 14:09:17Z heftig $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs' '!makeflags') url="http://www.gnome.org" install=gnome-keyring.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1b296fc58fb189c9632fdd8a8a8a2dbb0af97db1529af87d73e21a96c4b78c03') +sha256sums=('ed834e5a6d87fe8a90c7c79153af3d8979740d5f8eacad6a8991ef147c924af7') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD index 4a62231dd..87810e3cf 100644 --- a/extra/libgsf/PKGBUILD +++ b/extra/libgsf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 116824 2011-03-25 21:58:52Z heftig $ +# $Id: PKGBUILD 124392 2011-05-20 13:18:16Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgbase=libgsf pkgname=('libgsf' 'libgsf-gnome') -pkgver=1.14.20 +pkgver=1.14.21 pkgrel=1 arch=(i686 x86_64) url="http://www.gnome.org/" @@ -13,7 +13,7 @@ makedepends=('libxml2' 'glib2' 'bzip2' 'intltool' 'pkgconfig' 'python2' 'libbonobo' 'gconf' 'pygtk') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/1.14/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('df82cd86e472a6f8e566976eb7eb8f587aac2639c1448b14b4dbf4db7da1ada6') +sha256sums=('eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libxfce4ui/PKGBUILD b/extra/libxfce4ui/PKGBUILD index 493d76bad..5a528e5e2 100644 --- a/extra/libxfce4ui/PKGBUILD +++ b/extra/libxfce4ui/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 124274 2011-05-18 16:36:34Z andyrtr $ +# $Id: PKGBUILD 124354 2011-05-20 06:47:50Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> pkgname=libxfce4ui pkgver=4.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="share commonly used Xfce widgets among the Xfce applications" arch=('i686' 'x86_64') license=('GPL2') url="http://www.xfce.org/" -depends=('libxfce4util>=4.8.0' 'gtk2' "xfconf>=4.8.0" 'startup-notification') +depends=('libxfce4util>=4.8.0' 'gtk2' "xfconf>=4.8.0" 'libsm' 'startup-notification') makedepends=('intltool' 'gtk-doc' 'glade') optdepends=('glade: for using the included glade module') #replaces=('libxfcegui4') - later when all is ported diff --git a/multilib/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD index b81bee1e0..c9ab1d72f 100644 --- a/multilib/nspluginwrapper/PKGBUILD +++ b/multilib/nspluginwrapper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 47136 2011-05-17 17:28:43Z bluewind $ +# $Id: PKGBUILD 47193 2011-05-18 13:14:48Z bluewind $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=nspluginwrapper pkgver=1.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="Cross-platform NPAPI compatible plugin viewer" arch=('x86_64') url="http://nspluginwrapper.davidben.net/" @@ -10,16 +10,11 @@ license=('GPL') depends=('curl' 'lib32-libxt' 'lib32-gcc-libs' 'gtk2' 'lib32-gtk2') makedepends=('gcc-multilib') install="install" -source=(http://web.mit.edu/davidben/Public/$pkgname/$pkgname-$pkgver.tar.gz - nspluginwrapper-native-windows.patch) -sha256sums=('39b9034dc840ac6a21701406d96449e578b787aad7f6a09d97113776cf8251b3' - '3796b66f53448f4668e70aec97a3d74db2b2fcd308b36f87373405547cae38b1') +source=(http://web.mit.edu/davidben/Public/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('39b9034dc840ac6a21701406d96449e578b787aad7f6a09d97113776cf8251b3') build() { cd "$srcdir/$pkgname-$pkgver" - # Patch taken from the openSuSE src.rpm - patch -p0 -i "$srcdir/nspluginwrapper-native-windows.patch" - ./configure --with-lib32=lib32 --with-lib64=lib make -j1 } diff --git a/multilib/nspluginwrapper/install b/multilib/nspluginwrapper/install index ac2fc27b7..78e196fdb 100644 --- a/multilib/nspluginwrapper/install +++ b/multilib/nspluginwrapper/install @@ -1,5 +1,5 @@ post_upgrade() { - for i in /usr/lib32/mozilla/plugins/*; do - /usr/bin/nspluginwrapper -i "$i" + for i in `nspluginwrapper -l | grep -v "^ "`; do + /usr/bin/nspluginwrapper -u "$i" done } diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD index 26d06b7e2..acb78e0bf 100644 --- a/testing/udev/PKGBUILD +++ b/testing/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124322 2011-05-19 15:55:28Z tomegun $ +# $Id: PKGBUILD 124345 2011-05-20 06:14:46Z tomegun $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> @@ -6,7 +6,7 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=169 +pkgver=170 pkgrel=1 arch=(i686 x86_64) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" @@ -96,7 +96,7 @@ package_udev-compat() { install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules } -md5sums=('967c66e6b8e29d7cfc98326c5b00454d' +md5sums=('6e132d1a3b4dae24dafd2726c5cdd982' '4427855146513a4703ab5c7eb8a0156e' 'd8725e64fd0ce6e784ae795fae424c0a' 'f91fddc67609b45b244a624977c4247b') |