Merge remote-tracking branch 'x/master'

* x/master: (23 commits)
  sqlite: update to 3.7.10.
  colord: update to 0.1.16.
  SDL_mixer: make fluidsynth optional, it's dlopen(3)ed anyway.
  kmod: update to 4.
  perl-XML-Parser: update to 2.41.
  intltool: update to 0.50.0.
  connman: update to 0.78.
  openbox: remove openbox-gnome.desktop which doesn't work with gnome3.
  lxde: depend on gpicview, revbump.
  lxde: depend on lxtask, revbump.
  libfm: update to 0.1.17.
  New package: lxtask-0.1.4.
  openbox: update to 3.5.0.
  pcmanfm: update to 0.9.10.
  SDL_mixer: update to 1.2.12.
  SDL_image: update to 1.2.11.
  SDL_net: update to 1.2.8.
  SDL_ttf: update to 2.0.11.
  kernel: update to 3.2.1.
  ristretto: update to 0.3.2.
  ...
This commit is contained in:
davehome 2012-01-17 16:49:46 -07:00
commit 929f2b675c
50 changed files with 687 additions and 740 deletions

View file

@ -944,3 +944,5 @@ libmdbsql.so.0 libmdb mdbtools-devel
libkmod.so.1 libkmod libkmod-devel
libestr.so.0 libestr libestr-devel
libee.so.0 libee libee-devel
libobt.so.0 libopenbox openbox-devel
libobrender.so.27 libopenbox openbox-devel

View file

@ -1,22 +1,18 @@
# Template file for 'SDL_image-devel'.
#
short_desc="${short_desc} (development files)"
short_desc="${short_desc} - development files"
long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
revision=2
Add_dependency run libpng-devel
Add_dependency run tiff-devel
Add_dependency run jpeg-devel
Add_dependency run SDL-devel
Add_dependency run SDL_image
do_install()
{
mkdir -p ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
do_install() {
vmove usr/include usr
vmove "usr/lib/*.a" usr/lib
vmove usr/lib/pkgconfig usr/lib
}

View file

@ -1,2 +1,2 @@
abi_depends=">=1.2.10"
api_depends="${abi_depends}"
api_depends=">=1.2.11" # libwebp support

View file

@ -1,22 +1,31 @@
# Template file for 'SDL_image'
pkgname=SDL_image
version=1.2.10
revision=5
version=1.2.11
homepage="http://www.libsdl.org/projects/SDL_image/"
distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
build_style=gnu-configure
short_desc="Load images as SDL surfaces"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=75e05d1e95f6277b44797157d9e25a908ba8d08a393216ffb019b0d74de11876
license="BSD"
checksum=0b8f51af8c77a6849501fed675d49808ae6fbf1429d32ccbd958b7ba7c04be3b
long_desc="
This is a simple library to load images of various formats as SDL
surfaces. This library supports BMP, PNM (PPM/PGM/PBM), XPM, LBM,
PCX, GIF, JPEG, PNG, TGA, and TIFF formats."
subpackages="$pkgname-devel"
# The following are dlopen(3)ed at runtime.
Add_dependency run libpng
Add_dependency run tiff
Add_dependency run jpeg
Add_dependency run libwebp
Add_dependency build libpng-devel
Add_dependency build tiff-devel
Add_dependency build jpeg-devel
Add_dependency build SDL-devel
Add_dependency build libwebp-devel
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}

10
srcpkgs/SDL_mixer/INSTALL Normal file
View file

@ -0,0 +1,10 @@
case ${ACTION} in
post)
cat <<_EOF
==========================================================================
By default this package uses its built-in timidity as MIDI synth,
optionally installing the fluidsynth package replaces it. It is
dlopen(3)ed at runtime.
==========================================================================
_EOF
esac

View file

@ -5,8 +5,6 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
revision=2
Add_dependency run SDL-devel
Add_dependency run libvorbis-devel
Add_dependency run libmikmod-devel
@ -14,10 +12,8 @@ Add_dependency run libflac-devel
Add_dependency run smpeg-devel
Add_dependency run SDL_mixer
do_install()
{
mkdir -p ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
do_install() {
vmove usr/include usr
vmove "usr/lib/*.a" usr/lib
vmove usr/lib/pkgconfig usr/lib
}

View file

@ -1,3 +1,4 @@
libSDL-1.2.so.0
libpthread.so.0
libc.so.6
libm.so.6

View file

@ -1,12 +1,14 @@
# Template file for 'SDL_mixer'
pkgname=SDL_mixer
version=1.2.11
revision=2
version=1.2.12
revision=1
homepage="http://www.libsdl.org/projects/SDL_mixer/"
distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
build_style=gnu-configure
short_desc="Multi-channel audio mixer library"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9
license="BSD"
checksum=1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a
long_desc="
SDL_mixer is a sample multi-channel audio mixer library. It supports any
number of simultaneously playing channels of 16 bit stereo audio, plus
@ -14,20 +16,27 @@ long_desc="
Ogg Vorbis, and SMPEG MP3 libraries."
subpackages="$pkgname-devel"
# The following are dlopen(3)ed at runtime.
Add_dependency run libvorbis
Add_dependency run libmikmod
Add_dependency run smpeg
Add_dependency run libflac
#Add_dependency run libfluidsynth
Add_dependency build SDL-devel
Add_dependency build libvorbis-devel
Add_dependency build libmikmod-devel
Add_dependency build libflac-devel
Add_dependency build smpeg-devel
Add_dependency build fluidsynth-devel
pre_configure()
{
sed -i 's|/usr/local/lib/timidity|/usr/lib/timidity|' \
${wrksrc}/timidity/config.h || return 1
sed -i 's|/etc/timidity/timidity.cfg|/etc/timidity++/timidity.cfg|' \
${wrksrc}/timidity/config.h || return 1
pre_configure() {
sed -e "/CONFIG_FILE_ETC/s|/etc/timidity.cfg|/etc/timidity++/timidity.cfg|" \
-e "/DEFAULT_PATH/s|/etc/timidity|/etc/timidity++|" \
-e "/DEFAULT_PATH2/s|/usr/local/lib/timidity|/usr/lib/timidity|" \
-i timidity/config.h
}
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}

View file

@ -5,13 +5,11 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
revision=1
Add_dependency run SDL-devel
Add_dependency run SDL_net
do_install()
{
mkdir -p ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
do_install() {
vmove usr/include usr
vmove "usr/lib/*.a" usr/lib
vmove usr/lib/pkgconfig usr/lib
}

View file

@ -1,2 +1,2 @@
abi_depends=">=1.2.7"
api_depends="${abi_depends}"
api_depends=">=1.2.8" # pkgconfig support in -devel pkg.

View file

@ -1,15 +1,20 @@
# Template file for 'SDL_net'
pkgname=SDL_net
version=1.2.7
revision=2
version=1.2.8
homepage="http://www.libsdl.org/projects/SDL_net/"
distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
build_style=gnu-configure
short_desc="Small sample cross-platform networking library for SDL"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53
license="BSD"
checksum=5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4
long_desc="
This is a small sample cross-platform networking library which is
supplementary to the SDL (Simple DirectMedia Layer) library."
subpackages="$pkgname-devel"
Add_dependency build SDL-devel
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}

View file

@ -1,14 +1,13 @@
# Template file for 'SDL_ttf'
pkgname=SDL_ttf
version=2.0.10
version=2.0.11
homepage="http://www.libsdl.org/projects/$pkgname"
distfiles="${homepage}/release/$pkgname-$version.tar.gz"
build_style=gnu-configure
revision=1
short_desc="Use TrueType fonts in your SDL applications"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
checksum=7d38704bcc7c34029c2dcb73b2d4857e8ad76341c6e0faed279eb9f743c66c6a
checksum=724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7
long_desc="
SDL_ttf is a TrueType font rendering library that is used with the SDL
library, and almost as portable. It depends on freetype2 to handle the
@ -22,3 +21,4 @@ subpackages="$pkgname-devel"
Add_dependency build pkg-config
Add_dependency build freetype-devel
Add_dependency build SDL-devel
Add_dependency build MesaLib-devel

View file

@ -1,11 +1,11 @@
# Template file for 'at-spi2-core'
pkgname=at-spi2-core
version=2.2.2
version=2.2.3
distfiles="${GNOME_SITE}/$pkgname/2.2/$pkgname-$version.tar.xz"
build_style=gnu-configure
short_desc="Assistive Technology Service Provider Interface"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=d9b8ab2324d42b68552ec787b19619631c934528dc859da2349ea5f0ee7cc8b7
checksum=fb97f0a02fa378795e50857e22e640e099be1768081e28ca2dbdb3835f5b6af1
long_desc="
This package includes the protocol definitions for the new D-Bus
at-spi.

View file

@ -1,13 +1,13 @@
# Template file for 'colord'
pkgname=colord
version=0.1.15
version=0.1.16
homepage="http://www.freedesktop.org/software/colord"
distfiles="$homepage/releases/$pkgname-$version.tar.xz"
build_style=gnu-configure
configure_args="--disable-sane --disable-static"
short_desc="Color daemon"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=dff56476e02527899f4a2c39eeb092af369ab5dac1e21cbb6a5b0955b5c6e746
checksum=9489e29e7f5f529f759f7b913ccb8147e702bcdad641dfc1f94a1fc74dd942b1
long_desc="
colord is a system service that makes it easy to manage, install and generate
color profiles to accurately color manage input and output devices.

View file

@ -0,0 +1,8 @@
libgthread-2.0.so.0
libglib-2.0.so.0
libdbus-1.so.3
libpthread.so.0
libxtables.so.7
libresolv.so.2
libdl.so.2
libc.so.6

View file

@ -1,9 +0,0 @@
#!/sbin/runscript
command=/usr/sbin/connmand
name="Connection Manager daemon"
depend()
{
need dbus localmount
}

View file

@ -1,16 +1,16 @@
# Template file for 'connman'
pkgname=connman
version=0.69
revision=1
distfiles="${KERNEL_SITE}/network/$pkgname/$pkgname-$version.tar.bz2"
version=0.78
distfiles="${KERNEL_SITE}/network/$pkgname/$pkgname-$version.tar.xz"
build_style=gnu-configure
configure_args="--enable-pie --enable-polkit
--enable-ethernet --enable-wifi --enable-bluetooth --enable-openvpn
--enable-loopback --enable-pacrunner --enable-ntpd --enable-client
--enable-capng --enable-google --enable-threads"
configure_args="--enable-pie --enable-threads --enable-ethernet
--enable-wifi --enable-bluetooth --enable-loopback --enable-google
--enable-ntpd --enable-nmcompat --enable-polkit --enable-client
--enable-capng --with-systemdunitdir=/lib/systemd/system"
revision=1
short_desc="Open Source CONNection MANager"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=9f7bd87cb36689a2deb943d1fdb79c030071b2c4bc763e32cfd933955017419c
checksum=7a06c4b8abe09c8c07a73e39e3fda1de1aa9168e5081ee13a0850220b7593f62
long_desc="
The ConnMan project provides a daemon for managing internet connections
within embedded devices running the Linux operating system. The Connection
@ -21,15 +21,8 @@ long_desc="
resolving, are implemented using plug-ins. The plug-in approach allows for
easy adaption and modification for various use cases."
openrc_services="connmand default true"
subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run glib
Add_dependency run dbus-libs
Add_dependency run iptables
Add_dependency run libcap-ng
Add_dependency build pkg-config
Add_dependency build glib-devel
Add_dependency build dbus-devel
@ -37,11 +30,5 @@ Add_dependency build iptables-devel
Add_dependency build libcap-ng-devel
Add_dependency full dbus
Add_dependency full udev
Add_dependency full bluez
Add_dependency full wpa_supplicant
post_install()
{
vinstall ${FILESDIR}/connmand.rc 755 etc/init.d connmand
}

View file

@ -1,11 +1,11 @@
# Template build file for 'intltool'.
pkgname=intltool
version=0.41.1
version=0.50.0
distfiles="http://launchpad.net/intltool/trunk/$version/+download/$pkgname-$version.tar.gz"
build_style=gnu-configure
short_desc="Toolbox for internationalisation"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=06d02133a85b9d6f29cd763050dc9267a6d73ef3008993f5b917cafc7ece96c0
checksum=dccfb0b7dd35a170130e8934bfd30c29da6ae73bcd3ca4ba71317c977b2893d6
long_desc="
The intltool collection can be used to do these things:

View file

@ -1,10 +1,10 @@
# Common vars shared by the 'kernel' and 'kernel-libc-headers'
# build templates.
_kmajorver=3.1
version=${_kmajorver}.9
_kmajorver=3.2
version=${_kmajorver}.1
wrksrc="linux-${version}"
distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.kernel.org"
license="GPL-2"
checksum=bcf6d7dca2c6faa3dead83c4ea0705451f55552fe7945f1666d660aa332af6e6
checksum=1bd7a89830b7e0491943964491ac41ff44299f28e864d90a1f396e57fe24756b

File diff suppressed because it is too large Load diff

View file

@ -1,34 +0,0 @@
From cb0d0b72128ac566aad9a72800c5a64af66f0b6e Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Sun, 8 Jan 2012 18:08:05 -0200
Subject: [PATCH] modprobe: fix error path when loading dependencies
demarchi> scenario is the following:
demarchi> modA depends on modB and modC
demarchi> if there's a race when trying to insert a dependency of a module, say
modB, it will stop loading all the modules
demarchi> it should check by "module already loaded error"
demarchi> like it does for modA
---
tools/kmod-modprobe.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
index eaf9346..2cda935 100644
--- a/tools/kmod-modprobe.c
+++ b/tools/kmod-modprobe.c
@@ -666,9 +666,11 @@ static int insmod_do_deps_list(struct kmod_module *parent, struct kmod_list *dep
flags |= KMOD_INSERT_FORCE_VERMAGIC;
r = kmod_module_insert_module(dm, flags, opts);
+ if (r == -EEXIST && !first_time)
+ r = 0;
if (r < 0) {
WRN("could not insert '%s': %s\n",
- dmname, strerror(-r));
+ dmname, strerror(-r));
goto dep_error;
}
}
--
1.7.8.1

View file

@ -1,30 +0,0 @@
diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
index b6af26f..8506193 100644
--- a/tools/kmod-modinfo.c
+++ b/tools/kmod-modinfo.c
@@ -279,6 +279,12 @@ static int modinfo_alias_do(struct kmod_ctx *ctx, const char *alias)
LOG("Module alias %s not found.\n", alias);
return err;
}
+
+ if (list == NULL) {
+ LOG("Module %s not found.\n", alias);
+ return -ENOENT;
+ }
+
kmod_list_foreach(l, list) {
struct kmod_module *mod = kmod_module_get_module(l);
int r = modinfo_do(mod);
diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
index 8286b9b..6ca94f2 100644
--- a/tools/kmod-modprobe.c
+++ b/tools/kmod-modprobe.c
@@ -856,7 +856,7 @@ static int insmod_alias(struct kmod_ctx *ctx, const char *alias, const char *ext
if (list == NULL) {
LOG("Module %s not found.\n", alias);
- return err;
+ return -ENOENT;
}
if (use_blacklist) {

View file

@ -1,146 +0,0 @@
From 6daceb2f1f4d442ba04752aaa1cf43d554d5f646 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Sun, 8 Jan 2012 01:02:29 -0200
Subject: [PATCH] Replace NAME_MAX with PATH_MAX for module aliases
Module aliases can be bigger than NAME_MAX. So, replace with PATH_MAX
that is bigger enough to hold them.
Technically in some places NAME_MAX would be sufficient (those using
module names only), but they use functions that can be called with
alias. So increase the buffers in these cases to PATH_MAX too.
---
libkmod/libkmod-module.c | 10 +++++-----
libkmod/libkmod-util.c | 10 +++++-----
libkmod/libkmod-util.h | 6 +++---
tools/kmod-depmod.c | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index f2359a9..880bac5 100644
--- a/libkmod/libkmod-module.c
+++ b/libkmod/libkmod-module.c
@@ -185,7 +185,7 @@ KMOD_EXPORT int kmod_module_new_from_name(struct kmod_ctx *ctx,
{
struct kmod_module *m;
size_t namelen;
- char name_norm[NAME_MAX];
+ char name_norm[PATH_MAX];
char *namesep;
if (ctx == NULL || name == NULL || mod == NULL)
@@ -237,11 +237,11 @@ int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
const char *name, struct kmod_module **mod)
{
int err;
- char key[NAME_MAX];
+ char key[PATH_MAX];
size_t namelen = strlen(name);
size_t aliaslen = strlen(alias);
- if (namelen + aliaslen + 2 > NAME_MAX)
+ if (namelen + aliaslen + 2 > PATH_MAX)
return -ENAMETOOLONG;
memcpy(key, name, namelen);
@@ -283,7 +283,7 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
struct kmod_module *m;
int err;
struct stat st;
- char name[NAME_MAX];
+ char name[PATH_MAX];
char *abspath;
size_t namelen;
@@ -434,7 +434,7 @@ KMOD_EXPORT int kmod_module_new_from_lookup(struct kmod_ctx *ctx,
struct kmod_list **list)
{
int err;
- char alias[NAME_MAX];
+ char alias[PATH_MAX];
if (ctx == NULL || given_alias == NULL)
return -ENOENT;
diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
index 75e2fea..344d94a 100644
--- a/libkmod/libkmod-util.c
+++ b/libkmod/libkmod-util.c
@@ -121,11 +121,11 @@ char *underscores(struct kmod_ctx *ctx, char *s)
return s;
}
-inline int alias_normalize(const char *alias, char buf[NAME_MAX], size_t *len)
+inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
{
size_t s;
- for (s = 0; s < NAME_MAX - 1; s++) {
+ for (s = 0; s < PATH_MAX - 1; s++) {
const char c = alias[s];
switch (c) {
case '-':
@@ -160,12 +160,12 @@ finish:
return 0;
}
-inline char *modname_normalize(const char *modname, char buf[NAME_MAX],
+inline char *modname_normalize(const char *modname, char buf[PATH_MAX],
size_t *len)
{
size_t s;
- for (s = 0; s < NAME_MAX - 1; s++) {
+ for (s = 0; s < PATH_MAX - 1; s++) {
const char c = modname[s];
if (c == '-')
buf[s] = '_';
@@ -183,7 +183,7 @@ inline char *modname_normalize(const char *modname, char buf[NAME_MAX],
return buf;
}
-char *path_to_modname(const char *path, char buf[NAME_MAX], size_t *len)
+char *path_to_modname(const char *path, char buf[PATH_MAX], size_t *len)
{
char *modname;
diff --git a/libkmod/libkmod-util.h b/libkmod/libkmod-util.h
index 3cd352c..e8ed5ad 100644
--- a/libkmod/libkmod-util.h
+++ b/libkmod/libkmod-util.h
@@ -20,9 +20,9 @@ int read_str_ulong(int fd, unsigned long *value, int base) __must_check __attrib
char *strchr_replace(char *s, int c, char r);
bool path_is_absolute(const char *p) __must_check __attribute__((nonnull(1)));
char *path_make_absolute_cwd(const char *p) __must_check __attribute__((nonnull(1)));
-int alias_normalize(const char *alias, char buf[NAME_MAX], size_t *len) __must_check __attribute__((nonnull(1,2)));
-char *modname_normalize(const char *modname, char buf[NAME_MAX], size_t *len) __attribute__((nonnull(1, 2)));
-char *path_to_modname(const char *path, char buf[NAME_MAX], size_t *len) __attribute__((nonnull(2)));
+int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len) __must_check __attribute__((nonnull(1,2)));
+char *modname_normalize(const char *modname, char buf[PATH_MAX], size_t *len) __attribute__((nonnull(1, 2)));
+char *path_to_modname(const char *path, char buf[PATH_MAX], size_t *len) __attribute__((nonnull(2)));
unsigned long long ts_usec(const struct timespec *ts);
#endif
diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
index 70c397c..4726522 100644
--- a/tools/kmod-depmod.c
+++ b/tools/kmod-depmod.c
@@ -1249,7 +1249,7 @@ static int depmod_modules_search_file(struct depmod *depmod, size_t baselen, siz
struct kmod_module *kmod;
struct mod *mod;
const char *relpath;
- char modname[NAME_MAX];
+ char modname[PATH_MAX];
const struct kmod_ext *eitr;
size_t modnamelen;
uint8_t matches = 0;
@@ -2101,7 +2101,7 @@ static int output_builtin_bin(struct depmod *depmod, FILE *out)
{
FILE *in;
struct index_node *idx;
- char infile[PATH_MAX], line[PATH_MAX], modname[NAME_MAX];
+ char infile[PATH_MAX], line[PATH_MAX], modname[PATH_MAX];
if (out == stdout)
return 0;
--
1.7.8.1

View file

@ -1,16 +1,14 @@
# Template file for 'kmod'
pkgname=kmod
version=3
patch_args="-Np1"
version=4
homepage="http://git.profusion.mobi/cgit.cgi/kmod.git"
distfiles="http://packages.profusion.mobi//$pkgname/$pkgname-$version.tar.xz"
build_style=gnu-configure
configure_args="--with-rootprefix= --with-rootlibdir=/lib --with-zlib
--with-xz"
configure_args="--with-rootprefix= --with-rootlibdir=/lib --with-zlib --with-xz"
short_desc="Linux kernel module handling"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
checksum=4b32439703ab2837e81ae80f527f9e964ecb5883a9e80d1cc7518cf6e8593ad9
checksum=4bcae464d1801f403e6c6454b922c4b117f61cb8cf1a85a3a24267fbf353ff68
long_desc="
kmod is a set of tools to handle common tasks with Linux kernel modules like
insert, remove, list, check properties, resolve dependencies and aliases.

View file

@ -13,5 +13,6 @@ do_install()
{
vmove usr/include usr
vmove usr/lib/pkgconfig usr/lib
vmove usr/share/gtk-doc usr/share
vmove "usr/lib/*.a" usr/lib
}

View file

@ -18,3 +18,5 @@ libgmodule-2.0.so.0
libgthread-2.0.so.0
librt.so.1
libm.so.6
libdbus-glib-1.so.2
libdbus-1.so.3

View file

@ -1,11 +0,0 @@
--- configure.orig 2011-10-14 11:52:37.150473742 +0200
+++ configure 2011-10-14 11:52:46.191239300 +0200
@@ -14181,7 +14181,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-ac_config_files="$ac_config_files Makefile src/Makefile src/tests/Makefile data/Makefile data/ui/Makefile po/Makefile.in docs/Makefile docs/reference/Makefile docs/reference/libfm/Makefile libfm.pc libfm-gtk.pc"
+ac_config_files="$ac_config_files Makefile src/Makefile src/tests/Makefile data/Makefile data/ui/Makefile po/Makefile.in libfm.pc libfm-gtk.pc"
cat >confcache <<\_ACEOF

View file

@ -1,12 +1,12 @@
# Template file for 'libfm'
pkgname=libfm
version=0.1.16
version=0.1.17
distfiles="${SOURCEFORGE_SITE}/pcmanfm/$pkgname-$version.tar.gz"
build_style=gnu-configure
revision=1
configure_args="--enable-udisks"
short_desc="LXDE GLib/GIO based library"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=ed49365319b941757c155b3790a2adf73f5072227c578d9bcba7329c6f9fcd3b
checksum=1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b
long_desc="
libfm is a glib/gio-based lib used to develop file managers providing some
file management utilities."
@ -19,7 +19,9 @@ conf_files="
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build dbus-glib-devel
Add_dependency build gtk+-devel
Add_dependency build menu-cache-devel
Add_dependency full desktop-file-utils
Add_dependency full udisks

1
srcpkgs/libopenbox Symbolic link
View file

@ -0,0 +1 @@
openbox

View file

@ -1,7 +1,7 @@
# Template file for 'lxde'
pkgname=lxde
version=0.5.0
revision=1
revision=3
build_style=meta-template
short_desc="LXDE meta-package"
maintainer="Juan RP <xtraeme@gmail.com>"
@ -21,5 +21,7 @@ Add_dependency full lxlauncher
Add_dependency full lxinput
Add_dependency full lxrandr
Add_dependency full lxpanel
Add_dependency full lxtask
Add_dependency full gpicview
Add_dependency full xdg-utils
Add_dependency full xdg-user-dirs

View file

@ -0,0 +1,5 @@
libgtk-x11-2.0.so.0
libgobject-2.0.so.0
libglib-2.0.so.0
libpthread.so.0
libc.so.6

20
srcpkgs/lxtask/template Normal file
View file

@ -0,0 +1,20 @@
# Template file for 'lxtask'
pkgname=lxtask
version=0.1.4
homepage="http://lxde.org/"
distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
build_style=gnu-configure
short_desc="LXDE Task Manager"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
checksum=39110c99e9e56101e25be35628abafd81b1e3ea47e2d8bea45b2cb12c1e3cd61
long_desc="
LXTask - lightweight and desktop-independent task manager derived from
xfce4-taskmanager with all dependencies on xfce removed, new features,
and some improvement of the user interface."
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gtk+-devel
Add_dependency full desktop-file-utils

1
srcpkgs/openbox-devel Symbolic link
View file

@ -0,0 +1 @@
openbox

2
srcpkgs/openbox/depends Normal file
View file

@ -0,0 +1,2 @@
abi_depends=">=3.5.0"
api_depends="${abi_depends}"

View file

@ -0,0 +1,22 @@
libSM.so.6
libICE.so.6
libpangoxft-1.0.so.0
libpangoft2-1.0.so.0
libXft.so.2
libpango-1.0.so.0
libgobject-2.0.so.0
libgmodule-2.0.so.0
libgthread-2.0.so.0
librt.so.1
libXrender.so.1
libfontconfig.so.1
libfreetype.so.6
libX11.so.6
libglib-2.0.so.0
libImlib2.so.1
libxml2.so.2
libpthread.so.0
libc.so.6
libXinerama.so.1
libXrandr.so.2
libXext.so.6

View file

@ -0,0 +1,11 @@
# Template file for 'libopenbox'.
#
short_desc="openbox runtime shared libraries"
long_desc="
${long_desc}
This package includes the runtime shared libraries."
do_install() {
vmove "usr/lib/*.so*" usr/lib
}

View file

@ -0,0 +1,15 @@
# Template file for 'openbox-devel'.
#
short_desc="openbox development files"
long_desc="
${long_desc}
This package includes development files: headers, static libs, etc."
Add_dependency run libopenbox
do_install() {
vmove "usr/lib/*.a" usr/lib
vmove usr/include usr
vmove usr/lib/pkgconfig usr/lib
}

View file

@ -1,4 +1,3 @@
libXinerama.so.1
libXrandr.so.2
libXext.so.6
libglib-2.0.so.0
@ -10,15 +9,7 @@ libstartup-notification-1.so.0
libxml2.so.2
libc.so.6
libXau.so.6
libpangoxft-1.0.so.0
libpangoft2-1.0.so.0
libpango-1.0.so.0
libgobject-2.0.so.0
libgmodule-2.0.so.0
libgthread-2.0.so.0
librt.so.1
libXft.so.2
libXrender.so.1
libfontconfig.so.1
libfreetype.so.6
libpthread.so.0
libXinerama.so.1
libobrender.so.27
libobt.so.0

View file

@ -1,13 +1,15 @@
# Template file for 'openbox'
pkgname=openbox
version=3.4.10
version=3.5.0
revision=1
homepage="http://www.openbox.org"
distfiles="http://icculus.org/openbox/releases/$pkgname-$version.tar.gz"
build_style=gnu-configure
configure_args="--enable-startup-notification"
revision=1
short_desc="Standards compliant, fast, light-weight, extensible window manager"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=20356f93c3334c3209284fba2628a9c48c3140a35febd0bdafa3a164d0eaed00
license="GPL-2"
checksum=6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a
long_desc="
Openbox works with your applications, and makes your desktop easier to
manage. This is because the approach to its development was the opposite of
@ -29,18 +31,24 @@ long_desc="
* Multi-head Xinerama support!
* Pipe menus"
subpackages="${pkgname}-devel lib${pkgname}"
conf_files="
/etc/xdg/openbox/menu.xml
/etc/xdg/openbox/rc.xml
/etc/xdg/openbox/autostart.sh"
/etc/xdg/openbox/environment
/etc/xdg/openbox/autostart"
Add_dependency build pkg-config
Add_dependency build startup-notification-devel
Add_dependency build libxml2-devel
Add_dependency build libXrandr-devel
Add_dependency build libXcursor-devel
Add_dependency build libXinerama-devel
Add_dependency build imlib2-devel
Add_dependency build pango-devel
_deps="fontconfig freetype glib pango libICE libSM libX11 libXau libXcursor"
_deps="${_deps} libXext libXft libXinerama libXrandr libXrender libxml2"
_deps="${_deps} startup-notification"
for _dep_ in ${_deps}; do
Add_dependency run ${_dep_}
Add_dependency build ${_dep_}-devel
done
post_install() {
# Doesn't work with GNOME3.
rm -f ${DESTDIR}/usr/share/xsessions/openbox-gnome.desktop
}

View file

@ -0,0 +1,12 @@
pcmanfm-desktop.c uses ceil(3) so must be linked to libm.
--- src/Makefile.am.orig 2012-01-16 17:03:19.091356701 +0100
+++ src/Makefile.am 2012-01-16 17:03:34.625980985 +0100
@@ -48,6 +48,7 @@ pcmanfm_LDADD = \
$(GMODULE_LIBS) \
$(FM_LIBS) \
$(MENU_CACHE_LIBS) \
+ -lm \
$(NULL)
noinst_PROGRAMS=xml-purge

View file

@ -1,12 +1,11 @@
# Template file for 'pcmanfm'
pkgname=pcmanfm
version=0.9.9
version=0.9.10
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
build_style=gnu-configure
revision=3
short_desc="LXDE file manager"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=bc48af4ade638b47e4207cc274f6e38c2bd3786a811d20da47c3df9907c6fb6c
checksum=f133c6f207f719d1fc69fe8bc07b2de6883c6937ffa87448df42e3b1a30e0298
long_desc="
Features:
* An extremly fast, lightweight, yet feature-rich file manager
@ -16,9 +15,15 @@ long_desc="
conf_files="/etc/xdg/pcmanfm/default/pcmanfm.conf"
Add_dependency build automake
Add_dependency build gettext-devel
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gtk+-devel
Add_dependency build libfm-devel
Add_dependency full desktop-file-utils
pre_configure() {
autoreconf -fi
}

View file

@ -1,13 +1,14 @@
# Template build file for 'perl-XML-Parser'.
pkgname=perl-XML-Parser
version=2.40
version=2.41
wrksrc="XML-Parser-$version"
homepage="http://search.cpan.org/dist/XML-Parser/"
distfiles="${CPAN_SITE}/XML/XML-Parser-$version.tar.gz"
build_style=perl-module
revision=1
short_desc="Perl extension interface to James Clark's XML parser, expat"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=e5e433684e799ef7b6b852c0ca31b71054717628555444d3dc9fceac0df71512
license="GPL-2"
checksum=b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9
long_desc="
This module provides ways to parse XML documents. It is built on top of
XML::Parser::Expat, which is a lower level interface to James Clark's

View file

@ -1,6 +1,7 @@
# Template file for 'rhythmbox'.
pkgname=rhythmbox
version=2.95
revision=1
homepage="http://www.rhythmbox.org"
distfiles="${GNOME_SITE}/$pkgname/2.95/$pkgname-$version.tar.xz"
build_style=gnu-configure
@ -32,6 +33,8 @@ long_desc="
gtk_iconcache_dirs="/usr/share/icons/hicolor"
subpackages="lib${pkgname} ${pkgname}-devel"
build_requires=15
shlib_depends="libtdb>=1.2.6"
Add_dependency build pkg-config
Add_dependency build intltool

View file

@ -1,13 +1,13 @@
# Template file for 'ristretto'
pkgname=ristretto
version=0.3.1
version=0.3.2
homepage="http://goodies.xfce.org/projects/applications/ristretto"
distfiles="http://archive.xfce.org/src/apps/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
build_style=gnu-configure
short_desc="Picture-viewer for the Xfce desktop environment"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
checksum=7b3d5de3be0db8beca20d4408de9beb4efe3a78c44e22c5f19956887fbf70173
checksum=a28c9e472c329b5f3136ebea887dec5ba93a37d5562b493633161392aff5545f
long_desc="
Ristretto is a fast and lightweight picture-viewer for the Xfce desktop
environment."

View file

@ -1,6 +1,5 @@
# Template file for 'sqlite-tcl'.
#
revision=1
short_desc="${sourcepkg} TCL bindings"
long_desc="${long_desc}

View file

@ -1,16 +1,15 @@
# Template build file for 'sqlite'.
pkgname=sqlite
version=3.7.9
_amalgamationver=3070900
version=3.7.10
_amalgamationver=3071000
wrksrc=sqlite
create_wrksrc=yes
distfiles="http://www.sqlite.org/sqlite-autoconf-${_amalgamationver}.tar.gz"
revision=1
short_desc="SQL Database Engine in a C Library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.sqlite.org"
license="Public Domain"
checksum=7be6cdb375505e5d9a4aee88b2ddb6ea0d9d29c9545114ff77b345e1fa812439
checksum=9c1775057af5cc8b6cc64808b9553d77beccf3757e16ecee3bc878404d9c43e3
long_desc="
SQLite is a C library that implements an SQL database engine. Programs
that link with the SQLite library can have SQL database access without

View file

@ -1,6 +1,6 @@
# Template file for 'xbps-src'
pkgname=xbps-src
version=14
version=15
distfiles="https://github.com/downloads/xtraeme/xbps-src/xbps-src-${version}.tar.gz"
build_style=gnu-makefile
make_build_args="PREFIX=/usr ETCDIR=/etc/xbps"
@ -9,7 +9,7 @@ short_desc="The XBPS package system - binary package builder"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://code.google.com/p/xbps"
license="Simplified BSD"
checksum=9353f63c2ae61d181f7e13063cceefc963a5f17fd44a81392d891f8ebbf56709
checksum=c4c4b1b954cb1456a06f8b01c09bfb81ff57cff66354ebf87b6cccdd4958ecc1
long_desc="
The XBPS package system. A new, fast, from scratch and simple
binary package manager. This package includes xbps-src, the