root
8 years ago
parent
d0de5dd83f
commit
e503960851
@ -1,7 +1,9 @@
|
||||
AUX dav-0.8.5-asneeded.patch 318 SHA256 a20f1e1965ef7e9d5dd68c514b538733e949144a793913153c1cf4f3d18ccd1a SHA512 06ad6057354af941512e6c77f59cd9c30a7192c01fdce65d5d66e15fb99476429092f0587130162b78f22ca72354af8925735733c142a889a478c8a07384138f WHIRLPOOL f7f32dce5ca527fb6c09ec61367fc2de8769f375610d7d258bbd2874bc874fbf249b0bb2715511a79d96bfa19081ecfe196c3e8b5a5b3c072c8ce964c3e1f924
|
||||
AUX dav-0.8.5-davrc-buffer-overflow.patch 246 SHA256 5f0eb25c62b4b6bef694d7691ec6f525d66c7f5f71b15d8752f3df3c394a4c68 SHA512 36c8e336adc3cdb053af61ea53bf497073d197e67957f2ad011f7199c1518deb08f5fcfffa4ff14c49139f6bab01303332c8c15e5944245696dbc62dceff116c WHIRLPOOL d53dfa76d7a241cf3b770347bbe8df2deff12f49c9f9e90f2f1e80839fb03cbd0aba3a7ffaad9d622b9a8913259e7176002984c5de96115905af066ae11a1b7f
|
||||
AUX fix-Wformat-security-warnings.patch 1179 SHA256 e2af06615aee874426a97fe42dc1bef016d6c6c79954b8c25db15b72f118ad1d SHA512 c5665be995e718a460b6c75ae3843104721a58c2d4a5321659d8527034f413d433fdd1140b14d6a8587f298a2e4935f8a07579071e5aa5d6fa49e125da5e4895 WHIRLPOOL e39ca3dcb6768ce3336b20ace4790438518206d6cf9ff8a1fb75be34d302ca7b9417fdc56c88cb06f08448d20808f225d2663934a0d7d4f24ce2e13b82b7d2c5
|
||||
DIST dav-0.8.5.tar.gz 22824 SHA256 af3835c31f7fb28815bc9b5fcc76e229d0e389d13b178858d120664af486a9ba SHA512 cdedff875df392e8525399b40d45cdf4e984b1b014f03d9f5cd5be270eebe0003fcf48e9738f6ac2789138973970bb9fe6d0b8babd20c1df61e193f84ee066b3 WHIRLPOOL 049684e2846f9bbbd8b0cab97689f69adfff2067485be59789913272d884c5b07ad47320f2b9dbf1285af01a12cfd2f7f9eca8ac0a7528ba10271b64a767c94c
|
||||
EBUILD dav-0.8.5-r1.ebuild 884 SHA256 43164128ee757dad6cef0c953fdff14e205b7e0a75a802d19e3e7c342565411f SHA512 acfabf2102a0291097a9e6970e5ba06c820ea619546142c595982c4ed0a2db8880e575af6e6731624a8a9b65c022799fe8b3daf4667ba0d8abc53e4ae714266b WHIRLPOOL d2789143b0036dc6466b39af70546305aa2dd74fa15deb3068bd259abc6c7252129f94453647a457db148833a1a090f4255e9b4f8cc358c15beab926d8629ffc
|
||||
MISC ChangeLog 3146 SHA256 acfeb6fe0c8fc0f57e7fb44eba691a9a3da53153ae864f4482cd70c03d5725b0 SHA512 0981f16ebad57b2d2d9eaa8eddee9104a1106cb6e552dc0f600270b618b52a131c7ab356240ae3aa536094c904b06c72636f8e135c658d55786538c211293e73 WHIRLPOOL 374721439485757593c8aa8591e587c39ba0ede64069b8c9b5545a53e3d3290983423e81804eecacac6f51590d32637bfc8d9ae907b72947a896417dc3adface
|
||||
EBUILD dav-0.8.5-r2.ebuild 914 SHA256 416ea139b1f5c0f4f3d4cadbb2e40d642e32ddf094cdba0ab0edfb981024883d SHA512 2e1e66eeec841b0b8a722e7459d4f7cd1434ad739940243db7da83d5df6c527026adc6f08eebed376cffadc5ee6fc7ae23128d7475e2d6e968dd35d93742a34d WHIRLPOOL 7ff14fc50e2dd406ec43fb16e52348f006a838f0a610d3b1f415a99ad84a410461b68042418e20b1dfc74fe880afec02f50332c23b76c887630f4016212d6424
|
||||
MISC ChangeLog 3393 SHA256 1d8d30effbccff01cc937e9ec7553ce505a5371957071cab5371e789a1b6dd53 SHA512 5c1265b1d78f4bafa18a8b931555644041a49e71250741cff5c163a87555f62d7e24cd85cea4d488d276965c144219dc138bed142d096b08f018564b3e35cb5f WHIRLPOOL a2afc62ff085ae775747a77f39b837f55f2c61de28570c16a67df1090f21ff4eab67364cb349d8a9977f897222974ac44d29ab19dcd13ee2835461a2b3de6e8d
|
||||
MISC ChangeLog-2015 2388 SHA256 d65955217eab11486ed91023b7ccd57dfbfd89083df1744389b5c3dc0c9110b9 SHA512 0281137c752a7c761f61d9641ce7c4682a5a2563a02eba88292f220cb4007182ee609a59bf13bdc7acf5ab637f40e573573ff2a11d2f7c7ac4d35de88fc06668 WHIRLPOOL 104180131eb27984e49050ec8f4089b66e4824d69cc7398d4e7124eaa6fe58c4f246d2b1efc0ffdd353ebe0d9c602b2610209dfd574a67716cd5a019bdb34114
|
||||
MISC metadata.xml 245 SHA256 ce7dad3296fc521e775dce46cd51580e366ba33c278989f773343032d24bb5c4 SHA512 c42813db6849d65a3316be196bafc9fb991f6d78eb75f07e4202ba512c11ba1c6ea4082742df51fc83a06a520bd3297bd6f7404a48fbfee969937d10cd777a18 WHIRLPOOL 72c28bd0f649c7ae5e2ff828f09e21c810d7bd5efb49d77af0949bd24795d216984bac6427b8d8696de3c93189bc1a8a3304491c419a0e62367110c0ed5b0049
|
||||
|
||||
@ -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,8 +1,7 @@
|
||||
AUX discount-2.1.6-portage-multilib-CFLAGS.patch 1975 SHA256 a24fc76d0c45c3afd34f9c19ddcc905b78d540cf39dccd7111cfad785e76f996 SHA512 7e2546d09aa4f4ca4987cb71b388e494eede4c326af1cd7107e70f74d73038b64a5defef59fd50de8108101f36b16562e468b690d99e5f84a278187bc67e56ad WHIRLPOOL 8a94efd0ebc27ad083737a5dfc6ae169e66eb0ae4b7fd057ae879c5c09a18699164b140b8a06bbc8def1cecb44fdb6ea640986587309156ab34a5b868b2698e9
|
||||
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
|
||||
EBUILD discount-2.1.6-r1.ebuild 2051 SHA256 4598839490206f7ce7caf90caecea71097bff0ab300f2019ddeba3a2e9be7d21 SHA512 1d6b3500b14c14761e89cee57406a67e33c707229c956b51e803754477c9ee73b3f86ab30d057655c5abcda0a772fe57b5e2768f4c8b81a6a95a2445d10c2783 WHIRLPOOL 2d9ed7d4b62507d39c1270e7f602a52adcbde98fd5f3e04ddc0ded2bec8c4c6a6caf18edcc49075017a24b6f7979a33f487820b21cc8fd276e64296fc3dea174
|
||||
DIST discount-2.2.0.tar.bz2 88387 SHA256 b25395c29c2c08836199eb2eae87b56e6b545e77f5fbf921678aa1dc0ddab9f3 SHA512 04b66496ca53a2ab73cba2a8f9d8e77efd13f318b188611aaaebc4fd036a02cd188aa712337df414ff3b7ac65d2ced17020085cae10338e8af47e5b9552d981a WHIRLPOOL 1b4f30e924c4f38bc0685eb78c609c461e282dd54c6f588098ffb86dc03330ab45c68340dea5dd965cd26b42771ffc379c9ef828bbfc3a79f593b75f483c3e1d
|
||||
EBUILD discount-2.1.8a-r1.ebuild 2436 SHA256 7738627a93e2d51be20714e73583fae07a64e7295fe50a0bea001cb9eb4f852b SHA512 16bdb1800971f86974da592239d929e44d925a5b7800b048375c2d5b115ef6aa1d9b696f5520d6845027f40b5d2aac945217cc1e591889b7770211b73b08cf28 WHIRLPOOL c91d8b8c29731c82670d392de22d6b807d2b2e69cf02291a9c86514fe324a5357313be8dbb0ddbd0f6be49dd295f66f49ad947b013cbff192be13d43d6ce4abc
|
||||
MISC ChangeLog 3848 SHA256 fa1dd31b77f3b2579dff75b5338fcaae15e9fa29d60d2370888321a4115970dc SHA512 d705f67c3b9e5301749bc32a25c462022583e34e1d4f4c0ab61192a432401abf9a1d8df6c97697913b65e7a559e3998408af57473ae37a794619bb72967dd7b9 WHIRLPOOL afed67f83a55a5012439f2809ffdde40b7e1d3159946fde720ed4d0c5071c1573ebe0db9c8be68c7600df8ed8efa342d8a4adcb125e26985dea45e301f241d5c
|
||||
EBUILD discount-2.2.0.ebuild 1855 SHA256 e9ce788c4ab1bc56ab42e0e163a686d86874c1325ce97c259da33236d016b884 SHA512 e98a746e4e8cf5c3ae08a183486911e26dced3fdde105aa1484c8b58efd87e0c2ee84d121498149622e8afa6d058563a3cf468b1d648d21e11eb8738df47bad2 WHIRLPOOL 3109e6b911689867809758c9316323735795afbfffb2298d83d7b5e1be026cd0b45748782911175bbb20e6069812e1f1595110fb433654ee2e5148a5ac4a1e96
|
||||
MISC ChangeLog 4437 SHA256 d5163ee5d70cd238e1d1f4660191c8bcacf611acd85cc7c979c9d2574e656362 SHA512 d86bf209c399934d4e61bb6301d13a9bc0479d2177e027683e793b59428312e3b0987e3ed51a2b30a6f2c0f770361481d17cad2919f7341534939a61b02e74ad WHIRLPOOL ef0c778f497f1b471fc6be02bef58b821a4164056b1be0be1283c521922c3c7be32cce4b000dc06fed5d9f8f9f85b72c3ec56ab354f3a157595fe772887df223
|
||||
MISC ChangeLog-2015 2472 SHA256 7e63434fb1e7db783a0d961204a17cfed6790b3dd940fd238fecb5aa966520b5 SHA512 1c296077c16676cedcf2db0e4de5d17204ef2c496fd1145084be1be3aef8b711fa2c48ca287f4e04a51b6b5b02304bc6cb0a69976b05a22e8ca9d4ffca2675f8 WHIRLPOOL ebee3ca9558584c36adb5a61f11a955fe993a540f8699addbd2260c2fc39f19202128c7f54e213f0988de735619439a91fb05804f365ddd00c9d597c20ac2e0d
|
||||
MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
|
||||
|
||||
@ -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,5 +1,5 @@
|
||||
DIST pastebinit-1.5.tar.bz2 42941 SHA256 42e5a84ce7e46825fb3b6478e11893fad357197327257e474bd0d3549f438457 SHA512 cc4b7c46ab7932be3a1064ce7a1d91da3ebf4b132ad44b0090c8d431bfc68e945357344e59ac1239e37b3178de124930c5c8dc552b42f16c39c0452ac9ab8099 WHIRLPOOL 0d20dd1ab5cb10436fc23fae27f090195400cfcfca1b24b860e27f1e5d38d7341c08ae1c8d7cc747e4127e3c8ae634355f796a6308a5a61671210c9581b22481
|
||||
EBUILD pastebinit-1.5.ebuild 1343 SHA256 36f79994344a9be032855d53f661d4d2f06cd9ffd8fe00af7282e1f5cb8498a9 SHA512 49f16f962f629bd739fd224de2f1690f278c634594c64635df4109eecc92704b05a1f9d09a846f9fd0b6b3b3fed7601c5f830930877f7868c8d9f8141f719182 WHIRLPOOL 43113902c064eddf208d1f8517cbdf813ae9bd7a28ffe122e43dcef8dc691fb620d273985abecbad68d8b3fb779380ee6c913c0c02a0932ca9180a109006c8b7
|
||||
MISC ChangeLog 2868 SHA256 52685f2b9e50bcf8709e629d71d131b224760dc5b02f801cced97b94deedc427 SHA512 51cfe05b2ead732500886da02a1ec47eddd218d780be23ab1b1a3cf49724a03307d065393c31bf4cd670c6caeefbfed0e62c8c1bdeef14eaa7256aa3dbaba533 WHIRLPOOL f70ef7cb967118f6c558aded98cb2f0f38a2f6793d7aa784a3b40fe8a3757821ca9514d2bed8a5cf8179d4947c4c74d5a853b80e16a5f7a029059fada787c669
|
||||
MISC ChangeLog 3149 SHA256 7afddc9adc04fcde2b37346c51856bcd491694df7ef18380e90bc0f18d17f940 SHA512 4291a27623d3ae937426c880f57921a7b331ef987843cfef8f391bac0038d4478144f3720b557ef761d109c0d7b8e8fcc8296e19c44e69826c68115b0e172cf7 WHIRLPOOL a71dd51be4945fea63bfd6a1336524b228e849639ce9e2c37b14bf04a17212849979911b3dc9b8113264b267542bde334fd71c90d8398869d1ecf76fd72be11b
|
||||
MISC ChangeLog-2015 1760 SHA256 62cf3a38a86df230064778c80ae052c732729f2ef0dfe4b0ce6767ff955024c5 SHA512 e55b8950c931deefa717f39f6d7d71772f83e934a36448f9bf5337e5cbce22f09f5647ea4c955379f0a13e01da811810f525d1be87f39ced7e132f7d0c2ca264 WHIRLPOOL afa1a90d51ed2b327218dfdf0806959955f2a463904df6fc2f610b752dc37b5d3ce2032bfb31cd843a44751db369bd4158cfd260f93dbf48b2c3bb2f1d8233ab
|
||||
MISC metadata.xml 300 SHA256 bba8c08801e22b77c3dcfe761fc04b3f60335314185a2730fe98c16611df87e7 SHA512 7dc26c0febbda314bdcba49514f0222c0cca81d0fc20a0576061b406c1ba388a0d190888b98f61291b4b3e251115c0417ea6a6e2aebae1d32678d182741fb39f WHIRLPOOL cfb5210e91c692076f13da16a6a36d9c1d513c38246a3dd373fb37722f712848c4d8ebe058e21563ec9acb69c0648b8d459625c5f48725b08c9db397cd3d062f
|
||||
|
||||
@ -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,5 +1,5 @@
|
||||
AUX libfastjson-0.99.2-fix-for-implicit-declaration-of-vasprintf.patch 596 SHA256 1951a0a800d80f7255adb6f352837b63b0b4d377593b95e62ac7dc1eb3399a2b SHA512 fd32eb655520446578a6bf0ad6d855a78b77e229a3787f0d9d586c96e8ab72903f5e1f98ad2581dc33e5f58ebe88ee30f0ba4cdf4b8be42e9a1ee5e4572fb917 WHIRLPOOL 92fa0b93fbcba29712049c02b7274ec27b336346932a2a0c1f0c172541a7dbd98b8ce552241784568d11b53ed93367186c5e4da404ff96878d4be3b9d3ee3f48
|
||||
DIST libfastjson-0.99.2.tar.gz 366602 SHA256 6ff053d455243a81014f37b4d81c746d9b8d40256a56326c3a7921c8bf458dfd SHA512 4b57697cbb901bc12a26d98c3d6df998aba373d4f38339189c9bd3e5a32777fa4796039fe82581337e576fa93c6deb87759eba04326134f587064c82e1b3daaf WHIRLPOOL 56010125b4ba905aba3fa7ad69faf38237426c1ef5cbaad90458fe31e96b86719d2766d2099928dc22aa7d98a64d079a3bd9de31702b28547d1f1d416170d487
|
||||
EBUILD libfastjson-0.99.2.ebuild 856 SHA256 ec9b26bb774fde5bb4690803ca0568d0289be7e5398c86f591b4d5083da1311f SHA512 8b50f55982e10033145cffb4530755bdc67cb9220901c2b23b15ff3e4ee122de141195892c3017f187fd201a733943b4405a95d18e2ee81fc5fac835582200c6 WHIRLPOOL 8c279ef80ab307fc24fd8576978911c88631094506ef85ef6cd55989b907695bf90e724caca52d3546fa80ad94bc08c7e5e155fcb125d9c2308cc93b681791d9
|
||||
MISC ChangeLog 1235 SHA256 4ba411cfdbac6339d4085654e8b6120c850ac93c45dd39656756a7b6d4496d46 SHA512 ce4a7b6fd2e6eb8ecabc9d44e2e0df236e69a93e86c1a7d660e77fc7d81380a90a2be01f1cbd1af8abe1d11c9c7be701963dff2b8783a69b9e50a1fb56191bc5 WHIRLPOOL 990cd4bcc971e3630aaf476e06a3241f7c949b700055f9eee54f1a08be0e6d7050d170da9c6365694a26e3be15e7c05831a0e4f52c0ae9c3ee9ebba6c56459cc
|
||||
MISC metadata.xml 518 SHA256 d1f3b4e558a1297f5c15493db99aafeec2f82961bf79ebf501b655916ee6a48d SHA512 f42c0aa88b002eb5f1fefe52745ca04dbd3dedfc6bc9f4cb67b1ab52fa18d87fad3cb9ff2649a858bec3681ed37c6dbf0dac771b76a9a8399468ba2ef0cfb5cf WHIRLPOOL f7aea0266a7934e560193cf93ee096c6bf4fa74a5005e0600cdf7ea9bc5d4b7acd03063f76a34ad1073939fc687911f438837119da98b5cc5aa885d1d982e9db
|
||||
MISC ChangeLog 1715 SHA256 09c878cffe36055c2633928214f1a9aa67ca01583f7be846135332ffe4f84522 SHA512 7d5b11997226717095c26069d32c4d5981373b44effe8d03921c7a58c51627aa70dd17eb0ce3cffa4d8c94a4d101d95b74587fa697df6c2a3b58bea4ee9fc6dc WHIRLPOOL 4c5badf13023e5bc5b13578f0f1b80e3c9fd2ab7b6afc745e2ee72c9df475a90f77c7080b803e5e6959ff74d23f00e2f57fc58f1713688c1f6f8627106906988
|
||||
MISC metadata.xml 402 SHA256 f60dd074e87d0d8a160bd247a39b13b07e32cce3c126dde20178852e7de86a81 SHA512 db1c0a4e56c3d77ddefe57b84e30863ff269087237d0b64bd8a795b6ced782f6ebf14101cb5dde98fcf12c3338d71c1ff6b59250aa5137c50959d0bdc5691515 WHIRLPOOL 37b9819c76aa2be59137d9c23e99caf37fb91e607cb084bfa23dd315dc31dd7e064f9fa98a10cb8d2f0b23d6a6fcd86e47537ee7ecbcc968916b89a6352d92c3
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
DIST librdkafka-0.9.1.tar.gz 478341 SHA256 5ad57e0c9a4ec8121e19f13f05bacc41556489dfe8f46ff509af567fdee98d82 SHA512 d2023cc6f976ad7440b25cffd1b59587f6497febd7ac1a6d76eb7799d294210f20170063fe25f2eb1eb3cc373df791526d1bc8d0ffbb0bef4519dae89b177147 WHIRLPOOL a54a6ee8f0db0ee13de80f86ef1f53d1667fb48e8e27016f2c497b448aa6a33b8073c022255e8e9f48b3497266872862d2ba717f7fed0a39a01f72936115b7b5
|
||||
EBUILD librdkafka-0.9.1.ebuild 1225 SHA256 3f07fcde00c63a5473e7389a3869c80becddb3a7ec178ad5f49e3cc8cd373dfe SHA512 0ac03e4828f6b890f3211e9734a2b188e584a26c8ddd6345ded9212130be72762a5d5ac33673de4f55037af997a29ba521af12c061f47a396b36a2a4f783d73f WHIRLPOOL 0a2e73b2ad9f15255eeb2397a3b68500f83f0dcdf7a655b5867132f6286eda8671da1d0ccecaa9065dc41cbad8829cc1e06f1f5d722c08271202945ca97a6cbf
|
||||
MISC ChangeLog 1260 SHA256 2657015beab244341b36a1e933acf9301fe37e76be4d58c952bc28aca6bb0810 SHA512 e8a5e4d93c1ce92b173ea7735d27b119c2bad03da6992a34abdab5fc6feab0c40e8d4a4ea875377cdf6fda3856bbeb93cbef5cb4312cfecd70216e3f21c05569 WHIRLPOOL 3db3c9fe4debb0a92d27921e1e915d70b69b63e6f6e48cd43e3bfe4db6a88e7727b5fa20aa56c17d0e779a749e4e0d0f784936e37dcc73a9ff1abaf5bd083b3b
|
||||
MISC metadata.xml 518 SHA256 888e24fb0650249f13f9e27d355ac7b8e69e05dcb54b1572dbfc0f294075a0d8 SHA512 978d37d3f2382f0bb03d95174d2535f253de348d8c88ba76f0aa1538c70d5120ee467e35f35441a1fddda3b1cd11e610bd5c2515ae403ae736939f40bf3c4f7c WHIRLPOOL 102549d2eb045eb9807ab117f55cb608611e0aeada7d40a9b647ac2414e771664a250c2a9593b7e8a4b600f58ee84c3be27f08c417365d3526a2cb7b9bc55172
|
||||
MISC ChangeLog 1740 SHA256 773c67a554ed8f91c8b3eb7037406205e1bdeec87aad13f3326e7e84c2c69368 SHA512 2061e5e19f48c580636639d72e355ac204301551da14ab2856529eea24f984c9f9e7619412eeb10dabe102d75af2254b554e9c1edf071140332c2d24ac368ce5 WHIRLPOOL e858d2b116df76d1eed75e945038e9e8501387478410dc0f0e87083127ee4610ed417c4c7bc5d95b9f8b4bbdd8a8bfe0cc971ec21ae2a8a04ab6331e5b1b47b1
|
||||
MISC metadata.xml 402 SHA256 09956ac0b9af131df3fddda1303c3385c96cf23fb12a882342cb08e3678946bb SHA512 e1b870d9565af8447d0b6140992ddb3d55c2f76979601a15f47b209cc771a7f00380c3c0ce29ccb19407dace56f597bf3c962d2fc6902e6f583ca33609833cc5 WHIRLPOOL 7c5ab81fb668076ae17f50b856edbca651650cf24f6f053d2d3b4b0ce630fff2cf7e493081c09c105bba08d899f47f27db8b85bec43dff5527bdc6c560a04498
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
DIST mingw-libgnurx-2.5.1-src.tar.gz 125941 SHA256 7147b7f806ec3d007843b38e19f42a5b7c65894a57ffc297a76b0dcd5f675d76 SHA512 b86e5580b82ac17c68c0d2c7239a4e4d59310d357f599c4c4688e605b2f2209a40f8affce85bfd30fa2edde9ced482c433eba07b5b5adf068cd56dbf94224ba3 WHIRLPOOL a8570b9a13307e27d9fc375d41402e13c9557d995e731c6b39c993f0305d02e3dbb10f74bb19463cc48852fc05244c46c90f3356ece06dc930e3815cb3a81b08
|
||||
EBUILD mingw-libgnurx-2.5.1.ebuild 941 SHA256 ab57e2c972cb23f543191daf48ed7deb1fe0f99c0256e53d43d95265adc0c92b SHA512 5498f8e196a95dc0080310599110d279dccb1260591f87828d4801f29cd9b23bd1c04600b930fc296ca1e7610e234f57473cdb94830ea5890f7edfb0ef7fde0e WHIRLPOOL 7e8139e3d43fde8ae3236f820839e4cdce8fced8ecc479cdda099916a0d577eb2bdf5890b726c4ab22866b985b7209f7f654ef0533ebc293d47d9a68a682e3e0
|
||||
EBUILD mingw-libgnurx-2.5.1.ebuild 1048 SHA256 d8746b168d0195e39fb42e01f0072d4400b39a469e3249118e47ca84d5ed76a1 SHA512 8454f738902936b9ddbc0c0faac3eaa6fcecf1e0d47464aaa2d6cc6ddeeece2e642aeb01838a875a75c9796dcce344abebf529eaf799a58dce71e13654607cbc WHIRLPOOL 8a81eea54790d7cfaf2cd779dd1756c6650e2b9d6d104d88d9c1318abdd55f6e8d0f51caba704fadff8c9e31c230e688e75a80b0dc0b5bb96301e42c8d3cb274
|
||||
MISC ChangeLog 303 SHA256 5a130151ccb23b7ff67e1210b2feae4b08c1ef9e6fa8e63b2df9f51b87303c59 SHA512 498763f3c1c9e13970fff91b5547d8d5c097e95dce796a105445e4f04e75be1e0a9d85bde742094e66cc42251ce824c230d209431d19c5ef4b3b7f87da044d76 WHIRLPOOL e5bb774b22457281a1116720b41ee134ab758b539480ae7f2fe663a2677c56871150f48937365058c5d7c21259d5abd0c96d04ea49799b48675b69c85cd93937
|
||||
MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
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
|
||||
EBUILD dask-0.10.2.ebuild 955 SHA256 b477b21e6659a9280f432b7effa11f514ca86769d2ff298c4069d8bb7713fb35 SHA512 184e60b8aff49dbd1923ad71192187a7a52cbfe8928e37532adee42ea671bfa23d8a987d0af7bf6ac1644d57f2c3926a225a99360b5a2f99739debacfd755a27 WHIRLPOOL fbf01b93d2735ee5f861902a0d8d46aff2d6c0cf875166c3d27559309325d38c756645e0b44bf0d838b4f00bc4a0d60313058f46637237f39d45c17cc8b0aa9e
|
||||
EBUILD dask-0.8.1.ebuild 955 SHA256 b477b21e6659a9280f432b7effa11f514ca86769d2ff298c4069d8bb7713fb35 SHA512 184e60b8aff49dbd1923ad71192187a7a52cbfe8928e37532adee42ea671bfa23d8a987d0af7bf6ac1644d57f2c3926a225a99360b5a2f99739debacfd755a27 WHIRLPOOL fbf01b93d2735ee5f861902a0d8d46aff2d6c0cf875166c3d27559309325d38c756645e0b44bf0d838b4f00bc4a0d60313058f46637237f39d45c17cc8b0aa9e
|
||||
MISC ChangeLog 307 SHA256 24fd1f09ce033d81c6c523c4ad5d563db953509936c281618dda652523c0fbfe SHA512 c41598447e35909e9ee5636edb31e9c67f5ac969bdcc3ae506b4d0c057c39c3a9626290910a2636a61690436c312af3b03a811c787cc40d38a6c93e931f6a8ce WHIRLPOOL cac16f7053a65e0f297ef2e0d04578c69fa5d0524f46c94e73650e3cff145ebb902e5518c35b9501ba69b248bd7887eec2474d19af7843f818bd6d9974d51a19
|
||||
MISC ChangeLog 452 SHA256 6decbc1bcee30aac7ef68640138591410641719aa9926028f02c50ada2e0fe57 SHA512 c4287eb404db8af603d41341c6c854d578fb58faac7b0fdade4540f9211a1688423f1c8292eca061cdc71b6528c7456dec414d758225544297b92bc8ad49b646 WHIRLPOOL a2c3f15b8871d9dc71237bf9bda8047748a833498a44f28a9f453062a093894bdd3390acadac6696444a5081a687147e59de5044fbf410169df73b755750de66
|
||||
MISC metadata.xml 645 SHA256 802a49a0575c1c7891eef312f8d7ea88e598cd7f9f165f74a80a362596b8890d SHA512 7b53aa800e579452815b2124119c0d67b1a83d69f57ed47f363c64f0d6e9e8baa1fece1ed2bb29c9490ac661f9eb4eb2bc99002ec90a0f99dbb78002ab895f2d WHIRLPOOL 1f8fcf3dae555b46b31ad8aa4b12d79fbcda644cc7236796fd3ee335dbea68bdab28816d196799cd29c23eb8611140e31d5f49f432f404b944f6ad0701b3ac3e
|
||||
|
||||
@ -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,4 +1,4 @@
|
||||
DIST jsonref-0.1.tar.gz 12296 SHA256 56e0ce228798bdecadff865c142741b1ffdd57a5e9c40c40ec2b641d7c430ad3 SHA512 9900601feab0c20c902a6d5575fd411898af126a650d0c9ff955f50f5bd1f5da8e5a071ca86cac31ce3c5fb35a516f849cbb70098cac2cfdc910ba33a1f7411b WHIRLPOOL f1249188c03e90fb03a090dd4b2faec272aa9b9edcadceee32403ecf79a8a62029af9380cab8273094fa6cb04d086bf5e529febc9606e68f00016686817e2a05
|
||||
EBUILD jsonref-0.1.ebuild 479 SHA256 af7f630926df3d46510ded6f5974a540203f16821490b12e1fc2732c33f90e8a SHA512 d9e9ff80d46f9a6af64ff65cd95fe02449c1debd501695038024fffc8fc0b04e13f15040516d2909bce943f48028c775eab8a7ab8e2c53767da3a538420b82bb WHIRLPOOL 102a53575e5eb40581b62730c531acd6bc01b4a666d282fe8dc3103636360ef654e63b1b1d8d5b025ff17ba0fd141168538e0fbbf00dd6e6c0dda6b4a8bd82eb
|
||||
MISC ChangeLog 322 SHA256 c1aec447bd62ec06b0ebd9056c1a7b2a8970488f8435b5f466954a75504828b5 SHA512 0aaaeb656ad99be9fea7e990cf7eba5ed3e3efefeb9f77e3ea2d75da5221600c6e12e958959d2486917a4498c8de0a7e282797a169222c2ac2ebf1018e242927 WHIRLPOOL 80501b5c2095005383b72a131ef03ac90fd53b828170b4c75fe4515a3e18b7f769f8b522cb7e3c86125825ab9ba7b424493beb9a3802b9f284dade07b5e13fb1
|
||||
MISC ChangeLog 485 SHA256 133b3bad63267ed930b74e6f998934355c135a6eba895a15b32a3e08ea940ffa SHA512 b2acf529102f7a911bf248d08b4ef69ad7f7034660cd9c802736941b29ba32259668ed53272a1d584e09e61fc2d92d193c266a30d97125acf15ca87b372f54a7 WHIRLPOOL d5097bf86b27aa1035d9d6483475b5762b672a232d098a8f3d4ef1aad6a2e54cc5d3f4c88c5cd3968557331751d37541fcf1b100a8a5e683c22c1d45a3368e6f
|
||||
MISC metadata.xml 873 SHA256 6bd069ff52f983c4350b81f60b58d9be1835f7e8b01b59debc4a6dbc2e33fe1f SHA512 2cd3a5164002cc8c5819b9d7100c2a1fe50cac3a41ad1d0b6c83fa5bd03af3752df79e87d07a8e81cf9b9041aa244d136263201df9791851403960c69d7adadf WHIRLPOOL 85619d635a5d0424114775058de0f04bc4ec5de61ed29ca7248b986d5cfd0f90125dd689b91c607e9663f687909101b2ff5b9d6f28cf0e5679b146569df5c8d5
|
||||
|
||||
@ -0,0 +1,15 @@
|
||||
# ChangeLog for dev-python/pyicu
|
||||
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
|
||||
# (auto-generated from git log)
|
||||
|
||||
*pyicu-1.9.3 (10 Aug 2016)
|
||||
|
||||
10 Aug 2016; Marek Szuba <marecki@gentoo.org> +metadata.xml,
|
||||
+pyicu-1.9.3.ebuild:
|
||||
new package
|
||||
|
||||
Python bindings for dev-libs/icu. Ebuild based heavily on the one for
|
||||
version 1.9.2 from the jmbsvicetto overlay.
|
||||
|
||||
Package-Manager: portage-2.3.0
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
DIST PyICU-1.9.3.tar.gz 179514 SHA256 1a7a96212cb3e42e8df85b9062f1f1d6e207474d44f087218fad1d4ec210fa42 SHA512 93720f6fd4131b6cff7fe89996a3851b5993c74859e85de7813883a30152b63a0065b8c51c536cd40417b6e3ccf0ec4e26ed471cec84cd48761a306a35bfd15c WHIRLPOOL 97d5ff9d5a96aa98700c3048104bb79309f3b7a2e6610a03be1a1b06b23be44ffaa6ef9afb548144757421616bf2401fa4bffac6d8759a7718021abfa9fb03d0
|
||||
EBUILD pyicu-1.9.3.ebuild 1024 SHA256 5e3a99e4822eb4edc65e2830c16b43548478d4248fbffd6cac6ef24302d3723c SHA512 61637fea1798b7bcf2786c0240deb6a7a9cf2b0bb908188b755abf9fce0219abee4a728275cd20194ce213668887d5055a43ea5b748270f520866178af089397 WHIRLPOOL 05d7628c96b1c1092f93999a4cb37089fb47273268b258a79388dd1c211534c10f775570f667748782da14ee7903f7166ba1cc0f7636e520082e36b894ebf1ea
|
||||
MISC ChangeLog 418 SHA256 350d81932a80cf86749a5f2d111466f3dae0cac8d8776d43fece3049b0927d14 SHA512 a64b83fb218e2b2cc931b0fbb05b6a4448a196bab00a3c6a19e102ed72734c79655d88224ec55dd0f11fe39ab6b2f6736de30dc521472bf5e40db3366ae20b6f WHIRLPOOL b5dd984b874e605ac8fc85dd9f880eda1bb1f4af0f3f2159d00f0bc6bd8c093a9bc0b254de9b9bdab3fd9c56da43a7fae98fa0927a9bad85f097f752c377d5af
|
||||
MISC metadata.xml 243 SHA256 602d20d66daf59d1e01c584771bc9e099555417e71090761ee75d13930b4a361 SHA512 429d79cf05bd14bad96b72f4deee82ca8b0d729939c2b70951340993274dc43b3e76e5d8322861a750270ff938dae09ad81847e62f9c679ab1e72603dcebeaa2 WHIRLPOOL d6741904bd4a4f9375e8d8a82022cbff46c4e342b3d398f0e9e06c0ac89c6c67c448fe431685e665a8496edf0030f409339655943cc9e35e377e9e1523045db5
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
DIST buildbot-console-view-0.9.0rc1.tar.gz 627043 SHA256 4cd6c276082a65d2a7d6c9f8fbc14c9f7a57f80ca6ffa09b111976e026ab9d3c SHA512 80ceae74a2dc2035e6e389ee462a5c92aaf3f4d06008c5b01b2b71b6725c4380cc82b2145ffb09e77425926cf06b6ab60a027996d128579c4e83ca0984c40f06 WHIRLPOOL 87194dc0e6ca5b027f1d8f8d64756b145eadc958d02435508f6b5cb9a11323a1c1bd11bc5dad9780d1d4ecc5ac7dad7c5f01cc2a2bada221e8233849724c9c12
|
||||
EBUILD buildbot-console-view-0.9.0_rc1.ebuild 1017 SHA256 eac7b13931121654a9d3374b3c1389e153f9699831f2ad9ee37f9a1c57421f3f SHA512 f13a179df44c37445c8514e81bcafdd2e398225bc6463301a7993a30724a7663b5200481d5394a21c4b9b74cddba02c3b7d613ad6196798d2d9db59459909702 WHIRLPOOL eeb6af7f04f7c72fe55f7e0fbebf905c14df8b8c40a532ca49472c26a265f07bcf62c8a5a2d9b67e828886e87495a8143ef060afbead3318c5b3273b46ed7842
|
||||
EBUILD buildbot-console-view-0.9.0_rc1.ebuild 1017 SHA256 1627c118d2663abcbbf81532bc18042e835218cf2377c59d191bc75401335240 SHA512 1c698badb411add4698a31f641eca1d4fc27a2c0d2f249ca741cf9785ce6ee02fc2c677e9a0136d07ebc18270502457f9d739f11e9e9fe42c8f15982630fe0b4 WHIRLPOOL e89fb8a13d9984389a897e25d3fd8a427eb40f28dea140c0f6ae37d4916afaab32457c814ee9a936ab02e708755651167ef939cc7ef0a9041bcfd18de45cf2f1
|
||||
MISC ChangeLog 375 SHA256 3e523a69962ff9671cffc2b5b0aabeb413d2c41b10f8f885d71213ee2674626a SHA512 0b54c903871e409e2fb534bbef61227a08fea01a7f25380dcb679b0ccd8ee2a71a240c2aa21e2bf06305bdefed1932da0756b799d1a4b7501c2fbd0c231aa2e2 WHIRLPOOL b6987cac4cbc93e310a2e3467ac2906c666659aab2dadd70dadb785aec05ef96dd2164d782a19645b4e04b8e5315829eeae5182adedd4a40b424e16134d1dfaa
|
||||
MISC metadata.xml 700 SHA256 e5afc26d2b220051eb864706313d6c83124cd33ed23def72aa0ad2667179a4bf SHA512 fc9d68a1d59f7daac3326de2815dde52d79907e8b80f96f3ef780bc2b5ce4133c8cc9a26de3e6993183a4daa9548da9d6e2acf87b18639b68b90bc4e5ea69f05 WHIRLPOOL 2bd1da43b607c3bdd6a9318f0620d0cc13c4b2949d12a37b6f65f609f5490e2843fe322c9f1f9d9e32737c60b004687535e81dfaff3ddcfc0984624c985e2764
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
DIST buildbot-pkg-0.9.0rc1.tar.gz 3363 SHA256 0bbbf10361087493cc6ee62e077863eafe1b3e24c43a8429a6eb1a75b35359b6 SHA512 b9bf46252ddb28f1d83f4425f65cd8cdc187eaaee0006ec84d3bf9fe89d32001295ff631fa2f4f29d61a0da3ea9ab89e5b95a402bbd781b537e3f1497fa1ec23 WHIRLPOOL 33d643cae5ec89d418ec3a41c3903a8d8c1f6a95626a8391a4ffde3872184e5d8cfb776affe392cd70f6500267be08f972e4e92c9360029f9880b887e4c78cd5
|
||||
EBUILD buildbot-pkg-0.9.0_rc1.ebuild 952 SHA256 cd675ec6dd66881d04072a166dbe021cb9486d0fc4bbabaf728dea7136edc58c SHA512 f88261b3eacb8c571dd85abda52c968e313bfc8198c1bfef198a9aa7c1affe0f003af3e6d2ae9a429cd72053a6a300049411add78959becb7ad927b0ad3dcda6 WHIRLPOOL decba9643f7f01953e395242f160ce06d71a4ed2ea5c869abee67137b4512541da85a54f15a36cbfda80898dd01ae8b7ff82fabc4677e04a35bc8445d0f8248a
|
||||
EBUILD buildbot-pkg-0.9.0_rc1.ebuild 952 SHA256 88c94e6d74347791eadb6adf7f5d9d5d20daabce3b6ac0af59b75101a26431d2 SHA512 200801acdc4628b58d43e18412e8e9bd97e665f76464ccab78f17d78a49141ec71a38905c07f084207a7a417b33175c9217bc547e0a544c03bb76a07e0c288e7 WHIRLPOOL 607fb6c186836bf6545dabba8723c3c4ab806141c6aa0e45fedf9ef2f7975abd12e6bc0c712b2ff57eda6abe4eaff43261eae7301a2b79a5bc5ca2c750ad5d89
|
||||
MISC ChangeLog 406 SHA256 619d095bb302c2cd104304cbc041184b825650ce0c57b89def83a5a7819d9a34 SHA512 75711af3e81185cc9360190801ee1a625110030418a0b365a0e63353f7c93f1493c5d290737e1bcca19f28680c145b2873835306e409dddc4515d100edebe5d4 WHIRLPOOL 09e96404019b2160c7be7dfb16756673831ef376c7ed02b11074a223d25f089920ba9f5bdf6224487299966874eff492012663afd261311662b85658c81eb7c8
|
||||
MISC metadata.xml 1298 SHA256 bd626c614e0e015ea3c4c5993002a88bb14bb95ad1caf06f2d39aafb8af6cfd8 SHA512 9079fbdd287cfb6385328cc210ceacab5ab06fee9a2b904ff9773d1f9e9defd755f310a62a53d772a591e6c9ef4361cdf7969a4274e0041deb66db24d1578b21 WHIRLPOOL 4ef8ee369a6c3c377fad43da99fa2ab3abf184a706fee713f925ce442c72eba5c5f29d99de09f707114c6077471f057e0898d7cfbd754455636761787385344f
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
DIST buildbot-waterfall-view-0.9.0rc1.tar.gz 701353 SHA256 8822f75ceac242d00dc10cdc381864e460b936532a1618bf47ce9b353a63814a SHA512 3829faf9da4fb8a2137affbafc0fc4e08e3bfd229a861089e1140e715348305896235dfeb44df93b4b8da3273f261b1d98e02073d4b822c99c4eec7736824def WHIRLPOOL e616ab438b5d64a63ee33cf47475bb35869c27e9b277797ef99a246f72a95339eb8145afed1b18f412d2212be0292c6bae63f4741a7f1611d95529f67d8cae98
|
||||
EBUILD buildbot-waterfall-view-0.9.0_rc1.ebuild 1019 SHA256 bc71d8a86e70a0b5a6f49c9cba4dc257fb69925dad7aaac78563ff824d2fc041 SHA512 58d5a442663b2239db8c5fee2ce9106f80698f31a3299e71ff4c35f8a44d3135e8ff69776131df4c0d95d090d59fc2179d872f4a82531a45f6c67f190c916829 WHIRLPOOL 100c10d4f3be50ff5304200eeefda8ab57f804a11e59bc5075ce00aaff7396e0834d31fba8e053cdbb8b802f65e5eae9676455d26c27340dc08415a892650a4b
|
||||
EBUILD buildbot-waterfall-view-0.9.0_rc1.ebuild 1019 SHA256 e01725a84e79c8e59c562b4e677dae61cb23adda7ec0089f1ffc408ae96c34af SHA512 6bdbe8a6e29fc2d2c3ec284ab8abb4a88c6ac5c835c911a2f699e9cc4f9e7f4574b0e24e6c7d96b4157b95238c0d9200fa18a599d1253685363e71233241fb46 WHIRLPOOL 61bd4aabbcc84c19d86415234486b2ce5059959c385209621a4a0795e85fb7ee3b2daf917fe6993d0511a1cd44c5e71b43e2611da12eee70da22858d4bf49d85
|
||||
MISC ChangeLog 386 SHA256 40f959da39a056b0347aa3851459068d876fc589c1717c6bf00e30a50da25e3b SHA512 57e668512d68dc76b007b7a4bbf8b60703af100ca7c7528b991f81a594d4dd2a3ae92923dd0a6157d5c08dfa134876566ed351bc15726f65a44b9859fe5556ae WHIRLPOOL 89ded30b8840f70de5bafede2a4c16e538d256e32203f5dbe5be4bb1ba76ff73358d78fbe98bd611c63e65eee4e7f3166ce114a597043ecb7a8739e21a6214bd
|
||||
MISC metadata.xml 718 SHA256 4a565c79254716d235d3cfd0359969ad0cd8bfdae983192d9d3557630c1fb606 SHA512 e415b916f25c65b2e91152d8484896ffac115ef43610b4365ad0f9831edf8e7bd9d691c0d356fb469148e8005bcae1e545cbf1b5d4fcadbba7cbc02417bb52bf WHIRLPOOL deae15f6f8528c8ebd292ccf42801841b7cd952ab2933b2f5f077a02670e5d3dd8cd8c2c2db28fe506ca6ee87060ec29738db74635f762c455102f4c996ae1b2
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
DIST buildbot-www-0.9.0rc1.tar.gz 687202 SHA256 1bd29a1587bb836faf725f03ce31ff990a03ddf20d4024887016d17cc8e4e38c SHA512 82be17b617d763a657286095d4dc53d0a52c31e34320e9c024b2e1e071092f6769532c4a8adc4ee026c9a7637763e37a0aee4b9365073999a68abf7d7151136c WHIRLPOOL 0464a6b1ccf7272ab459f2bcf9400e9ce5b2723d71e4cd3c5f9c9ab2b077470fc5dd9513e97ba9785d80c1952263b788fd8e138eb299e26ed3027fe8c5b9098d
|
||||
EBUILD buildbot-www-0.9.0_rc1.ebuild 1067 SHA256 91695b88c28e6be2aff7de0ee43cc50333019c58a407d08a93439004804714d2 SHA512 a8c02a1c2943e87c0b3aee1abe5c757844a01d64c1cff9dba43ef32740b6d5e5fcc3076f698ad2311ad9c64f08f13e2497ebb6b56531bdeb840fd028fbef8dab WHIRLPOOL db7b43141250f4bbb1bb09f83c920459d32bf5a52432b8833978b8434f8837f08045e14fd4a910d213ed710085ab2df0a38cedb3ac5cb29fe10defca82f69811
|
||||
EBUILD buildbot-www-0.9.0_rc1.ebuild 1067 SHA256 3dd37ae297922bb9a2abcb6b29bbab559096b967907b4135c2131c16710b2b9f SHA512 1f65370f28166451382afa7ad229c3e81b35e05bb2653a2eb6283a7a7c13de855fe9c7966ab6f01e9e4a8a3558eb6fcbd5b67e9fd0e764915d842f872b3f25e7 WHIRLPOOL 0fabbe5ca71689a188e4f2d166e1a86d40b16e9d4557ad19697c9457970e4ac1c309d0b3678e166afbf1167a5e926a65c0036bef922ee037d489ce010390aee4
|
||||
MISC ChangeLog 413 SHA256 e4bedc5518fa59d25bf93a695d76c632701782e9642ac09954eaa5d3f4b4afde SHA512 530f3cd560331d0d2aeb5f486ad773a3bfa2438d32bae3e56bcc4f6f32ef5fb2452c13f7bd2c20b4cb76eb68f71193fea5a046af600c518c8a7c5ccf7e4e7fc8 WHIRLPOOL 9d3ef6e123294b3b7cae8e235dc2e1c543e94b74ccb77579067fda2bacf1253e8e52aa98e563627f0a4d74fadf8a6ddcbe8a0823e8aec19ad3508747597d6531
|
||||
MISC metadata.xml 718 SHA256 0b773ebac8b558ef1a6f2d408c64447f42402ffcd7c80b217d587a0aa2bf06dd SHA512 0ea5c5be7ffc954f296881c80872a536ef689624dc00c4cded6c29e8001d122156561391ce79ebc1ffc98582f5233cbb23a018b034b2ae5419c78679237becc9 WHIRLPOOL ed53ab0b7dca838e8378fe169c82858d6074f0ea56439a2d9d6cc680dbc46dae9d9d28d1d7091cdb05e86bcde0b09df05169bec9da64fc23cedfbb7a5cab0d51
|
||||
|
||||
@ -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."
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue