root
8 years ago
parent
4efd8b3fde
commit
2a81eef9fa
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="A minimal console text editor"
|
||||
HOMEPAGE="http://dav-text.sourceforge.net/"
|
||||
|
||||
# The maintainer does not keep sourceforge's mirrors up-to-date,
|
||||
# so we point to the website's store of files.
|
||||
SRC_URI="http://dav-text.sourceforge.net/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
|
||||
RDEPEND="sys-libs/ncurses:0"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-asneeded.patch"
|
||||
"${FILESDIR}/${P}-davrc-buffer-overflow.patch"
|
||||
"${FILESDIR}/fix-Wformat-security-warnings.patch"
|
||||
)
|
||||
|
||||
# Makefile only
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() {
|
||||
emake \
|
||||
CC="$(tc-getCC)" \
|
||||
CFLAGS="${CFLAGS}" \
|
||||
LDFLAGS="${LDFLAGS} $( $(tc-getPKG_CONFIG) --libs ncurses)"
|
||||
}
|
||||
|
||||
DOCS=( README )
|
||||
@ -0,0 +1,39 @@
|
||||
From 8e57c21b3b707c2a81695384688c46faa1d51da8 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Orlitzky <michael@orlitzky.com>
|
||||
Date: Wed, 10 Aug 2016 15:52:30 -0400
|
||||
Subject: [PATCH 1/1] fileIO.c: add format strings to sprintf calls.
|
||||
|
||||
Two calls to sprintf() in fileIO.c were missing the trivial format
|
||||
string "%s". This caused warnings with -Wformat-security, and build
|
||||
failures with -Werror=format-security. Those two calls are now fixed.
|
||||
|
||||
Gentoo-Bug: 521016
|
||||
---
|
||||
fileIO.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/fileIO.c b/fileIO.c
|
||||
index a6c535a..1916a46 100644
|
||||
--- a/fileIO.c
|
||||
+++ b/fileIO.c
|
||||
@@ -92,7 +92,7 @@ char *doSave(char *filename) {
|
||||
n++;
|
||||
choices = realloc(choices, n*sizeof(char *));
|
||||
choices[n-1] = malloc(256);
|
||||
- sprintf(choices[n-1], d->d_name);
|
||||
+ sprintf(choices[n-1], "%s", d->d_name);
|
||||
}
|
||||
closedir(dir);
|
||||
|
||||
@@ -178,7 +178,7 @@ void load(char *filename)
|
||||
n++;
|
||||
choices = realloc(choices, n*sizeof(char *));
|
||||
choices[n-1] = malloc(256);
|
||||
- sprintf(choices[n-1], d->d_name);
|
||||
+ sprintf(choices[n-1], "%s", d->d_name);
|
||||
}
|
||||
closedir(dir);
|
||||
|
||||
--
|
||||
2.7.3
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 1ede664b18bd8a88359a3cebb291ad49833ee033 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
Date: Tue, 7 Aug 2012 01:29:01 -0400
|
||||
Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa
|
||||
|
||||
If mesa had been built with shared glapi, glAccum is not available in
|
||||
libOSMesa without explicitly linking to libGL. In addition, in
|
||||
mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to
|
||||
libglapi if mesa was built with shared glapi, see
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=399813
|
||||
And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and
|
||||
libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832
|
||||
---
|
||||
configure.ac | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index cc32c24..275b792 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1128,7 +1128,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
|
||||
|
||||
if test "x$with_osmesa" != "xno"
|
||||
then
|
||||
- WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
||||
+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
||||
+ if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
|
||||
+ osmesa_save_CC=$CC
|
||||
+ CC=$CXX
|
||||
+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
||||
+ CC=$osmesa_save_CC
|
||||
+ fi
|
||||
WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
|
||||
[libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
|
||||
fi
|
||||
--
|
||||
1.8.0
|
||||
|
||||
@ -1,351 +0,0 @@
|
||||
From 67f9b6e3c5d2397446d39ab454f691c1ee46d2c0 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Julliard <julliard@winehq.org>
|
||||
Date: Sat, 30 Nov 2013 11:22:25 +0100
|
||||
Subject: [PATCH] configure: Update FreeType configure checks for the changed
|
||||
headers location.
|
||||
|
||||
---
|
||||
configure | 78 +++++++++++++++------------------------------------
|
||||
configure.ac | 40 +++++++-------------------
|
||||
dlls/gdi32/freetype.c | 62 ++++++++++++++--------------------------
|
||||
include/config.h.in | 33 ----------------------
|
||||
4 files changed, 54 insertions(+), 159 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 80348f3..9b2f2c2 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -11419,7 +11419,21 @@ test "$cross_compiling" = yes || FREETYPE_LIBS=${FREETYPE_LIBS:-`(freetype-confi
|
||||
FREETYPE_LIBS=${FREETYPE_LIBS:-"-lfreetype"}
|
||||
ac_save_CPPFLAGS=$CPPFLAGS
|
||||
CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfreetype" >&5
|
||||
+for ac_header in ft2build.h
|
||||
+do :
|
||||
+ ac_fn_c_check_header_mongrel "$LINENO" "ft2build.h" "ac_cv_header_ft2build_h" "$ac_includes_default"
|
||||
+if test "x$ac_cv_header_ft2build_h" = xyes; then :
|
||||
+ cat >>confdefs.h <<_ACEOF
|
||||
+#define HAVE_FT2BUILD_H 1
|
||||
+_ACEOF
|
||||
+
|
||||
+fi
|
||||
+
|
||||
+done
|
||||
+
|
||||
+ if test "$ac_cv_header_ft2build_h" = "yes"
|
||||
+ then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfreetype" >&5
|
||||
$as_echo_n "checking for -lfreetype... " >&6; }
|
||||
if ${ac_cv_lib_soname_freetype+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
@@ -11461,7 +11475,7 @@ fi
|
||||
if test "x$ac_cv_lib_soname_freetype" = "x"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
|
||||
$as_echo "not found" >&6; }
|
||||
- ft_lib=no
|
||||
+ FREETYPE_LIBS=""
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_freetype" >&5
|
||||
$as_echo "$ac_cv_lib_soname_freetype" >&6; }
|
||||
@@ -11470,51 +11484,11 @@ cat >>confdefs.h <<_ACEOF
|
||||
#define SONAME_LIBFREETYPE "$ac_cv_lib_soname_freetype"
|
||||
_ACEOF
|
||||
|
||||
- ft_lib=yes
|
||||
-fi
|
||||
- if test "$ft_lib" = "yes"
|
||||
- then
|
||||
- for ac_header in ft2build.h \
|
||||
- freetype/freetype.h \
|
||||
- freetype/ftglyph.h \
|
||||
- freetype/fttypes.h \
|
||||
- freetype/tttables.h \
|
||||
- freetype/ftsnames.h \
|
||||
- freetype/ttnameid.h \
|
||||
- freetype/ftoutln.h \
|
||||
- freetype/ftwinfnt.h \
|
||||
- freetype/ftmodapi.h \
|
||||
- freetype/ftlcdfil.h
|
||||
-do :
|
||||
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_FT2BUILD_H
|
||||
-# include <ft2build.h>
|
||||
-#endif
|
||||
-"
|
||||
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
||||
- cat >>confdefs.h <<_ACEOF
|
||||
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||
-_ACEOF
|
||||
-
|
||||
-fi
|
||||
-
|
||||
-done
|
||||
-
|
||||
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
-/* end confdefs.h. */
|
||||
-#include <ft2build.h>
|
||||
-#include <freetype/fttrigon.h>
|
||||
-_ACEOF
|
||||
-if ac_fn_c_try_cpp "$LINENO"; then :
|
||||
|
||||
-$as_echo "#define HAVE_FREETYPE_FTTRIGON_H 1" >>confdefs.h
|
||||
+$as_echo "#define HAVE_FREETYPE 1" >>confdefs.h
|
||||
|
||||
- wine_cv_fttrigon=yes
|
||||
-else
|
||||
- wine_cv_fttrigon=no
|
||||
-fi
|
||||
-rm -f conftest.err conftest.i conftest.$ac_ext
|
||||
- ac_fn_c_check_type "$LINENO" "FT_TrueTypeEngineType" "ac_cv_type_FT_TrueTypeEngineType" "#include <freetype/ftmodapi.h>
|
||||
+ ac_fn_c_check_type "$LINENO" "FT_TrueTypeEngineType" "ac_cv_type_FT_TrueTypeEngineType" "#include <ft2build.h>
|
||||
+#include FT_MODULE_H
|
||||
"
|
||||
if test "x$ac_cv_type_FT_TrueTypeEngineType" = xyes; then :
|
||||
|
||||
@@ -11525,15 +11499,9 @@ _ACEOF
|
||||
|
||||
fi
|
||||
|
||||
- if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
|
||||
- then
|
||||
-
|
||||
-$as_echo "#define HAVE_FREETYPE 1" >>confdefs.h
|
||||
-
|
||||
- else
|
||||
- FREETYPE_LIBS=""
|
||||
- fi
|
||||
+fi
|
||||
else
|
||||
+ FREETYPE_CFLAGS=""
|
||||
FREETYPE_LIBS=""
|
||||
fi
|
||||
CPPFLAGS=$ac_save_CPPFLAGS
|
||||
@@ -11541,14 +11509,14 @@ test -z "$FREETYPE_CFLAGS" || FREETYPE_CFLAGS=`echo " $FREETYPE_CFLAGS" | sed 's
|
||||
test -z "$FREETYPE_LIBS" || FREETYPE_LIBS=`echo " $FREETYPE_LIBS" | sed 's/ -L\([^/]\)/ -L\$(top_builddir)\/\1/g'`
|
||||
|
||||
fi
|
||||
-if test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes; then :
|
||||
+if test "x$ac_cv_lib_soname_freetype" = x; then :
|
||||
case "x$with_freetype" in
|
||||
xno) ;;
|
||||
*) as_fn_error $? "FreeType ${notice_platform}development files not found. Fonts will not be built.
|
||||
Use the --without-freetype option if you really want this." "$LINENO" 5 ;;
|
||||
esac
|
||||
fi
|
||||
-test "x$ac_cv_header_freetype_freetype_h" = xyes -a "x$wine_cv_fttrigon" = xyes || enable_fonts=${enable_fonts:-no}
|
||||
+test "x$ac_cv_lib_soname_freetype" = x && enable_fonts=${enable_fonts:-no}
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for parport header/ppdev.h" >&5
|
||||
$as_echo_n "checking for parport header/ppdev.h... " >&6; }
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 81b7027..c4021b4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1463,42 +1463,22 @@ then
|
||||
WINE_PACKAGE_FLAGS(FREETYPE,[freetype2],[-lfreetype],
|
||||
[`(freetype-config --cflags || freetype2-config --cflags) 2>/dev/null`],
|
||||
[`(freetype-config --libs || freetype2-config --libs) 2>/dev/null`],
|
||||
- [WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$FREETYPE_LIBS])
|
||||
- if test "$ft_lib" = "yes"
|
||||
+ [AC_CHECK_HEADERS([ft2build.h])
|
||||
+ if test "$ac_cv_header_ft2build_h" = "yes"
|
||||
then
|
||||
- AC_CHECK_HEADERS(ft2build.h \
|
||||
- freetype/freetype.h \
|
||||
- freetype/ftglyph.h \
|
||||
- freetype/fttypes.h \
|
||||
- freetype/tttables.h \
|
||||
- freetype/ftsnames.h \
|
||||
- freetype/ttnameid.h \
|
||||
- freetype/ftoutln.h \
|
||||
- freetype/ftwinfnt.h \
|
||||
- freetype/ftmodapi.h \
|
||||
- freetype/ftlcdfil.h,,,
|
||||
- [#ifdef HAVE_FT2BUILD_H
|
||||
-# include <ft2build.h>
|
||||
-#endif])
|
||||
- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <ft2build.h>
|
||||
-#include <freetype/fttrigon.h>]])],[AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1,
|
||||
- [Define if you have the <freetype/fttrigon.h> header file.])
|
||||
- wine_cv_fttrigon=yes],[wine_cv_fttrigon=no])
|
||||
- AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>])
|
||||
- dnl Check that we have at least freetype/freetype.h
|
||||
- if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
|
||||
- then
|
||||
- AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
|
||||
- else
|
||||
- FREETYPE_LIBS=""
|
||||
- fi
|
||||
+ WINE_CHECK_SONAME(freetype,FT_Init_FreeType,
|
||||
+ [AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
|
||||
+ AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <ft2build.h>
|
||||
+#include FT_MODULE_H])],
|
||||
+ [FREETYPE_LIBS=""],[$FREETYPE_LIBS])
|
||||
else
|
||||
+ FREETYPE_CFLAGS=""
|
||||
FREETYPE_LIBS=""
|
||||
fi])
|
||||
fi
|
||||
-WINE_ERROR_WITH(freetype,[test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes],
|
||||
+WINE_ERROR_WITH(freetype,[test "x$ac_cv_lib_soname_freetype" = x],
|
||||
[FreeType ${notice_platform}development files not found. Fonts will not be built.])
|
||||
-test "x$ac_cv_header_freetype_freetype_h" = xyes -a "x$wine_cv_fttrigon" = xyes || enable_fonts=${enable_fonts:-no}
|
||||
+test "x$ac_cv_lib_soname_freetype" = x && enable_fonts=${enable_fonts:-no}
|
||||
|
||||
dnl **** Check for parport (currently Linux only) ****
|
||||
AC_CACHE_CHECK([for parport header/ppdev.h], ac_cv_c_ppdev,
|
||||
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
|
||||
index fb4f2af..e230299 100644
|
||||
--- a/dlls/gdi32/freetype.c
|
||||
+++ b/dlls/gdi32/freetype.c
|
||||
@@ -77,6 +77,23 @@
|
||||
#undef SetRectRgn
|
||||
#endif /* HAVE_CARBON_CARBON_H */
|
||||
|
||||
+#ifdef HAVE_FT2BUILD_H
|
||||
+#include <ft2build.h>
|
||||
+#include FT_FREETYPE_H
|
||||
+#include FT_GLYPH_H
|
||||
+#include FT_TYPES_H
|
||||
+#include FT_TRUETYPE_TABLES_H
|
||||
+#include FT_SFNT_NAMES_H
|
||||
+#include FT_TRUETYPE_IDS_H
|
||||
+#include FT_OUTLINE_H
|
||||
+#include FT_TRIGONOMETRY_H
|
||||
+#include FT_MODULE_H
|
||||
+#include FT_WINFONTS_H
|
||||
+#ifdef FT_LCD_FILTER_H
|
||||
+#include FT_LCD_FILTER_H
|
||||
+#endif
|
||||
+#endif /* HAVE_FT2BUILD_H */
|
||||
+
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "winternl.h"
|
||||
@@ -95,43 +112,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
|
||||
|
||||
#ifdef HAVE_FREETYPE
|
||||
|
||||
-#ifdef HAVE_FT2BUILD_H
|
||||
-#include <ft2build.h>
|
||||
-#endif
|
||||
-#ifdef HAVE_FREETYPE_FREETYPE_H
|
||||
-#include <freetype/freetype.h>
|
||||
-#endif
|
||||
-#ifdef HAVE_FREETYPE_FTGLYPH_H
|
||||
-#include <freetype/ftglyph.h>
|
||||
-#endif
|
||||
-#ifdef HAVE_FREETYPE_TTTABLES_H
|
||||
-#include <freetype/tttables.h>
|
||||
-#endif
|
||||
-#ifdef HAVE_FREETYPE_FTTYPES_H
|
||||
-#include <freetype/fttypes.h>
|
||||
-#endif
|
||||
-#ifdef HAVE_FREETYPE_FTSNAMES_H
|
||||
-#include <freetype/ftsnames.h>
|
||||
-#endif
|
||||
-#ifdef HAVE_FREETYPE_TTNAMEID_H
|
||||
-#include <freetype/ttnameid.h>
|
||||
-#endif
|
||||
-#ifdef HAVE_FREETYPE_FTOUTLN_H
|
||||
-#include <freetype/ftoutln.h>
|
||||
-#endif
|
||||
-#ifdef HAVE_FREETYPE_FTTRIGON_H
|
||||
-#include <freetype/fttrigon.h>
|
||||
-#endif
|
||||
-#ifdef HAVE_FREETYPE_FTWINFNT_H
|
||||
-#include <freetype/ftwinfnt.h>
|
||||
-#endif
|
||||
-#ifdef HAVE_FREETYPE_FTMODAPI_H
|
||||
-#include <freetype/ftmodapi.h>
|
||||
-#endif
|
||||
-#ifdef HAVE_FREETYPE_FTLCDFIL_H
|
||||
-#include <freetype/ftlcdfil.h>
|
||||
-#endif
|
||||
-
|
||||
#ifndef HAVE_FT_TRUETYPEENGINETYPE
|
||||
typedef enum
|
||||
{
|
||||
@@ -186,7 +166,7 @@ MAKE_FUNCPTR(FT_Vector_Transform);
|
||||
MAKE_FUNCPTR(FT_Vector_Unit);
|
||||
static FT_Error (*pFT_Outline_Embolden)(FT_Outline *, FT_Pos);
|
||||
static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library);
|
||||
-#ifdef HAVE_FREETYPE_FTLCDFIL_H
|
||||
+#ifdef FT_LCD_FILTER_H
|
||||
static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter);
|
||||
#endif
|
||||
|
||||
@@ -924,7 +904,7 @@ static BOOL is_hinting_enabled(void)
|
||||
|
||||
static BOOL is_subpixel_rendering_enabled( void )
|
||||
{
|
||||
-#ifdef HAVE_FREETYPE_FTLCDFIL_H
|
||||
+#ifdef FT_LCD_FILTER_H
|
||||
static int enabled = -1;
|
||||
if (enabled == -1)
|
||||
{
|
||||
@@ -3918,7 +3898,7 @@ static BOOL init_freetype(void)
|
||||
/* Don't warn if these ones are missing */
|
||||
pFT_Outline_Embolden = wine_dlsym(ft_handle, "FT_Outline_Embolden", NULL, 0);
|
||||
pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0);
|
||||
-#ifdef HAVE_FREETYPE_FTLCDFIL_H
|
||||
+#ifdef FT_LCD_FILTER_H
|
||||
pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0);
|
||||
#endif
|
||||
|
||||
@@ -6706,7 +6686,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
|
||||
case WINE_GGO_HBGR_BITMAP:
|
||||
case WINE_GGO_VRGB_BITMAP:
|
||||
case WINE_GGO_VBGR_BITMAP:
|
||||
-#ifdef HAVE_FREETYPE_FTLCDFIL_H
|
||||
+#ifdef FT_LCD_FILTER_H
|
||||
{
|
||||
switch (ft_face->glyph->format)
|
||||
{
|
||||
diff --git a/include/config.h.in b/include/config.h.in
|
||||
index a14db5b..79f8b45 100644
|
||||
--- a/include/config.h.in
|
||||
+++ b/include/config.h.in
|
||||
@@ -132,39 +132,6 @@
|
||||
/* Define if FreeType 2 is installed */
|
||||
#undef HAVE_FREETYPE
|
||||
|
||||
-/* Define to 1 if you have the <freetype/freetype.h> header file. */
|
||||
-#undef HAVE_FREETYPE_FREETYPE_H
|
||||
-
|
||||
-/* Define to 1 if you have the <freetype/ftglyph.h> header file. */
|
||||
-#undef HAVE_FREETYPE_FTGLYPH_H
|
||||
-
|
||||
-/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */
|
||||
-#undef HAVE_FREETYPE_FTLCDFIL_H
|
||||
-
|
||||
-/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */
|
||||
-#undef HAVE_FREETYPE_FTMODAPI_H
|
||||
-
|
||||
-/* Define to 1 if you have the <freetype/ftoutln.h> header file. */
|
||||
-#undef HAVE_FREETYPE_FTOUTLN_H
|
||||
-
|
||||
-/* Define to 1 if you have the <freetype/ftsnames.h> header file. */
|
||||
-#undef HAVE_FREETYPE_FTSNAMES_H
|
||||
-
|
||||
-/* Define if you have the <freetype/fttrigon.h> header file. */
|
||||
-#undef HAVE_FREETYPE_FTTRIGON_H
|
||||
-
|
||||
-/* Define to 1 if you have the <freetype/fttypes.h> header file. */
|
||||
-#undef HAVE_FREETYPE_FTTYPES_H
|
||||
-
|
||||
-/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */
|
||||
-#undef HAVE_FREETYPE_FTWINFNT_H
|
||||
-
|
||||
-/* Define to 1 if you have the <freetype/ttnameid.h> header file. */
|
||||
-#undef HAVE_FREETYPE_TTNAMEID_H
|
||||
-
|
||||
-/* Define to 1 if you have the <freetype/tttables.h> header file. */
|
||||
-#undef HAVE_FREETYPE_TTTABLES_H
|
||||
-
|
||||
/* Define to 1 if the system has the type `fsblkcnt_t'. */
|
||||
#undef HAVE_FSBLKCNT_T
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 5c163b8..b600cf7 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -52,7 +52,8 @@ __tooldeps__: libs/port libs/wine libs/wpp
|
||||
__builddeps__: __tooldeps__ include
|
||||
.PHONY: depend check test testclean crosstest __tooldeps__ __builddeps__
|
||||
|
||||
-loader server: libs/port libs/wine tools
|
||||
+loader: libs/port libs/wine tools
|
||||
+server: libs/port libs/wine tools include
|
||||
fonts: tools/sfnt2fon
|
||||
include: tools tools/widl
|
||||
libs/wine tools: libs/port
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From b7eb1ff48dd1210aa3e1002afc503d5df75d50b9 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
Date: Tue, 7 Aug 2012 01:29:01 -0400
|
||||
Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa
|
||||
|
||||
If mesa had been built with shared glapi, glAccum is not available in
|
||||
libOSMesa without explicitly linking to libGL. In addition, in
|
||||
mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to
|
||||
libglapi if mesa was built with shared glapi, see
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=399813
|
||||
And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and
|
||||
libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832
|
||||
---
|
||||
configure.ac | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 66b4dd6..0303d87 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1213,7 +1213,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
|
||||
|
||||
if test "x$with_osmesa" != "xno"
|
||||
then
|
||||
- WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
||||
+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
||||
+ if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
|
||||
+ osmesa_save_CC=$CC
|
||||
+ CC=$CXX
|
||||
+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
||||
+ CC=$osmesa_save_CC
|
||||
+ fi
|
||||
WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
|
||||
[libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
|
||||
fi
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From 695c19cdd2fc24aaa7ed89976c4965b376707131 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Wed, 25 Feb 2015 22:45:42 +0100
|
||||
Subject: ntdll: Fix race-condition when threads are killed during shutdown.
|
||||
|
||||
When exit_thread is executed, nb_threads is decremented before the thread is
|
||||
fully shutdown. When another thread runs ExitProcess() this will cause a SIGQUIT
|
||||
signal to all threads, effectively decrementing nb_threads twice. The process
|
||||
will terminate with a wrong exitcode then because the refcount reaches zero too
|
||||
early.
|
||||
|
||||
Currently Wine has no locking protection of LdrShutdownProcess(), so it can
|
||||
only be executed safely when all other threads have terminated before. Most
|
||||
likely there are more Wine bugs in this area, but the attached patch should
|
||||
fix the most critical one (messed up refcounting of threads) for now.
|
||||
|
||||
[Alexandre Rostovtsev <tetromino@gentoo.org> : rebase to be applied after
|
||||
Maarten Lankhorst's "override pthreads to fix gstreamer v5" patch.]
|
||||
---
|
||||
dlls/ntdll/thread.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|
||||
index 4f181dc..1bdbcbf 100755
|
||||
--- a/dlls/ntdll/thread.c
|
||||
+++ b/dlls/ntdll/thread.c
|
||||
@@ -461,6 +461,7 @@ static void exit_thread_common( int status )
|
||||
static void *prev_teb;
|
||||
TEB *teb;
|
||||
#endif
|
||||
+ sigset_t sigset;
|
||||
|
||||
if (status) /* send the exit code to the server (0 is already the default) */
|
||||
{
|
||||
@@ -473,7 +474,7 @@ static void exit_thread_common( int status )
|
||||
SERVER_END_REQ;
|
||||
}
|
||||
|
||||
- if (interlocked_xchg_add( &nb_threads, -1 ) <= 1)
|
||||
+ if (interlocked_xchg_add( &nb_threads, 0 ) <= 1)
|
||||
{
|
||||
LdrShutdownProcess();
|
||||
exit( status );
|
||||
@@ -499,6 +500,11 @@ static void exit_thread_common( int status )
|
||||
reap_thread(NtCurrentTeb());
|
||||
#endif
|
||||
|
||||
+ sigemptyset( &sigset );
|
||||
+ sigaddset( &sigset, SIGQUIT );
|
||||
+ pthread_sigmask( SIG_BLOCK, &sigset, NULL );
|
||||
+ if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
|
||||
+
|
||||
close( ntdll_get_thread_data()->wait_fd[0] );
|
||||
close( ntdll_get_thread_data()->wait_fd[1] );
|
||||
close( ntdll_get_thread_data()->reply_fd );
|
||||
--
|
||||
2.3.1
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
From 0d92921d264d5d0d1041c66353f022f1bc88577f Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
Date: Sun, 8 Mar 2015 00:10:31 -0500
|
||||
Subject: [PATCH] Revert "ntdll: Fix race-condition when threads are killed
|
||||
during shutdown."
|
||||
|
||||
This reverts Sebastian Lackner's Wine-Staging patch to allow Maarten
|
||||
Lankhorst's "override pthreads to fix gstreamer v5" to apply
|
||||
---
|
||||
dlls/ntdll/thread.c | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|
||||
index 74e64c9..3696c8e 100644
|
||||
--- a/dlls/ntdll/thread.c
|
||||
+++ b/dlls/ntdll/thread.c
|
||||
@@ -370,7 +370,6 @@ void terminate_thread( int status )
|
||||
void exit_thread( int status )
|
||||
{
|
||||
static void *prev_teb;
|
||||
- sigset_t sigset;
|
||||
TEB *teb;
|
||||
|
||||
if (status) /* send the exit code to the server (0 is already the default) */
|
||||
@@ -384,7 +383,7 @@ void exit_thread( int status )
|
||||
SERVER_END_REQ;
|
||||
}
|
||||
|
||||
- if (interlocked_xchg_add( &nb_threads, 0 ) <= 1)
|
||||
+ if (interlocked_xchg_add( &nb_threads, -1 ) <= 1)
|
||||
{
|
||||
LdrShutdownProcess();
|
||||
exit( status );
|
||||
@@ -406,11 +405,6 @@ void exit_thread( int status )
|
||||
}
|
||||
}
|
||||
|
||||
- sigemptyset( &sigset );
|
||||
- sigaddset( &sigset, SIGQUIT );
|
||||
- pthread_sigmask( SIG_BLOCK, &sigset, NULL );
|
||||
- if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
|
||||
-
|
||||
close( ntdll_get_thread_data()->wait_fd[0] );
|
||||
close( ntdll_get_thread_data()->wait_fd[1] );
|
||||
close( ntdll_get_thread_data()->reply_fd );
|
||||
--
|
||||
2.3.1
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From b97783fd33b4d9897c149d7a14747aa4969bd9e9 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 19 Mar 2015 07:56:04 +0100
|
||||
Subject: Reapply various changes conflicting with Maarten Lankhorst's
|
||||
gstreamer hack v5.
|
||||
|
||||
---
|
||||
dlls/ntdll/thread.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|
||||
index 1e7f231..cf0461d 100644
|
||||
--- a/dlls/ntdll/thread.c
|
||||
+++ b/dlls/ntdll/thread.c
|
||||
@@ -461,6 +461,8 @@ static void exit_thread_common( int status )
|
||||
static void *prev_teb;
|
||||
TEB *teb;
|
||||
#endif
|
||||
+ shmlocal_t *shmlocal;
|
||||
+ sigset_t sigset;
|
||||
|
||||
if (status) /* send the exit code to the server (0 is already the default) */
|
||||
{
|
||||
@@ -502,6 +504,11 @@ static void exit_thread_common( int status )
|
||||
reap_thread(NtCurrentTeb());
|
||||
#endif
|
||||
|
||||
+ sigemptyset( &sigset );
|
||||
+ sigaddset( &sigset, SIGQUIT );
|
||||
+ pthread_sigmask( SIG_BLOCK, &sigset, NULL );
|
||||
+ if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
|
||||
+
|
||||
close( ntdll_get_thread_data()->wait_fd[0] );
|
||||
close( ntdll_get_thread_data()->wait_fd[1] );
|
||||
close( ntdll_get_thread_data()->reply_fd );
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From 1527fb44c331f2c61224514beb758895a5f85c8d Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 19 Mar 2015 07:51:48 +0100
|
||||
Subject: Revert various changes conflicting with Maarten Lankhorst's gstreamer
|
||||
hack v5.
|
||||
|
||||
Note: These changes have to be reapplied with the corresponding -post patchset
|
||||
afterwards.
|
||||
---
|
||||
dlls/ntdll/thread.c | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|
||||
index 30a4720..843be0f 100644
|
||||
--- a/dlls/ntdll/thread.c
|
||||
+++ b/dlls/ntdll/thread.c
|
||||
@@ -385,8 +385,6 @@ void terminate_thread( int status )
|
||||
void exit_thread( int status )
|
||||
{
|
||||
static void *prev_teb;
|
||||
- shmlocal_t *shmlocal;
|
||||
- sigset_t sigset;
|
||||
TEB *teb;
|
||||
|
||||
if (status) /* send the exit code to the server (0 is already the default) */
|
||||
@@ -425,11 +423,6 @@ void exit_thread( int status )
|
||||
}
|
||||
}
|
||||
|
||||
- sigemptyset( &sigset );
|
||||
- sigaddset( &sigset, SIGQUIT );
|
||||
- pthread_sigmask( SIG_BLOCK, &sigset, NULL );
|
||||
- if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
|
||||
-
|
||||
close( ntdll_get_thread_data()->wait_fd[0] );
|
||||
close( ntdll_get_thread_data()->wait_fd[1] );
|
||||
close( ntdll_get_thread_data()->reply_fd );
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
From 36a9f9dd05c3b9df77c44c91663e9bd6cae1c848 Mon Sep 17 00:00:00 2001
|
||||
From: Ken Thomases <ken@codeweavers.com>
|
||||
Date: Mon, 15 Jun 2015 20:42:33 -0500
|
||||
Subject: [PATCH 1/1] configure: Only check for libunwind.h on OS X.
|
||||
|
||||
---
|
||||
configure | 13 ++++++++++++-
|
||||
configure.ac | 2 +-
|
||||
2 files changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index a104097..c0951db 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -6626,7 +6626,6 @@ for ac_header in \
|
||||
lber.h \
|
||||
ldap.h \
|
||||
libproc.h \
|
||||
- libunwind.h \
|
||||
link.h \
|
||||
linux/cdrom.h \
|
||||
linux/compiler.h \
|
||||
@@ -7849,6 +7848,18 @@ uninstall::
|
||||
;;
|
||||
|
||||
darwin*|macosx*)
|
||||
+ for ac_header in libunwind.h
|
||||
+do :
|
||||
+ ac_fn_c_check_header_mongrel "$LINENO" "libunwind.h" "ac_cv_header_libunwind_h" "$ac_includes_default"
|
||||
+if test "x$ac_cv_header_libunwind_h" = xyes; then :
|
||||
+ cat >>confdefs.h <<_ACEOF
|
||||
+#define HAVE_LIBUNWIND_H 1
|
||||
+_ACEOF
|
||||
+
|
||||
+fi
|
||||
+
|
||||
+done
|
||||
+
|
||||
LIBEXT="dylib"
|
||||
DLLFLAGS="$DLLFLAGS -fPIC"
|
||||
LIBWINE_LDFLAGS="-multiply_defined suppress"
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index df28b27..f9df3f0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -424,7 +424,6 @@ AC_CHECK_HEADERS(\
|
||||
lber.h \
|
||||
ldap.h \
|
||||
libproc.h \
|
||||
- libunwind.h \
|
||||
link.h \
|
||||
linux/cdrom.h \
|
||||
linux/compiler.h \
|
||||
@@ -751,6 +750,7 @@ uninstall::
|
||||
;;
|
||||
|
||||
darwin*|macosx*)
|
||||
+ AC_CHECK_HEADERS(libunwind.h)
|
||||
LIBEXT="dylib"
|
||||
DLLFLAGS="$DLLFLAGS -fPIC"
|
||||
LIBWINE_LDFLAGS="-multiply_defined suppress"
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
From: Erich E. Hoover <erich.e.hoover@wine-staging.com>
|
||||
Date: Fri, 10 Jul 2015 20:52:33 +0000 (-0600)
|
||||
Subject: ntdll: Only set the security cookie if it has not already been set.
|
||||
X-Git-Url: http://source.winehq.org/git/wine.git/commitdiff_plain/e9d7cf99ada80ea8345c301481c63a24780f2b63
|
||||
|
||||
ntdll: Only set the security cookie if it has not already been set.
|
||||
---
|
||||
|
||||
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
|
||||
index 410e060..ff947da 100644
|
||||
--- a/dlls/ntdll/virtual.c
|
||||
+++ b/dlls/ntdll/virtual.c
|
||||
@@ -61,6 +61,12 @@ WINE_DECLARE_DEBUG_CHANNEL(module);
|
||||
#define MAP_NORESERVE 0
|
||||
#endif
|
||||
|
||||
+#ifdef _WIN64
|
||||
+#define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
|
||||
+#endif
|
||||
+#define DEFAULT_SECURITY_COOKIE_32 0xbb40e64e
|
||||
+#define DEFAULT_SECURITY_COOKIE_16 (DEFAULT_SECURITY_COOKIE_32 >> 16)
|
||||
+
|
||||
/* File view */
|
||||
struct file_view
|
||||
{
|
||||
@@ -1053,6 +1059,36 @@ static NTSTATUS stat_mapping_file( struct file_view *view, struct stat *st )
|
||||
return status;
|
||||
}
|
||||
|
||||
+/***********************************************************************
|
||||
+ * set_security_cookie
|
||||
+ *
|
||||
+ * Create a random security cookie for buffer overflow protection. Make
|
||||
+ * sure it does not accidentally match the default cookie value.
|
||||
+ */
|
||||
+static void set_security_cookie(ULONG_PTR *cookie)
|
||||
+{
|
||||
+ static ULONG seed;
|
||||
+
|
||||
+ if (!cookie) return;
|
||||
+ if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId();
|
||||
+ while (1)
|
||||
+ {
|
||||
+ if (*cookie == DEFAULT_SECURITY_COOKIE_16)
|
||||
+ *cookie = RtlRandom( &seed ) >> 16; /* leave the high word clear */
|
||||
+ else if (*cookie == DEFAULT_SECURITY_COOKIE_32)
|
||||
+ *cookie = RtlRandom( &seed );
|
||||
+#ifdef DEFAULT_SECURITY_COOKIE_64
|
||||
+ else if (*cookie == DEFAULT_SECURITY_COOKIE_64)
|
||||
+ {
|
||||
+ *cookie = RtlRandom( &seed );
|
||||
+ /* fill up, but keep the highest word clear */
|
||||
+ *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16;
|
||||
+ }
|
||||
+#endif
|
||||
+ else
|
||||
+ break;
|
||||
+ }
|
||||
+}
|
||||
|
||||
/***********************************************************************
|
||||
* map_image
|
||||
@@ -1285,18 +1321,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
|
||||
loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE,
|
||||
IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size );
|
||||
if (loadcfg && loadcfg_size >= sizeof(*loadcfg))
|
||||
- {
|
||||
- static ULONG seed;
|
||||
- ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie;
|
||||
-
|
||||
- if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId();
|
||||
- if (cookie)
|
||||
- {
|
||||
- *cookie = RtlRandom( &seed );
|
||||
- if (sizeof(ULONG_PTR) > sizeof(ULONG)) /* fill up, but keep the highest word clear */
|
||||
- *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16;
|
||||
- }
|
||||
- }
|
||||
+ set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie);
|
||||
|
||||
/* set the image protections */
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
From 2f0514345d325ecd20a88e3b0cb896ca9d23deae Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 19 Mar 2015 07:56:04 +0100
|
||||
Subject: Reapply various changes conflicting with Maarten Lankhorst's
|
||||
gstreamer hack v5.
|
||||
|
||||
---
|
||||
dlls/ntdll/ntdll_misc.h | 1 +
|
||||
dlls/ntdll/thread.c | 7 +++++++
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
|
||||
index e1be304..d5bc678 100644
|
||||
--- a/dlls/ntdll/ntdll_misc.h
|
||||
+++ b/dlls/ntdll/ntdll_misc.h
|
||||
@@ -244,6 +244,7 @@ struct ntdll_thread_data
|
||||
WINE_VM86_TEB_INFO vm86; /* 1fc vm86 private data */
|
||||
void *exit_frame; /* 204 exit frame pointer */
|
||||
#endif
|
||||
+ void *pthread_stack; /* 208/318 pthread stack */
|
||||
struct list entry;
|
||||
BOOL detached;
|
||||
};
|
||||
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|
||||
index 2011c1e2..9f824eb 100644
|
||||
--- a/dlls/ntdll/thread.c
|
||||
+++ b/dlls/ntdll/thread.c
|
||||
@@ -467,6 +467,8 @@ static void exit_thread_common( int status )
|
||||
static void *prev_teb;
|
||||
TEB *teb;
|
||||
#endif
|
||||
+ shmlocal_t *shmlocal;
|
||||
+ sigset_t sigset;
|
||||
|
||||
if (status) /* send the exit code to the server (0 is already the default) */
|
||||
{
|
||||
@@ -508,6 +510,11 @@ static void exit_thread_common( int status )
|
||||
reap_thread(NtCurrentTeb());
|
||||
#endif
|
||||
|
||||
+ sigemptyset( &sigset );
|
||||
+ sigaddset( &sigset, SIGQUIT );
|
||||
+ pthread_sigmask( SIG_BLOCK, &sigset, NULL );
|
||||
+ if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
|
||||
+
|
||||
close( ntdll_get_thread_data()->wait_fd[0] );
|
||||
close( ntdll_get_thread_data()->wait_fd[1] );
|
||||
close( ntdll_get_thread_data()->reply_fd );
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
From c96187cdbddd742728557062b85d05ac320c3e8f Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 19 Mar 2015 07:51:48 +0100
|
||||
Subject: Revert various changes conflicting with Maarten Lankhorst's gstreamer
|
||||
hack v5.
|
||||
|
||||
Note: These changes have to be reapplied with the corresponding -post patchset
|
||||
afterwards.
|
||||
---
|
||||
dlls/ntdll/ntdll_misc.h | 1 -
|
||||
dlls/ntdll/thread.c | 7 -------
|
||||
2 files changed, 8 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
|
||||
index e7facf3..88531df 100644
|
||||
--- a/dlls/ntdll/ntdll_misc.h
|
||||
+++ b/dlls/ntdll/ntdll_misc.h
|
||||
@@ -243,7 +243,6 @@ struct ntdll_thread_data
|
||||
WINE_VM86_TEB_INFO vm86; /* 1fc vm86 private data */
|
||||
void *exit_frame; /* 204 exit frame pointer */
|
||||
#endif
|
||||
- void *pthread_stack; /* 208/318 pthread stack */
|
||||
};
|
||||
|
||||
C_ASSERT( FIELD_OFFSET(TEB, SpareBytes1) + sizeof(struct ntdll_thread_data) <=
|
||||
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|
||||
index 6ad4b95..3ad51a2 100644
|
||||
--- a/dlls/ntdll/thread.c
|
||||
+++ b/dlls/ntdll/thread.c
|
||||
@@ -391,8 +391,6 @@ void terminate_thread( int status )
|
||||
void exit_thread( int status )
|
||||
{
|
||||
static void *prev_teb;
|
||||
- shmlocal_t *shmlocal;
|
||||
- sigset_t sigset;
|
||||
TEB *teb;
|
||||
|
||||
if (status) /* send the exit code to the server (0 is already the default) */
|
||||
@@ -431,11 +429,6 @@ void exit_thread( int status )
|
||||
}
|
||||
}
|
||||
|
||||
- sigemptyset( &sigset );
|
||||
- sigaddset( &sigset, SIGQUIT );
|
||||
- pthread_sigmask( SIG_BLOCK, &sigset, NULL );
|
||||
- if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
|
||||
-
|
||||
close( ntdll_get_thread_data()->wait_fd[0] );
|
||||
close( ntdll_get_thread_data()->wait_fd[1] );
|
||||
close( ntdll_get_thread_data()->reply_fd );
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@ -0,0 +1,519 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
|
||||
PLOCALE_BACKUP="en"
|
||||
|
||||
inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
|
||||
EGIT_BRANCH="master"
|
||||
inherit git-r3
|
||||
SRC_URI=""
|
||||
#KEYWORDS=""
|
||||
else
|
||||
MAJOR_V=$(get_version_component_range 1-2)
|
||||
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2"
|
||||
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
VANILLA_GV="2.40"
|
||||
VANILLA_MV="4.5.6"
|
||||
STAGING_GV="2.40"
|
||||
STAGING_MV="4.5.6"
|
||||
[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
|
||||
STAGING_P="wine-staging-${PV}"
|
||||
STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
|
||||
WINE_GENTOO="wine-gentoo-2015.03.07"
|
||||
GST_P="wine-1.8-gstreamer-1.0"
|
||||
DESCRIPTION="Free implementation of Windows(tm) on Unix"
|
||||
HOMEPAGE="http://www.winehq.org/"
|
||||
SRC_URI="${SRC_URI}
|
||||
!staging? (
|
||||
gecko? (
|
||||
abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
|
||||
abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
|
||||
)
|
||||
mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
|
||||
)
|
||||
staging? (
|
||||
gecko? (
|
||||
abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86.msi )
|
||||
abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86_64.msi )
|
||||
)
|
||||
mono? ( https://dl.winehq.org/wine/wine-mono/${STAGING_MV}/wine-mono-${STAGING_MV}.msi )
|
||||
)
|
||||
https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${GST_P}.patch.bz2
|
||||
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
|
||||
else
|
||||
SRC_URI="${SRC_URI}
|
||||
staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz -> ${STAGING_P}.tar.gz )"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
|
||||
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
|
||||
X? ( truetype )
|
||||
elibc_glibc? ( threads )
|
||||
mono? ( abi_x86_32 )
|
||||
osmesa? ( opengl )
|
||||
pipelight? ( staging )
|
||||
s3tc? ( staging )
|
||||
test? ( abi_x86_32 )
|
||||
themes? ( staging )
|
||||
vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
|
||||
|
||||
# FIXME: the test suite is unsuitable for us; many tests require net access
|
||||
# or fail due to Xvfb's opengl limitations.
|
||||
RESTRICT="test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
X? (
|
||||
x11-libs/libXcursor[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXext[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXrandr[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXi[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
|
||||
)
|
||||
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
|
||||
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
|
||||
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
|
||||
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
|
||||
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
|
||||
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
|
||||
gstreamer? (
|
||||
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
|
||||
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
|
||||
)
|
||||
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
|
||||
lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
|
||||
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
|
||||
mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
|
||||
ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
|
||||
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
|
||||
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
|
||||
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
|
||||
openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
|
||||
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
|
||||
opengl? (
|
||||
virtual/glu[${MULTILIB_USEDEP}]
|
||||
virtual/opengl[${MULTILIB_USEDEP}]
|
||||
)
|
||||
osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
|
||||
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
|
||||
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
|
||||
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
|
||||
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
|
||||
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
|
||||
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
|
||||
themes? (
|
||||
dev-libs/glib:2[${MULTILIB_USEDEP}]
|
||||
x11-libs/cairo[${MULTILIB_USEDEP}]
|
||||
x11-libs/gtk+:3[${MULTILIB_USEDEP}]
|
||||
)
|
||||
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
|
||||
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
|
||||
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
|
||||
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
|
||||
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
|
||||
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
|
||||
xml? (
|
||||
dev-libs/libxml2[${MULTILIB_USEDEP}]
|
||||
dev-libs/libxslt[${MULTILIB_USEDEP}]
|
||||
)
|
||||
abi_x86_32? (
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-baselibs-20140508-r14
|
||||
!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-db-20140508-r3
|
||||
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-medialibs-20140508-r6
|
||||
!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-opengl-20140508-r1
|
||||
!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-sdl-20140508-r1
|
||||
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-soundlibs-20140508
|
||||
!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-xlibs-20140508
|
||||
)"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
|
||||
perl? (
|
||||
dev-lang/perl
|
||||
dev-perl/XML-Simple
|
||||
)
|
||||
pulseaudio? (
|
||||
realtime? ( sys-auth/rtkit )
|
||||
)
|
||||
s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
|
||||
samba? ( >=net-fs/samba-3.0.25[winbind] )
|
||||
selinux? ( sec-policy/selinux-wine )
|
||||
udisks? ( sys-fs/udisks:2 )"
|
||||
|
||||
# tools/make_requests requires perl
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
sys-devel/flex
|
||||
>=sys-kernel/linux-headers-2.6
|
||||
virtual/pkgconfig
|
||||
virtual/yacc
|
||||
X? (
|
||||
x11-proto/inputproto
|
||||
x11-proto/xextproto
|
||||
x11-proto/xf86vidmodeproto
|
||||
)
|
||||
prelink? ( sys-devel/prelink )
|
||||
staging? (
|
||||
dev-lang/perl
|
||||
dev-perl/XML-Simple
|
||||
)
|
||||
xinerama? ( x11-proto/xineramaproto )"
|
||||
|
||||
# These use a non-standard "Wine" category, which is provided by
|
||||
# /etc/xdg/applications-merged/wine.menu
|
||||
QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
|
||||
usr/share/applications/wine-notepad.desktop
|
||||
usr/share/applications/wine-uninstaller.desktop
|
||||
usr/share/applications/wine-winecfg.desktop"
|
||||
|
||||
wine_compiler_check() {
|
||||
[[ ${MERGE_TYPE} = "binary" ]] && return 0
|
||||
|
||||
# GCC-specific bugs
|
||||
if tc-is-gcc; then
|
||||
# bug #549768
|
||||
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
|
||||
ebegin "Checking for gcc-5 ms_abi compiler bug"
|
||||
$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
|
||||
# Run in subshell to prevent "Aborted" message
|
||||
( "${T}"/pr66838 || false ) >/dev/null 2>&1
|
||||
if ! eend $?; then
|
||||
eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
|
||||
eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
|
||||
eerror "or use gcc-config to select a different compiler version."
|
||||
eerror "See https://bugs.gentoo.org/549768"
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
# bug #574044
|
||||
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
|
||||
ebegin "Checking for gcc-5-3 stack realignment compiler bug"
|
||||
# Compile in subshell to prevent "Aborted" message
|
||||
( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
|
||||
if ! eend $?; then
|
||||
eerror "Wine cannot be built with this version of gcc-5.3"
|
||||
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
|
||||
eerror "or use gcc-config to select a different compiler version."
|
||||
eerror "See https://bugs.gentoo.org/574044"
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Ensure compiler support
|
||||
if use abi_x86_64; then
|
||||
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
|
||||
# Compile in subshell to prevent "Aborted" message
|
||||
( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
|
||||
if ! eend $?; then
|
||||
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
|
||||
eerror
|
||||
eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
wine_build_environment_check() {
|
||||
[[ ${MERGE_TYPE} = "binary" ]] && return 0
|
||||
|
||||
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
|
||||
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
|
||||
eerror "See https://bugs.gentoo.org/487864 for more details."
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
wine_compiler_check || die
|
||||
wine_build_environment_check || die
|
||||
|
||||
# Verify OSS support
|
||||
if use oss && ! use kernel_FreeBSD; then
|
||||
if ! has_version ">=media-sound/oss-4"; then
|
||||
eerror "You cannot build wine with USE=oss without having support from a"
|
||||
eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
|
||||
eerror
|
||||
die
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
wine_build_environment_check || die
|
||||
if ! use staging; then
|
||||
GV=${VANILLA_GV}
|
||||
MV=${VANILLA_MV}
|
||||
else
|
||||
GV=${STAGING_GV}
|
||||
MV=${STAGING_MV}
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
git-r3_src_unpack
|
||||
if use staging; then
|
||||
local WINE_COMMIT=${EGIT_VERSION}
|
||||
|
||||
git-r3_fetch "${STAGING_EGIT_REPO_URI}"
|
||||
git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
|
||||
|
||||
local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
|
||||
|
||||
if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
|
||||
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
|
||||
einfo "If src_prepare fails, try emerging with the env var EGIT_COMMIT."
|
||||
einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
l10n_find_plocales_changes "${S}/po" "" ".po"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local md5="$(md5sum server/protocol.def)"
|
||||
local PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
|
||||
"${FILESDIR}"/${PN}-1.9.5-multilib-portage.patch #395615
|
||||
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
|
||||
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
|
||||
"${FILESDIR}"/${PN}-1.8-gnutls-3.5-compat.patch #587028
|
||||
"${WORKDIR}/${GST_P}.patch"
|
||||
)
|
||||
if use staging; then
|
||||
ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
|
||||
ewarn "Wine bugzilla should explicitly state that staging was used."
|
||||
|
||||
local STAGING_EXCLUDE=""
|
||||
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
|
||||
|
||||
# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
|
||||
ebegin "Running Wine-Staging patch installer"
|
||||
(
|
||||
set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
|
||||
cd "${STAGING_DIR}/patches"
|
||||
source "${STAGING_DIR}/patches/patchinstall.sh"
|
||||
)
|
||||
eend $? || die "Failed to apply Wine-Staging patches"
|
||||
|
||||
# To differentiate unofficial staging releases
|
||||
if [[ ! -z ${SUFFIX} ]]; then
|
||||
sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
|
||||
fi
|
||||
fi
|
||||
|
||||
default
|
||||
eautoreconf
|
||||
|
||||
# Modification of the server protocol requires regenerating the server requests
|
||||
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
|
||||
einfo "server/protocol.def was patched; running tools/make_requests"
|
||||
tools/make_requests || die #432348
|
||||
fi
|
||||
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
|
||||
if ! use run-exes; then
|
||||
sed -i '/^MimeType/d' loader/wine.desktop || die #117785
|
||||
fi
|
||||
|
||||
# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
|
||||
cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
|
||||
|
||||
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export LDCONFIG=/bin/true
|
||||
use custom-cflags || strip-flags
|
||||
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
--sysconfdir=/etc/wine
|
||||
$(use_with alsa)
|
||||
$(use_with capi)
|
||||
$(use_with lcms cms)
|
||||
$(use_with cups)
|
||||
$(use_with ncurses curses)
|
||||
$(use_with udisks dbus)
|
||||
$(use_with fontconfig)
|
||||
$(use_with ssl gnutls)
|
||||
$(use_enable gecko mshtml)
|
||||
$(use_with gphoto2 gphoto)
|
||||
$(use_with gsm)
|
||||
$(use_with gstreamer)
|
||||
--without-hal
|
||||
$(use_with jpeg)
|
||||
$(use_with ldap)
|
||||
$(use_enable mono mscoree)
|
||||
$(use_with mp3 mpg123)
|
||||
$(use_with netapi)
|
||||
$(use_with nls gettext)
|
||||
$(use_with openal)
|
||||
$(use_with opencl)
|
||||
$(use_with opengl)
|
||||
$(use_with osmesa)
|
||||
$(use_with oss)
|
||||
$(use_with pcap)
|
||||
$(use_with png)
|
||||
$(use_with pulseaudio pulse)
|
||||
$(use_with threads pthread)
|
||||
$(use_with scanner sane)
|
||||
$(use_enable test tests)
|
||||
$(use_with truetype freetype)
|
||||
$(use_with v4l)
|
||||
$(use_with X x)
|
||||
$(use_with xcomposite)
|
||||
$(use_with xinerama)
|
||||
$(use_with xml)
|
||||
$(use_with xml xslt)
|
||||
)
|
||||
|
||||
use staging && myconf+=(
|
||||
--with-xattr
|
||||
$(use_with themes gtk3)
|
||||
$(use_with vaapi va)
|
||||
)
|
||||
|
||||
local PKG_CONFIG AR RANLIB
|
||||
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
|
||||
# set AR and RANLIB to make QA scripts happy; #483342
|
||||
tc-export PKG_CONFIG AR RANLIB
|
||||
|
||||
if use amd64; then
|
||||
if [[ ${ABI} == amd64 ]]; then
|
||||
myconf+=( --enable-win64 )
|
||||
else
|
||||
myconf+=( --disable-win64 )
|
||||
fi
|
||||
|
||||
# Note: using --with-wine64 results in problems with multilib.eclass
|
||||
# CC/LD hackery. We're using separate tools instead.
|
||||
fi
|
||||
|
||||
ECONF_SOURCE=${S} \
|
||||
econf "${myconf[@]}"
|
||||
emake depend
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
|
||||
if [[ ${ABI} == x86 ]]; then
|
||||
if [[ $(id -u) == 0 ]]; then
|
||||
ewarn "Skipping tests since they cannot be run under the root user."
|
||||
ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
|
||||
return
|
||||
fi
|
||||
|
||||
WINEPREFIX="${T}/.wine-${ABI}" \
|
||||
Xemake test
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
local DOCS=( ANNOUNCE AUTHORS README )
|
||||
local l
|
||||
add_locale_docs() {
|
||||
local locale_doc="documentation/README.$1"
|
||||
[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
|
||||
}
|
||||
l10n_for_each_locale_do add_locale_docs
|
||||
|
||||
einstalldocs
|
||||
prune_libtool_files --all
|
||||
|
||||
emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
|
||||
if use gecko ; then
|
||||
insinto /usr/share/wine/gecko
|
||||
use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
|
||||
use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
|
||||
fi
|
||||
if use mono ; then
|
||||
insinto /usr/share/wine/mono
|
||||
doins "${DISTDIR}"/wine-mono-${MV}.msi
|
||||
fi
|
||||
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
|
||||
rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
|
||||
fi
|
||||
|
||||
# Remove wineconsole if neither backend is installed #551124
|
||||
if ! use X && ! use ncurses; then
|
||||
rm "${D}"/usr/{bin/,man/man1/}wineconsole* || die
|
||||
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
|
||||
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
|
||||
fi
|
||||
|
||||
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
|
||||
use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
|
||||
|
||||
if use abi_x86_64 && ! use abi_x86_32; then
|
||||
dosym /usr/bin/wine{64,} # 404331
|
||||
dosym /usr/bin/wine{64,}-preloader
|
||||
fi
|
||||
|
||||
# respect LINGUAS when installing man pages, #469418
|
||||
for l in de fr pl; do
|
||||
use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
|
||||
done
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
fdo-mime_desktop_database_update
|
||||
|
||||
if ! use gecko; then
|
||||
ewarn "Without Wine Gecko, wine prefixes will not have a default"
|
||||
ewarn "implementation of iexplore. Many older windows applications"
|
||||
ewarn "rely upon the existence of an iexplore implementation, so"
|
||||
ewarn "you will likely need to install an external one, like via winetricks"
|
||||
fi
|
||||
if ! use mono; then
|
||||
ewarn "Without Wine Mono, wine prefixes will not have a default"
|
||||
ewarn "implementation of .NET. Many windows applications rely upon"
|
||||
ewarn "the existence of a .NET implementation, so you will likely need"
|
||||
ewarn "to install an external one, like via winetricks"
|
||||
fi
|
||||
|
||||
if use gstreamer; then
|
||||
ewarn "This package uses a Gentoo specific patchset to provide"
|
||||
ewarn "GStreamer 1.0 support. Any bugs related to GStreamer should"
|
||||
ewarn "be filed at Gentoo's bugzilla, not upstream's."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -0,0 +1,531 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
|
||||
PLOCALE_BACKUP="en"
|
||||
|
||||
inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
|
||||
EGIT_BRANCH="master"
|
||||
inherit git-r3
|
||||
SRC_URI=""
|
||||
#KEYWORDS=""
|
||||
else
|
||||
MAJOR_V=$(get_version_component_range 1-2)
|
||||
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2"
|
||||
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
VANILLA_GV="2.47"
|
||||
VANILLA_MV="4.6.3"
|
||||
STAGING_GV="2.47"
|
||||
STAGING_MV="4.6.3"
|
||||
[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
|
||||
STAGING_P="wine-staging-${PV}"
|
||||
STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
|
||||
D3D9_P="wine-d3d9-${PV}"
|
||||
D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
|
||||
WINE_GENTOO="wine-gentoo-2015.03.07"
|
||||
DESCRIPTION="Free implementation of Windows(tm) on Unix"
|
||||
HOMEPAGE="http://www.winehq.org/"
|
||||
SRC_URI="${SRC_URI}
|
||||
!staging? (
|
||||
gecko? (
|
||||
abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
|
||||
abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
|
||||
)
|
||||
mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
|
||||
)
|
||||
staging? (
|
||||
gecko? (
|
||||
abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86.msi )
|
||||
abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86_64.msi )
|
||||
)
|
||||
mono? ( https://dl.winehq.org/wine/wine-mono/${STAGING_MV}/wine-mono-${STAGING_MV}.msi )
|
||||
)
|
||||
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
|
||||
D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
|
||||
else
|
||||
SRC_URI="${SRC_URI}
|
||||
staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz -> ${STAGING_P}.tar.gz )
|
||||
d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
|
||||
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
|
||||
X? ( truetype )
|
||||
elibc_glibc? ( threads )
|
||||
osmesa? ( opengl )
|
||||
pipelight? ( staging )
|
||||
s3tc? ( staging )
|
||||
test? ( abi_x86_32 )
|
||||
themes? ( staging )
|
||||
vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
|
||||
|
||||
# FIXME: the test suite is unsuitable for us; many tests require net access
|
||||
# or fail due to Xvfb's opengl limitations.
|
||||
RESTRICT="test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
X? (
|
||||
x11-libs/libXcursor[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXext[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXrandr[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXi[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
|
||||
)
|
||||
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
|
||||
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
|
||||
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
|
||||
d3d9? (
|
||||
media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
|
||||
x11-libs/libX11[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXext[${MULTILIB_USEDEP}]
|
||||
x11-libs/libxcb[${MULTILIB_USEDEP}]
|
||||
)
|
||||
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
|
||||
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
|
||||
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
|
||||
gstreamer? (
|
||||
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
|
||||
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
|
||||
)
|
||||
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
|
||||
lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
|
||||
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
|
||||
mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
|
||||
ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
|
||||
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
|
||||
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
|
||||
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
|
||||
openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
|
||||
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
|
||||
opengl? (
|
||||
virtual/glu[${MULTILIB_USEDEP}]
|
||||
virtual/opengl[${MULTILIB_USEDEP}]
|
||||
)
|
||||
osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
|
||||
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
|
||||
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
|
||||
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
|
||||
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
|
||||
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
|
||||
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
|
||||
themes? (
|
||||
dev-libs/glib:2[${MULTILIB_USEDEP}]
|
||||
x11-libs/cairo[${MULTILIB_USEDEP}]
|
||||
x11-libs/gtk+:3[${MULTILIB_USEDEP}]
|
||||
)
|
||||
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
|
||||
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
|
||||
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
|
||||
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
|
||||
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
|
||||
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
|
||||
xml? (
|
||||
dev-libs/libxml2[${MULTILIB_USEDEP}]
|
||||
dev-libs/libxslt[${MULTILIB_USEDEP}]
|
||||
)
|
||||
abi_x86_32? (
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-baselibs-20140508-r14
|
||||
!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-db-20140508-r3
|
||||
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-medialibs-20140508-r6
|
||||
!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-opengl-20140508-r1
|
||||
!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-sdl-20140508-r1
|
||||
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-soundlibs-20140508
|
||||
!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
|
||||
!<app-emulation/emul-linux-x86-xlibs-20140508
|
||||
)"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
|
||||
perl? (
|
||||
dev-lang/perl
|
||||
dev-perl/XML-Simple
|
||||
)
|
||||
pulseaudio? (
|
||||
realtime? ( sys-auth/rtkit )
|
||||
)
|
||||
s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
|
||||
samba? ( >=net-fs/samba-3.0.25[winbind] )
|
||||
selinux? ( sec-policy/selinux-wine )
|
||||
udisks? ( sys-fs/udisks:2 )"
|
||||
|
||||
# tools/make_requests requires perl
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
sys-devel/flex
|
||||
>=sys-kernel/linux-headers-2.6
|
||||
virtual/pkgconfig
|
||||
virtual/yacc
|
||||
X? (
|
||||
x11-proto/inputproto
|
||||
x11-proto/xextproto
|
||||
x11-proto/xf86vidmodeproto
|
||||
)
|
||||
prelink? ( sys-devel/prelink )
|
||||
staging? (
|
||||
dev-lang/perl
|
||||
dev-perl/XML-Simple
|
||||
)
|
||||
xinerama? ( x11-proto/xineramaproto )"
|
||||
|
||||
# These use a non-standard "Wine" category, which is provided by
|
||||
# /etc/xdg/applications-merged/wine.menu
|
||||
QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
|
||||
usr/share/applications/wine-notepad.desktop
|
||||
usr/share/applications/wine-uninstaller.desktop
|
||||
usr/share/applications/wine-winecfg.desktop"
|
||||
|
||||
wine_compiler_check() {
|
||||
[[ ${MERGE_TYPE} = "binary" ]] && return 0
|
||||
|
||||
# GCC-specific bugs
|
||||
if tc-is-gcc; then
|
||||
# bug #549768
|
||||
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
|
||||
ebegin "Checking for gcc-5 ms_abi compiler bug"
|
||||
$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
|
||||
# Run in subshell to prevent "Aborted" message
|
||||
( "${T}"/pr66838 || false ) >/dev/null 2>&1
|
||||
if ! eend $?; then
|
||||
eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
|
||||
eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
|
||||
eerror "or use gcc-config to select a different compiler version."
|
||||
eerror "See https://bugs.gentoo.org/549768"
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
# bug #574044
|
||||
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
|
||||
ebegin "Checking for gcc-5-3 stack realignment compiler bug"
|
||||
# Compile in subshell to prevent "Aborted" message
|
||||
( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
|
||||
if ! eend $?; then
|
||||
eerror "Wine cannot be built with this version of gcc-5.3"
|
||||
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
|
||||
eerror "or use gcc-config to select a different compiler version."
|
||||
eerror "See https://bugs.gentoo.org/574044"
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Ensure compiler support
|
||||
if use abi_x86_64; then
|
||||
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
|
||||
# Compile in subshell to prevent "Aborted" message
|
||||
( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
|
||||
if ! eend $?; then
|
||||
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
|
||||
eerror
|
||||
eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
wine_build_environment_check() {
|
||||
[[ ${MERGE_TYPE} = "binary" ]] && return 0
|
||||
|
||||
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
|
||||
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
|
||||
eerror "See https://bugs.gentoo.org/487864 for more details."
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
wine_compiler_check || die
|
||||
wine_build_environment_check || die
|
||||
|
||||
# Verify OSS support
|
||||
if use oss && ! use kernel_FreeBSD; then
|
||||
if ! has_version ">=media-sound/oss-4"; then
|
||||
eerror "You cannot build wine with USE=oss without having support from a"
|
||||
eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
|
||||
eerror
|
||||
die
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
wine_build_environment_check || die
|
||||
if ! use staging; then
|
||||
GV=${VANILLA_GV}
|
||||
MV=${VANILLA_MV}
|
||||
else
|
||||
GV=${STAGING_GV}
|
||||
MV=${STAGING_MV}
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
git-r3_src_unpack
|
||||
if use staging; then
|
||||
local WINE_COMMIT=${EGIT_VERSION}
|
||||
|
||||
git-r3_fetch "${STAGING_EGIT_REPO_URI}"
|
||||
git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
|
||||
|
||||
local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
|
||||
|
||||
if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
|
||||
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
|
||||
einfo "If src_prepare fails, try emerging with the env var EGIT_COMMIT."
|
||||
einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
|
||||
fi
|
||||
fi
|
||||
if use d3d9; then
|
||||
git-r3_fetch "${D3D9_EGIT_REPO_URI}"
|
||||
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
|
||||
fi
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
l10n_find_plocales_changes "${S}/po" "" ".po"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local md5="$(md5sum server/protocol.def)"
|
||||
local PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
|
||||
"${FILESDIR}"/${PN}-1.9.5-multilib-portage.patch #395615
|
||||
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
|
||||
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
|
||||
)
|
||||
if use staging; then
|
||||
ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
|
||||
ewarn "Wine bugzilla should explicitly state that staging was used."
|
||||
|
||||
local STAGING_EXCLUDE=""
|
||||
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
|
||||
|
||||
# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
|
||||
ebegin "Running Wine-Staging patch installer"
|
||||
(
|
||||
set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
|
||||
cd "${STAGING_DIR}/patches"
|
||||
source "${STAGING_DIR}/patches/patchinstall.sh"
|
||||
)
|
||||
eend $? || die "Failed to apply Wine-Staging patches"
|
||||
|
||||
# To differentiate unofficial staging releases
|
||||
if [[ ! -z ${SUFFIX} ]]; then
|
||||
sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
|
||||
fi
|
||||
fi
|
||||
if use d3d9; then
|
||||
if use staging; then
|
||||
PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
|
||||
else
|
||||
PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
|
||||
fi
|
||||
PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
|
||||
fi
|
||||
|
||||
default
|
||||
eautoreconf
|
||||
|
||||
# Modification of the server protocol requires regenerating the server requests
|
||||
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
|
||||
einfo "server/protocol.def was patched; running tools/make_requests"
|
||||
tools/make_requests || die #432348
|
||||
fi
|
||||
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
|
||||
if ! use run-exes; then
|
||||
sed -i '/^MimeType/d' loader/wine.desktop || die #117785
|
||||
fi
|
||||
|
||||
# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
|
||||
cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
|
||||
|
||||
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export LDCONFIG=/bin/true
|
||||
use custom-cflags || strip-flags
|
||||
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
--sysconfdir=/etc/wine
|
||||
$(use_with alsa)
|
||||
$(use_with capi)
|
||||
$(use_with lcms cms)
|
||||
$(use_with cups)
|
||||
$(use_with ncurses curses)
|
||||
$(use_with udisks dbus)
|
||||
$(use_with fontconfig)
|
||||
$(use_with ssl gnutls)
|
||||
$(use_enable gecko mshtml)
|
||||
$(use_with gphoto2 gphoto)
|
||||
$(use_with gsm)
|
||||
$(use_with gstreamer)
|
||||
--without-hal
|
||||
$(use_with jpeg)
|
||||
$(use_with ldap)
|
||||
$(use_enable mono mscoree)
|
||||
$(use_with mp3 mpg123)
|
||||
$(use_with netapi)
|
||||
$(use_with nls gettext)
|
||||
$(use_with openal)
|
||||
$(use_with opencl)
|
||||
$(use_with opengl)
|
||||
$(use_with osmesa)
|
||||
$(use_with oss)
|
||||
$(use_with pcap)
|
||||
$(use_with png)
|
||||
$(use_with pulseaudio pulse)
|
||||
$(use_with threads pthread)
|
||||
$(use_with scanner sane)
|
||||
$(use_enable test tests)
|
||||
$(use_with truetype freetype)
|
||||
$(use_with v4l)
|
||||
$(use_with X x)
|
||||
$(use_with xcomposite)
|
||||
$(use_with xinerama)
|
||||
$(use_with xml)
|
||||
$(use_with xml xslt)
|
||||
)
|
||||
|
||||
use staging && myconf+=(
|
||||
--with-xattr
|
||||
$(use_with themes gtk3)
|
||||
$(use_with vaapi va)
|
||||
)
|
||||
use d3d9 && myconf+=( $(use_with d3d9 d3dadapter) )
|
||||
|
||||
local PKG_CONFIG AR RANLIB
|
||||
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
|
||||
# set AR and RANLIB to make QA scripts happy; #483342
|
||||
tc-export PKG_CONFIG AR RANLIB
|
||||
|
||||
if use amd64; then
|
||||
if [[ ${ABI} == amd64 ]]; then
|
||||
myconf+=( --enable-win64 )
|
||||
else
|
||||
myconf+=( --disable-win64 )
|
||||
fi
|
||||
|
||||
# Note: using --with-wine64 results in problems with multilib.eclass
|
||||
# CC/LD hackery. We're using separate tools instead.
|
||||
fi
|
||||
|
||||
ECONF_SOURCE=${S} \
|
||||
econf "${myconf[@]}"
|
||||
emake depend
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
|
||||
if [[ ${ABI} == x86 ]]; then
|
||||
if [[ $(id -u) == 0 ]]; then
|
||||
ewarn "Skipping tests since they cannot be run under the root user."
|
||||
ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
|
||||
return
|
||||
fi
|
||||
|
||||
WINEPREFIX="${T}/.wine-${ABI}" \
|
||||
Xemake test
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
local DOCS=( ANNOUNCE AUTHORS README )
|
||||
local l
|
||||
add_locale_docs() {
|
||||
local locale_doc="documentation/README.$1"
|
||||
[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
|
||||
}
|
||||
l10n_for_each_locale_do add_locale_docs
|
||||
|
||||
einstalldocs
|
||||
prune_libtool_files --all
|
||||
|
||||
emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
|
||||
if use gecko ; then
|
||||
insinto /usr/share/wine/gecko
|
||||
use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
|
||||
use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
|
||||
fi
|
||||
if use mono ; then
|
||||
insinto /usr/share/wine/mono
|
||||
doins "${DISTDIR}"/wine-mono-${MV}.msi
|
||||
fi
|
||||
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
|
||||
rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
|
||||
fi
|
||||
|
||||
# Remove wineconsole if neither backend is installed #551124
|
||||
if ! use X && ! use ncurses; then
|
||||
rm "${D}"/usr/{bin/,man/man1/}wineconsole* || die
|
||||
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
|
||||
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
|
||||
fi
|
||||
|
||||
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
|
||||
use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
|
||||
|
||||
if use abi_x86_64 && ! use abi_x86_32; then
|
||||
dosym /usr/bin/wine{64,} # 404331
|
||||
dosym /usr/bin/wine{64,}-preloader
|
||||
fi
|
||||
|
||||
# respect LINGUAS when installing man pages, #469418
|
||||
for l in de fr pl; do
|
||||
use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
|
||||
done
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
fdo-mime_desktop_database_update
|
||||
|
||||
if ! use gecko; then
|
||||
ewarn "Without Wine Gecko, wine prefixes will not have a default"
|
||||
ewarn "implementation of iexplore. Many older windows applications"
|
||||
ewarn "rely upon the existence of an iexplore implementation, so"
|
||||
ewarn "you will likely need to install an external one, like via winetricks"
|
||||
fi
|
||||
if ! use mono; then
|
||||
ewarn "Without Wine Mono, wine prefixes will not have a default"
|
||||
ewarn "implementation of .NET. Many windows applications rely upon"
|
||||
ewarn "the existence of a .NET implementation, so you will likely need"
|
||||
ewarn "to install an external one, like via winetricks"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST discount-2.1.6.tar.bz2 83823 SHA256 702bb29e17e387f82e40fae062d5e4939bc6fb22dcf53e6109982a5faa110796 SHA512 75e2fcc31f670bab77a3658a684054971998e91ad14743814480a4d24a59285dea1fe922d16c8d1c868250c417963a80282b8fe278021240ba424b840dd4df8e WHIRLPOOL 9f519c44df4bc5300729dd0f51fbcb20f957da68d03b670307bfd51c0d994b5d2b765eac6e17bba8119bb095277ce5dfbad185599bdeca834c4982eb813d7a79
|
||||
DIST discount-2.1.8a.tar.bz2 85161 SHA256 c01502f4eedba8163dcd30c613ba5ee238a068f75291be127856261727e03526 SHA512 a1eba7076a27da56136b8057189c5474a36bf11f8233cbae270c8a0cf9b070332b4dcdbbbecfbfbe1d8c19961ccaf87cee27ebe855c6bc6558d8ccc423553c96 WHIRLPOOL 5d7148f6c4e9f84a5290fffafa417c4684517df6fce0deec773beb2f89b4416b7849aa50351c27338653b8950b68c3c49ba223d31e347ad7562b0cb040761114
|
||||
DIST discount-2.2.0.tar.bz2 88387 SHA256 b25395c29c2c08836199eb2eae87b56e6b545e77f5fbf921678aa1dc0ddab9f3 SHA512 04b66496ca53a2ab73cba2a8f9d8e77efd13f318b188611aaaebc4fd036a02cd188aa712337df414ff3b7ac65d2ced17020085cae10338e8af47e5b9552d981a WHIRLPOOL 1b4f30e924c4f38bc0685eb78c609c461e282dd54c6f588098ffb86dc03330ab45c68340dea5dd965cd26b42771ffc379c9ef828bbfc3a79f593b75f483c3e1d
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From 9b95e9a2dce195a8dfbdbf3206494095b177d405 Mon Sep 17 00:00:00 2001
|
||||
From: Nathan Phillip Brink <binki@gentoo.org>
|
||||
Date: Thu, 25 Jul 2013 01:14:14 -0400
|
||||
Subject: [PATCH] =?UTF-8?q?Fix=20support=20for=20=E2=80=9C$=20CFLAGS=3D-m32=20./configure.sh=E2=80=9D=20by=20using=20CFLAGS=20for=20all=20build=20invokations=20of=20CC.?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
---
|
||||
Makefile.in | 14 +++++++-------
|
||||
1 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 9bb438a..3bda63d 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -64,7 +64,7 @@ $(DESTDIR)$(LIBDIR):
|
||||
@INSTALL_DIR@ $(DESTDIR)$(LIBDIR)
|
||||
|
||||
version.o: version.c VERSION
|
||||
- $(CC) -DVERSION=\"`cat VERSION`\" -c version.c
|
||||
+ $(CC) $(CFLAGS) -DVERSION=\"`cat VERSION`\" -c version.c
|
||||
|
||||
VERSION:
|
||||
@true
|
||||
@@ -76,23 +76,23 @@ blocktags: mktags
|
||||
|
||||
# example programs
|
||||
@THEME@theme: theme.o $(MKDLIB) mkdio.h
|
||||
-@THEME@ $(CC) $(LFLAGS) -o theme theme.o pgm_options.o -lmarkdown @LIBS@
|
||||
+@THEME@ $(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o pgm_options.o -lmarkdown @LIBS@
|
||||
|
||||
|
||||
mkd2html: mkd2html.o $(MKDLIB) mkdio.h
|
||||
- $(CC) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
|
||||
+ $(CC) $(CFLAGS) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
|
||||
|
||||
markdown: main.o pgm_options.o $(MKDLIB)
|
||||
- $(CC) $(LFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
|
||||
+ $(CC) $(CFLAGS) $(LFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
|
||||
|
||||
makepage: makepage.c pgm_options.o $(MKDLIB) mkdio.h
|
||||
- $(CC) $(LFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
|
||||
+ $(CC) $(CFLAGS) $(LFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
|
||||
|
||||
pgm_options.o: pgm_options.c mkdio.h config.h
|
||||
- $(CC) -I. -c pgm_options.c
|
||||
+ $(CC) $(CFLAGS) -I. -c pgm_options.c
|
||||
|
||||
main.o: main.c mkdio.h config.h
|
||||
- $(CC) -I. -c main.c
|
||||
+ $(CC) $(CFLAGS) -I. -c main.c
|
||||
|
||||
$(MKDLIB): $(OBJS)
|
||||
./librarian.sh make $(MKDLIB) VERSION $(OBJS)
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
@ -1 +1,2 @@
|
||||
DIST squirrel-3.1.tar.gz 175612 SHA256 51942b8638a97b673e34ecf3ca50304996fa99bbdbfa7fe93d9744e6769b2f95 SHA512 8aec059c801a8f6a1ddb9585cebd51457cfd43743cb0b03494e022fd47392e7b4b88e4703f184f4dcba2be8c0fb756e9b260e2f230e1bd92b37cdcb86d4f1141 WHIRLPOOL f1b7b1c96c0d0e8fd7f1c27f05684bacb803a33fd5dbe2bd767b955e2fd747c83a7ef666bc10f1b6ab7fa51fe6df46551dec947e77c862855fee3b7ad7289703
|
||||
DIST squirrel_2.2.4_stable.tar.gz 419567 SHA256 936ca05469ab19f16a730685ef4ad1ca5a3838195765d47935a4ba9052d8b2d4 SHA512 91fe260b362d682eb5d21334c0ffa532120550c1c49a40412ac87118bee5f045e79c260f42247bd2c897d33b7a593dd2bc2e5c8e78e219553682f8b6cd79201d WHIRLPOOL 7cc953f1bbfc8e228be9310eff714b682f0e77b5e1ae9bf0a5bb0ec1c9f53b873c9199bb0679b7b13759bbe54e96de674a9b42b90db3ddd2a3caa36bc067ab50
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="A interpreted language mainly used for games"
|
||||
HOMEPAGE="http://squirrel-lang.org/"
|
||||
SRC_URI="https://github.com/albertodemichelis/squirrel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="examples static-libs"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DINSTALL_LIB_DIR="$(get_libdir)" \
|
||||
-DINSTALL_INC_DIR=include
|
||||
$(usex static-libs '' -DDISABLE_STATIC=YES)
|
||||
# /usr/bin/sq is used by app-text/ispell
|
||||
# /usr/lib/libsquirrel.so is used by app-shells/squirrelsh
|
||||
-DLONG_OUTPUT_NAMES=YES
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
dodoc HISTORY
|
||||
|
||||
if use examples; then
|
||||
docompress -x /usr/share/doc/${PF}/samples
|
||||
dodoc -r samples
|
||||
fi
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST dask-0.10.2.tar.gz 357356 SHA256 dbc80f7cbf51abee4dc49e5da188c57e2f816898165cbc1ddfe44b2c640036ca SHA512 92bd671ff1483fe87edd34330dce321b88362d80ef4d836ab4eede87fdad5f657c51d03a9885a53924fb3becb504a8843cf852be08c88f5389f04c3f1b8aefe2 WHIRLPOOL 91d910130edfe3595d5f3f54aeb63a12bafd89f8d6bb68ca70dd72b98cf5ed465955154eef7ee2f7caf0f2d4145648cd48663b680c847e0f2b9600c0d5131b25
|
||||
DIST dask-0.8.1.tar.gz 292047 SHA256 43deb1934cd033668e5e60b735f45c9c3ee2813f87bd51c243f975e55267fa43 SHA512 b75fca59ecf285bae2fe82cb635fbcb78e9eb1389dc764c36e20c2278b12ec41363f463adfeff33891cf0eaf9a03ef1586b90ea5189c03d955bc670ac416660b WHIRLPOOL 63bdfef96af56e82b72759c60546b9cc72fd67ec94ddff226d34ce8612e2c603729aaf2b31823971001701b01317c96ddf74a539ebab3cdc02a7e554ff8e8f37
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
|
||||
HOMEPAGE="http://dask.pydata.org/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/bokeh[${PYTHON_USEDEP}]
|
||||
dev-python/cloudpickle[${PYTHON_USEDEP}]
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
dev-python/pandas[${PYTHON_USEDEP}]
|
||||
dev-python/partd[${PYTHON_USEDEP}]
|
||||
dev-python/psutil[${PYTHON_USEDEP}]
|
||||
dev-python/toolz[${PYTHON_USEDEP}]"
|
||||
DEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/toolz[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/numexpr[${PYTHON_USEDEP}]
|
||||
sci-libs/scipy[${PYTHON_USEDEP}] )"
|
||||
|
||||
python_test() {
|
||||
py.test || die
|
||||
}
|
||||
@ -1,161 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
PYTHON_REQ_USE="sqlite"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
|
||||
|
||||
[[ ${PV} == *9999 ]] && inherit git-r3
|
||||
inherit readme.gentoo-r1 user systemd distutils-r1
|
||||
|
||||
MY_PV="${PV/_p/p}"
|
||||
MY_V="0.9.0rc1"
|
||||
MY_P="${PN}-${MY_V}"
|
||||
|
||||
DESCRIPTION="BuildBot build automation system"
|
||||
HOMEPAGE="http://trac.buildbot.net/ https://github.com/buildbot/buildbot http://pypi.python.org/pypi/buildbot"
|
||||
[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
else
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
IUSE="crypt doc examples irc mail manhole test"
|
||||
|
||||
RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
|
||||
|| (
|
||||
>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
|
||||
>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
|
||||
crypt? (
|
||||
>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
|
||||
dev-python/idna[${PYTHON_USEDEP}]
|
||||
dev-python/service_identity[${PYTHON_USEDEP}]
|
||||
)
|
||||
irc? (
|
||||
|| ( >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}]
|
||||
<dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
)
|
||||
mail? (
|
||||
|| ( >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}]
|
||||
<dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
)
|
||||
manhole? (
|
||||
|| ( >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}]
|
||||
<dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
)
|
||||
dev-python/future[${PYTHON_USEDEP}]
|
||||
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
|
||||
>=dev-python/autobahn-0.10.2[${PYTHON_USEDEP}]
|
||||
<dev-python/autobahn-0.13.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
|
||||
doc? ( >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] )
|
||||
test? (
|
||||
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
|| (
|
||||
(
|
||||
>=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}]
|
||||
)
|
||||
<dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
dev-python/moto[${PYTHON_USEDEP}]
|
||||
dev-python/boto3[${PYTHON_USEDEP}]
|
||||
dev-python/ramlfications[${PYTHON_USEDEP}]
|
||||
dev-python/pyjade[${PYTHON_USEDEP}]
|
||||
dev-python/txgithub[${PYTHON_USEDEP}]
|
||||
dev-python/txrequests[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
# still yet to be added deps
|
||||
# doc? ( 'sphinxcontrib-blockdiag',
|
||||
# 'sphinxcontrib-spelling',
|
||||
# 'pyenchant',
|
||||
# 'docutils>=0.8',
|
||||
# 'sphinx-jinja',)
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
[[ ${PV} == *9999 ]] && S=${S}/master
|
||||
|
||||
pkg_setup() {
|
||||
enewuser buildbot
|
||||
|
||||
DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
|
||||
to support starting buildbot through Gentoo's init system. To use this,
|
||||
set up your build master following the documentation, make sure the
|
||||
resulting directories are owned by the \"buildbot\" user and point
|
||||
\"${EROOT}etc/conf.d/buildmaster\" at the right location. The scripts can
|
||||
run as a different user if desired. If you need to run more than one
|
||||
build master, just copy the scripts."
|
||||
}
|
||||
|
||||
# docs generation is broken might need a separate ebuild
|
||||
#python_compile_all() {
|
||||
#if use doc; then
|
||||
#einfo "Generation of documentation"
|
||||
##'man' target is currently broken
|
||||
#emake -C docs html
|
||||
#fi
|
||||
#}
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
|
||||
doman docs/buildbot.1
|
||||
|
||||
#if use doc; then
|
||||
# dohtml -r docs/_build/html/
|
||||
# # TODO: install man pages
|
||||
#fi
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r contrib docs/examples
|
||||
fi
|
||||
|
||||
newconfd "${FILESDIR}"/buildmaster.confd.9 buildmaster
|
||||
newinitd "${FILESDIR}"/buildmaster.initd.9 buildmaster
|
||||
systemd_dounit "${FILESDIR}/${PN}9".service
|
||||
|
||||
# In case of multiple masters, it's possible to edit web files
|
||||
# so all master can share the changes. So protect them!
|
||||
# If something else need to be protected, please open a bug
|
||||
# on http://bugs.gentoo.org
|
||||
local cp
|
||||
add_config_protect() {
|
||||
cp+=" $(python_get_sitedir)/${PN}/status/web"
|
||||
}
|
||||
python_foreach_impl add_config_protect
|
||||
echo "CONFIG_PROTECT=\"${cp}\"" \
|
||||
> 85${PN} || die
|
||||
doenvd 85${PN}
|
||||
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
readme.gentoo_print_elog
|
||||
elog
|
||||
elog "Upstream recommends the following when upgrading:"
|
||||
elog "Each time you install a new version of Buildbot, you should run the"
|
||||
elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
|
||||
elog "This will add files and fix (or at least detect) incompatibilities between"
|
||||
elog "your old config and the new code."
|
||||
}
|
||||
@ -0,0 +1,201 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
PYTHON_REQ_USE="sqlite"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
|
||||
|
||||
[[ ${PV} == *9999 ]] && inherit git-r3
|
||||
inherit readme.gentoo-r1 user systemd distutils-r1
|
||||
|
||||
MY_PV="${PV/_p/p}"
|
||||
MY_V="0.9.0rc1"
|
||||
MY_P="${PN}-${MY_V}"
|
||||
|
||||
DESCRIPTION="BuildBot build automation system"
|
||||
HOMEPAGE="http://trac.buildbot.net/ https://github.com/buildbot/buildbot http://pypi.python.org/pypi/buildbot"
|
||||
[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
else
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
IUSE="crypt doc examples irc mail manhole test"
|
||||
|
||||
RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
|
||||
|| (
|
||||
>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
|
||||
>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
|
||||
crypt? (
|
||||
>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
|
||||
dev-python/idna[${PYTHON_USEDEP}]
|
||||
dev-python/service_identity[${PYTHON_USEDEP}]
|
||||
)
|
||||
irc? (
|
||||
|| ( >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}]
|
||||
<dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
)
|
||||
mail? (
|
||||
|| ( >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}]
|
||||
<dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
)
|
||||
manhole? (
|
||||
|| ( >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}]
|
||||
<dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
)
|
||||
dev-python/future[${PYTHON_USEDEP}]
|
||||
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
|
||||
>=dev-python/autobahn-0.10.2[${PYTHON_USEDEP}]
|
||||
<dev-python/autobahn-0.13.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
|
||||
doc? ( >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] )
|
||||
test? (
|
||||
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
|| (
|
||||
(
|
||||
>=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}]
|
||||
)
|
||||
<dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
dev-python/moto[${PYTHON_USEDEP}]
|
||||
dev-python/boto3[${PYTHON_USEDEP}]
|
||||
dev-python/ramlfications[${PYTHON_USEDEP}]
|
||||
dev-python/pyjade[${PYTHON_USEDEP}]
|
||||
dev-python/txgithub[${PYTHON_USEDEP}]
|
||||
dev-python/txrequests[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
# still yet to be added deps
|
||||
# doc? ( 'sphinxcontrib-blockdiag',
|
||||
# 'sphinxcontrib-spelling',
|
||||
# 'pyenchant',
|
||||
# 'docutils>=0.8',
|
||||
# 'sphinx-jinja',)
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
[[ ${PV} == *9999 ]] && S=${S}/master
|
||||
|
||||
pkg_setup() {
|
||||
enewuser buildbot
|
||||
|
||||
DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
|
||||
to support starting buildbot through Gentoo's init system. To use this,
|
||||
execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
|
||||
The scripts can run as a different user if desired."
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
distutils-r1_src_compile
|
||||
|
||||
if use doc; then
|
||||
einfo "Generation of documentation"
|
||||
pushd docs > /dev/null
|
||||
#'man' target is currently broken
|
||||
emake html
|
||||
popd > /dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
distutils-r1_src_install
|
||||
|
||||
doman docs/buildbot.1
|
||||
|
||||
if use doc; then
|
||||
dohtml -r docs/_build/html/
|
||||
# TODO: install man pages
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r contrib docs/examples
|
||||
fi
|
||||
|
||||
newconfd "${FILESDIR}/buildmaster.confd" buildmaster
|
||||
newinitd "${FILESDIR}/buildmaster.initd" buildmaster
|
||||
systemd_dounit "${FILESDIR}/buildmaster.target"
|
||||
systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
|
||||
systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
|
||||
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if [[ -n ${REPLACING_VERSIONS} ]]; then
|
||||
ewarn
|
||||
ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
|
||||
ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
|
||||
ewarn "is now the common base directory for all instances. If you are migrating from an older"
|
||||
ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
|
||||
ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
|
||||
ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
|
||||
ewarn " ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
|
||||
ewarn " rc-update add buildmaster.myinstance default"
|
||||
ewarn " /etc/init.d/buildmaster.myinstance start"
|
||||
ewarn "Systems using systemd can do the following:"
|
||||
ewarn " systemctl enable buildmaster@myinstance.service"
|
||||
ewarn " systemctl enable buildmaster.target"
|
||||
ewarn " systemctl start buildmaster.target"
|
||||
elog
|
||||
elog "Upstream recommends the following when upgrading:"
|
||||
elog "Each time you install a new version of Buildbot, you should run the"
|
||||
elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
|
||||
elog "This will add files and fix (or at least detect) incompatibilities between"
|
||||
elog "your old config and the new code."
|
||||
fi
|
||||
elog
|
||||
elog "In order to create a new instance of buildmaster, execute:"
|
||||
elog " emerge --config =${CATEGORY}/${PF}"
|
||||
}
|
||||
|
||||
pkg_config() {
|
||||
local buildmaster_path="/var/lib/buildmaster"
|
||||
einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
|
||||
einfo "Press Control-C to abort."
|
||||
|
||||
einfo "Enter the name for the new instance: "
|
||||
read instance_name
|
||||
[[ -z "${instance_name}" ]] && die "Invalid instance name"
|
||||
|
||||
local instance_path="${buildmaster_path}/${instance_name}"
|
||||
if [[ -e "${instance_path}" ]]; then
|
||||
eerror "The instance with the specified name already exists:"
|
||||
eerror "${instance_path}"
|
||||
die "Instance already exists"
|
||||
fi
|
||||
|
||||
local buildbot="/usr/bin/buildbot"
|
||||
if [[ ! -d "${buildmaster_path}" ]]; then
|
||||
mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
|
||||
fi
|
||||
"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
|
||||
chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
|
||||
mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
|
||||
|| die "Moving sample configuration failed"
|
||||
ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
|
||||
|| die "Unable to create link to init file"
|
||||
|
||||
einfo "Successfully created a buildmaster instance at ${instance_path}."
|
||||
einfo "To change the default settings edit the master.cfg file in this directory."
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
[Unit]
|
||||
Description=buildbot master daemon
|
||||
After=local-fs.target network.target
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
User=buildbot
|
||||
WorkingDirectory=/var/lib/buildmaster
|
||||
ExecStartPre=/usr/bin/buildbot checkconfig /var/lib/buildmaster
|
||||
ExecStart=/usr/bin/buildbot start /var/lib/buildmaster
|
||||
ExecStop=/usr/bin/buildbot stop /var/lib/buildmaster
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@ -1,10 +0,0 @@
|
||||
|
||||
# Path to the build master's basedir.
|
||||
BASEDIR=/var/lib/buildmaster
|
||||
|
||||
# User account for the buildmaster.
|
||||
# The basedir should be owned by this user.
|
||||
USERNAME=buildbot
|
||||
|
||||
# Extra options to pass to twistd.
|
||||
TWISTD_OPTS=""
|
||||
@ -1,54 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
extra_started_commands="reload"
|
||||
|
||||
depend() {
|
||||
need net
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
if [ -z "${BASEDIR}" ]; then
|
||||
eerror "BASEDIR not set"
|
||||
return 1
|
||||
fi
|
||||
if [ -z "${USERNAME}" ]; then
|
||||
eerror "USERNAME not set"
|
||||
return 1
|
||||
fi
|
||||
if [ ! -d "${BASEDIR}" ]; then
|
||||
eerror "${BASEDIR} is not a directory"
|
||||
return 1
|
||||
fi
|
||||
if [ ! -e "${BASEDIR}/buildbot.tac" ]; then
|
||||
eerror "${BASEDIR} does not contain buildbot.tac"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
start() {
|
||||
checkconfig || return 1
|
||||
ebegin "Starting buildmaster in ${BASEDIR}"
|
||||
start-stop-daemon --start -u "${USERNAME}" \
|
||||
--pidfile "${BASEDIR}/buildmaster.pid" \
|
||||
--exec /usr/bin/twistd -- \
|
||||
--no_save \
|
||||
--logfile="${BASEDIR}/twistd.log" \
|
||||
--pidfile="${BASEDIR}/buildmaster.pid" \
|
||||
--python="${BASEDIR}/buildbot.tac"
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping buildmaster in ${BASEDIR}"
|
||||
start-stop-daemon --stop --pidfile "${BASEDIR}/buildmaster.pid"
|
||||
eend $?
|
||||
}
|
||||
|
||||
reload() {
|
||||
ebegin "Reconfiguring buildmaster in ${BASEDIR}"
|
||||
start-stop-daemon --signal HUP --pidfile \
|
||||
"${BASEDIR}"/buildmaster.pid
|
||||
eend $?
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST gtkevemon-1.8-learning.patch.gz 5879 SHA256 ec9951ae91447e4e5f1d1720a35c27a92546760cc2ae76cd269f85cb59766437 SHA512 44d58ce947b27fb623a94e79e2eff6a20aec1bd0a63c3029347099e64bde5fc31080bcfed0da8fd00f70c2f5c88182760ee169729729c39805bee099099d3022 WHIRLPOOL 68342fc1e8aa729f4e6cd3002fbde58ad7c3818dc5d76cddfb4b4d4d05a5f9e55d8244f07a7803c3fc5ddc354546cc20f73c0c6dea58fd1a2303004cd3ce120e
|
||||
DIST gtkevemon-1.8-source.tar.gz 321226 SHA256 32faf51b5b84f7e055dd47b7c43f722613b5c6cfbd8ec6a47cada75e686300c7 SHA512 483a66bda9f34ae423ce4205eaf5dc3775dab9d8d0074a19d79ffad86bc13974b09927efd1757300233c8e040f42e564ea44f32a5c3c2726db404d43d9fb5736 WHIRLPOOL 60ea958633d6fc9ca2e6b4940f30f9691c95c8d1a43a16763ab3532065be0872e0e6c0fe71a0b36ebd0d74422105cc745ab7d88ce0a5f7a552c9ca22c62f4a85
|
||||
DIST v1.10.tar.gz 240225 SHA256 532d36755f33e2e00cdf8bf7ca52b16c04e4a1c47235b821a93236b493da5239 SHA512 c3fad5ba1947be527adf9c90bfad60eb505fd6b3bb3379f960748ccb529381b34b5c5c653516220d17998c95ce2b53105834f7d79053bc1e8ccc9094c8b974c9 WHIRLPOOL ea319155abe46db1af5ed739eaf2034446d4b8d1f83470c7acccf94030720c8bdc0182e3ed2c803d9f09557a49fe9056c0758de99628d152fce44e8bc4486818
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit flag-o-matic
|
||||
|
||||
DESCRIPTION="A standalone skill monitoring application for EVE Online"
|
||||
HOMEPAGE="http://gtkevemon.battleclinic.com"
|
||||
SRC_URI="http://github.com/gtkevemon/${PN}/archive/v${PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-cpp/gtkmm:2.4
|
||||
dev-libs/libxml2
|
||||
dev-libs/openssl:0
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -e 's:Categories=Game;$:Categories=Game;RolePlaying;GTK;:' \
|
||||
-i "icon/${PN}.desktop" \
|
||||
|| die "failed fix categories in icon/${PN}.desktop"
|
||||
|
||||
# Fixes a QA notice.
|
||||
sed -i "/^Encoding/d" "icon/${PN}.desktop" \
|
||||
|| die "failed to remove the Encoding from icon/${PN}.desktop"
|
||||
|
||||
append-cxxflags -std=c++11
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin "src/${PN}"
|
||||
doicon "icon/${PN}.svg"
|
||||
domenu "icon/${PN}.desktop"
|
||||
einstalldocs
|
||||
}
|
||||
@ -1,57 +1,47 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=4
|
||||
EAPI=6
|
||||
|
||||
inherit eutils
|
||||
|
||||
IUSE=""
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
inherit mercurial
|
||||
EHG_REPO_URI="https://bitbucket.org/BattleClinic/${PN}"
|
||||
KEYWORDS=""
|
||||
SRC_URI=""
|
||||
MY_S="${WORKDIR}/${P}/gtkevemon"
|
||||
else
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SRC_URI="http://gtkevemon.battleclinic.com/releases/${P}-source.tar.gz"
|
||||
fi
|
||||
inherit flag-o-matic git-r3
|
||||
|
||||
DESCRIPTION="A standalone skill monitoring application for EVE Online"
|
||||
HOMEPAGE="http://gtkevemon.battleclinic.com"
|
||||
EGIT_REPO_URI="https://github.com/${PN}/${PN}"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS=""
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-cpp/gtkmm:2.4
|
||||
dev-cpp/gtkmm:3.0
|
||||
dev-libs/libxml2
|
||||
net-misc/curl[ssl]
|
||||
"
|
||||
DEPEND="${DEPEND}
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_unpack()
|
||||
{
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
mercurial_src_unpack
|
||||
S=${MY_S}
|
||||
else
|
||||
default
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -e 's:Categories=Game;$:Categories=Game;RolePlaying;GTK;:' \
|
||||
-i icon/${PN}.desktop || die "sed failed"
|
||||
-i "icon/${PN}.desktop" \
|
||||
|| die "failed fix categories in icon/${PN}.desktop"
|
||||
|
||||
# Fixes a QA notice.
|
||||
sed -i "/^Encoding/d" "icon/${PN}.desktop" \
|
||||
|| die "failed to remove the Encoding from icon/${PN}.desktop"
|
||||
|
||||
append-cxxflags -std=c++11
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# fixed QA notice
|
||||
sed -i "/^Encoding/d" icon/${PN}.desktop
|
||||
dobin src/${PN}
|
||||
doicon icon/${PN}.svg
|
||||
domenu icon/${PN}.desktop
|
||||
dodoc CHANGES README TODO
|
||||
dobin "src/${PN}"
|
||||
doicon "icon/${PN}.svg"
|
||||
domenu "icon/${PN}.desktop"
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="sqlite"
|
||||
|
||||
inherit distutils-r1 eutils
|
||||
|
||||
MY_PV=${PV/_beta/-beta.}
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
HOMEPAGE="http://beets.radbox.org/ https://pypi.python.org/pypi/beets"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SLOT="0"
|
||||
LICENSE="MIT"
|
||||
IUSE="beatport bpd chroma convert doc discogs echonest echonest_tempo lastgenre mpdstats replaygain test web"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/munkres[${PYTHON_USEDEP}]
|
||||
>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
|
||||
dev-python/unidecode[${PYTHON_USEDEP}]
|
||||
>=media-libs/mutagen-1.22[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
beatport? ( dev-python/requests[${PYTHON_USEDEP}] )
|
||||
bpd? ( dev-python/bluelet[${PYTHON_USEDEP}] )
|
||||
chroma? ( dev-python/pyacoustid[${PYTHON_USEDEP}] )
|
||||
convert? ( media-video/ffmpeg:0[encode] )
|
||||
discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
|
||||
doc? ( dev-python/sphinx )
|
||||
echonest? ( dev-python/pyechonest[${PYTHON_USEDEP}] )
|
||||
echonest_tempo? ( dev-python/pyechonest[${PYTHON_USEDEP}] )
|
||||
mpdstats? ( dev-python/python-mpd[${PYTHON_USEDEP}] )
|
||||
lastgenre? ( dev-python/pylast[${PYTHON_USEDEP}] )
|
||||
replaygain? ( || ( media-sound/mp3gain media-sound/aacgain ) )
|
||||
web? ( dev-python/flask[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
# remove plugins that do not have appropriate dependencies installed
|
||||
for flag in beatport bpd chroma convert discogs echonest echonest_tempo lastgenre \
|
||||
mpdstats replaygain web;do
|
||||
if ! use $flag ; then
|
||||
rm -r beetsplug/${flag}.py || \
|
||||
rm -r beetsplug/${flag}/ ||
|
||||
die "Unable to remove $flag plugin"
|
||||
fi
|
||||
done
|
||||
|
||||
for flag in bpd lastgenre web;do
|
||||
if ! use $flag ; then
|
||||
sed -i "s:'beetsplug.$flag',::" setup.py || \
|
||||
die "Unable to disable $flag plugin "
|
||||
fi
|
||||
done
|
||||
|
||||
use bpd || rm -f test/test_player.py
|
||||
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
use doc && emake -C docs html
|
||||
}
|
||||
|
||||
python_test() {
|
||||
cd test
|
||||
if ! use web;then
|
||||
rm test_web.py || die "Failed to remove test_web.py"
|
||||
fi
|
||||
"${PYTHON}" testall.py || die "Testsuite failed"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
doman man/beet.1 man/beetsconfig.5
|
||||
|
||||
use doc && dohtml -r docs/_build/html/
|
||||
}
|
||||
@ -1 +1 @@
|
||||
Wed, 10 Aug 2016 19:40:36 +0000
|
||||
Thu, 11 Aug 2016 05:10:37 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Wed, 10 Aug 2016 19:40:36 +0000
|
||||
Thu, 11 Aug 2016 05:10:37 +0000
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
DEFINED_PHASES=configure install postinst preinst prepare setup
|
||||
DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_sigrok? ( sci-libs/libsigrok ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_write_riemann? ( dev-libs/protobuf-c:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_cgroups? ( sys-fs/xfsprogs ) collectd_plugins_df? ( sys-fs/xfsprogs ) collectd_plugins_genericjmx? ( >=virtual/jdk-1.6 ) collectd_plugins_iptables? ( <=sys-kernel/linux-headers-4.4 ) collectd_plugins_java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
|
||||
DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_write_riemann? ( dev-libs/protobuf-c:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_cgroups? ( sys-fs/xfsprogs ) collectd_plugins_df? ( sys-fs/xfsprogs ) collectd_plugins_genericjmx? ( >=virtual/jdk-1.6 ) collectd_plugins_iptables? ( <=sys-kernel/linux-headers-4.4 ) collectd_plugins_java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
|
||||
DESCRIPTION=Collects system statistics and provides mechanisms to store the values
|
||||
EAPI=6
|
||||
HOMEPAGE=http://collectd.org/
|
||||
IUSE=contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev collectd_plugins_amqp collectd_plugins_aggregation collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_genericjmx collectd_plugins_gmond collectd_plugins_hddtemp collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_load collectd_plugins_logfile collectd_plugins_log_logstash collectd_plugins_lvm collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_md collectd_plugins_memcachec collectd_plugins_memcached collectd_plugins_memory collectd_plugins_modbus collectd_plugins_multimeter collectd_plugins_mysql collectd_plugins_netlink collectd_plugins_network collectd_plugins_network collectd_plugins_nfs collectd_plugins_nginx collectd_plugins_notify_desktop collectd_plugins_notify_email collectd_plugins_ntpd collectd_plugins_numa collectd_plugins_nut collectd_plugins_olsrd collectd_plugins_onewire collectd_plugins_openldap collectd_plugins_openvpn collectd_plugins_oracle collectd_plugins_perl collectd_plugins_ping collectd_plugins_postgresql collectd_plugins_powerdns collectd_plugins_processes collectd_plugins_protocols collectd_plugins_python collectd_plugins_python collectd_plugins_redis collectd_plugins_routeros collectd_plugins_rrdcached collectd_plugins_rrdtool collectd_plugins_sensors collectd_plugins_serial collectd_plugins_sigrok collectd_plugins_smart collectd_plugins_snmp collectd_plugins_statsd collectd_plugins_swap collectd_plugins_syslog collectd_plugins_table collectd_plugins_tail collectd_plugins_tail_csv collectd_plugins_target_notification collectd_plugins_target_replace collectd_plugins_target_scale collectd_plugins_target_set collectd_plugins_tcpconns collectd_plugins_teamspeak2 collectd_plugins_ted collectd_plugins_thermal collectd_plugins_threshold collectd_plugins_tokyotyrant collectd_plugins_turbostat collectd_plugins_unixsock collectd_plugins_uptime collectd_plugins_users collectd_plugins_uuid collectd_plugins_varnish collectd_plugins_virt collectd_plugins_vmem collectd_plugins_vserver collectd_plugins_wireless collectd_plugins_write_graphite collectd_plugins_write_http collectd_plugins_write_kafka collectd_plugins_write_log collectd_plugins_write_redis collectd_plugins_write_riemann collectd_plugins_write_sensu collectd_plugins_write_tsdb collectd_plugins_zfs_arc collectd_plugins_zookeeper +filecaps elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
|
||||
KEYWORDS=~amd64 ~arm ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_sigrok? ( sci-libs/libsigrok ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_write_riemann? ( dev-libs/protobuf-c:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_genericjmx? ( >=virtual/jre-1.6 ) collectd_plugins_java? ( >=virtual/jre-1.6 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) java? ( >=dev-java/java-config-2.2.0-r3 )
|
||||
RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_write_riemann? ( dev-libs/protobuf-c:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_genericjmx? ( >=virtual/jre-1.6 ) collectd_plugins_java? ( >=virtual/jre-1.6 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) java? ( >=dev-java/java-config-2.2.0-r3 )
|
||||
REQUIRED_USE=collectd_plugins_genericjmx? ( java ) collectd_plugins_java? ( java ) collectd_plugins_python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) ) collectd_plugins_smart? ( udev )
|
||||
SLOT=0
|
||||
SRC_URI=http://collectd.org//files/collectd-5.5.1.tar.bz2
|
||||
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde fcaps 6a1091a98b1dde01cc26ab3252da1a9b java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib d062ae4ba2fc40a19c11de2ad89b6616 perl-functions aac50de73be0a80ebe780e0b20850130 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 user c66cbe7502fe1161066eb947d15b79f6 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=00b2a36c2f2f00b22d2225407e7f59a7
|
||||
_md5_=bb68938233cf220a1f511d58d847a68d
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
DEFINED_PHASES=compile configure
|
||||
DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
|
||||
DESCRIPTION=A minimal console text editor
|
||||
EAPI=6
|
||||
HOMEPAGE=http://dav-text.sourceforge.net/
|
||||
KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=sys-libs/ncurses:0
|
||||
SLOT=0
|
||||
SRC_URI=http://dav-text.sourceforge.net/files/dav-0.8.5.tar.gz
|
||||
_eclasses_=multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
|
||||
_md5_=ed74fb35c0047e1bc4910584cb0fab02
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,11 +0,0 @@
|
||||
DEFINED_PHASES=configure install postinst prepare
|
||||
DESCRIPTION=An implementation of John Gruber's Markdown text to html language written in C
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
|
||||
IUSE=minimal
|
||||
KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
|
||||
LICENSE=BSD
|
||||
SLOT=0
|
||||
SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.1.6.tar.bz2
|
||||
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
|
||||
_md5_=7bf2e5edb370508b8b37647d51096380
|
||||
@ -0,0 +1,10 @@
|
||||
DEFINED_PHASES=configure install postinst prepare test
|
||||
DESCRIPTION=A Markdown-to HTML translator written in C
|
||||
EAPI=6
|
||||
HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
|
||||
IUSE=minimal test
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
|
||||
LICENSE=BSD
|
||||
SLOT=0
|
||||
SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.0.tar.bz2
|
||||
_md5_=272e5749b9ad01a9155615e1ef241b3e
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue