tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into webkitgtk2

Browse Source 
Conflicts:
	common/shlibs
This commit is contained in:
Eivind Uggedal
2015-01-13 22:44:56 +00:00
parent 17c9c00273 ed512c9de6
commit 3c91dd1ff4
225 changed files with 16499 additions and 1199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/build_style/gnu-makefile.sh
View File

@@ -6,7 +6,7 @@ do_build() {
${make_cmd} \
CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" STRIP="$STRIP" \
CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" STRIP=":" \
${makejobs} ${make_build_args} ${make_build_target}
}
@@ -14,7 +14,7 @@ do_install() {
: ${make_cmd:=make}
: ${make_install_target:=install}
make_install_args+=" PREFIX=/usr DESTDIR=${DESTDIR}"
make_install_args+=" STRIP=: PREFIX=/usr DESTDIR=${DESTDIR}"
${make_cmd} ${make_install_args} ${make_install_target}
}

5
common/hooks/pre-configure/02-script-wrapper.sh
View File

@@ -42,8 +42,8 @@ generic_wrapper3() {
cp ${XBPS_CROSS_BASE}/usr/bin/${wrapper} ${XBPS_WRAPPERDIR}
sed -e "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" -i ${XBPS_WRAPPERDIR}/${wrapper}
sed -e "s,libdir=/usr/lib,libdir=${XBPS_CROSS_BASE}/usr/lib,g" -i ${XBPS_WRAPPERDIR}/${wrapper}
sed -e "s,^prefix=/usr,prefix=${XBPS_CROSS_BASE}/usr," -i ${XBPS_WRAPPERDIR}/${wrapper}
sed -e "s,^libdir=.*,libdir=${XBPS_CROSS_BASE}/usr/lib,g" -i ${XBPS_WRAPPERDIR}/${wrapper}
sed -e "s,^prefix=.*,prefix=${XBPS_CROSS_BASE}/usr," -i ${XBPS_WRAPPERDIR}/${wrapper}
chmod 755 ${XBPS_WRAPPERDIR}/${wrapper}
}
@@ -106,6 +106,7 @@ hook() {
generic_wrapper3 fltk-config
generic_wrapper3 xslt-config
generic_wrapper3 xml2-config
generic_wrapper3 fox-config
python_wrapper python-config 2.7
python_wrapper python3.4-config 3.4m

4
common/hooks/pre-pkg/05-prepare-32bit.sh
View File

@@ -149,8 +149,8 @@ hook() {
for f in ${lib32files}; do
echo "$pkgver: installing additional files: $f ..."
_targetdir=${destdir32}/$(dirname ${f})
mkdir -p ${_targetdir}
cp -a ${PKGDESTDIR}/${f} ${_targetdir}
mkdir -p ${_targetdir/\/usr\/lib/\/usr\/lib32}
cp -a ${PKGDESTDIR}/${f} ${_targetdir/\/usr\/lib/\/usr\/lib32}
done
# If it's a development pkg add a dependency to the 64bit pkg.
if [[ $pkgname =~ '-devel' ]]; then

21
common/shlibs
View File

@@ -321,8 +321,8 @@ libvorbisfile.so.3 libvorbis-1.2.1rc1_1
libtheora.so.0 libtheora-1.0_1
libtheoradec.so.1 libtheora-1.0_1
libtheoraenc.so.1 libtheora-1.0_1
libcdda_interface.so.0 cdparanoia-10.2_1
libcdda_paranoia.so.0 cdparanoia-10.2_1
libcdda_interface.so.0 libcdparanoia-10.2_10
libcdda_paranoia.so.0 libcdparanoia-10.2_10
libasound.so.2 alsa-lib-1.0.20_1
libvisual-0.4.so.0 libvisual-0.4.0_1
libxfsm-4.6.so.0 xfce4-session-4.9.1_1
@@ -475,9 +475,11 @@ libsoup-gnome-2.4.so.1 libsoup-gnome-2.34.0_1
libunique-3.0.so.0 libunique-2.91.4_1
libwebkitgtk-1.0.so.0 webkitgtk2-2.4.8_2
libwebkitgtk-3.0.so.0 webkitgtk-2.0.0_1
libwebkit2gtk-3.0.so.25 webkitgtk-2.0.0_1
libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1
libjavascriptcoregtk-1.0.so.0 webkitgtk2-2.4.8_2
libjavascriptcoregtk-3.0.so.0 webkitgtk-2.0.0_1
libwebkit2gtk-3.0.so.25 webkitgtk-2.0.0_1
libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1
libgimp-2.0.so.0 libgimp-2.8.10_3
libgimpwidgets-2.0.so.0 libgimp-2.8.10_3
libgimpui-2.0.so.0 libgimp-2.8.10_3
@@ -680,6 +682,7 @@ librecode.so.0 librecode-3.6_1
libenca.so.0 libenca-1.13_1
libwavpack.so.1 libwavpack-4.60.1_1
libvala-0.24.so.0 libvala-0.24.0_1
libvala-0.26.so.0 libvala-0.26.2_1
libSDL_net-1.2.so.0 SDL_net-1.2.7_1
libmodplug.so.1 libmodplug-0.8.8_1
libfetch.so libfetch-2.33_1
@@ -749,7 +752,7 @@ libXevie.so.1 libXevie-1.0.2_1
libatspi.so.0 at-spi2-core-1.91.91_1
libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
libmutter.so.0 mutter-3.4.1_1
libvte2_90.so.9 vte3-0.28.0_1
libvte-2.91.so.0 vte3-0.38.1_1
libgnome-media-profiles-3.0.so.0 libgnome-media-profiles-3.0.0_1
libpipeline.so.1 libpipeline-1.2.0_1
libosp.so.5 opensp-1.5.2_1
@@ -1088,10 +1091,10 @@ libcheese-gtk.so.23 libcheese-3.6.0_1
libSoundTouch.so.0 soundtouch-1.7.0_1
libzapojit-0.0.so.0 libzapojit-0.0.2_1
libmusicbrainz5.so.1 libmusicbrainz5-5.1.0_1
librygel-core-2.2.so.2 librygel-0.22.0_1
librygel-server-2.2.so.2 librygel-0.22.0_1
librygel-renderer-2.2.so.2 librygel-0.22.0_1
librygel-renderer-gst-2.2.so.2 librygel-0.22.0_1
librygel-core-2.4.so.2 librygel-0.24.0_1
librygel-server-2.4.so.2 librygel-0.24.0_1
librygel-renderer-2.4.so.2 librygel-0.24.0_1
librygel-renderer-gst-2.4.so.2 librygel-0.24.0_1
libharfbuzz.so.0 libharfbuzz-0.9.4_1
libharfbuzz-icu.so.0 libharfbuzz-0.9.19_1
libosinfo-1.0.so.0 libosinfo-0.2.0_1
@@ -1888,3 +1891,5 @@ libsystemd-journal.so.0 LoginKit-git-20141226_1
libsystemd-login.so.0 LoginKit-git-20141226_1
libsystemd.so.0 LoginKit-git-20141226_1
libssr-glinject.so ssr-0.3.1_1
libgdict-1.0.so.6 gnome-dictionary-3.14.1_1
libasignify.so.1 asignify-1.0_1