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

Merge branch 'master' into libgit2

Browse Source
This commit is contained in:
Enno Boland
2018-08-25 21:49:17 +02:00
committed by GitHub
parent 427a0542ea 8a1d1ee0f8
commit d5b7d3faed
467 changed files with 2700 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/environment/build-style/scons.sh Normal file
View File

@@ -0,0 +1 @@
hostmakedepends+=" scons"

23
common/hooks/post-install/04-create-xbps-metadata-scripts.sh
View File

@@ -148,7 +148,7 @@ _EOF
#
if [ -d "${PKGDESTDIR}/usr/lib/udev/hwdb.d" ]; then
_add_trigger hwdb.d-dir
fi
fi
#
# (Un)Register a shell in /etc/shells.
#
@@ -222,6 +222,20 @@ _EOF
_add_trigger gio-modules
fi
#
# Handle gtk immodules in /usr/lib/gtk-2.0/2.10.0/immodules with
# gtk-immodules
#
if [ -d ${PKGDESTDIR}/usr/lib/gtk-2.0/2.10.0/immodules ]; then
_add_trigger gtk-immodules
fi
#
# Handle gtk3 immodules in /usr/lib/gtk-3.0/3.0.0/immodules with
# gtk3-immodules
#
if [ -d ${PKGDESTDIR}/usr/lib/gtk-3.0/3.0.0/immodules ]; then
_add_trigger gtk3-immodules
fi
#
# Handle gsettings schemas in /usr/share/glib-2.0/schemas with
# gsettings-schemas.
#
@@ -229,6 +243,13 @@ _EOF
_add_trigger gsettings-schemas
fi
#
# Handle gdk-pixbuf loadable modules in /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders
# with gdk-pixbuf-loaders
#
if [ -d ${PKGDESTDIR}/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders ]; then
_add_trigger gdk-pixbuf-loaders
fi
#
# Handle mime database in /usr/share/mime with update-mime-database.
#
if [ -d ${PKGDESTDIR}/usr/share/mime ]; then

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

@@ -153,5 +153,5 @@ hook() {
generic_wrapper3 libetpan-config
generic_wrapper3 giblib-config
python_wrapper python-config 2.7
python_wrapper python3.4-config 3.4m
python_wrapper python3-config 3.6m
}

3
common/hooks/pre-pkg/04-generate-runtime-deps.sh
View File

@@ -47,7 +47,7 @@ store_pkgdestdir_rundeps() {
}
hook() {
local depsftmp f lf j tmplf mapshlibs sorequires _curdep
local depsftmp f lf j mapshlibs sorequires _curdep
# Disable trap on ERR, xbps-uhelper cmd might return error... but not something
# to be worried about because if there are broken shlibs this hook returns
@@ -55,7 +55,6 @@ hook() {
trap - ERR
mapshlibs=$XBPS_COMMONDIR/shlibs
tmplf=$XBPS_SRCPKGDIR/$pkgname/template
if [ -n "$noarch" -o -n "$noverifyrdeps" ]; then
store_pkgdestdir_rundeps

29
common/shlibs
View File

@@ -124,6 +124,7 @@ libGLESv1_CM.so.1 libGLES-1.0_1
libGLESv2.so.2 libGLES-1.0_1
libEGL.so rpi-userland-0.0.0.0.20150907_1
libGLESv2.so rpi-userland-0.0.0.0.20150907_1
libGLESv2.so opera-55.0.2994.37_2
libbrcmEGL.so rpi-userland-20180103_2
libbrcmGLESv2.so rpi-userland-20180103_2
libbrcmOpenVG.so rpi-userland-20180103_2
@@ -341,7 +342,7 @@ libMagickCore-6.Q16.so.6 libmagick-6.9.9.44_1
libMagickWand-6.Q16.so.6 libmagick-6.9.9.44_1
libMagick++-6.Q16.so.8 libmagick-6.9.9.0_1
libltdl.so.7 libltdl-2.2.6_1
libpoppler.so.74 poppler-0.63.0_1
libpoppler.so.79 poppler-0.68.0_1
libpoppler-glib.so.8 poppler-glib-0.18.2_1
libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
@@ -1568,10 +1569,10 @@ libdovecot-lda.so.0 dovecot-2.2.11_2
libnetapi.so.0 samba-3.6.23_1
libsmbsharemodes.so.0 samba-3.6.23_1
libmysqld.so.18 libmariadbclient-5.5.36_1
libwscodecs.so.1 libwireshark-2.4.1_1
libwiretap.so.7 libwireshark-2.4.1_1
libwireshark.so.9 libwireshark-2.4.5_1
libwsutil.so.8 libwireshark-2.4.1_1
libwscodecs.so.2 libwireshark-2.6.2_1
libwiretap.so.8 libwireshark-2.6.2_1
libwireshark.so.10 libwireshark-2.6.2_1
libwsutil.so.9 libwireshark-2.6.2_1
libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1
libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1
libKF5Prison.so.5 prison-5.43.0_1
@@ -2020,11 +2021,11 @@ libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1
libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1
liblastfm.so.1 liblastfm-1.0.9_1
liblastfm_fingerprint.so.1 liblastfm-1.0.9_1
libdruntime-ldc-debug-shared.so.80 ldc-runtime-1.10.0_1
libdruntime-ldc-shared.so.80 ldc-runtime-1.10.0_1
libphobos2-ldc-shared.so.80 ldc-runtime-1.10.0_1
libphobos2-ldc-debug-shared.so.80 ldc-runtime-1.10.0_1
libldc-jit.so.80 ldc-runtime-1.10.0_1
libdruntime-ldc-debug-shared.so.81 ldc-runtime-1.11.0_1
libdruntime-ldc-shared.so.81 ldc-runtime-1.11.0_1
libphobos2-ldc-shared.so.81 ldc-runtime-1.11.0_1
libphobos2-ldc-debug-shared.so.81 ldc-runtime-1.11.0_1
libldc-jit.so.81 ldc-runtime-1.11.0_1
libmarblewidget.so.19 marble-4.14.3_2
libastro.so.1 marble-4.14.3_2
libmarblewidget-qt5.so.28 marble5-17.12.2_1
@@ -2197,7 +2198,7 @@ libgoocanvas.so.3 goocanvas1-1.0.0_1
libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
libplatform.so.2.0 platform-2.0.1_1
libp8-platform.so.2 p8-platform-2.1.0.1_1
libfacter.so.3.11.3 facter-3.11.3_1
libfacter.so.3.11.4 facter-3.11.4_1
libOIS-1.3.0.so ois-1.3_1
libSILLY.so.1 silly-0.1.0_1
libkeybinder-3.0.so.0 libkeybinder3-0.3.0_1
@@ -2830,7 +2831,7 @@ libsidplayfp.so.4 libsidplayfp-1.8.7_1
libstilview.so.0 libsidplayfp-1.8.7_1
libczmq.so.4 czmq-4.0.1_1
liblz.so.1 lzlib-1.8_1
libelogind.so.0 elogind-219.12_1
libelogind.so.0 libelogind-238.1_2
libnma.so.0 libnm-gtk-1.4.0_1
libgspell-1.so.2 gspell-1.8.0_1
libotf.so.1 libotf-0.9.16_1
@@ -3353,9 +3354,6 @@ libgeos-3.6.2.so geos-3.6.2_1
libgeos_c.so.1 geos-3.6.2_1
libspatialindex.so.4 libspatialindex-1.8.5_1
libspatialindex_c.so.4 libspatialindex-1.8.5_1
liboctave.so.5 octave-4.4.0_1
liboctinterp.so.5 octave-4.4.0_1
liboctgui.so.3 octave-4.4.0_1
libpapi.so.5 papi-5.6.0_1
libpfm.so.4 papi-5.6.0_1
libfifechan.so.0.1.4 fifechan-0.1.4_1
@@ -3405,3 +3403,4 @@ libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so shaderc-2017.2_1
libglslang.so glslang-6.2.2596_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1