snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 2 Activity Actions

Revert "common/shlibs: fix hidrd"

Browse source 
This reverts commit f7948d6051.

??????
This commit is contained in:
q66 2020-07-06 22:25:02 +02:00
parent f7948d6051
commit 248503d632
15 changed files with 93 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/shlibs
View file

@ -3965,7 +3965,7 @@ libjpegxr.so.0 jxrlib-0.2.2_1
libjxrglue.so.0 jxrlib-0.2.2_1
libhidrd_util.so.0 hidrd-0.2.0_1
libhidrd_usage.so.0 hidrd-0.2.0_1
libhidrd_item.so.0 hidrd-0.2.0_1
libhidrd_item.so.0
libhidrd_opt.so.0 hidrd-0.2.0_1
libhidrd_strm.so.0 hidrd-0.2.0_1
libhidrd_fmt.so.0 hidrd-0.2.0_1

2
common/xbps-src/shutils/chroot.sh
View file

@ -20,7 +20,7 @@ install_base_chroot() {
fi
# Reconfigure base-files to create dirs/symlinks.
if xbps-query -r $XBPS_MASTERDIR base-files &>/dev/null; then
XBPS_ARCH=$XBPS_TARGET_PKG xbps-reconfigure -r $XBPS_MASTERDIR -f base-files
XBPS_ARCH=$XBPS_TARGET_PKG xbps-reconfigure -r $XBPS_MASTERDIR -f base-files &>/dev/null
fi
msg_normal "xbps-src: installed base-chroot successfully!\n"

2
srcpkgs/android-file-transfer-linux/template
View file

@ -4,7 +4,7 @@ version=3.9
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIB=1"
hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"
makedepends="file-devel fuse-devel qt5-devel readline-devel"
short_desc="Android File Transfer for Linux"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

48
srcpkgs/codelite/patches/92ed90e07.patch Normal file
View file

@ -0,0 +1,48 @@
From 92ed90e07774dfc8556bee02c66120eed4938a40 Mon Sep 17 00:00:00 2001
From: dghart <dghart david@4Pane.co.uk>
Date: Wed, 19 Jun 2019 11:23:38 +0100
Subject: [PATCH] Compilation fix for wx3.0 gtk+3 builds
---
codelite_terminal/TextView.cpp | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/codelite_terminal/TextView.cpp b/codelite_terminal/TextView.cpp
index 83d2e260c..5966f9972 100644
--- codelite_terminal/TextView.cpp
+++ codelite_terminal/TextView.cpp
@@ -12,7 +12,11 @@ TextView::TextView(wxWindow* parent, wxWindowID winid)
m_ctrl->SetCaretStyle(wxSTC_CARETSTYLE_BLOCK);
m_ctrl->SetYCaretPolicy(wxSTC_CARET_STRICT | wxSTC_CARET_SLOP, 4);
m_ctrl->SetLexer(wxSTC_LEX_CONTAINER);
+#if wxCHECK_VERSION(3, 1, 1)
m_ctrl->StartStyling(0);
+#else
+ m_ctrl->StartStyling(0, 0x1f);
+#endif
m_ctrl->SetWrapMode(wxSTC_WRAP_CHAR);
#else
m_ctrl = new TextCtrl_t(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize,
@@ -61,7 +65,11 @@ void TextView::SetDefaultStyle(const wxTextAttr& attr)
{
#if USE_STC
m_defaultAttr = attr;
+#if wxCHECK_VERSION(3, 1, 1)
m_ctrl->StartStyling(m_ctrl->GetLastPosition());
+#else
+ m_ctrl->StartStyling(m_ctrl->GetLastPosition(), 0x1f);
+#endif
#else
m_ctrl->SetDefaultStyle(attr);
#endif
@@ -210,6 +218,10 @@ void TextView::Clear()
#if USE_STC
m_ctrl->ClearAll();
m_ctrl->ClearDocumentStyle();
+#if wxCHECK_VERSION(3, 1, 1)
m_ctrl->StartStyling(0);
+#else
+ m_ctrl->StartStyling(0, 0x1f);
+#endif
#endif
}

32
srcpkgs/codelite/patches/musl.patch
View file

@ -1,29 +1,29 @@
--- codelitegcc/main.cpp.orig 2019-06-29 08:37:38.818622077 +0200
+++ codelitegcc/main.cpp 2019-06-29 08:38:04.090937646 +0200
@@ -33,6 +33,7 @@ extern int ExecuteProcessWIN(const std::
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/stat.h>
+#include <fcntl.h>
void WriteContent( const std::string& logfile, const std::string& filename, const std::string& flags )
{
--- sdk/codelite_indexer/libctags/read.c
+++ sdk/codelite_indexer/libctags/read.c
@@ -608,6 +608,9 @@
#elif defined(__NetBSD__)
if(location._pos < 0)
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/stat.h>
+#include <fcntl.h>
void WriteContent( const std::string& logfile, const std::string& filename, const std::string& flags )
{
--- sdk/codelite_indexer/libctags/read.c.orig 2019-06-29 08:54:26.592208449 +0200
+++ sdk/codelite_indexer/libctags/read.c 2019-06-29 08:56:18.688608501 +0200
@@ -605,6 +605,9 @@ extern int readChars (char *buffer, size
#if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__)
if(location < 0)
return 0;
+#elif defined(__linux__) && !defined(__GLIBC__) /* musl */
+ if(location.__lldata < 0)
+ return 0;
+ return 0;
#else
if(location.__pos < 0)
return 0;
@@ -624,6 +627,8 @@
@@ -619,6 +622,8 @@ extern int readChars (char *buffer, size
#if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__)
sizeToRead = endPos - location;
#elif defined(__NetBSD__)
sizeToRead = endPos._pos - location._pos;
+#elif defined(__linux__) && !defined(__GLIBC__) /* musl */
+ sizeToRead = endPos.__lldata - location.__lldata;
#else

23
srcpkgs/codelite/template
View file

@ -1,12 +1,12 @@
# Template file for 'codelite'
pkgname=codelite
version=14.0
revision=1
version=13.0
revision=3
archs="i686* x86_64* ppc64le*"
build_style=cmake
configure_args="-DWITH_PCH=0
$(vopt_if sftp -DENABLE_SFTP=1)
$(vopt_if lldb -DENABLE_LLDB=1)
"
$(vopt_if lldb -DENABLE_LLDB=1)"
hostmakedepends="pkg-config clang which"
makedepends="gtk+3-devel wxWidgets-gtk3-devel sqlite-devel
$(vopt_if lldb lldb-devel) $(vopt_if hunspell hunspell-devel)
@ -16,24 +16,19 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.codelite.org"
distfiles="https://github.com/eranif/${pkgname}/archive/${version}.tar.gz"
checksum=67c7947808552ac07c6c71f8cd53440d293da03d89176b9dfb38012c5dd662b4
checksum=f2653fa42d6214999718236998cb223e6de00a498c0cfde795e901be693fb9ac
nocross=yes
python_version=2 #unverified
build_options="hunspell lldb mysql sftp"
build_options_default="hunspell lldb sftp"
desc_option_hunspell="Enable SpellCheck plugin"
desc_option_lldb="Enable support for LLDB"
desc_option_mysql="Enable mysql/mariadb support"
desc_option_sftp="Enable Workspace Mirroring plugin"
build_options_default="hunspell sftp"
# lldb is nocross
if [ -z "$CROSS_BUILD" ] ; then
build_options_default+=" lldb"
fi
pre_configure() {
vsed -i \
-e 's,wx-config,&-gtk3,g' \
-e "1i\SET(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" \
sed -i -e 's,wx-config,&-gtk3,g' \
-e "1i\SET(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" \
CMakeLists.txt
}

6
srcpkgs/cpputest/template
View file

@ -9,11 +9,7 @@ homepage="http://cpputest.github.io/"
license="BSD"
distfiles="https://github.com/cpputest/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
checksum="c81dccc5a1bfc7fc6511590c0a61def5f78e3fb19cb8e1f889d8d3395a476456"
if [ -n "$XBPS_CHECK_PKGS" ] ; then
configure_args+=" -DTESTS=OFF"
fi
configure_args+=" -DTESTS=OFF"
post_install() {
vlicense COPYING
}

1
srcpkgs/gtk4/template
View file

@ -30,6 +30,7 @@ homepage="https://www.gtk.org/"
distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
checksum=a947caa5296610b0f1d7a03b58df34765c227c577c78e683e75eea3251a67035
# Package build options
build_options="broadway colord cups gir cloudproviders wayland x11"
desc_option_broadway="Enable support for the HTML5 Broadway backend"
desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"

8
srcpkgs/lshw/template
View file

@ -9,15 +9,7 @@ make_install_args="SBINDIR=/usr/bin"
make_install_target="install install-gui"
make_use_env=yes
hostmakedepends="docbook2x pkg-config"
<<<<<<< Updated upstream
makedepends="gtk+-devel"
=======
<<<<<<< Updated upstream
makedepends="gtk+-devel libglade-devel sqlite-devel"
=======
makedepends="gtk+-devel libcanberra-devel"
>>>>>>> Stashed changes
>>>>>>> Stashed changes
short_desc="Hardware lister application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"

10
srcpkgs/neovim/template
View file

@ -5,7 +5,7 @@ revision=1
build_style=cmake
build_helper="qemu"
hostmakedepends="pkg-config gettext gperf LuaJIT lua51-lpeg lua51-mpack"
makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel
makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel LuaJIT-devel
libluv-devel"
depends="libvterm>=0.1.0"
short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs"
@ -24,14 +24,6 @@ alternatives="
vim:vim:/usr/bin/nvim
vim:vim.1:/usr/share/man/man1/nvim.1"
# fallback to lua5.1 if LuaJIT is unavailable
#if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ] || [ "$XBPS_MACHINE" = "x86_64" ] ; then
makedepends+=" LuaJIT-devel"
#else
# configure_args+=" -DPREFER_LUA=ON"
# makedepends+=" lua51-devel"
#fi
pre_configure() {
vsed -i runtime/CMakeLists.txt \
-e "s|\".*/bin/nvim|\${CMAKE_CROSSCOMPILING_EMULATOR} &|g"

6
srcpkgs/rdup/template
View file

@ -5,6 +5,7 @@ revision=3
build_style=gnu-configure
hostmakedepends="automake pkg-config"
makedepends="glib-devel libarchive-devel nettle-devel"
checkdepends="bsdtar dejagnu"
short_desc="The only backup program that doesn't make backups"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
license="GPL-3.0-or-later"
@ -13,11 +14,6 @@ distfiles="https://github.com/miekg/rdup/archive/${version}.tar.gz"
checksum=787b8c37e88be810a710210a9d9f6966b544b1389a738aadba3903c71e0c29cb
patch_args="-Np1"
do_check() {
# checks require mcrypt which is yet to be packaged
:
}
pre_configure() {
vsed -e 's/-Werror//' -i GNUmakefile.in
autoreconf -fi

8
srcpkgs/rpi-kernel/template
View file

@ -135,14 +135,14 @@ do_install() {
vmkdir boot
# Generate kernel.img and install it to destdir.
case "$XBPS_TARGET_MACHINE" in
armv6l*)
cp arch/arm/boot/zImage ${DESTDIR}/boot/kernel.img
aarch64*)
cp arch/arm64/boot/Image ${DESTDIR}/boot/kernel8.img
;;
armv7l*)
cp arch/arm/boot/zImage ${DESTDIR}/boot/kernel7.img
;;
aarch64*)
cp arch/arm64/boot/Image ${DESTDIR}/boot/kernel8.img
armv6l*)
cp arch/arm/boot/zImage ${DESTDIR}/boot/kernel.img
;;
esac

13
srcpkgs/samsung-unified-driver/template
View file

@ -1,23 +1,18 @@
# Template file for 'samsung-unified-driver'
pkgname=samsung-unified-driver
version=1.00.39
version=1.00.37
revision=3
archs="i686 x86_64"
create_wrksrc=yes
#depends="cups ghostscript libusb-compat sane"
archs="i686 x86_64"
repository=nonfree
depends="cups ghostscript libusb-compat sane"
short_desc="Unified Linux Driver for Samsung printers and scanners"
maintainer="Thomas Bernard <thomas@famillebernardgouriou.fr>"
license="Propietary"
homepage="http://www.samsung.com"
distfiles="http://downloadcenter.samsung.com/content/DR/201512/20151210091120064/uld_v${version}_00.99.tar.gz"
checksum="6b85253ea0bb51d241f6fd665ff0d39464cdad87084802a77a385c707fa2c664"
homepage="http://www.hp.com"
distfiles="https://ftp.hp.com/pub/softlib/software13/printers/SS/SL-M4580FX/uld_V${version}_01.17.tar.gz"
checksum="0c38213b846644500526bf281caaa6e36c40b8f2241cac2f0398c97c3814540e"
repository=nonfree
nostrip=true
#restricted=yes
post_extract() {
mv uld/i386 uld/i686

4
srcpkgs/vmap/template
View file

@ -1,6 +1,6 @@
# Template file for 'vmap'
pkgname=vmap
version=0.4.1
version=0.4
revision=1
build_style=qmake
configure_args="CONFIG+=NONMAP"
@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.com/git-rep/vmap"
distfiles="https://gitlab.com/git-rep/vmap/-/archive/${version}/vmap-${version}.tar.gz"
checksum=
checksum=950d1a9b27ec4ff6b4641f699350914588bf59658d03bb526f5a46fb72c6a689
if [ -n "CROSS_BUILD" ]; then
hostmakedepends+=" qt5-svg-devel"

6
srcpkgs/vtk/template
View file

@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.0.0
revision=1
version=8.2.0
revision=4
wrksrc=VTK-${version}
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
@ -37,7 +37,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
checksum=15def4e6f84d72f82386617fe595ec124dda3cbd13ea19a0dcd91583197d8715
checksum=34c3dc775261be5e45a8049155f7228b6bd668106c72a3c435d95730d17d57bb
nocross="hdf5 is nocross"