Merge branch 'master' into xserver1.18

This commit is contained in:
Juan RP 2015-11-12 07:33:00 +01:00
commit 7a8ca09460
95 changed files with 620 additions and 8016 deletions

View file

@ -868,7 +868,7 @@ colon, i.e `system_groups="mygroup:78"` or `system_groups="foo blah:8000"`.
- `system_accounts` This specifies the names of the new **system users/groups** to be created,
separated by blanks, i.e `system_accounts="foo blah:22"`. Optionally the **uid** and **gid**
can be specified by delimiting it with a color, i.e `system_accounts="foo:48"`.
can be specified by delimiting it with a colon, i.e `system_accounts="foo:48"`.
Additional variables for the **system accounts** can be specified to change its behavior:
- `<account>_homedir` the home directory for the user. If unset defaults to `/var/empty`.

View file

@ -108,7 +108,7 @@ genpkg() {
${_shrequires:+--shlib-requires "${_shrequires}"} \
${_alternatives:+--alternatives "${_alternatives}"} \
${_preserve:+--preserve} \
${_tags:+--tags "${tags}"} \
${tags:+--tags "${tags}"} \
--architecture ${arch} \
--homepage "${homepage}" \
--license "${license}" \

View file

@ -2281,3 +2281,5 @@ libfreeimage.so.3 freeimage-3.17.0_1
libfreeimageplus.so.3 freeimage-plus-3.17.0_1
libtoluapp.so toluapp-1.0.93_1
libmpd.so.1 libmpd-11.8.17_1
libfa.so.1 augeas-1.4.0_1
libaugeas.so.0 augeas-1.4.0_1

View file

@ -1,7 +1,7 @@
# Template build file for 'alsa-lib'.
pkgname=alsa-lib
version=1.0.29
revision=2
version=1.1.0
revision=1
build_style=gnu-configure
configure_args="--with-pythonlibs=-lpython2.7 --with-pythonincludes=-I${XBPS_CROSS_BASE}/usr/include/python2.7"
hostmakedepends="automake libtool pkg-config python-devel"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="LGPL-2.1"
homepage="http://www.alsa-project.org"
distfiles="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$version.tar.bz2"
checksum=73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0
checksum=dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15
pre_configure() {
autoreconf -fi

View file

@ -1,10 +0,0 @@
--- arcam-av/arcam_av.c.orig 2015-05-13 18:42:27.594373337 +0200
+++ arcam-av/arcam_av.c 2015-05-13 18:42:38.945502875 +0200
@@ -31,6 +31,7 @@
#include <unistd.h>
#include <sys/ipc.h>
+#include <sys/select.h>
#include <sys/shm.h>
#include <sys/stat.h>
#include <sys/stat.h>

View file

@ -1,7 +1,7 @@
# Template build file for 'alsa-plugins'.
pkgname=alsa-plugins
version=1.0.29
revision=2
version=1.1.0
revision=1
build_style=gnu-configure
configure_args="--disable-maemo-plugin"
hostmakedepends="pkg-config"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2, LGPL-2.1"
homepage="http://www.alsa-project.org"
distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2"
checksum=325d85cac285f632b83e0191ae3f348bad03c1f007b937042f164abb81ea6532
checksum=3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee
alsa-plugins-jack_package() {
short_desc+=" - Jack output plugin"

View file

@ -1,7 +1,7 @@
# Template file for 'alsa-tools'
pkgname=alsa-tools
version=1.0.29
revision=2
version=1.1.0
revision=1
hostmakedepends="pkg-config"
makedepends="alsa-lib-devel gtk+-devel gtk+3-devel fltk-devel"
depends="python-alsa"
@ -10,7 +10,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="GPL-2"
homepage="http://alsa-project.org"
distfiles="ftp://ftp.alsa-project.org/pub/tools/${pkgname}-${version}.tar.bz2"
checksum=94abf0ab5a73f0710c70d4fb3dc1003af5bae2d2ed721d59d245b41ad0f2fbd1
checksum=7d34558c590a50294b36576d257316a1ac5cd951eb8cd7d330e09f8cc757ab51
_tools="
as10k1 echomixer envy24control hdajackretask hda-verb hdspconf hdsploader

View file

@ -1,12 +1,12 @@
# Template build file for 'alsa-utils'.
pkgname=alsa-utils
version=1.0.29
revision=3
version=1.1.0
revision=1
build_pie=yes
build_style=gnu-configure
configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d -disable-alsaconf"
hostmakedepends="pkg-config xmlto"
makedepends="ncurses-devel alsa-lib-devel libsamplerate-devel"
makedepends="ncurses-devel alsa-lib-devel libsamplerate-devel fftw-devel"
depends="alsa-lib>=${version}"
make_dirs="/var/lib/alsa 0750 root root"
short_desc="The Advanced Linux Sound Architecture (ALSA) utilities"
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.alsa-project.org"
license="GPL-2"
distfiles="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$version.tar.bz2"
checksum=5160058f3e14483ced5de919dd473f93932059454530a9b7ef97dcabd6833e9b
checksum=3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1
post_install() {
# Install required udev rules file.

View file

@ -1,6 +1,6 @@
# Template file for 'audacious-plugins'.
pkgname=audacious-plugins
version=3.6.2
version=3.7
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@ -9,9 +9,10 @@ makedepends="
lame-devel libvorbis-devel libflac-devel mpg123-devel faad2-devel ffmpeg-devel
libmodplug-devel fluidsynth-devel libcdio-paranoia-devel wavpack-devel libnotify-devel
libcurl-devel libmtp-devel neon-devel libmms-devel gtk+-devel libxml2-devel"
depends="audacious>=${version}"
short_desc="Plugins for the Audacious media player"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="BSD"
homepage="http://audacious-media-player.org/"
distfiles="http://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2"
checksum=e7798936249e1601177503d148a3dd59edd289579f3f1667351eb0ba463642e8
checksum=3856e9f7261cbb27b5e15246ee3959189ab950389ef02aaec27d645a0a516c2c

View file

@ -1,6 +1,6 @@
# Template file for 'audacious'.
pkgname=audacious
version=3.6.2
version=3.7
revision=1
build_style=gnu-configure
configure_args="--enable-thunar"
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://audacious-media-player.org/"
distfiles="http://distfiles.${pkgname}-media-player.org/${pkgname}-${version}.tar.bz2"
checksum=b2fdb9f3cafd65b2afc50efea6f17a7a329547f1d394f525870e42cb0483cb04
checksum=4e5a74394c85b1135fc5a89dcc3a03601cddc53af060f587e489352d1fc9cf67
audacious-devel_package() {
depends="audacious>=${version}_${revision}"

1
srcpkgs/augeas-devel Symbolic link
View file

@ -0,0 +1 @@
augeas

24
srcpkgs/augeas/template Normal file
View file

@ -0,0 +1,24 @@
# Template file for 'augeas'
pkgname=augeas
version=1.4.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="readline-devel libxml2-devel"
short_desc="Configuration file editing tool"
maintainer="allan <mail@may.mooo.com>"
license="LGPL-2.1"
homepage="http://augeas.net"
distfiles="http://download.augeas.net/augeas-${version}.tar.gz"
checksum=659fae7ac229029e60a869a3b88c616cfd51cf2fba286cdfe3af3a052cb35b30
augeas-devel_package() {
depends="${pkgname}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}

View file

@ -1,6 +1,6 @@
# Template file for 'cantarell-fonts'
pkgname=cantarell-fonts
version=0.0.18
version=0.0.18.1
revision=1
noarch=yes
build_style=gnu-configure
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://abattis.org/cantarell/"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/0.0/$pkgname-$version.tar.xz"
checksum=f84df2ca44fa9266fdffd2b8de1adeff60eb7e7c9ec8e338a229b3126aabb977
checksum=9c5b1a2edee1d3acf30eaae3d559b2b2e1d835249cf2770f6f8bfc6af861e8f0
post_install() {
vmkdir etc/fonts/conf.d

View file

@ -4,7 +4,7 @@ _release="15.9"
pkgname=catalyst
version=15.201.1151
revision=3
revision=4
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Proprietary AMD license"
homepage="http://www.amd.com"
@ -13,7 +13,7 @@ only_for_archs="i686 x86_64"
hostmakedepends="unzip wget"
subpackages="${pkgname}-opencl ${pkgname}-dkms ${pkgname}-libs"
depends="${pkgname}-dkms-${version}_${revision}"
conflicts="nvidia>=0 xserver-abi-video>19"
conflicts="nvidia>=0 xserver-abi-video>19_1"
short_desc="${_desc} - Utilities"
repository="nonfree"
create_wrksrc=yes

View file

@ -0,0 +1,26 @@
# Template file for 'chefdk'
pkgname=chef-client
version=12.5.1
revision=1
only_for_archs="x86_64 i686"
build_style=fetch
short_desc="Client for the Chef Systems Integration Framework"
maintainer="bougyman <bougyman@voidlinux.eu>"
license="apache2"
homepage="https://github.com/chef/chef"
if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ];then
_debarch=amd64
checksum=656a4c4a8fd64d74d1d970fb0d07076d6f1d8230d37d751f2c3698a52d82c070
else
_debarch=i386
checksum=d2e82528eca2b247cd59998bb9e0ac3df41614c97337c7d52f69051cafa83bd4
fi
distfiles="https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/10.04/${XBPS_TARGET_MACHINE}/chef_${version}-1_${_debarch}.deb"
do_install() {
ar p chef_${version}-1_${_debarch}.deb data.tar.gz | tar xzf - -C "${DESTDIR}"
mkdir -p "$DESTDIR"/usr/bin
for bin in chef-apply chef-client chef-shell chef-solo knife ohai;do
ln -s /opt/chef/bin/${bin} "$DESTDIR"/usr/bin/${bin}
done
}

View file

@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
version=2.8.1
version=2.8.2
revision=1
short_desc="The Cinnamon session handler"
build_style=gnu-configure
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=4f3b56b7f5de874e419c8930c100e3ca19dcb1f232a09af2bac4cdfb740f314f
checksum=0a7236c75fef67c1a1c173e184c083ff2879e870428bdc3cb53a892cb0bfaf79
pre_configure() {
NOCONFIGURE=1 ./autogen.sh

View file

@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
version=2.8.0
version=2.8.1
revision=1
short_desc="The Cinnamon Settings Daemon"
build_style=gnu-configure
@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=ddaa68c847eee3cfbca3617faf1cd2aed8784cc80ec1af76d461e0f9a34b6077
checksum=2e01f7e8900043f8efb28f33814e70ca12eb12b7d49061ce6d059c1a0b0344a0
pre_configure() {
NOCONFIGURE=1 ./autogen.sh

View file

@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
version=2.8.0
version=2.8.1
revision=1
noarch=yes
build_style=gnu-makefile
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=d4c6ca5ff04c9e670e1a0cfe79b0834437829222f1382cc8de65af4c7c94f081
checksum=48431b300fd46552d71d009e3fad84c76d4f0d0cc6db9ec7241aed95f8bb5f98
do_install () {
vmkdir /usr/share/locale

View file

@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
version=2.8.0
revision=2
version=2.8.3
revision=1
wrksrc="Cinnamon-${version}"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
build_style=gnu-configure
@ -23,7 +23,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=ef058a8a466bf20c5aa2579408db93b0e9d5b31405075b232c6277a56c2b595d
checksum=e83e3f9fcf00214ec8444dfe4be88e9d00bec14f03b3cbf01dd6dfa7237dec9b
CFLAGS+="-I/usr/include/gtk-3.0"

View file

@ -1,6 +1,6 @@
# Template file for 'clipgrab'
pkgname=clipgrab
version=3.5.2
version=3.5.3
revision=1
build_style=qmake
hostmakedepends="qt-qmake"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://www.clipgrab.org"
distfiles="http://download.clipgrab.de/${pkgname}-${version}.tar.gz"
checksum=f7753aae0d32d4a4793c800937792c1c8302e5b8ecb8a2c40a54741e69792a5f
checksum=6b486d469b3d943736c3d0c8752bb12169c5c4e85e829a98ef47913bb61d317e
configure_args=clipgrab.pro
do_install() {

View file

@ -1,6 +1,6 @@
# Template file for 'crane'
pkgname=crane
version=2.1.0
version=2.2.0
revision=1
build_style=go
hostmakedepends="git"
@ -10,7 +10,7 @@ license="MIT"
go_import_path="github.com/michaelsauter/crane"
homepage="https://${go_import_path}"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=2847d64d566f1d7e3e93e4863bc90b044ac185e0afd6f7203c739f762d747ad8
checksum=a439dcc62765c644feb5ac7add8c96f2476791739c2e2fb2440338e19598767a
post_install() {
vlicense LICENSE

View file

@ -1,9 +1,10 @@
# Template file for 'darcs'
pkgname=darcs
version=2.10.1
revision=2
version=2.10.2
revision=1
nocross=yes
build_style=haskell-stack
stackage="lts-3.13"
make_build_args="--flag darcs:use-time-1point5"
hostmakedepends="ghc stack"
makedepends="zlib-devel libcurl-devel ncurses-devel"
@ -12,7 +13,7 @@ maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="GPL-2"
homepage="http://darcs.net/"
distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
checksum=f1ef65b43780e7593ca1afdae5ecf44ed91d62cc1be360693a52c5ff7b57ee94
checksum=6337d3fac04711fa2ef5813558b409c59166c5599b0c9d68c418d21cdccfb327
post_install() {
vinstall contrib/darcs_completion 644 etc/bash_completion.d

View file

@ -0,0 +1,17 @@
/* See LICENSE file for copyright and license details. */
/* Default settings; can be overriden by command line. */
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
/* -fn option overrides fonts[0]; default X11 font or font set */
static const char *fonts[] = {
"monospace:size=10"
};
static const char *prompt = NULL; /* -p option; prompt to the elft of input field */
static const char *normbgcolor = "#222222"; /* -nb option; normal background */
static const char *normfgcolor = "#bbbbbb"; /* -nf option; normal foreground */
static const char *selbgcolor = "#005577"; /* -sb option; selected background */
static const char *selfgcolor = "#eeeeee"; /* -sf option; selected foreground */
static const char *outbgcolor = "#00ffff";
static const char *outfgcolor = "#000000";
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
static unsigned int lines = 0;

View file

@ -0,0 +1,147 @@
From 34e4ada60c7ca73cfdd83a02c7416af39dfc0dc0 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <miwaxe@gmail.com>
Date: Tue, 10 Nov 2015 19:29:45 +0100
Subject: [PATCH] fuzzymatch-4.6
---
dmenu.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 85 insertions(+), 4 deletions(-)
diff --git a/dmenu.c b/dmenu.c
index a07f8e3..c26ecfc 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -32,6 +32,7 @@ struct item {
char *text;
struct item *left, *right;
int out;
+ int distance;
};
static char text[BUFSIZ] = "";
@@ -253,6 +254,86 @@ match(void)
calcoffsets();
}
+int
+compare_distance(const void *a, const void *b)
+{
+ struct item *da = *(struct item **) a;
+ struct item *db = *(struct item **) b;
+
+ if (!db)
+ return 1;
+ if (!da)
+ return -1;
+
+ return da->distance - db->distance;
+}
+
+void
+fuzzymatch(void)
+{
+ /* bang - we have so much memory */
+ struct item *it;
+ struct item **fuzzymatches = NULL;
+ char c;
+ int number_of_matches = 0, i, pidx, sidx, eidx;
+ int text_len = strlen(text), itext_len;
+
+ matches = matchend = NULL;
+
+ /* walk through all items */
+ for (it = items; it && it->text; it++) {
+ if (text_len) {
+ itext_len = strlen(it->text);
+ pidx = 0;
+ sidx = eidx = -1;
+ /* walk through item text */
+ for (i = 0; i < itext_len && (c = it->text[i]); i++) {
+ /* fuzzy match pattern */
+ if (text[pidx] == c) {
+ if(sidx == -1)
+ sidx = i;
+ pidx++;
+ if (pidx == text_len) {
+ eidx = i;
+ break;
+ }
+ }
+ }
+ /* build list of matches */
+ if (eidx != -1) {
+ /* compute distance */
+ /* factor in 30% of sidx and distance between eidx and total
+ * text length .. let's see how it works */
+ it->distance = eidx - sidx + (itext_len - eidx + sidx) / 3;
+ appenditem(it, &matches, &matchend);
+ number_of_matches++;
+ }
+ } else {
+ appenditem(it, &matches, &matchend);
+ }
+ }
+
+ if (number_of_matches) {
+ /* initialize array with matches */
+ if (!(fuzzymatches = realloc(fuzzymatches, number_of_matches * sizeof(struct item*))))
+ die("cannot realloc %u bytes:", number_of_matches * sizeof(struct item*));
+ for (i = 0, it = matches; it && i < number_of_matches; i++, it = it->right) {
+ fuzzymatches[i] = it;
+ }
+ /* sort matches according to distance */
+ qsort(fuzzymatches, number_of_matches, sizeof(struct item*), compare_distance);
+ /* rebuild list of matches */
+ matches = matchend = NULL;
+ for (i = 0, it = fuzzymatches[i]; i < number_of_matches && it && \
+ it->text; i++, it = fuzzymatches[i]) {
+ appenditem(it, &matches, &matchend);
+ }
+ free(fuzzymatches);
+ }
+ curr = sel = matches;
+ calcoffsets();
+}
+
static void
insert(const char *str, ssize_t n)
{
@@ -263,7 +344,7 @@ insert(const char *str, ssize_t n)
if (n > 0)
memcpy(&text[cursor], str, n);
cursor += n;
- match();
+ fuzzymatch();
}
static size_t
@@ -308,7 +389,7 @@ keypress(XKeyEvent *ev)
case XK_k: /* delete right */
text[cursor] = '\0';
- match();
+ fuzzymatch();
break;
case XK_u: /* delete left */
insert(NULL, 0 - cursor);
@@ -442,7 +523,7 @@ keypress(XKeyEvent *ev)
strncpy(text, sel->text, sizeof text - 1);
text[sizeof text - 1] = '\0';
cursor = strlen(text);
- match();
+ fuzzymatch();
break;
}
drawmenu();
@@ -584,7 +665,7 @@ setup(void)
}
promptw = (prompt && *prompt) ? TEXTW(prompt) : 0;
inputw = MIN(inputw, mw/3);
- match();
+ fuzzymatch();
/* create menu window */
swa.override_redirect = True;
--
2.6.3

View file

@ -1,11 +1,13 @@
--- draw.c.orig 2012-12-16 06:41:04.477405084 +0100
+++ draw.c 2012-12-16 06:41:34.027700813 +0100
@@ -95,7 +95,7 @@ DC *
initdc(void) {
DC *dc;
diff --git dmenu.c dmenu.c
index a07f8e3..98a0073 100644
--- dmenu.c
+++ dmenu.c
@@ -652,7 +652,7 @@ main(int argc, char *argv[])
else
usage();
- if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+ if(!setlocale(LC_CTYPE, NULL) || !XSupportsLocale())
fputs("no locale support\n", stderr);
if(!(dc = calloc(1, sizeof *dc)))
eprintf("cannot malloc %u bytes:", sizeof *dc);
- if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+ if (!setlocale(LC_CTYPE, NULL) || !XSupportsLocale())
fputs("warning: no locale support\n", stderr);
if (!(dpy = XOpenDisplay(NULL)))
die("cannot open display\n");

View file

@ -1,77 +1,36 @@
# Template file for 'dmenu'
pkgname=dmenu
version=4.5
revision=10
makedepends="libXinerama-devel $(vopt_if xft 'libXft-devel freetype-devel')"
version=4.6
revision=1
makedepends="libXinerama-devel libXft-devel freetype-devel"
short_desc="A generic menu for X"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="MIT"
homepage="http://tools.suckless.org/dmenu/"
distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
checksum="082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850"
checksum=4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3
build_options="xft fuzzymatch monarg mouse"
desc_option_xft="Enable Xft font support"
build_options="fuzzymatch"
desc_option_fuzzymatch="Enable Fuzzymatch support"
desc_option_monarg="Enable monitor argument support"
desc_option_mouse="Enable mouse support"
if [ "$build_option_xft" ]; then
distfiles+=" http://tools.suckless.org/dmenu/patches/dmenu-${version}-xft.diff"
skip_extraction+=" ${pkgname}-${version}-xft.diff"
checksum+=" efb4095d65e5e86f9dde97294732174409c24f319bdd4824cc22fa1404972b4f"
fi
if [ "$build_option_fuzzymatch" ]; then
distfiles+=" http://tools.suckless.org/dmenu/patches/${pkgname}-${version}-fuzzymatch.diff"
skip_extraction+=" ${pkgname}-${version}-fuzzymatch.diff"
checksum+=" f037978583a16b2dab554058b147c2dbdfc758472d2bc9e1f031b2b9c686c0ff"
fi
if [ "$build_option_monarg" ]; then
distfiles+=" http://tools.suckless.org/dmenu/patches/${pkgname}-${version}-monarg.diff"
skip_extraction+=" ${pkgname}-${version}-monarg.diff"
checksum+=" c30a4acd9202712c019de72f9c2832686e6e25ca0b939757e31c20b9c110008b"
fi
if [ "$build_option_mouse" ]; then
distfiles+=" http://tools.suckless.org/dmenu/patches/${pkgname}-${version}-mouse-support.diff"
skip_extraction+=" ${pkgname}-${version}-mouse-support.diff"
checksum+=" 8ac73e77abb7c5e60080abe892e2b4232c9370bff39e5548cf9a403cffe692c4"
fi
## RIght now mouse && xft are incompatible
pre_build() {
local srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}/"
if [ "$build_option_fuzzymatch" ]; then
msg_normal "Applying fuzzymatch patches"
patch -p2 < "$srcdir/${pkgname}-${version}-fuzzymatch.diff"
echo '#include "fuzzymatch.c"' >> dmenu.c
fi
if [ "$build_option_xft" ]; then
msg_normal "Applying xft patches"
patch -p1 < "$srcdir/${pkgname}-${version}-xft.diff"
fi
if [ "$build_option_mouse" ]; then
msg_normal "Applying mouse patches"
patch -p1 < "$srcdir/${pkgname}-${version}-mouse-support.diff"
fi
if [ "$build_option_monarg" ]; then
msg_normal "Applying monarg patches"
patch -p1 < "$srcdir/${pkgname}-${version}-monarg.diff"
patch -p1 < "${FILESDIR}/fuzzymatch.patch"
fi
}
do_build() {
sed -i -e "s|^CFLAGS =|CFLAGS += |g" \
-e "s|^LDFLAGS = \-s|LDFLAGS += |g" config.mk
cp ${FILESDIR}/config.h config.h
sed -i -e "s|^FREETYPEINC|#FREETYPEINC|g" \
-e "s|^X11INC|#X11INC|g" \
-e "s|^X11LIB|#X11LIB|g" config.mk
x11inc=$XBPS_CROSS_BASE/usr/include/X11
x11lib=$XBPS_CROSS_BASE/usr/lib
xftinc=-I$XBPS_CROSS_BASE/usr/include/freetype2
make CC="$CC" ${makejobs} X11INC=$x11inc X11LIB=$x11lib \
$(vopt_if xft XFTINC=$xftinc)
freetypeinc=$XBPS_CROSS_BASE/usr/include/freetype2
make CC="$CC" ${makejobs} X11INC=$x11inc X11LIB=$x11lib FREETYPEINC=$freetypeinc
}
do_install() {

View file

@ -1,7 +1,10 @@
/* See LICENSE file for copyright and license details. */
/* appearance */
static const char font[] = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
static const char *fonts[] = {
"monospace:size=10"
};
static const char dmenufont[] = "monospace:size=10";
static const char normbordercolor[] = "#444444";
static const char normbgcolor[] = "#222222";
static const char normfgcolor[] = "#bbbbbb";
@ -10,22 +13,26 @@ static const char selbgcolor[] = "#005577";
static const char selfgcolor[] = "#eeeeee";
static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int snap = 32; /* snap pixel */
static const Bool showbar = True; /* False means no bar */
static const Bool topbar = True; /* False means bottom bar */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
/* tagging */
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
static const Rule rules[] = {
/* xprop(1):
* WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title
*/
/* class instance title tags mask isfloating monitor */
{ "Gimp", NULL, NULL, 0, True, -1 },
{ "Firefox", NULL, NULL, 1 << 8, False, -1 },
{ "Gimp", NULL, NULL, 0, 1, -1 },
{ "Firefox", NULL, NULL, 1 << 8, 0, -1 },
};
/* layout(s) */
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
static const int nmaster = 1; /* number of clients in master area */
static const Bool resizehints = True; /* True means respect size hints in tiled resizals */
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
static const int nmaster = 1; /* number of clients in master area */
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
static const Layout layouts[] = {
/* symbol arrange function */
@ -46,8 +53,9 @@ static const Layout layouts[] = {
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
/* commands */
static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
static const char *termcmd[] = { "uxterm", NULL };
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
static const char *termcmd[] = { "st", NULL };
static Key keys[] = {
/* modifier key function argument */

View file

@ -1,25 +1,25 @@
# Template file for 'dwm'
pkgname=dwm
version=6.0
revision=5
version=6.1
revision=1
homepage="http://dwm.suckless.org"
distfiles="http://dl.suckless.org/dwm/dwm-$version.tar.gz"
makedepends="libXinerama-devel"
makedepends="libXinerama-devel libXft-devel freetype-devel"
short_desc="A dynamic window manager for X"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="MIT"
checksum=b2b9483de69259eeea56844899bb2385158d3e79a42d82b10c142099fc8eeb56
checksum=c2f6c56167f0acdbe3dc37cca9c1a19260c040f2d4800e3529a21ad7cce275fe
do_build() {
cp ${FILESDIR}/config.h config.h
sed -i "/CFLAGS/s|\${CPPFLAGS}|& $CFLAGS|g" config.mk
sed -i "/LDFLAGS/s|\-s|$LDFLAGS|g" config.mk
make CC=$CC INCS="-I." LIBS="-lX11 -lXinerama"
make CC=$CC INCS="-I. -I${XBPS_CROSS_BASE}/usr/include/freetype2" LIBS="-lX11 -lXinerama -lXft -lfontconfig"
}
do_install() {
make PREFIX=/usr DESTDIR=$DESTDIR install
vinstall LICENSE 644 usr/share/licenses/$pkgname
vinstall README 644 usr/share/doc/$pkgname
vinstall ${FILESDIR}/dwm.desktop 644 usr/share/xsessions
vlicense LICENSE
}

View file

@ -1,7 +1,7 @@
# Template file for 'fltk'
pkgname=fltk
version=1.3.3
revision=2
revision=3
build_style=gnu-configure
configure_args="--enable-threads --enable-xft --enable-shared"
makedepends="libjpeg-turbo-devel libpng-devel MesaLib-devel alsa-lib-devel

View file

@ -1,25 +0,0 @@
From 7710040ea723def69dde485d6f497fac87f215fa Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Sun, 11 Aug 2013 18:58:20 +0200
Subject: [PATCH] data: Fix syntax error in fprintd.pod
fprintd.pod around line 100: =over without closing =back
POD document had syntax errors at /usr/bin/pod2man line 69.
---
data/fprintd.pod | 3 +++
1 file changed, 3 insertions(+)
diff --git a/data/fprintd.pod b/data/fprintd.pod
index 83c7afc..7085920 100644
--- data/fprintd.pod
+++ data/fprintd.pod
@@ -100,3 +100,6 @@ By default, fprintd stores the fingerprints in B</var/lib/fprint/>
=over 8
=item B<dbus-daemon>, B<gnome-about-me>
+
+=back
+
--
1.8.3.1

View file

@ -1,7 +1,7 @@
# Template file for 'fprintd'
pkgname=fprintd
version=0.5.1
revision=6
version=0.6.0
revision=1
lib32disabled=yes
build_style=gnu-configure
configure_args="--sysconfdir=/etc/$pkgname --disable-static
@ -14,7 +14,7 @@ hostmakedepends="intltool pkg-config"
makedepends="libfprint-devel dbus-devel dbus-glib-devel polkit-devel pam-devel"
license="GPL-2"
distfiles="http://people.freedesktop.org/~hadess/${pkgname}-${version}.tar.xz"
checksum=9256970fe30cb0332c1932fc0dad3c8d83570eb8e153305e9430e3cd90806e58
checksum=3f5462eeb4917d2f74925b904ceb2668c011b732d84fb1c5679f4f9ce9b6c6af
post_install() {
mv $DESTDIR/etc/$pkgname/dbus-1 $DESTDIR/etc

View file

@ -1,6 +1,6 @@
# Template file for 'freetds'
pkgname=freetds
version=0.95.65
version=0.95.67
revision=1
build_style=gnu-configure
configure_args="--sysconfdir=/etc/$pkgname"
@ -12,7 +12,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="LGPL-3"
homepage="http://www.freetds.org/"
distfiles="ftp://ftp.freetds.org/pub/freetds/stable/${pkgname}-${version}.tar.gz"
checksum=fa9257d8164d2ede81bd084f63661acf5235e9e903db5da3a6f9abe7d7224d02
checksum=9de8e07a6480b253c3d6ea7a55b78a9ea15b1a2ab2ead2c27c2720d8842d8818
freetds-devel_package() {
short_desc+=" - development files"

View file

@ -1,6 +1,6 @@
# Template build file for 'gdk-pixbuf'.
pkgname=gdk-pixbuf
version=2.32.1
version=2.32.2
revision=1
build_style=gnu-configure
configure_args="$(vopt_enable gir introspection) --without-libjasper
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.gtk.org/"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc
checksum=d3ab06fc123b13effed4c27c77cebdfad2173ff20628d82c397b7660ae926145
# Package build options
build_options="gir"
@ -37,7 +37,7 @@ gdk-pixbuf-xlib_package() {
}
}
gdk-pixbuf-devel_package() {
depends="libglib-devel libpng-devel>=1.6 ${sourcepkg}-xlib>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
depends="${makedepends} ${sourcepkg}-xlib>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove "usr/lib/*.so"

View file

@ -1,7 +1,7 @@
# Template build file for 'glew19'.
pkgname=glew19
version=1.9.0
revision=1
revision=2
hostmakedepends="pkg-config"
makedepends="libXext-devel libXmu-devel libXi-devel MesaLib-devel"
short_desc="The OpenGL Extension Wrangler Library (1.9 branch)"
@ -16,13 +16,12 @@ do_build() {
sed -i -e "s|lib64|lib|" config/Makefile.linux
make CFLAGS.EXTRA="-fPIC $CFLAGS" LDFLAGS.EXTRA="$LDFLAGS" ${makejobs}
}
do_install() {
make GLEW_DEST=${DESTDIR}/usr install
}
glew19-devel_package() {
conflicts="glew-devel"
conflicts="glew-devel>=0"
depends="glew19-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {

View file

@ -1,7 +1,7 @@
# Template file for 'gnuplot'
pkgname=gnuplot
version=5.0.1
revision=2
revision=3
configure_args="--with-readline=builtin"
hostmakedepends="pkg-config"
makedepends="zlib-devel libX11-devel gd-devel lua52-devel"
@ -18,7 +18,7 @@ CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
subpackages="gnuplot-common"
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" cairo-devel pango-devel wxGTK-devel qt-devel"
makedepends+=" cairo-devel pango-devel wxWidgets-devel qt-devel"
subpackages+=" gnuplot-wx gnuplot-qt"
fi
@ -50,9 +50,9 @@ do_configure() {
cd ${wrksrc}/x11
./configure ${configure_args} --without-qt --disable-wxwidgets --without-cairo --disable-wxt
cd ${wrksrc}/wx
./configure ${configure_args}
./configure ${configure_args} --without-qt ac_cv_path_WX_CONFIG=/usr/bin/wx-config-3.0 LIBS="-lX11"
cd ${wrksrc}/qt
./configure ${configure_args} --enable-qt --disable-wxwidgets
./configure ${configure_args} --with-qt --disable-wxwidgets
else
cd ${wrksrc}/x11
./configure ${configure_args}

View file

@ -1,6 +1,6 @@
# Template build file for 'gtk+3'.
pkgname=gtk+3
version=3.18.2
version=3.18.3
revision=1
wrksrc="gtk+-${version}"
build_style=gnu-configure
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.gtk.org/"
license="LGPL-2.1"
distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
checksum=5dbec561c4a00070073bf9cf4cfdd61fab4a14c8ff5b15d700bd378f8185e152
checksum=f3c76791f93f51e260b03676f83007730b9875a0a9bf5cd42442e2f14e593546
hostmakedepends="automake gettext-devel libtool pkg-config
glib-devel gtk-doc gobject-introspection gtk-update-icon-cache

View file

@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
version=1.26.1.1
version=1.26.2
revision=1
build_pie=yes
build_style=gnu-configure
@ -21,8 +21,8 @@ short_desc="Userspace virtual filesystem"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.gnome.org"
license="LGPL-2.1"
distfiles="${GNOME_SITE}/$pkgname/${version%.*.*}/$pkgname-$version.tar.xz"
checksum=2dadf986e464db1d7f007b178a5432b30ba93ef0cb31a2795156540d496dc06d
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=695b6e0f3de5ac2cb4d188917edef3f13299328150a2413f1a7131d9b2d48d18
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"

View file

@ -1,15 +1,15 @@
# Template file for 'intel-ucode'
pkgname=intel-ucode
version=20150121
revision=2
version=20151106
revision=1
noarch=yes
create_wrksrc=yes
short_desc="Microcode update files for Intel CPUs"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="INTEL Software License Agreement"
homepage="http://downloadcenter.intel.com/SearchResult.aspx?lang=eng&keyword=%22microcode%22"
distfiles="http://downloadmirror.intel.com/24661/eng/microcode-${version}.tgz"
checksum=23353b93bb421971496cea5e9f9d390ce0ed22580a8cc45ae7b3b322dcd8f6b3
distfiles="http://downloadmirror.intel.com/25512/eng/microcode-${version}.tgz"
checksum=096e39489eef67666be652e81fa372a06b74f39ea3d565dc0287242c668717e7
only_for_archs="i686 x86_64 i686-musl x86_64-musl"

View file

@ -1,7 +1,7 @@
# Template file for 'jack'
pkgname=jack
version=1.9.10
revision=8
revision=9
# XXX libffado (firewire)
hostmakedepends="pkg-config python"
makedepends="eigen opus-devel libsamplerate-devel readline-devel dbus-devel celt-devel"

View file

@ -1,7 +1,8 @@
# Template file for 'kexec-tools'
pkgname=kexec-tools
version=2.0.10
version=2.0.11
revision=1
build_pie=yes
build_style=gnu-configure
makedepends="liblzma-devel"
short_desc="Tools to support fast kexec reboots"
@ -9,7 +10,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
homepage="http://kernel.org/pub/linux/utils/kernel/kexec/"
distfiles="${KERNEL_SITE}/utils/kernel/kexec/$pkgname-$version.tar.xz"
checksum=e23e4149712c861b2755e268a89d2e73a6cd1af4abc362a1ce419e212d19a1a3
checksum=b1097986ffdb928cf41a94e8a5dfddc981a8fa710cccf13298e7f8dd939a2ee3
pre_build() {
rm ${XBPS_WRAPPERDIR}/strip

View file

@ -1,6 +1,6 @@
# Template build file for 'libGL'.
pkgname=libGL
version=11.0.4
version=11.0.5
revision=1
wrksrc="mesa-${version}"
build_style=gnu-configure
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.mesa3d.org/"
license="MIT, LGPL-2.1"
distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
checksum=40201bf7fc6fa12a6d9edfe870b41eb4dd6669154e3c42c48a96f70805f5483d
checksum=9c255a2a6695fcc6ef4a279e1df0aeaf417dc142f39ee59dfb533d80494bb67a
hostmakedepends="
automake libtool flex pkg-config llvm python-Mako libxml2-python wayland-devel"

View file

@ -1,6 +1,6 @@
# Template file for 'libevdev'
pkgname=libevdev
version=1.4.4
version=1.4.5
revision=1
build_pie=yes
build_style=gnu-configure
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="MIT"
homepage="http://www.freedesktop.org/wiki/Software/libevdev/"
distfiles="http://freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
checksum=ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9
checksum=e91c58ca86e0631186798449e0a78c65474ff562081d968ba0521f76c8c2ca1d
libevdev-devel_package() {
short_desc+=" - development files"

File diff suppressed because it is too large Load diff

View file

@ -1,16 +1,16 @@
# Template file for 'libfprint'
pkgname=libfprint
version=0.5.1
revision=4
version=0.6.0
revision=1
build_style=gnu-configure
makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel"
makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel"
hostmakedepends="pkg-config automake autoconf libtool"
short_desc="Support for consumer fingerprint reader devices"
maintainer="Enno Boland <gottox@voidlinux.eu>"
license="LGPL"
homepage="http://www.freedesktop.org/wiki/Software/fprint/"
distfiles="http://people.freedesktop.org/~hadess/libfprint-${version}.tar.xz"
checksum=6d12563b91888b84b71eee6d2e113d8e9e9940c6a28a0915656b6f86b9568fb3
checksum=2583fcb7d542a918c023776f188067fcedec614e65494dd52bc4d661be803cbe
configure_args="--disable-static \
--disable-udev-rules \
--disable-static \

1
srcpkgs/libu2f-server-devel Symbolic link
View file

@ -0,0 +1 @@
libu2f-server

View file

@ -0,0 +1,24 @@
--- src/Makefile.am.orig 2015-11-09 10:56:00.391780111 -0600
+++ src/Makefile.am 2015-11-09 10:56:14.510779188 -0600
@@ -40,21 +40,6 @@
BUILT_SOURCES = cmdline.c cmdline.h
MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-dist_man_MANS = $(top_srcdir)/man/u2f-server.1
-DISTCLEANFILES = $(dist_man_MANS)
-
-$(top_srcdir)/man/u2f-server.1: $(srcdir)/u2f-server.c $(srcdir)/cmdline.ggo $(top_srcdir)/configure.ac
- $(HELP2MAN) \
- --output=$(top_builddir)/man/$@ $(builddir)/u2f-server$(EXEEXT) \
- --name="Yubico Universal 2nd Factor (U2F) Server Tool" \
- --no-info
-if ENABLE_H2A
- $(HELP2ADOC) \
- -e $(builddir)/u2f-server$(EXEEXT) \
- --name="Yubico Universal 2nd Factor (U2F) Server Tool" \
- > $(top_builddir)/man/$@.txt
-endif
-
clean-local:
rm -f $(top_builddir)/man/*.[1-9]
rm -f $(top_builddir)/man/*.[1-9].txt

View file

@ -0,0 +1,35 @@
# Template file for 'libu2f-server'
pkgname=libu2f-server
version=1.0.1
revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_pie=yes
build_style=gnu-configure
configure_args="--enable-gtk-doc-html=no"
hostmakedepends="automake libtool pkg-config gengetopt check"
makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
license="BSD"
homepage="https://developers.yubico.com/libu2f-server/"
distfiles="https://github.com/Yubico/libu2f-server/archive/libu2f-server-${version}.tar.gz"
checksum="d87405ab7b271c3f674d64af8c878fdbf74d3b1d76b09de000c0d2cda5b44828"
pre_configure() {
autoreconf -fi
}
post_install() {
vlicense COPYING LICENSE
}
libu2f-server-devel_package() {
short_desc+=" - development files"
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/*.a
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
}
}

View file

@ -0,0 +1,3 @@
site=https://github.com/Yubico/libu2f-server/releases
pattern=tag-name">libu2f-server-\K\d+.\d+.\d+(?=<\/span>)
version=${version//./_}

View file

@ -1,6 +1,6 @@
# Template file for 'linux'
pkgname=linux
version=4.1
version=4.2
revision=1
build_style=meta
homepage="http://www.voidlinux.eu/"

View file

@ -1,8 +1,9 @@
# Template file for 'lvm2'
pkgname=lvm2
version=2.02.133
version=2.02.134
revision=1
wrksrc="LVM2.${version}"
build_pie=yes
build_style=gnu-configure
configure_args="--disable-selinux --enable-readline --enable-pkgconfig
--enable-fsadm --enable-applib --enable-dmeventd --enable-cmdlib
@ -22,7 +23,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://sourceware.org/lvm2/"
license="GPL-2, LGPL-2.1"
distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz"
checksum=b63f2ae56f4cc949c94c8d3491d2a37e795b7619d9c85e6a81a53661619b3508
checksum=131f3f0377faf9cda65f91becfebce5e56629bcf883844cafc9b29d69cce4436
post_install() {
sed -i 's,use_lvmetad = 1,use_lvmetad = 0,' ${DESTDIR}/etc/lvm/lvm.conf
@ -30,7 +31,7 @@ post_install() {
}
device-mapper-devel_package() {
depends="readline-devel ncurses-devel eudev-libudev-devel device-mapper>=${version}_${revision}"
depends="${makedepends} device-mapper>=${version}_${revision}"
short_desc="Device Mapper userspace library - development files"
pkg_install() {
vmove usr/lib/pkgconfig/devmapper.pc

View file

@ -2,7 +2,7 @@
_desc="Linux Containers"
pkgname=lxc
version=1.1.4
version=1.1.5
revision=1
build_pie=yes
build_style=gnu-configure
@ -16,7 +16,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://linuxcontainers.org"
license="LGPL-2.1"
distfiles="http://linuxcontainers.org/downloads/lxc-${version}.tar.gz"
checksum=8f072ea2001bc94389003d82a91902855edf16b609e06f0486a74e4b8973e5dc
checksum=9588ad1b04e114ee7370f690c65131e28098b28d2521d97c73557d11897ed0be
conf_files="/etc/lxc/default.conf"
make_dirs="

View file

@ -1,8 +1,9 @@
# Template file for 'man-db'
pkgname=man-db
version=2.7.4
revision=2
version=2.7.5
revision=1
lib32disabled=yes
build_pie=yes
build_style=gnu-configure
configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip
--with-bzip2=/usr/bin/bzip2 --disable-rpath --enable-threads=posix
@ -18,7 +19,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2, LGPL-2.1"
homepage="http://www.nongnu.org/man-db/"
distfiles="${NONGNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
checksum=153f4d3c33f5f9b0c8484bb39d9d271f6ae4aa1b3f5d6d515879692dba944f0b
checksum=5c4ddd0d67abbbcb408dc5804906f62210f7c863ef791198faca3d75681cca14
alternatives="
man:man:/usr/bin/mandb-man

View file

@ -1,6 +1,6 @@
# Template file for 'mbedtls'
pkgname=mbedtls
version=2.1.2
version=2.2.0
revision=1
hostmakedepends="perl cmake"
build_style=cmake
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Apache-2.0"
homepage="https://tls.mbed.org/"
distfiles="https://tls.mbed.org/download/mbedtls-${version}-apache.tgz"
checksum=ce57cb9085f976ffde945af7e8cec058a66ad181a96fd228fbcbc485213a7c58
checksum=3c6d3487ab056da94450cf907afc84f026aff7880182baffe137c98e3d00fb55
mbedtls-devel_package() {
short_desc+=" - development files"

View file

@ -1,7 +1,7 @@
# Template file for 'mc'
pkgname=mc
version=4.8.14
revision=4
version=4.8.15
revision=1
build_pie=yes
build_style=gnu-configure
configure_args="--with-screen=ncurses --without-x"
@ -23,4 +23,4 @@ license="GPL-3"
homepage="http://www.ibiblio.org/mc/"
#distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
checksum=e0518f7e41f1536a0737662187fe4f1c743e16d1419019541ad97ea34d9b103e
checksum=b17765f419bbb33353571a87bdf81c458512c0397c01ee4266b149c86c75b5c3

View file

@ -1,22 +1,20 @@
# Template file for 'mediainfo'
pkgname=mediainfo
version=0.7.79
revision=1
revision=2
short_desc="Display technical and tag data for video and audio files"
homepage="http://mediaarea.net/MediaInfo"
maintainer="Georg Schabel <gescha@posteo.de>"
license="BSD"
distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.gz"
checksum=cea457879be6a278cc69cdde3f7263715b1ebdd3012af9dacdb365c37aef0c9b
configure_args="--with-wx-config=wx-config-3.0"
hostmakedepends="automake libtool pkg-config"
makedepends="libmediainfo-devel zlib-devel wxGTK-devel"
makedepends="libmediainfo-devel zlib-devel wxWidgets-devel"
depends="desktop-file-utils hicolor-icon-theme"
create_wrksrc=yes
_gnudir="MediaInfo/Project/GNU"
replaces="mediainfo-gui>=0"
license="BSD"
distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.gz"
checksum=cea457879be6a278cc69cdde3f7263715b1ebdd3012af9dacdb365c37aef0c9b
nocross=yes # wxWidgets
do_configure() {

View file

@ -1,6 +1,6 @@
# Template file for 'mercurial'
pkgname=mercurial
version=3.6
version=3.6.1
revision=1
lib32disabled=yes
build_style=python-module
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
homepage="http://mercurial.selenic.com"
distfiles="${homepage}/release/${pkgname}-${version}.tar.gz"
checksum=85b5574f3694373e981926374a758dab2128d6f3c593a72a7c9d2cb371054f39
checksum=d4647943165affd11baf0705556920481d5346b97604babab6ad76f1744474c6
post_install() {
vmkdir usr/share/man/man1

View file

@ -1,7 +1,7 @@
# Template file for 'mk-configure'
pkgname=mk-configure
version=0.28.0
revision=2
version=0.29.0
revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-makefile
make_cmd=bmake
@ -14,7 +14,7 @@ maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="BSD"
homepage="https://github.com/cheusov/mk-configure/archive/"
distfiles="https://github.com/cheusov/${pkgname}/archive/${pkgname}-${version}.tar.gz"
checksum=2fa9a4846adbc1031411c8cd1d278ee8bef288a6c98fa16a28ba208a0a21ddd5
checksum=99ea7a3d64938e4afd06cc65840d87f5c9c49b086a83576a465ec3cb09005596
post_install() {
vlicense doc/LICENSE

View file

@ -1,6 +1,6 @@
# Template file for 'mosquitto'
pkgname=mosquitto
version=1.4.4
version=1.4.5
revision=1
build_style=gnu-makefile
make_build_args="WITH_TLS_PSK=no" # not supported by libressl
@ -12,7 +12,7 @@ maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
license="epl-v10, edl-v10"
homepage="http://mosquitto.org/"
distfiles="http://mosquitto.org/files/source/mosquitto-${version}.tar.gz"
checksum=c643c7123708aadcd29287dda7b5ce7c910f75b02956a8fc4fe65ad2ea767a5f
checksum=b432e19fee0c549f4a0fb0e866d1b6a897b38dbf1ddfda92bb43e2a24f01df66
pre_install() {
sed -i 's,sbin,bin,g' */Makefile

View file

@ -1,6 +1,6 @@
# Template file for 'mpv'
pkgname=mpv
version=0.12.0
version=0.13.0
revision=1
short_desc="Video player based on MPlayer/mplayer2"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
@ -19,7 +19,7 @@ makedepends="
depends="desktop-file-utils hicolor-icon-theme"
conf_files="/etc/mpv/encoding-profiles.conf"
distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
checksum=df242044c749d850344f5499860d852849147f20c63d36d2cd678627bd8d6cc4
checksum=1372704fd8f5701ef7d60f347fd15fe536e23ef148279bf4a4415e72896912db
if [ -z "$CROSS_BUILD" ]; then
configure_args+=" --enable-zsh-comp"

View file

@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
version=2.8.1
version=2.8.2
revision=1
short_desc="Cinnamon window manager based on Mutter"
build_style=gnu-configure
@ -15,7 +15,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=4ae31981a3ab72f244ad16f248cf45e498bad1e0409fb76a8c1c8186c47f7ad8
checksum=c611fe100ea79046e9e271dc651f10995d5f552dbaf896fba6d130c9a8345369
pre_configure() {
NOCONFIGURE=1 ./autogen.sh

View file

@ -1,7 +1,8 @@
# Template file for 'nbd'
pkgname=nbd
version=3.11
revision=2
version=3.12.1
revision=1
build_pie=yes
build_style=gnu-configure
configure_args="--enable-syslog --sbindir=/usr/bin"
hostmakedepends="pkg-config"
@ -14,7 +15,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
homepage="http://nbd.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/nbd/nbd-${version}.tar.gz"
checksum=b681ff0ae05e16e679814d8c87661844c582c716f9440bcfbd673ebc1dba1cfc
checksum=ad3c513b4579ee02fcc0a34db28f0eeeaf474f35bb23547b3c268464a2819327
post_install() {
vsv nbd

View file

@ -1,7 +1,7 @@
# Template file for 'nemo'
pkgname=nemo
version=2.8.0
revision=2
version=2.8.2
revision=1
short_desc="The Cinnamon file manager (nautilus fork)"
build_style=gnu-configure
configure_args=" --disable-static --disable-update-mimedb
@ -16,7 +16,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=f22687b1556d328c9300aacb3bbd5b4b0a491221dacd979c421b96df85b51189
checksum=99b405c79dd0e68a79266c157479836123738c8aefe05aef701e775656f93cc6
build_options="gir"
if [ -z "$CROSS_BUILD" ]; then

View file

@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux (long-lived series)"
pkgname=nvidia-stable
version=340.93
revision=1
revision=3
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
@ -14,7 +14,7 @@ repository="nonfree"
create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities"
depends="${pkgname}-dkms-${version}_${revision} pkg-config"
conflicts="catalyst>=0 xserver-abi-video>20"
conflicts="catalyst>=0 xserver-abi-video>19_1"
provides="nvidia-${version}_${revision}"
replaces="nvidia>=0"

View file

@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
pkgname=nvidia
version=352.55
revision=1
revision=3
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Proprietary NVIDIA license"
homepage="http://www.nvidia.com"
@ -14,7 +14,7 @@ repository="nonfree"
create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities"
depends="nvidia-gtklibs-${version}_${revision} nvidia-dkms-${version}_${revision} pkg-config"
conflicts="xserver-abi-video>20"
conflicts="xserver-abi-video>19_1"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}"

View file

@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux (304.xx series)"
pkgname=nvidia304
version=304.128
revision=1
revision=3
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
@ -15,7 +15,7 @@ short_desc="${_desc} - Libraries and Utilities"
depends="${pkgname}-dkms-${version}_${revision} pkg-config"
provides="nvidia-${version}_${revision}"
replaces="nvidia>=0"
conflicts="catalyst>=0 xserver-abi-video>20"
conflicts="catalyst>=0 xserver-abi-video>19_1"
subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs"
if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then

View file

@ -1,9 +1,10 @@
# Template file for 'pgadmin3'
pkgname=pgadmin3
version=1.20.0
revision=1
revision=2
build_style=gnu-configure
makedepends="postgresql-libs-devel wxGTK-devel libxslt-devel libressl-devel"
configure_args="ac_cv_path_WX_CONFIG=wx-config-3.0 --with-wx-version=3.0"
makedepends="postgresql-libs-devel wxWidgets-devel libxslt-devel libressl-devel"
short_desc="Comprehensive design and management interface for PostgreSQL"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="BSD"
@ -12,6 +13,10 @@ distfiles="http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmi
checksum=0773d7826a9c7a998c4872e9b00b998e0bbb10448984d66853420c95fa626b8c
nocross=yes
post_extract() {
sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
sed -i 's,${WX_HOME}/bin/wx-config,&-3.0,g' configure
}
post_install() {
vlicense LICENSE
}

View file

@ -0,0 +1,12 @@
--- sshbn.h.orig
+++ sshbn.h
@@ -26,7 +26,8 @@
* using the same 'two machine registers' kind of code generation that
* 32-bit targets use for 64-bit ints. If we have one of these, we can
* use a 64-bit BignumInt and a 128-bit BignumDblInt. */
-typedef __uint64_t BignumInt;
+#include <stdint.h>
+typedef uint64_t BignumInt;
typedef __uint128_t BignumDblInt;
#define BIGNUM_INT_MASK 0xFFFFFFFFFFFFFFFFULL
#define BIGNUM_TOP_BIT 0x8000000000000000ULL

View file

@ -0,0 +1,10 @@
--- unix/uxcons.c
+++ unix/uxcons.c
@@ -8,6 +8,7 @@
#include <stdarg.h>
#include <assert.h>
#include <errno.h>
+#include <sys/select.h>
#include <termios.h>
#include <unistd.h>

View file

@ -1,7 +1,8 @@
# Template file for 'putty'
pkgname=putty
version=0.65
revision=1
version=0.66
revision=2
build_pie=yes
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="gtk+-devel"
@ -10,4 +11,6 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="MIT"
homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
checksum=d543c1fd4944ea51d46d4abf31bfb8cde9bd1c65cb36dc6b83e51ce875660ca0
checksum=fe7312f66c54865868b362f4b79bd1fbe7ce9e8b1fd504b04034182db1f32993
CFLAGS="-Wno-error"

View file

@ -0,0 +1,14 @@
$OpenBSD: patch-SWIG__ssl_i,v 1.4 2015/10/25 15:29:13 rpe Exp $
--- SWIG/_ssl.i.orig Tue Oct 13 15:34:30 2015
+++ SWIG/_ssl.i Wed Oct 21 21:03:50 2015
@@ -52,10 +52,6 @@ extern const char *SSL_alert_desc_string(int);
%rename(ssl_get_alert_desc_v) SSL_alert_desc_string_long;
extern const char *SSL_alert_desc_string_long(int);
-%rename(sslv2_method) SSLv2_method;
-extern SSL_METHOD *SSLv2_method(void);
-%rename(sslv3_method) SSLv3_method;
-extern SSL_METHOD *SSLv3_method(void);
%rename(sslv23_method) SSLv23_method;
extern SSL_METHOD *SSLv23_method(void);
%rename(tlsv1_method) TLSv1_method;

View file

@ -1,7 +1,7 @@
# Template file for 'python-M2Crypto'
pkgname=python-M2Crypto
version=0.22.5
revision=1
revision=2
wrksrc="M2Crypto-${version}"
build_style=python-module
pycompile_module="M2Crypto"

View file

@ -1,6 +1,6 @@
# Template file for 'rclone'
pkgname=rclone
version=1.23
version=1.24
revision=1
build_style=go
go_import_path="github.com/ncw/rclone"
@ -10,9 +10,9 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="MIT"
homepage="http://rclone.org/downloads/"
distfiles="https://github.com/ncw/rclone/archive/v${version}.tar.gz"
checksum=fc063f81b9751ff49dcb9c7379e812fd70c0724471247def8e634ae8d8fbdbb4
checksum=b8a7f7951c6bf2aef8a3c91a80feb0e1da695422cf85482831bed4d1cd018ed9
post_install(){
post_install() {
vlicense COPYING
python make_manual.py
make rclone.1

View file

@ -1,6 +1,6 @@
# Template file for 'rrdtool'
pkgname=rrdtool
version=1.5.4
version=1.5.5
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config groff intltool"
@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
license="GPL-2"
homepage="http://oss.oetiker.ch/${pkgname}"
distfiles="http://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${version}.tar.gz"
checksum=3feea3da87c02128a27083f1c7b2cb797ef673e946564c0ce008c1c25a5c3f99
checksum=3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6
configure_args="--enable-perl --enable-perl-site-install
--with-perl-options=INSTALLDIRS=vendor --enable-ruby
--enable-ruby-site-install --enable-python --enable-lua

View file

@ -1,6 +1,6 @@
# Template file for 'runit-void'
pkgname=runit-void
version=20151108
version=20151111
revision=1
wrksrc="void-runit-${version}"
build_pie=yes
@ -10,7 +10,7 @@ short_desc="Void Linux runit scripts"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Public Domain"
distfiles="https://github.com/voidlinux/void-runit/archive/${version}.tar.gz"
checksum=0bf3cda7210ca0010958189ee9d36a67c46cc4e6d83657331e6b50e49d53e852
checksum=8695f4706e5f08ac56d87f32601c12779d607c0226855b096cb605007f50c55e
depends="virtual?awk procps-ng runit"
conf_files="

View file

@ -1,6 +1,6 @@
# Template file for 'scons'
pkgname=scons
version=2.4.0
version=2.4.1
revision=1
build_style=python-module
hostmakedepends="python"
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.scons.org/"
license="MIT"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=1892f472934f1f5947d0e4c5d01e3b992641425553faab4062ddb8e3504c1fb2
checksum=8fc4f42928c69bcbb33e1be94b646f2c700b659693fabc778c192d4d22f753a7
post_install() {
vlicense LICENSE.txt

View file

@ -1,6 +1,6 @@
# Template file for 'syncthing'
pkgname=syncthing
version=0.11.26
version=0.12.2
revision=1
build_style=go
go_import_path="github.com/syncthing/syncthing"
@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.eu>"
license="MPLv2"
homepage="http://syncthing.net/"
distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
checksum=d2cc72d5711c5a7d25c32951bd11680ad7d9530c2183de240287f07fe9e80ac2
checksum=22d14c884537c8b6b6cb40563d4876e5167ea183f5c9d0e711782b5623dd59f9
do_build() {
goarch="${GOARCH}"

View file

@ -0,0 +1,17 @@
diff -ur host-orig/superscript.com/net/ucspi-ssl-0.95b/src/ssl_params.c host/superscript.com/net/ucspi-ssl-0.95b/src/ssl_params.c
--- host-orig/superscript.com/net/ucspi-ssl-0.95b/src/ssl_params.c 2012-06-07 09:50:27.000000000 -0500
+++ host/superscript.com/net/ucspi-ssl-0.95b/src/ssl_params.c 2015-11-10 12:17:02.000000000 -0600
@@ -16,11 +16,13 @@
if (!SSL_CTX_set_tmp_dh(ctx,dh)) return 0;
}
+#ifndef LIBRESSL_VERSION_NUMBER
if (len) {
rsa = RSA_generate_key(len,RSA_F4,0,0);
if (!rsa) return 0;
if (!SSL_CTX_set_tmp_rsa(ctx,rsa)) return 0;
}
+#endif
return 1;
}

View file

@ -1,7 +1,7 @@
# Template file for 'ucspi-ssl'
pkgname=ucspi-ssl
version=0.95b
revision=1
revision=2
short_desc="Command-line tools for building SSL client-server applications"
maintainer="Evan Deaubl <evan@deaubl.name>"
license="public domain"

View file

@ -1,18 +1,18 @@
# Template file for 'vdirsyncer'
pkgname=vdirsyncer
version=0.7.0
version=0.7.3
revision=1
noarch=yes
build_style=python-module
hostmakedepends="python-setuptools"
depends="python-atomicwrites python-click python-click-log python-click-threading python-icalendar python-keyring python-lxml python-setuptools python-requests python-requests-toolbelt"
depends="python-atomicwrites python-click python-click-log python-click-threading python-icalendar python-lxml python-setuptools python-requests python-requests-toolbelt"
pycompile_module="vdirsyncer"
short_desc="Synchronize calendars and addressbooks"
maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
license="MIT"
homepage="https://vdirsyncer.readthedocs.org/"
distfiles="${PYPI_SITE}/v/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=ddf9e20b085f97c7bae97ed4cd5e8a78f472ee0b1cae3be537809ae98589172a
checksum=3e87df25f7f5af172f2063e39deccac7c5477a2be3c7ff16183b6b8e9f2d112a
pre_build() {
sed -e '/use_scm_version/,/setuptools_scm/ d' \

View file

@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
version=5.0.8
version=5.0.10
revision=1
wrksrc="VirtualBox-${version}"
short_desc="General-purpose full virtualizer for x86 hardware"
@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://virtualbox.org"
license="GPL-2, MPL-1.1, CDDL"
distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2"
checksum=e043518b7ab150e478c00b622360a5feb95f4e5b19e72bfcc71174356e2dacb3
checksum=56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89
lib32disabled=yes
only_for_archs="i686 x86_64"

View file

@ -1,2 +1,2 @@
pkgname="webkitgtk"
ignore="*.[13579].*"
ignore="*.[1-9][13579].*"

View file

@ -0,0 +1,19 @@
--- src/findFile.cpp 2013-03-27 22:57:44.000000000 +0100
+++ src/findFile.cpp 2014-02-17 17:16:01.256683107 +0100
@@ -37,14 +37,14 @@
}
#if defined(__UNIX__)
- testPath = wxString(wxStandardPaths().GetInstallPrefix() + _T("/share/") + _T(PACKAGE) + _T("/") + str);
+ testPath = wxString(wxStandardPaths::Get().GetInstallPrefix() + _T("/share/") + _T(PACKAGE) + _T("/") + str);
if(wxFileExists(testPath) || wxDirExists(testPath)) // Si c'est dans le dossier /usr/.../share/nomprog
{
return testPath;
}
#endif // defined(__UNIX__)
- testPath = wxString(wxStandardPaths().GetDataDir() + _T("/") + str);
+ testPath = wxString(wxStandardPaths::Get().GetDataDir() + _T("/") + str);
if(wxFileExists(testPath) || wxDirExists(testPath)) // Si c'est dans le dossier /usr/.../share/nomPaquet
{
return testPath;

View file

@ -1,15 +1,16 @@
# Template file for 'winusb'
pkgname=winusb
version=1.0.11
revision=3
revision=4
only_for_archs="i686 x86_64 i686-musl x86_64-musl"
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-3.0"
hostmakedepends="pkg-config"
makedepends="wxGTK-devel ntfs-3g parted grub-x86_64-efi desktop-file-utils hicolor-icon-theme"
makedepends="wxWidgets-devel ntfs-3g parted grub-x86_64-efi desktop-file-utils hicolor-icon-theme"
short_desc="Simple tool that enable you to create your own usb stick windows installer"
depends="desktop-file-utils hicolor-icon-theme parted ntfs-3g grub-x86_64-efi"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://en.congelli.eu/prog_info_winusb.html"
distfiles="http://www6.frugalware.org/mirrors/linux/frugalware/frugalware-current/source/xapps-extra/winusb/winusb-${version}.tar.gz"
distfiles="ftp://ftp.freebsd.ch/gentoo/distfiles/winusb-${version}.tar.gz"
checksum=7bd8d2e63651134bd4173dcf358708fb9e6de1677c088e67d45995a1d5066bc9

View file

@ -1,6 +1,6 @@
# Template file for 'xboxdrv'
pkgname=xboxdrv
version=0.8.7
version=0.8.8
revision=1
build_style=scons
hostmakedepends="scons unzip pkg-config glib-devel dbus-glib-devel"
@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
license="GPL-3"
homepage="http://pingus.seul.org/~grumbel/xboxdrv/"
distfiles="https://github.com/Grumbel/${pkgname}/archive/v${version}.zip"
checksum=c5ce45a06163be70cf436c083d3935eb496060d243c37c6726e5d2690a75e570
checksum=3bf1752f4aa21bd662532c1a62f7988882506aa46489e984f4af2e5e2d9ade48
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install

View file

@ -2,15 +2,15 @@
#
# NOTE: keep this package synchronized with "srcpkgs/xbps".
pkgname=xbps-static
version=0.49
revision=4
version=0.50
revision=1
build_style=configure
short_desc="The XBPS package system utilities - static binaries"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.voidlinux.eu/xbps"
license="2-clause-BSD"
distfiles="https://github.com/voidlinux/xbps/archive/$version.tar.gz"
checksum=54a5b7bed63f471df2c28749e39b4f630fd78a5a49ac4a60e33edcc0dc95645f
checksum=d8a8b7a62d7b3da16d457dc703f6acfa3ebe97c59b25e39544361330ed82650d
wrksrc="xbps-${version}"
hostmakedepends="pkg-config"

View file

@ -1,136 +0,0 @@
From 512122da4cb3c9fd6c5cea26cd7290b0d7f1e620 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 31 Oct 2015 14:01:20 +0100
Subject: [PATCH] alternatives: really make relative symlinks this time.
---
NEWS | 2 ++
lib/package_alternatives.c | 15 +++++++++++----
tests/xbps/xbps-alternatives/main.sh | 25 ++++++++-----------------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/lib/package_alternatives.c b/lib/package_alternatives.c
index 958c9f1..b71081e 100644
--- lib/package_alternatives.c
+++ lib/package_alternatives.c
@@ -102,23 +102,28 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
cnt = xbps_array_count(a);
for (i = 0; i < cnt; i++) {
xbps_string_t str;
- char *l, *lnk;
- const char *tgt;
+ char *l, *lnk, *tgt;
+ const char *tgt0;
int rv;
str = xbps_array_get(a, i);
l = left(xbps_string_cstring_nocopy(str));
assert(l);
- tgt = right(xbps_string_cstring_nocopy(str));
+ tgt0 = right(xbps_string_cstring_nocopy(str));
assert(tgt);
if (l[0] != '/') {
char *tgt_dup, *tgt_dir;
- tgt_dup = strdup(tgt);
+ tgt_dup = strdup(tgt0);
assert(tgt_dup);
tgt_dir = dirname(tgt_dup);
lnk = xbps_xasprintf("%s%s/%s", xhp->rootdir, tgt_dir, l);
free(tgt_dup);
+ tgt_dup = strdup(tgt0);
+ assert(tgt_dup);
+ tgt = strdup(basename(tgt_dup));
+ free(tgt_dup);
} else {
+ tgt = strdup(tgt0);
lnk = xbps_xasprintf("%s%s", xhp->rootdir, l);
}
xbps_set_cb_state(xhp, XBPS_STATE_ALTGROUP_LINK_ADDED, 0, NULL,
@@ -128,10 +133,12 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
xbps_dbg_printf(xhp, "failed to create alt symlink '%s'"
"for group '%s': %s\n", lnk, grname,
strerror(errno));
+ free(tgt);
free(lnk);
free(l);
return rv;
}
+ free(tgt);
free(lnk);
free(l);
}
diff --git a/tests/xbps/xbps-alternatives/main.sh b/tests/xbps/xbps-alternatives/main.sh
index 8d16314..463272c 100644
--- tests/xbps/xbps-alternatives/main.sh
+++ tests/xbps/xbps-alternatives/main.sh
@@ -35,9 +35,9 @@ register_one_relative_head() {
}
register_one_relative_body() {
mkdir -p repo pkg_A/usr/bin
- touch pkg_A/usr/bin/fileA pkg_A/usr/bin/fileB
+ touch pkg_A/usr/bin/fileA
cd repo
- xbps-create -A noarch -n A-1.1_1 -s "A pkg" --alternatives "file:../file:/usr/bin/fileA file2:file2:/usr/bin/fileB" ../pkg_A
+ xbps-create -A noarch -n A-1.1_1 -s "A pkg" --alternatives "file:file:/usr/bin/fileA" ../pkg_A
atf_check_equal $? 0
xbps-rindex -d -a $PWD/*.xbps
atf_check_equal $? 0
@@ -47,17 +47,8 @@ register_one_relative_body() {
atf_check_equal $? 0
rv=1
if [ -e root/usr/bin/fileA ]; then
- lnk=$(readlink root/usr/file)
- if [ "$lnk" = "/usr/bin/fileA" ]; then
- rv=0
- fi
- echo "A lnk: $lnk"
- fi
- atf_check_equal $rv 0
- rv=1
- if [ -e root/usr/bin/fileB ]; then
- lnk=$(readlink root/usr/bin/file2)
- if [ "$lnk" = "/usr/bin/fileB" ]; then
+ lnk=$(readlink root/usr/bin/file)
+ if [ "$lnk" = "fileA" ]; then
rv=0
fi
echo "A lnk: $lnk"
@@ -150,7 +141,7 @@ unregister_one_body() {
atf_check_equal $? 0
xbps-remove -r root -yvd A
rv=1
- if [ ! -L root/usr/bin/file -a ! -e root/usr/bin/fileA ]; then
+ if [ ! -e root/usr/bin/file -a ! -e root/usr/bin/fileA ]; then
rv=0
fi
atf_check_equal $rv 0
@@ -175,7 +166,7 @@ unregister_one_relative_body() {
atf_check_equal $? 0
xbps-remove -r root -yvd A
rv=1
- if [ ! -L root/usr/bin/file -a ! -e root/usr/bin/fileA ]; then
+ if [ ! -e root/usr/bin/file -a ! -e root/usr/bin/fileA ]; then
rv=0
fi
atf_check_equal $rv 0
@@ -211,7 +202,7 @@ unregister_multi_body() {
atf_check_equal $rv 0
xbps-remove -r root -yvd A
rv=1
- if [ ! -L root/usr/bin/file -a ! -e root/usr/bin/fileA ]; then
+ if [ ! -e root/usr/bin/file -a ! -e root/usr/bin/fileA ]; then
rv=0
fi
atf_check_equal $rv 0
@@ -230,7 +221,7 @@ unregister_multi_body() {
xbps-remove -r root -yvd B
rv=1
- if [ ! -L root/usr/bin/file -a ! -e root/usr/bin/fileB ]; then
+ if [ ! -e root/usr/bin/file -a ! -e root/usr/bin/fileB ]; then
rv=0
fi
atf_check_equal $rv 0
--
2.6.2

View file

@ -1,25 +0,0 @@
From 33a1bea633048a9d52f1ba52ec19852d321ffb37 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 31 Oct 2015 14:07:12 +0100
Subject: [PATCH 1/2] alternatives: fix a warning.
---
lib/package_alternatives.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/package_alternatives.c b/lib/package_alternatives.c
index b71081e..58caa41 100644
--- lib/package_alternatives.c
+++ lib/package_alternatives.c
@@ -102,7 +102,7 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
cnt = xbps_array_count(a);
for (i = 0; i < cnt; i++) {
xbps_string_t str;
- char *l, *lnk, *tgt;
+ char *l, *lnk, *tgt = NULL;
const char *tgt0;
int rv;
--
2.6.2

View file

@ -1,25 +0,0 @@
From f896b17ba73a51451b221ebfc1bae59022cabcec Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 31 Oct 2015 14:19:50 +0100
Subject: [PATCH 2/2] alternatives: fix an assertion!
---
lib/package_alternatives.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/package_alternatives.c b/lib/package_alternatives.c
index 58caa41..19c1422 100644
--- lib/package_alternatives.c
+++ lib/package_alternatives.c
@@ -110,7 +110,7 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
l = left(xbps_string_cstring_nocopy(str));
assert(l);
tgt0 = right(xbps_string_cstring_nocopy(str));
- assert(tgt);
+ assert(tgt0);
if (l[0] != '/') {
char *tgt_dup, *tgt_dir;
tgt_dup = strdup(tgt0);
--
2.6.2

View file

@ -1,35 +0,0 @@
From 1ed8551c08c11bd627d573cde48574200c7e8760 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 31 Oct 2015 15:03:26 +0100
Subject: [PATCH] xbps_configure_packages: ignore internal xbps objects.
Fixes an assertion triggered by `xbps-reconfigure -a`.
---
NEWS | 3 +++
lib/package_configure.c | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/package_configure.c b/lib/package_configure.c
index be8aeb5..e279199 100644
--- lib/package_configure.c
+++ lib/package_configure.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2009-2014 Juan Romero Pardines.
+ * Copyright (c) 2009-2015 Juan Romero Pardines.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,8 @@ xbps_configure_packages(struct xbps_handle *xhp, xbps_array_t ignpkgs)
assert(iter);
while ((obj = xbps_object_iterator_next(iter))) {
pkgd = xbps_dictionary_get_keysym(xhp->pkgdb, obj);
- xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver);
+ if (!xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver))
+ continue;
if (xbps_array_count(ignpkgs)) {
if ((xbps_match_string_in_array(ignpkgs, pkgver)) ||
(xbps_match_pkgver_in_array(ignpkgs, pkgver))) {
--
2.6.2

View file

@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.49
revision=4
version=0.50
revision=1
bootstrap=yes
build_style=configure
short_desc="The XBPS package system utilities"
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="https://github.com/voidlinux/xbps"
license="2-clause-BSD"
distfiles="https://github.com/voidlinux/xbps/archive/$version.tar.gz"
checksum=54a5b7bed63f471df2c28749e39b4f630fd78a5a49ac4a60e33edcc0dc95645f
checksum=d8a8b7a62d7b3da16d457dc703f6acfa3ebe97c59b25e39544361330ed82650d
hostmakedepends="pkg-config"
makedepends="zlib-devel libressl-devel libarchive-devel"

View file

@ -0,0 +1,32 @@
Description: Fix code to compile with wxwidgets 3.0
Drops support for wx < 2.7, which is just not relevant now. And in fact
configure.ac checks for at least 2.8.0.
Author: Olly Betts <olly@survex.com>
Last-Update: 2014-03-07
--- src/chmframe.cpp
+++ src/chmframe.cpp
@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
enu.EnumerateFacenames();
_normalFonts = new wxArrayString;
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
*_normalFonts = enu.GetFacenames();
-#else
- *_normalFonts = *enu.GetFacenames();
-#endif
_normalFonts->Sort();
}
@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
_fixedFonts = new wxArrayString;
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
*_fixedFonts = enu.GetFacenames();
-#else
- *_fixedFonts = *enu.GetFacenames();
-#endif
_fixedFonts->Sort();
}

View file

@ -1,9 +1,10 @@
# Template file for 'xchm'
pkgname=xchm
version=1.23
revision=1
revision=2
build_style=gnu-configure
makedepends="libchmlib-devel wxGTK-devel"
configure_args="--with-wx-config=wx-config-3.0"
makedepends="libchmlib-devel wxWidgets-devel"
short_desc="The CHM viewer for Unix"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="GPL-2"

View file

@ -1,7 +1,7 @@
# Template file for 'xfsdump'
pkgname=xfsdump
version=3.1.4
revision=2
version=3.1.6
revision=1
build_style=gnu-configure
configure_args="--sbindir=/usr/bin"
makedepends="libuuid-devel ncurses-devel xfsprogs-devel attr-devel"
@ -10,7 +10,7 @@ maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="LGPL-2.1"
homepage="http://oss.sgi.com/projects/xfs/"
distfiles="ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-${version}.tar.gz"
checksum=570eafd0721515bdd79cb0e295b701d49cdf81e71a0a0ff0df6d4c5cc1960943
checksum=7f78c11ca527477d90e5e62b0778f3ad96f2b71c19173044e9aca9515fff42d0
post_extract() {
case "$XBPS_TARGET_MACHINE" in
@ -18,6 +18,15 @@ post_extract() {
sed -i -e 's/SIGCLD/SIGCHLD/g' \
-e 's/RLIM64_INFINITY/RLIM_INFINITY/g' \
common/main.c
sed -i -e 's/constpp/& const/' common/types.h
sed -i -e '1i#include <stdio.h>' invutil/invutil.c librmt/rmtioctl.c */inv_fstab.c */content.c */inv_idx.c */inv_mgr.c */inv_stobj.c
sed -i -e '1i#include <fcntl.h>' invutil/invidx.c
sed -i -e '1i#include <stdlib.h>' common/drive.c
sed -i -e '1i#include <limits.h>' */var.c
sed -i -e '1i#include <stdio.h>' common/drive_*.c common/global.c
sed -i -e '1i#include <sys/types.h>' */content.c
sed -i -e 's,sys/signal,signal,' librmt/rmtopen.c
sed -i -e 's/__uint32_t/uint32_t/g' */*.h
esac
}
post_install() {

View file

@ -1,16 +1,16 @@
# Template file for 'xmlto'
pkgname=xmlto
version=0.0.26
revision=2
version=0.0.27
revision=1
build_style=gnu-configure
hostmakedepends="libxslt docbook-xsl"
depends="${hostmakedepends}"
depends="bash ${hostmakedepends}"
short_desc="Tool to help transform XML documents into other formats"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
homepage="http://cyberelk.net/tim/software/xmlto/"
distfiles="https://fedorahosted.org/releases/x/m/xmlto/xmlto-$version.tar.bz2"
checksum=efb49b2fb3bc27c1a1e24fe34abf19b6bf6cbb40844e6fd58034cdf21c54b5ec
checksum=1b7183b85f7fb0a2e4cf684f3da83cf09f5080738ee2c1770762a78c8ac99f7f
post_install() {
# Requires bash!

View file

@ -1,6 +1,6 @@
# Template file for 'youtube-dl'
pkgname=youtube-dl
version=2015.11.02
version=2015.11.10
revision=1
noarch=yes
wrksrc="${pkgname}"
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://rg3.github.com/youtube-dl/"
license="Public Domain"
distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz"
checksum=5c5bc5a7fec405ed353bd7052a4a83e8782742d246b24af73393fe70c7b28d8c
checksum=c5a34ecbcf27ff34e1aae7c17732095309012e33ea9d1d4def613ca73f47e6be
do_install() {
vbin ${pkgname}