From 0e589d31fd50f6852a3f3ea1a2113b599d2165f6 Mon Sep 17 00:00:00 2001 From: davehome Date: Wed, 16 Nov 2011 19:37:22 -0700 Subject: [PATCH 1/6] adobe-flash-plugin: Update to 11.1.102.55 for i686 --- srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs | 1 + srcpkgs/adobe-flash-plugin/template | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs b/srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs index c85a21573ff..94dee570554 100644 --- a/srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs +++ b/srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs @@ -27,3 +27,4 @@ libdl.so.2 libm.so.6 libc.so.6 ld-linux-x86-64.so.2 +ld-linux.so.2 diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template index 662e67dee18..e61b25c2e7d 100644 --- a/srcpkgs/adobe-flash-plugin/template +++ b/srcpkgs/adobe-flash-plugin/template @@ -10,8 +10,7 @@ if [ "$XBPS_MACHINE" = "x86_64" ]; then _distcksum=345818f97e4d2e974a70d7f5bcd6a0131304f8ec2ef91eed1de2931376a35c27 else _disttarball="${_url}/install_flash_player_11_linux.i386.tar.gz" - # XXX FIXME update for 11.1.102.55 - _distcksum=3532ee49eda0845597084a805e11985f9fd9c5f7b5b72f592ceb18529da918c1 + _distcksum=678e2270cb12821b3685af22428e1122b2d130bc8f12ecc714d3636a00b5ed23 fi distfiles="${_eula} ${_disttarball}" checksum="${_eulacksum} ${_distcksum}" From 01ccf91073f8819e47b6f952167fec59cfc62f17 Mon Sep 17 00:00:00 2001 From: davehome Date: Wed, 16 Nov 2011 20:17:28 -0700 Subject: [PATCH 2/6] openobex: convert to the new rshlibs world order. --- srcpkgs/openobex/libopenobex.rshlibs | 1 + srcpkgs/openobex/libopenobex.template | 3 +-- srcpkgs/openobex/openobex.rshlibs | 1 + srcpkgs/openobex/template | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/openobex/libopenobex.rshlibs b/srcpkgs/openobex/libopenobex.rshlibs index 631aa1dda40..7e27f4505e6 100644 --- a/srcpkgs/openobex/libopenobex.rshlibs +++ b/srcpkgs/openobex/libopenobex.rshlibs @@ -1 +1,2 @@ libc.so.6 +libusb-0.1.so.4 diff --git a/srcpkgs/openobex/libopenobex.template b/srcpkgs/openobex/libopenobex.template index 6d1ce728579..777ce279fd3 100644 --- a/srcpkgs/openobex/libopenobex.template +++ b/srcpkgs/openobex/libopenobex.template @@ -5,9 +5,8 @@ long_desc="${long_desc} This package contains the shared library provided by openobex." -revision=3 +revision=4 -Add_dependency run libusb-compat do_install() { diff --git a/srcpkgs/openobex/openobex.rshlibs b/srcpkgs/openobex/openobex.rshlibs index 527940d5860..7728f60cd17 100644 --- a/srcpkgs/openobex/openobex.rshlibs +++ b/srcpkgs/openobex/openobex.rshlibs @@ -1,2 +1,3 @@ libopenobex.so.1 libc.so.6 +libbluetooth.so.3 diff --git a/srcpkgs/openobex/template b/srcpkgs/openobex/template index e1a0a96b548..eeed182faa1 100644 --- a/srcpkgs/openobex/template +++ b/srcpkgs/openobex/template @@ -1,7 +1,7 @@ # Template file for 'openobex' pkgname=openobex version=1.5 -revision=2 +revision=3 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.bz2" build_style=gnu-configure configure_args="--enable-apps --enable-irda --enable-bluetooth --enable-usb" @@ -20,6 +20,5 @@ long_desc=" subpackages="libopenobex libopenobex-devel" Add_dependency run libusb-compat -Add_dependency run libbluetooth Add_dependency build libusb-compat-devel Add_dependency build libbluetooth-devel From a4a5cd93169b9e00bc006a95a93c2f5004853ba9 Mon Sep 17 00:00:00 2001 From: davehome Date: Wed, 16 Nov 2011 20:26:04 -0700 Subject: [PATCH 3/6] pcmanfm: make libm SONAME x86_64 specific. --- srcpkgs/pcmanfm/pcmanfm.rshlibs | 2 +- srcpkgs/pcmanfm/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pcmanfm/pcmanfm.rshlibs b/srcpkgs/pcmanfm/pcmanfm.rshlibs index 2baeb0a7851..1c01a002f4d 100644 --- a/srcpkgs/pcmanfm/pcmanfm.rshlibs +++ b/srcpkgs/pcmanfm/pcmanfm.rshlibs @@ -11,4 +11,4 @@ libgobject-2.0.so.0 libglib-2.0.so.0 libpthread.so.0 libc.so.6 -libm.so.6 +libm.so.6 x86_64 diff --git a/srcpkgs/pcmanfm/template b/srcpkgs/pcmanfm/template index cd8321ff830..4fa6725de37 100644 --- a/srcpkgs/pcmanfm/template +++ b/srcpkgs/pcmanfm/template @@ -3,7 +3,7 @@ pkgname=pcmanfm version=0.9.9 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" build_style=gnu-configure -revision=2 +revision=3 short_desc="LXDE file manager" maintainer="Juan RP " checksum=bc48af4ade638b47e4207cc274f6e38c2bd3786a811d20da47c3df9907c6fb6c From cbf4c4e598dcef95d9f7c01cfe3fcf856a4a027d Mon Sep 17 00:00:00 2001 From: davehome Date: Wed, 16 Nov 2011 22:50:55 -0700 Subject: [PATCH 4/6] virtualbox-ose: Update due to modified tarball (idiots); add i686 rshlib glibc; revbump --- srcpkgs/virtualbox-ose/template | 4 ++-- srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template | 2 ++ srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template | 2 ++ srcpkgs/virtualbox-ose/virtualbox-ose-guest.rshlibs | 1 + srcpkgs/virtualbox-ose/virtualbox-ose-guest.template | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index 1088e759cb6..bdc98216e2a 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -2,7 +2,7 @@ pkgname=virtualbox-ose _vbox_distver=4.1.6 version=${_vbox_distver} -revision=3 +revision=4 patch_args="-Np1" wrksrc="VirtualBox-${version}_OSE" distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2" @@ -10,7 +10,7 @@ short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Juan RP " homepage="http://virtualbox.org" license="GPL-2, MPL-1.1, CDDL" -checksum=7acbb75f8314ea56601db36ac8a52b4aa6eabae65a3d6e95e66f6450883d8818 +checksum=554137cb33a806bf0dd74dc0de0c3008dd9bb20d483cdcebaf8a929720c0ab7e long_desc=" VirtualBox is a free x86 virtualization solution allowing a wide range of x86 operating systems such as Windows, DOS, BSD or Linux to run on a Linux system." diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template b/srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template index c6060857193..9602e1e4dd1 100644 --- a/srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template +++ b/srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template @@ -8,6 +8,8 @@ long_desc="${long_desc} use of these modules. Kernel sources or headers are required to compile this module." +revision=1 + dkms_modules="virtualbox-ose ${_vbox_distver}" noarch=yes diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template b/srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template index d2767674cf6..753c0aeef20 100644 --- a/srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template +++ b/srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template @@ -8,6 +8,8 @@ long_desc="${long_desc} order to make use of these modules. Kernel sources or headers are required to compile these modules." +revision=1 + dkms_modules="virtualbox-ose-guest ${_vbox_distver}" noarch=yes diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.rshlibs b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.rshlibs index 50f33f6161c..d9ab748c1bf 100644 --- a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.rshlibs +++ b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.rshlibs @@ -8,6 +8,7 @@ libpthread.so.0 librt.so.1 libc.so.6 ld-linux-x86-64.so.2 +ld-linux.so.2 libcrypt.so.1 libstdc++.so.6 libm.so.6 diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template index 54f862da1a3..f38373caf04 100644 --- a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template +++ b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template @@ -8,7 +8,7 @@ long_desc="${long_desc} They provide closer integration and allow to share data through shared folders between the host system and the virtual machine." -revision=2 +revision=3 systemd_services="virtualbox-guest.service on" Add_dependency run virtualbox-ose-guest-dkms ">=${version}" From 6cee018611d32f177c5c1cac608d8db1fb58ea24 Mon Sep 17 00:00:00 2001 From: davehome Date: Wed, 16 Nov 2011 23:39:33 -0700 Subject: [PATCH 5/6] wine: submit pkg to the new rshlibs world order (NRWO). --- srcpkgs/wine/libwine.rshlibs | 20 ++++++++++++++++++++ srcpkgs/wine/libwine.template | 16 +--------------- srcpkgs/wine/template | 4 +--- srcpkgs/wine/wine.rshlibs | 3 +++ 4 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 srcpkgs/wine/libwine.rshlibs create mode 100644 srcpkgs/wine/wine.rshlibs diff --git a/srcpkgs/wine/libwine.rshlibs b/srcpkgs/wine/libwine.rshlibs new file mode 100644 index 00000000000..9bd38d18d68 --- /dev/null +++ b/srcpkgs/wine/libwine.rshlibs @@ -0,0 +1,20 @@ +libdl.so.2 +libc.so.6 +libxml2.so.2 +libm.so.6 +libmpg123.so.0 +libSM.so.6 +libXext.so.6 +libX11.so.6 +libz.so.1 +libGLU.so.1 +libGL.so.1 +libresolv.so.2 +libgphoto2.so.2 +libgphoto2_port.so.0 +libasound.so.2 +libldap_r-2.4.so.2 +liblber-2.4.so.2 +libpthread.so.0 +libopenal.so.1 +liblcms.so.1 diff --git a/srcpkgs/wine/libwine.template b/srcpkgs/wine/libwine.template index 1a279038f41..c6250bee356 100644 --- a/srcpkgs/wine/libwine.template +++ b/srcpkgs/wine/libwine.template @@ -5,22 +5,8 @@ long_desc="${long_desc} This package contains the wine runtime." -revision=3 +revision=4 -Add_dependency run glibc -Add_dependency run lcms -Add_dependency run zlib -Add_dependency run libSM -Add_dependency run libXext -Add_dependency run libX11 -Add_dependency run libldap -Add_dependency run alsa-lib -Add_dependency run libgphoto2 -Add_dependency run libxml2 -Add_dependency run libmpg123 -Add_dependency run libGL -Add_dependency run libGLU -Add_dependency run libopenal do_install() { diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 92821baf9d8..d8ae519251b 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,7 +1,7 @@ # Template file for 'wine' pkgname=wine version=1.2.3 -revision=2 +revision=3 build_style=gnu-configure homepage="http://www.winehq.org/" distfiles="http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${version}.tar.bz2" @@ -18,8 +18,6 @@ only_for_archs=i686 subpackages="lib$pkgname $pkgname-devel" gtk_iconcache_dirs="/usr/share/icons/hicolor" -Add_dependency run glibc -Add_dependency run libwine Add_dependency build lcms-devel Add_dependency build zlib-devel diff --git a/srcpkgs/wine/wine.rshlibs b/srcpkgs/wine/wine.rshlibs new file mode 100644 index 00000000000..5a89a864101 --- /dev/null +++ b/srcpkgs/wine/wine.rshlibs @@ -0,0 +1,3 @@ +libc.so.6 +libwine.so.1 +libpthread.so.0 From 1631bbd4f35a9907d20ab2f19fe814362341ddf1 Mon Sep 17 00:00:00 2001 From: davehome Date: Wed, 16 Nov 2011 23:42:20 -0700 Subject: [PATCH 6/6] dssi-vst: submit pkg to the new rshlibs world order (NRWO). --- srcpkgs/dssi-vst/dssi-vst.rshlibs | 9 +++++++++ srcpkgs/dssi-vst/template | 7 +------ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/dssi-vst/dssi-vst.rshlibs diff --git a/srcpkgs/dssi-vst/dssi-vst.rshlibs b/srcpkgs/dssi-vst/dssi-vst.rshlibs new file mode 100644 index 00000000000..87e71e48101 --- /dev/null +++ b/srcpkgs/dssi-vst/dssi-vst.rshlibs @@ -0,0 +1,9 @@ +libjack.so.0 +libasound.so.2 +libpthread.so.0 +libstdc++.so.6 +libm.so.6 +libgcc_s.so.1 +libc.so.6 +liblo.so.7 +libwine.so.1 diff --git a/srcpkgs/dssi-vst/template b/srcpkgs/dssi-vst/template index f7c233f5990..77a25af470d 100644 --- a/srcpkgs/dssi-vst/template +++ b/srcpkgs/dssi-vst/template @@ -1,7 +1,7 @@ # Template file for 'dssi-vst' pkgname=dssi-vst version=0.9.2 -revision=1 +revision=2 homepage="http://breakfastquay.com/dssi-vst/" distfiles="http://code.breakfastquay.com/attachments/download/10/${pkgname}-${version}.tar.bz2" short_desc="Run Windows VST plugins on Linux" @@ -17,11 +17,6 @@ long_desc=" only_for_archs=i686 -Add_dependency run glibc -Add_dependency run libjack -Add_dependency run alsa-lib -Add_dependency run libgcc -Add_dependency run liblo Add_dependency run dssi Add_dependency run ladspa-sdk Add_dependency run ladspa-sdk-progs