root
9 years ago
parent
6896f20e03
commit
10037b1a5f
@ -0,0 +1,56 @@
|
||||
From 2945539d12bbb79c44fd4402e87150b4ec58af25 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas D.
|
||||
Date: Tue, 24 Mar 2015 02:03:13 +0100
|
||||
Subject: [PATCH] Add option to disable valgrind usage in testbench
|
||||
|
||||
Temporary workaround for https://github.com/rsyslog/rsyslog/issues/263
|
||||
|
||||
---
|
||||
configure.ac | 27 +++++++++++++++++++++++----
|
||||
1 file changed, 23 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0c72f80..cdfdd25 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -13,10 +13,6 @@ AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
|
||||
-# check if valgrind is present
|
||||
-AC_CHECK_PROG(have_valgrind, [valgrind], [yes])
|
||||
-AM_CONDITIONAL(HAVE_VALGRIND, test x$have_valgrind = xyes)
|
||||
-
|
||||
# Checks for programs.
|
||||
AC_PROG_LEX
|
||||
AC_PROG_YACC
|
||||
@@ -1125,6 +1121,29 @@ if test "x$enable_testbench" = "xyes"; then
|
||||
fi
|
||||
|
||||
|
||||
+# valgrind-testbench
|
||||
+AC_ARG_WITH([valgrind_testbench],
|
||||
+ [AS_HELP_STRING([--without-valgrind-testbench], [Don't use valgrind in testbench])]
|
||||
+)
|
||||
+
|
||||
+if test "x$with_valgrind_testbench" != "xno"; then
|
||||
+ AC_CHECK_PROG(VALGRIND, [valgrind], [valgrind], [no])
|
||||
+
|
||||
+ if test "x$enable_testbench" = "xyes" && test "x$VALGRIND" = "xno"; then
|
||||
+ if test "x$with_valgrind_testbench" = "xyes"; then
|
||||
+ AC_MSG_ERROR([valgrind is missing but forced with --with-valgrind-testbench. Either install valgrind or remove the option!])
|
||||
+ else
|
||||
+ AC_MSG_WARN([valgrind is missing -- testbench won't use valgrind!])
|
||||
+ fi
|
||||
+ else
|
||||
+ AC_MSG_NOTICE([testbench will use valgrind])
|
||||
+ fi
|
||||
+else
|
||||
+ AC_MSG_NOTICE([testbench won't use valgrind due to set --without-valgrind-testbench option])
|
||||
+fi
|
||||
+AM_CONDITIONAL([HAVE_VALGRIND], [test "x$with_valgrind_testbench" != "xno" && test "x$VALGRIND" != "xno"])
|
||||
+
|
||||
+
|
||||
# settings for the file input module
|
||||
AC_ARG_ENABLE(imfile,
|
||||
[AS_HELP_STRING([--enable-imfile],[file input module enabled @<:@default=no@:>@])],
|
||||
@ -1,4 +1 @@
|
||||
DIST spice-0.12.2.tar.bz2 1685684 SHA256 5654fac02f5568088ea01979088d539f4e95551568dd709ec197e965cf8612d5 SHA512 5381ab15568d0bbe998dfa2e4bab64ea2255664f466545c16d77708fbe8b9c4627e837c4c4d229fed501665c90b38e8c31f12ccb434f5c7e96eb89ac61bd9a9b WHIRLPOOL 6ae9fcb5b6cd89176cc657f8c19e6424c1c85624229eff7ec168db57a580680042c22e8daf43a78ccd5076568a1db91dc7a3dfcfc6b9f24380af04ab0f4e44b7
|
||||
DIST spice-0.12.3.tar.bz2 1606683 SHA256 bfd65e1c466524f9469cb58764904eeec1dae27c4901c4dbd0bf1ec419048546 SHA512 92d5871cd154d863ee54657e8064f6093bd5ab47e277a1398fed46b8592f44416d6d04be2d85a4ada90d4bfb5ef94dbc618a818219023416d3f8a82acbd3009e WHIRLPOOL bd431acefde4a3dd9c2fea5fa31c1ab2e1b2a34a1021d401510cb98307f8703922015d10db09795f26d514dbd49b147cd598dca2df16c784780530ab960a181b
|
||||
DIST spice-0.12.4.tar.bz2 1718655 SHA256 cf063e7df42e331a835529d2f613d8a01f8cb2963e8edaadf73a8d65c46fb387 SHA512 9867c2ace6205b606eef4a04a7e1fa0533c8d419cbb063edf4ded12db24f76237487d3e9dd57dec0f5b952eef399aa395d8591e2d82cab4d13e0d3ce6c7fba74 WHIRLPOOL 73c81bc1481c33512805c19934b4b4de92024cb2c5c0409ae34f2a926056ba970d2deb7ec4a13685e7b1854ca2c505f2b87b6ccd1e4d3454a65146c16c933de7
|
||||
DIST spice-0.12.5.tar.bz2 1737169 SHA256 4209a20d8f67cb99a8a6ac499cfe79a18d4ca226360457954a223d6795c2f581 SHA512 1501c913ba3b1856444536a9bfda7a2138a96088f940b483e963df342b91deb945d77bfb3c83ebddfcd7c3008695c0dd7df30ff9fd8502cbbcac1c610a273572 WHIRLPOOL 8f50a91febb0d2279ac867ae31cb14f996106625f0f26ba1bb8b5b576eedce6839f52c70e19a03f03be209f695c36b3ba1d94fadee6c9f134e2afffd5b99c476
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
From 53488f0275d6c8a121af49f7ac817d09ce68090d Mon Sep 17 00:00:00 2001
|
||||
From: David Gibson <david@gibson.dropbear.id.au>
|
||||
Date: Fri, 05 Jul 2013 07:11:46 +0000
|
||||
Subject: Use RING_FOREACH_SAFE in red_channel.c functions which are missing it
|
||||
|
||||
Currently, both red_channel_pipes_add_type() and
|
||||
red_channel_pipes_add_empty_msg() use plaing RING_FOREACH() which is not
|
||||
safe versus removals from the ring within the loop body.
|
||||
|
||||
Although it's rare, such a removal can occur in both cases. In the case
|
||||
of red_channel_pipes_add_type() we have:
|
||||
red_channel_pipes_add_type()
|
||||
-> red_channel_client_pipe_add_type()
|
||||
-> red_channel_client_push()
|
||||
|
||||
And in the case of red_channel_client_pipes_add_empty_msg() we have:
|
||||
red_channel_client_pipes_add_empty_msg()
|
||||
-> red_channel_client_pipe_add_empty_msg()
|
||||
-> red_channel_client_push()
|
||||
|
||||
But red_channel_client_push() can cause a removal from the clients ring if
|
||||
a network error occurs:
|
||||
red_channel_client_push()
|
||||
-> red_channel_client_send()
|
||||
-> red_peer_handle_outgoing()
|
||||
-> handler->cb->on_error callback
|
||||
= red_channel_client_default_peer_on_error()
|
||||
-> red_channel_client_disconnect()
|
||||
-> red_channel_remove_client()
|
||||
-> ring_remove()
|
||||
|
||||
When this error path does occur, the assertion in RING_FOREACH()'s
|
||||
ring_next() trips, and the process containing the spice server is aborted.
|
||||
i.e. your whole VM dies, as a result of an unfortunately timed network
|
||||
error on the spice channel.
|
||||
|
||||
Please apply.
|
||||
|
||||
Signed-off-by: David Gibson <dgibson@redhat.com>
|
||||
---
|
||||
diff --git a/server/red_channel.c b/server/red_channel.c
|
||||
index c0b1781..8742008 100644
|
||||
--- a/server/red_channel.c
|
||||
+++ b/server/red_channel.c
|
||||
@@ -1572,9 +1572,9 @@ void red_channel_client_pipe_add_type(RedChannelClient *rcc, int pipe_item_type)
|
||||
|
||||
void red_channel_pipes_add_type(RedChannel *channel, int pipe_item_type)
|
||||
{
|
||||
- RingItem *link;
|
||||
+ RingItem *link, *next;
|
||||
|
||||
- RING_FOREACH(link, &channel->clients) {
|
||||
+ RING_FOREACH_SAFE(link, next, &channel->clients) {
|
||||
red_channel_client_pipe_add_type(
|
||||
SPICE_CONTAINEROF(link, RedChannelClient, channel_link),
|
||||
pipe_item_type);
|
||||
@@ -1593,9 +1593,9 @@ void red_channel_client_pipe_add_empty_msg(RedChannelClient *rcc, int msg_type)
|
||||
|
||||
void red_channel_pipes_add_empty_msg(RedChannel *channel, int msg_type)
|
||||
{
|
||||
- RingItem *link;
|
||||
+ RingItem *link, *next;
|
||||
|
||||
- RING_FOREACH(link, &channel->clients) {
|
||||
+ RING_FOREACH_SAFE(link, next, &channel->clients) {
|
||||
red_channel_client_pipe_add_empty_msg(
|
||||
SPICE_CONTAINEROF(link, RedChannelClient, channel_link),
|
||||
msg_type);
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,51 +0,0 @@
|
||||
From 58195c195110f0dbb24d831b5eefb2f094848b26 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Ruppert <idl0r@qasl.de>
|
||||
Date: Sun, 03 Nov 2013 17:38:55 +0000
|
||||
Subject: Require alsa only with --enable-client
|
||||
|
||||
Hey guys,
|
||||
|
||||
the alsa libraries/header seem to be required only when configured with
|
||||
--enable-client so I wrote a patch to make configure respect it.
|
||||
|
||||
--
|
||||
Regards,
|
||||
Christian Ruppert
|
||||
|
||||
From 53683cc75ba092799f856f710cb45b2aacfb6123 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Ruppert <idl0r@gentoo.org>
|
||||
Date: Sun, 3 Nov 2013 18:36:26 +0100
|
||||
Subject: [PATCH] Require alsa only with --enable-client
|
||||
---
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7e81329..882bf1b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -246,12 +246,6 @@ fi
|
||||
AC_MSG_RESULT([found])
|
||||
fi
|
||||
|
||||
-if test "$os_linux" = yes; then
|
||||
- PKG_CHECK_MODULES(ALSA, alsa)
|
||||
- AC_SUBST(ALSA_CFLAGS)
|
||||
- AC_SUBST(ALSA_LIBS)
|
||||
-fi
|
||||
-
|
||||
PKG_CHECK_MODULES(SSL, openssl)
|
||||
AC_SUBST(SSL_CFLAGS)
|
||||
AC_SUBST(SSL_LIBS)
|
||||
@@ -280,6 +274,12 @@ AC_SUBST(GL_LIBS)
|
||||
SPICE_NONPKGCONFIG_LIBS+=" $GL_LIBS"
|
||||
|
||||
if test "x$red_target" = "xx11" && test "x$enable_client" = "xyes" ; then
|
||||
+ if test "$os_linux" = yes; then
|
||||
+ PKG_CHECK_MODULES(ALSA, alsa)
|
||||
+ AC_SUBST(ALSA_CFLAGS)
|
||||
+ AC_SUBST(ALSA_LIBS)
|
||||
+ fi
|
||||
+
|
||||
PKG_CHECK_MODULES(XRANDR, xrandr)
|
||||
PKG_CHECK_MODULES(XFIXES, xfixes)
|
||||
PKG_CHECK_MODULES(MISC_X, x11 xext xrender)
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,88 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.2.ebuild,v 1.6 2014/08/06 06:44:37 patrick Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
|
||||
inherit eutils python
|
||||
|
||||
DESCRIPTION="SPICE server and client"
|
||||
HOMEPAGE="http://spice-space.org/"
|
||||
SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="+client +gui sasl smartcard static-libs" # static
|
||||
|
||||
RDEPEND=">=x11-libs/pixman-0.17.7
|
||||
media-libs/alsa-lib
|
||||
media-libs/celt:0.5.1
|
||||
dev-libs/openssl
|
||||
virtual/jpeg
|
||||
sys-libs/zlib
|
||||
sasl? ( dev-libs/cyrus-sasl )
|
||||
smartcard? ( >=app-emulation/libcacard-0.1.2 )
|
||||
client? (
|
||||
gui? ( =dev-games/cegui-0.6*[opengl] )
|
||||
>=x11-libs/libXrandr-1.2
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXrender
|
||||
)"
|
||||
|
||||
# broken as we don't have static alsa-lib and building that one static requires more work
|
||||
# static? (
|
||||
# >=x11-libs/pixman-0.17.7[static-libs(+)]
|
||||
# media-libs/celt:0.5.1[static-libs(+)]
|
||||
# virtual/jpeg[static-libs(+)]
|
||||
# sys-libs/zlib[static-libs(+)]
|
||||
# media-libs/alsa-lib[static-libs(-)]
|
||||
# >=x11-libs/libXrandr-1.2[static-libs(+)]
|
||||
# x11-libs/libX11[static-libs(+)]
|
||||
# x11-libs/libXext[static-libs(+)]
|
||||
# x11-libs/libXinerama[static-libs(+)]
|
||||
# x11-libs/libXfixes[static-libs(+)]
|
||||
# x11-libs/libXrender[static-libs(+)]
|
||||
# )
|
||||
# )"
|
||||
DEPEND="virtual/pkgconfig
|
||||
dev-python/pyparsing
|
||||
${RDEPEND}"
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
# maintainer notes:
|
||||
# * opengl support is currently broken
|
||||
# * TODO: add slirp for tunnel-support
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}/0.11.0-gold.patch"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
python_convert_shebangs 2 spice-common/spice_codegen.py
|
||||
|
||||
econf \
|
||||
$(use_enable static-libs static) \
|
||||
--disable-tunnel \
|
||||
$(use_enable client) \
|
||||
$(use_enable gui) \
|
||||
$(use_with sasl) \
|
||||
$(use_enable smartcard) \
|
||||
--disable-static-linkage
|
||||
# $(use_enable static static-linkage) \
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
use static-libs || rm "${D}"/usr/lib*/*.la
|
||||
}
|
||||
@ -1,103 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.3-r1.ebuild,v 1.9 2014/08/06 06:44:37 patrick Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
|
||||
|
||||
inherit eutils python-any-r1
|
||||
|
||||
DESCRIPTION="SPICE server and client"
|
||||
HOMEPAGE="http://spice-space.org/"
|
||||
SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="client gui sasl smartcard static-libs" # static
|
||||
|
||||
RDEPEND=">=x11-libs/pixman-0.17.7
|
||||
>=dev-libs/glib-2.22:2
|
||||
media-libs/alsa-lib
|
||||
>=media-libs/celt-0.5.1.1:0.5.1
|
||||
dev-libs/openssl
|
||||
virtual/jpeg
|
||||
sys-libs/zlib
|
||||
sasl? ( dev-libs/cyrus-sasl )
|
||||
smartcard? ( >=app-emulation/libcacard-0.1.2 )
|
||||
client? (
|
||||
gui? ( =dev-games/cegui-0.6*[opengl] )
|
||||
>=x11-libs/libXrandr-1.2
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
>=x11-libs/libXinerama-1.0
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXrender
|
||||
)"
|
||||
|
||||
# broken as we don't have static alsa-lib and building that one static requires more work
|
||||
# static? (
|
||||
# >=x11-libs/pixman-0.17.7[static-libs(+)]
|
||||
# media-libs/celt:0.5.1[static-libs(+)]
|
||||
# virtual/jpeg[static-libs(+)]
|
||||
# sys-libs/zlib[static-libs(+)]
|
||||
# media-libs/alsa-lib[static-libs(-)]
|
||||
# >=x11-libs/libXrandr-1.2[static-libs(+)]
|
||||
# x11-libs/libX11[static-libs(+)]
|
||||
# x11-libs/libXext[static-libs(+)]
|
||||
# x11-libs/libXinerama[static-libs(+)]
|
||||
# x11-libs/libXfixes[static-libs(+)]
|
||||
# x11-libs/libXrender[static-libs(+)]
|
||||
# )
|
||||
# )"
|
||||
DEPEND="virtual/pkgconfig
|
||||
$(python_gen_any_dep \
|
||||
'>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]')
|
||||
${RDEPEND}"
|
||||
|
||||
python_check_deps() {
|
||||
has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
# maintainer notes:
|
||||
# * opengl support is currently broken
|
||||
# * TODO: add slirp for tunnel-support
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}/0.11.0-gold.patch"
|
||||
|
||||
epatch "${FILESDIR}/${P}-CVE-2013-4130.patch"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable static-libs static) \
|
||||
--disable-tunnel \
|
||||
$(use_enable client) \
|
||||
$(use_enable gui) \
|
||||
$(use_with sasl) \
|
||||
$(use_enable smartcard) \
|
||||
--disable-static-linkage
|
||||
# $(use_enable static static-linkage) \
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
use static-libs || prune_libtool_files
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use gui; then
|
||||
ewarn "USE=gui will be removed in the next version."
|
||||
ewarn "Upstream has stated that 'spicy' is deprecated and that you"
|
||||
ewarn "should use 'remote-viewer' from app-emulation/virt-viewer."
|
||||
fi
|
||||
}
|
||||
@ -1,94 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.4-r1.ebuild,v 1.3 2014/08/06 06:44:37 patrick Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
|
||||
|
||||
inherit autotools eutils python-any-r1
|
||||
|
||||
DESCRIPTION="SPICE server and client"
|
||||
HOMEPAGE="http://spice-space.org/"
|
||||
SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="client sasl smartcard static-libs" # static
|
||||
|
||||
RDEPEND=">=x11-libs/pixman-0.17.7
|
||||
>=dev-libs/glib-2.22:2
|
||||
>=media-libs/celt-0.5.1.1:0.5.1
|
||||
dev-libs/openssl
|
||||
virtual/jpeg
|
||||
sys-libs/zlib
|
||||
sasl? ( dev-libs/cyrus-sasl )
|
||||
smartcard? ( >=app-emulation/libcacard-0.1.2 )
|
||||
client? (
|
||||
media-libs/alsa-lib
|
||||
>=x11-libs/libXrandr-1.2
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
>=x11-libs/libXinerama-1.0
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXrender
|
||||
)"
|
||||
|
||||
# broken as we don't have static alsa-lib and building that one static requires more work
|
||||
# static? (
|
||||
# >=x11-libs/pixman-0.17.7[static-libs(+)]
|
||||
# media-libs/celt:0.5.1[static-libs(+)]
|
||||
# virtual/jpeg[static-libs(+)]
|
||||
# sys-libs/zlib[static-libs(+)]
|
||||
# media-libs/alsa-lib[static-libs(-)]
|
||||
# >=x11-libs/libXrandr-1.2[static-libs(+)]
|
||||
# x11-libs/libX11[static-libs(+)]
|
||||
# x11-libs/libXext[static-libs(+)]
|
||||
# x11-libs/libXinerama[static-libs(+)]
|
||||
# x11-libs/libXfixes[static-libs(+)]
|
||||
# x11-libs/libXrender[static-libs(+)]
|
||||
# )
|
||||
# )"
|
||||
DEPEND="virtual/pkgconfig
|
||||
$(python_gen_any_dep \
|
||||
'>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]')
|
||||
${RDEPEND}"
|
||||
|
||||
python_check_deps() {
|
||||
has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
# maintainer notes:
|
||||
# * opengl support is currently broken
|
||||
# * TODO: add slirp for tunnel-support
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}/0.11.0-gold.patch" \
|
||||
"${FILESDIR}/${P}-alsa-conditional.patch"
|
||||
|
||||
epatch_user
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable static-libs static) \
|
||||
--disable-tunnel \
|
||||
$(use_enable client) \
|
||||
$(use_with sasl) \
|
||||
$(use_enable smartcard) \
|
||||
--disable-gui \
|
||||
--disable-static-linkage
|
||||
# $(use_enable static static-linkage) \
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
use static-libs || prune_libtool_files
|
||||
}
|
||||
@ -0,0 +1,113 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.9.4.ebuild,v 1.1 2015/03/27 13:38:21 jlec Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit base fdo-mime prefix qmake-utils
|
||||
|
||||
DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
|
||||
HOMEPAGE="http://texstudio.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
|
||||
IUSE="video +qt4 qt5"
|
||||
|
||||
REQUIRED_USE="^^ ( qt4 qt5 )"
|
||||
|
||||
COMMON_DEPEND="
|
||||
app-text/hunspell
|
||||
app-text/poppler:=[qt4?,qt5?]
|
||||
>=dev-libs/quazip-0.7.1[qt4?,qt5?]
|
||||
dev-qt/qtsingleapplication[qt4?,qt5?]
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
qt4? (
|
||||
dev-qt/designer:4
|
||||
>=dev-qt/qtgui-4.8.5:4
|
||||
>=dev-qt/qtcore-4.6.1:4
|
||||
>=dev-qt/qtscript-4.6.1:4
|
||||
>=dev-qt/qtsvg-4.6.1:4
|
||||
>=dev-qt/qttest-4.6.1:4
|
||||
)
|
||||
qt5? (
|
||||
dev-qt/designer:5
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtconcurrent:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtnetwork:5
|
||||
dev-qt/qtprintsupport:5
|
||||
dev-qt/qtscript:5
|
||||
dev-qt/qtsvg:5
|
||||
dev-qt/qttest:5
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtxml:5
|
||||
)
|
||||
video? ( media-libs/phonon[qt4?,qt5?] )"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
virtual/latex-base
|
||||
app-text/psutils
|
||||
app-text/ghostscript-gpl
|
||||
media-libs/netpbm"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
S="${WORKDIR}"/${P/-/}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.6.4-hunspell-quazip.patch
|
||||
"${FILESDIR}"/${PN}-2.8.2-desktop.patch
|
||||
# Get it from fedora
|
||||
"${FILESDIR}"/${PN}-2.5-viewers-use-xdg-open.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
|
||||
|
||||
if use video; then
|
||||
sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
|
||||
fi
|
||||
|
||||
sed \
|
||||
-e '/hunspell.pri/d' \
|
||||
-e '/quazip.pri/d' \
|
||||
-e '/qtsingleapplication.pri/d' \
|
||||
-e '/QUAZIP_STATIC/d' \
|
||||
-i ${PN}.pro || die
|
||||
|
||||
# cat >> ${PN}.pro <<- EOF
|
||||
# exists(texmakerx_my.pri):include(texmakerx_my.pri)
|
||||
# EOF
|
||||
|
||||
cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
|
||||
eprefixify ${PN}.pri
|
||||
|
||||
epatch ${PATCHES[@]}
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use qt5; then
|
||||
eqmake5
|
||||
else
|
||||
eqmake4
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local i
|
||||
for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
|
||||
insinto /usr/share/icons/hicolor/${i}
|
||||
newins utilities/${PN}${i}.png ${PN}.png
|
||||
done
|
||||
emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>games</herd>
|
||||
<herd>graphics</herd>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.7.1-r4.ebuild,v 1.1 2015/03/27 06:41:28 alonbl Exp $
|
||||
|
||||
EAPI=5
|
||||
AUTOTOOLS_AUTORECONF=yes
|
||||
|
||||
inherit eutils autotools-multilib multilib toolchain-funcs
|
||||
|
||||
DESCRIPTION="Low-level cryptographic library"
|
||||
HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
|
||||
SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( LGPL-3 LGPL-2.1 )"
|
||||
SLOT="0/4" # subslot = libnettle soname version
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
|
||||
IUSE="doc +gmp neon static-libs test"
|
||||
|
||||
DEPEND="gmp? ( dev-libs/gmp:0[${MULTILIB_USEDEP}] )"
|
||||
RDEPEND="${DEPEND}
|
||||
abi_x86_32? (
|
||||
!<=app-emulation/emul-linux-x86-baselibs-20131008-r17
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
||||
)"
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=(
|
||||
/usr/include/nettle/nettle-stdint.h
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
tc-is-static-only || epatch "${FILESDIR}"/${PN}-2.7-shared.patch
|
||||
|
||||
sed -e '/CFLAGS=/s: -ggdb3::' \
|
||||
-e 's/solaris\*)/sunldsolaris*)/' \
|
||||
-i configure.ac || die
|
||||
|
||||
# conditionally build tests and examples required by tests
|
||||
use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
|
||||
|
||||
autotools-utils_src_prepare
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# --disable-openssl bug #427526
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
--libdir="${EPREFIX}"/usr/$(get_libdir) \
|
||||
$(use_enable gmp public-key) \
|
||||
$(use_enable static-libs static) \
|
||||
--disable-openssl \
|
||||
$(tc-is-static-only && echo --disable-shared) \
|
||||
$(use_enable doc documentation) \
|
||||
$(use_enable neon arm-neon)
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
if use doc ; then
|
||||
dohtml nettle.html
|
||||
dodoc nettle.pdf
|
||||
fi
|
||||
}
|
||||
@ -1,6 +1,3 @@
|
||||
DIST bunny-1.3.1.gem 175104 SHA256 542e1c928d2d0d1fa3f5eecca624e91ea97edbc9c5579535a30e014dfb1ca4a4 SHA512 7eff120914db6e85abcea9b13b9c03ff7a9c46913d2f6f1cadfb5538a8c222bf294426345de4e6290d5b11e4f30be6e8b3f5f07a7f7a5f16dfda4fc89a35118f WHIRLPOOL afaa944155a7f99d3611cd47a53884081afcc892e69cfe68dfc9050c82411e652197709b9d82b816f349e76ff32040fa0088e8a8097a31fce807e2134497fa09
|
||||
DIST bunny-1.4.0.gem 175616 SHA256 7f66ac3e05ccc8769e29edb0de2ef1e774cdd954be0309f687496f408740cd22 SHA512 74f4f6660f3e34ca9cc20709432074e900791d3cfe4d9f769237b82ca1f55d294d63fce8b6d0abe594e4b4fb7b1f9534046c885ea50b9a34104ef655bd550e2e WHIRLPOOL b3f6324f0e7de23ac6837fd694be721f7418fb01e40754d8a37665507a3bc8ef754dba6509985059b471901474aad9bdff8b75476db3f073c02b12ec375bc2a2
|
||||
DIST bunny-1.4.1.gem 175616 SHA256 31ffea0583dbe2df270a9947125310ae0d1c738fc33313d6127fdc903190e063 SHA512 f6a77c6badfcf62649718c24b94e05a9b06e28f70d21301ce2cbe9e9d0e21efb48cde82725c9f0d65d761fad84e932ab05876569c2412cf458bc70b0987d32a0 WHIRLPOOL 8a86aa72b9b46b662915ae8a727f7d967e2017c3bcba6d24631313643eb6f369fb98db0f5d1070c9489fbf964c8d12528f84b7d29a13259c39dc10d4ddea344b
|
||||
DIST bunny-1.5.0.gem 178688 SHA256 9bc88dd4760ab29fabd304b47aec8abc4a28c59509d9ca791d120da7a41a6c9a SHA512 1271c268df9f8e75750ad6bea5f8a6ab51348acc5806c102c00d96d7094e723bb968b733df8a6ab212b4871bf1d1d59f87f7239ff90a242ef648bb118d24a7e6 WHIRLPOOL ca29470ee951e4814457909a80c641f07b2f5903e4b6974340dbc770308a0e799978928fe5690d6f0b7e285576c3551fe3a6613191b4e81f3c8a508b14906980
|
||||
DIST bunny-1.5.1.gem 178688 SHA256 0668e58dd5a020cb6614515276964b7d2563ca643a98d126429128b33d54f65e SHA512 82add6e87343d6c7df1dfc4cb5d91d413626e2b608b9a5a22397039aede3017fb400117c959a0274a4eb1bd737b724d7bbd98e901133f68428fc5cbed20df810 WHIRLPOOL e1d3bbc2df08dec252f07c981e5eb39b5f31f5358f0f3cf42aa40c393c0494086862acf7094e854a552cc295c77afbc7066a153a9400ced6087487d355fcc8fc
|
||||
DIST bunny-1.6.3.gem 180224 SHA256 3eb1339993db6ea5b8655be374c0427924c13bdc9cafee8141e513d334e0a52d SHA512 ceeca544cd05c78adb3bd3164ca84851b65270ecd069e923979b432abc92160642f334df088364ae9960b2c3523260a0ffcd06dd20b51bd798178231efa74a95 WHIRLPOOL 7a9a20240e15c3b480aa870c6270f08ba0d95d12d4ea68e71c444e5abe4933a9dfadbe3babf71c1e35c78a04be09a0d8c01159781b749db3be79189ddede9e13
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bunny/bunny-1.3.1.ebuild,v 1.1 2014/06/23 05:45:06 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby19 ruby20 ruby21"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
# Tests require a live AMQP server.
|
||||
RUBY_FAKEGEM_TASK_TEST=""
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Another synchronous Ruby AMQP client"
|
||||
HOMEPAGE="http://github.com/celldee/bunny"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_rdepend ">=dev-ruby/amq-protocol-1.9.2"
|
||||
|
||||
all_ruby_install() {
|
||||
all_fakegem_install
|
||||
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r examples || die
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bunny/bunny-1.4.0.ebuild,v 1.1 2014/08/16 06:19:07 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby19 ruby20 ruby21"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
# Tests require a live AMQP server.
|
||||
RUBY_FAKEGEM_TASK_TEST=""
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Another synchronous Ruby AMQP client"
|
||||
HOMEPAGE="http://github.com/celldee/bunny"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_rdepend ">=dev-ruby/amq-protocol-1.9.2"
|
||||
|
||||
all_ruby_install() {
|
||||
all_fakegem_install
|
||||
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r examples || die
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bunny/bunny-1.4.1.ebuild,v 1.1 2014/09/23 05:24:14 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby19 ruby20 ruby21"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
# Tests require a live AMQP server.
|
||||
RUBY_FAKEGEM_TASK_TEST=""
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Another synchronous Ruby AMQP client"
|
||||
HOMEPAGE="http://github.com/celldee/bunny"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_rdepend ">=dev-ruby/amq-protocol-1.9.2"
|
||||
|
||||
all_ruby_install() {
|
||||
all_fakegem_install
|
||||
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r examples || die
|
||||
}
|
||||
@ -1,4 +1,3 @@
|
||||
DIST connection_pool-1.2.0.gem 10240 SHA256 41c0f1ff0c5a697869344ff50ae0d952fe99b52b26c21744b06fac34323adcb9 SHA512 f339a8789351286380ec8146ed18f18622914816c1c2d88201277a8ab375855ff229b0de4bc4ae93e47df7126b54e5617866388e95ddb5cc337165729debb3f5 WHIRLPOOL 39a9c28b1f7345da369f7dfba657a2e799741db5a4a5eec7f0b46a5b027a7618aaae240ffa021485fc8877f7f91fc9f9594c275ef1a32317098d3670a595f6d2
|
||||
DIST connection_pool-2.0.0.gem 11264 SHA256 07c6af4793949d290624eb1019e852e850e2e319d3828a62036ee9a0eb74479f SHA512 c3be1a85d8f548b2869f5453fea8af3d049a2a0e21111f33c582b7bbb06d635d58aa0a9ee4c98a17899feac42d638c6a4ab566364eb4c43efcb3390dd24c46ab WHIRLPOOL eab11e48347451f430302101827685a6f7c0f41f7b10ba27f4505d01b321b6d8a257bc30ff9dd1965ad882e7848f97702e175a7c6e2e80780ba337c269c322c8
|
||||
DIST connection_pool-2.1.1.gem 12800 SHA256 fae94f374754373071dcabff633680b198e2ec3f97c4f6b34f66acd2462d511a SHA512 fff321176c143c23a1c7682f86a4aa347597d11db19d436b1e847ad6d6d5dcad4f912b661d4f1995decc8bbb548c2bf05d0010bb1ee22beb936b06f855c06f58 WHIRLPOOL aa40d1ce74407608a032f04385be1f12184d98f20e6378f2ad87dcb13250224892ce17b1f8e2755feaafc0eb5b6da887d467ff9ff624f3d6a5b5c29e0f2ba6a6
|
||||
DIST connection_pool-2.1.2.gem 12800 SHA256 500e4081c79f326a1db11fa679a04734fae66c583fa3648df5552bc2de295a6a SHA512 7a9b12721544d0345b70ea92f76353763deb870d76f06fbd6b63096701450431be6d5a9fb8b425feadd86c4a61d691dbd5c09879ed68f19162d5f3809a468603 WHIRLPOOL 6bebd35bac3a0f2e04d8eed299109e790321031c7391f194f50e3a018e83a379faf9e28243829968070c2d63a11c9e6d382fa5f97fa0f44c1ba99d470b4a3a96
|
||||
DIST connection_pool-2.1.3.gem 12800 SHA256 0b5ebba95b511d7dc6398ee4c2404eff00dab3e18e977de1a5548315097e9cba SHA512 51aa701242f6b7b7f8fd7f494982acee21c0cbf282e360db073464c99d3af26412428e1e542561a1126e54b900019f81521fb25144221e082e8a65163ec25af4 WHIRLPOOL ba3cc3096292b31a00e14069129b62ea2f1dcef173da7c186f0eb42aea7c188d20745946a739cc2273b484db6a7626646eadfc5333be33d94c122377809c1436
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/connection_pool/connection_pool-1.2.0.ebuild,v 1.2 2014/01/10 07:06:49 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby19 ruby20"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_TEST="rake"
|
||||
RUBY_FAKEGEM_RECIPE_DOC="none"
|
||||
RUBY_FAKEGEM_EXTRADOC="Changes.md README.md"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Generic connection pooling for Ruby"
|
||||
HOMEPAGE="https://github.com/mperham/connection_pool"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
|
||||
|
||||
all_ruby_prepare() {
|
||||
# Fix test
|
||||
sed -i -e "2s/.*/require 'minitest'/" test/helper.rb || die "sed failed"
|
||||
|
||||
sed -i -e '/git ls-files/d' connection_pool.gemspec || die
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
--- src/freedoko.cpp.old 2012-09-24 09:49:20.770335560 +0200
|
||||
+++ src/freedoko.cpp 2012-09-24 09:49:59.696057735 +0200
|
||||
@@ -37,6 +37,7 @@
|
||||
|
||||
#include "constants.h"
|
||||
#include <time.h>
|
||||
+#include <unistd.h>
|
||||
#ifdef WINDOWS
|
||||
// for 'mkdir'
|
||||
#include <io.h>
|
||||
@ -1,61 +0,0 @@
|
||||
--- FreeDoko_0.7.10.orig/src/Makefile
|
||||
+++ FreeDoko_0.7.10/src/Makefile
|
||||
@@ -217,15 +217,7 @@
|
||||
# compile FreeDoko
|
||||
$(PROGRAM) : show_settings objects $(DIRECTORIES)
|
||||
@echo "compiling $(PROGRAM)..."
|
||||
-# Gentoo users do want to see the real compile line.
|
||||
-# So remove the next five lines (the echo lines)
|
||||
-# and remove the '@' in the line after.
|
||||
- @echo '$(CXX) $(CXXFLAGS)'
|
||||
- @echo ' $$(OBJECTS)'
|
||||
- @echo ' $(INCLUDE_ALL)'
|
||||
- @echo ' $(LIBS_ALL)'
|
||||
- @echo ' -o $@'
|
||||
- @$(CXX) $(CXXFLAGS) \
|
||||
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) \
|
||||
$(OBJECTS_ALL:%.o=$(FREEDOKO_WORKING_DIRECTORY)/%.o) \
|
||||
$(INCLUDE_ALL) \
|
||||
$(LIBS_ALL) \
|
||||
--- FreeDoko_0.7.10.orig/src/Makefile.os
|
||||
+++ FreeDoko_0.7.10/src/Makefile.os
|
||||
@@ -1,6 +1,5 @@
|
||||
include $(DEPTH)/../Makefile.os
|
||||
|
||||
-include $(DEPTH)/Makefile.local
|
||||
include $(DEPTH)/Makefile.modules
|
||||
|
||||
ifeq ($(OPERATING_SYSTEM), Linux)
|
||||
--- FreeDoko_0.7.10.orig/src/Makefile.rules
|
||||
+++ FreeDoko_0.7.10/src/Makefile.rules
|
||||
@@ -80,10 +80,7 @@
|
||||
$(DEPTH)/Makefile.modules \
|
||||
$(DEPTH)/Makefile.local \
|
||||
$(DEPTH)/Makefile.os
|
||||
-# Gentoo users do want to see the real compile line.
|
||||
-# So remove the next line and remove the '@' in the line after.
|
||||
- @echo $(CXX) -c $(SUBDIR)/$<
|
||||
- @$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(DEPGEN_FLAGS) -o $@ -c $<
|
||||
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(DEPGEN_FLAGS) -o $@ -c $<
|
||||
|
||||
|
||||
-include $(OBJECTS:%.o=$(TARGET_DIR_LOCAL)%.d)
|
||||
--- FreeDoko_0.7.10.orig/src/ui/help.cpp
|
||||
+++ FreeDoko_0.7.10/src/ui/help.cpp
|
||||
@@ -152,14 +152,14 @@
|
||||
for (list<string>::const_iterator d = datadir.begin();
|
||||
d != datadir.end();
|
||||
d++)
|
||||
- directories.push_back(*d + "/"
|
||||
+ directories.push_back("/"
|
||||
+ ::setting(Setting::MANUAL_DIRECTORY) + "/"
|
||||
+ ::translator.token());
|
||||
if (::translator.token() != ::setting(Setting::LANGUAGE))
|
||||
for (list<string>::const_iterator d = datadir.begin();
|
||||
d != datadir.end();
|
||||
d++)
|
||||
- directories.push_back(*d + "/"
|
||||
+ directories.push_back("/"
|
||||
+ ::setting(Setting::MANUAL_DIRECTORY) + "/"
|
||||
+ ::setting(Setting::LANGUAGE));
|
||||
} // fill the directories list
|
||||
@ -1,102 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.11.ebuild,v 1.4 2013/12/24 12:47:38 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils gnome2-utils games
|
||||
|
||||
DESCRIPTION="FreeDoko is a Doppelkopf-game"
|
||||
HOMEPAGE="http://free-doko.sourceforge.net"
|
||||
SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
|
||||
doc? ( mirror://sourceforge/free-doko/FreeDoko_${PV}.manual.zip )
|
||||
backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> ${PN}-backgrounds.zip )
|
||||
kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip )
|
||||
xskatcards? ( mirror://sourceforge/free-doko/xskat.zip )
|
||||
pysolcards? ( mirror://sourceforge/free-doko/pysol.zip )
|
||||
gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip )
|
||||
openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip )
|
||||
!xskatcards? (
|
||||
!kdecards? (
|
||||
!gnomecards? (
|
||||
!openclipartcards? (
|
||||
!pysolcards? (
|
||||
mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86"
|
||||
IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net doc"
|
||||
|
||||
RDEPEND="net? ( net-libs/gnet dev-libs/glib:2 )
|
||||
>=dev-cpp/gtkmm-2.4:2.4"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip
|
||||
virtual/pkgconfig"
|
||||
|
||||
S=${WORKDIR}/FreeDoko_${PV}
|
||||
|
||||
src_unpack() {
|
||||
local cards=0
|
||||
|
||||
unpack_cards() {
|
||||
use $1 && { unpack $2 ; cards=$(( $cards + 1 )); };
|
||||
}
|
||||
unpack FreeDoko_${PV}.src.zip
|
||||
use doc && unpack FreeDoko_${PV}.manual.zip
|
||||
cp /dev/null "${S}"/src/Makefile.local
|
||||
|
||||
cd "${S}"/data/cardsets
|
||||
|
||||
unpack_cards xskatcards xskat.zip
|
||||
unpack_cards kdecards kdecarddecks.zip
|
||||
unpack_cards pysolcards pysol.zip
|
||||
unpack_cards gnomecards gnome-games.zip
|
||||
unpack_cards openclipartcards openclipart.zip
|
||||
[ $cards ] || unpack xskat.zip # fall back to xskat
|
||||
|
||||
if use backgrounds ; then
|
||||
cd "${S}"/data/backgrounds
|
||||
unpack ${PN}-backgrounds.zip
|
||||
fi
|
||||
}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-gentoo.patch
|
||||
"${FILESDIR}"/${P}-gcc47.patch
|
||||
)
|
||||
|
||||
src_compile() {
|
||||
export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"${GAMES_DATADIR}/${PN}\"'"
|
||||
export CPPFLAGS+=" -DMANUAL_DIRECTORY_VALUE='\"/usr/share/doc/${PF}/html\"'"
|
||||
export OSTYPE=Linux
|
||||
export USE_NETWORK=$(use net && echo true || echo false)
|
||||
export USE_SOUND_ALUT=false # still marked experimental
|
||||
emake Version
|
||||
emake -C src FreeDoko
|
||||
}
|
||||
|
||||
src_install() {
|
||||
newgamesbin src/FreeDoko freedoko
|
||||
insinto "${GAMES_DATADIR}"/${PN}/
|
||||
doins -r data/{ai,cardsets,backgrounds,rules,sounds,translations,*png}
|
||||
find "${D}${GAMES_DATADIR}"/${PN} -name Makefile -delete
|
||||
dodoc AUTHORS README ChangeLog
|
||||
use doc && dohtml -r doc/manual/
|
||||
newicon -s 32 src/FreeDoko.png ${PN}.png
|
||||
make_desktop_entry ${PN} FreeDoko
|
||||
prepgamesdirs
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
games_pkg_preinst
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
games_pkg_postinst
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -0,0 +1,97 @@
|
||||
--- quake2-r0.16.1.orig/Makefile
|
||||
+++ quake2-r0.16.1/Makefile
|
||||
@@ -54,24 +54,26 @@ endif
|
||||
|
||||
|
||||
# this nice line comes from the linux kernel makefile
|
||||
ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
|
||||
|
||||
ifneq ($(ARCH),x86_64)
|
||||
ifneq ($(ARCH),i386)
|
||||
ifneq ($(ARCH),axp)
|
||||
+ifneq ($(ARCH),ia64)
|
||||
ifneq ($(ARCH),ppc)
|
||||
ifneq ($(ARCH),sparc)
|
||||
$(error arch $(ARCH) is currently not supported)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
+endif
|
||||
|
||||
CC=gcc
|
||||
|
||||
ifndef OPT_CFLAGS
|
||||
ifeq ($(ARCH),axp)
|
||||
OPT_CFLAGS=-ffast-math -funroll-loops \
|
||||
-fomit-frame-pointer -fexpensive-optimizations
|
||||
endif
|
||||
@@ -283,16 +285,46 @@ ifeq ($(ARCH),axp)
|
||||
$(warning Warning: SDL support not supported for $(ARCH))
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(BUILD_SDLGL)),YES)
|
||||
$(warning Warning: SDLGL support not supported for $(ARCH))
|
||||
endif
|
||||
endif # ARCH axp
|
||||
|
||||
+ifeq ($(ARCH),ia64)
|
||||
+ ifeq ($(strip $(BUILD_SDLQUAKE2)),YES)
|
||||
+ TARGETS += $(BUILDDIR)/sdlquake2
|
||||
+ endif
|
||||
+
|
||||
+ ifeq ($(strip $(BUILD_SVGA)),YES)
|
||||
+ TARGETS += $(BUILDDIR)/ref_soft.$(SHLIBEXT)
|
||||
+ endif
|
||||
+
|
||||
+ ifeq ($(strip $(BUILD_X11)),YES)
|
||||
+ TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT)
|
||||
+ endif
|
||||
+
|
||||
+ ifeq ($(strip $(BUILD_GLX)),YES)
|
||||
+ TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT)
|
||||
+ endif
|
||||
+
|
||||
+ ifeq ($(strip $(BUILD_FXGL)),YES)
|
||||
+ TARGETS += $(BUILDDIR)/ref_gl.$(SHLIBEXT)
|
||||
+ endif
|
||||
+
|
||||
+ ifeq ($(strip $(BUILD_SDL)),YES)
|
||||
+ TARGETS += $(BUILDDIR)/ref_softsdl.$(SHLIBEXT)
|
||||
+ endif
|
||||
+
|
||||
+ ifeq ($(strip $(BUILD_SDLGL)),YES)
|
||||
+ TARGETS += $(BUILDDIR)/ref_sdlgl.$(SHLIBEXT)
|
||||
+ endif
|
||||
+endif # ARCH ia64
|
||||
+
|
||||
ifeq ($(ARCH),ppc)
|
||||
ifeq ($(strip $(BUILD_SDLQUAKE2)),YES)
|
||||
TARGETS += $(BUILDDIR)/sdlquake2
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(BUILD_SVGA)),YES)
|
||||
$(warning Warning: SVGAlib support not supported for $(ARCH))
|
||||
endif
|
||||
--- quake2-r0.16.1.orig/src/linux/sys_linux.c
|
||||
+++ quake2-r0.16.1/src/linux/sys_linux.c
|
||||
@@ -216,16 +216,18 @@ void *Sys_GetGameAPI (void *parms)
|
||||
char *path;
|
||||
char *str_p;
|
||||
#if defined __i386__
|
||||
const char *gamename = "gamei386.so";
|
||||
#elif defined __x86_64__
|
||||
const char *gamename = "gamex86_64.so";
|
||||
#elif defined __alpha__
|
||||
const char *gamename = "gameaxp.so";
|
||||
+#elif defined __ia64__
|
||||
+ const char *gamename = "gameia64.so";
|
||||
#elif defined __powerpc__
|
||||
const char *gamename = "gameppc.so";
|
||||
#elif defined __sparc__
|
||||
const char *gamename = "gamesparc.so";
|
||||
#else
|
||||
#error Unknown arch
|
||||
#endif
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue