parent
49a19a9eaa
commit
97fff5ae53
@ -1,3 +1,3 @@
|
|||||||
DIST fleet-0.9.0.tar.gz 405482 SHA256 3198e19e038a4a4f2f7d2f36aa7ffd3cdf2cfdaed0e7c255b33c465deded90e8 SHA512 cbff807f38cad108112216751fd0aa1ab402062d0cb68245c177fc89d88bb6a43c10d8b6ba577b493f1b16c910f6cf1e209bec96da550a3e44fad5ce004ab1d3 WHIRLPOOL 5b1cafe5bd48a30c3a523d00fbeb311db4ecafe7737564389f4223f5deedbc5e4056f001084e652a1e9c61e5fff25b8cc1e2ee32930b6a514c5ca8f41aefbcca
|
DIST fleet-0.10.0.tar.gz 427728 SHA256 024b29cb217a81d04a48e6e5017549149fccfe76042a3570e9a3b8206cefcf48 SHA512 e9ffb51ab6be508e8c5f07860f6ef7c2beabed039870cd4926397ff8d28c9dcdb01c6d18fe513bc429ab9bde7eb8a91644b0534b8396d5ad33d1ace8e7dd7ac6 WHIRLPOOL 458830e2fe0c0937665e4e4ec23992801aaa6938e62b08f1486568fe92f70731f4dfeb83a8b13f5161d8819df7a409388db1c1849ceb3f4011179ea86303b3b0
|
||||||
DIST fleet-0.9.1.tar.gz 404954 SHA256 573387652fb5b4d6fad99ec344502edd575550bc649ffb6bf43b38309cd85ce7 SHA512 acc80707a6a0142b731c963474a7b31d43790007a28eb05e05f229bc1fb7775cbd64e0ff8cb469954ec76a0219f7501f4b8b51dce4b772ea5db7b3afb97fe50c WHIRLPOOL 8536f5d92090ac20aa2da26153f1c0769ca3288016b27619921036126dd94611e59a678d5f78847e1df61328e6aa4e89f5a2b001a4ce2ebe7a2a3067b57498e7
|
DIST fleet-0.9.1.tar.gz 404954 SHA256 573387652fb5b4d6fad99ec344502edd575550bc649ffb6bf43b38309cd85ce7 SHA512 acc80707a6a0142b731c963474a7b31d43790007a28eb05e05f229bc1fb7775cbd64e0ff8cb469954ec76a0219f7501f4b8b51dce4b772ea5db7b3afb97fe50c WHIRLPOOL 8536f5d92090ac20aa2da26153f1c0769ca3288016b27619921036126dd94611e59a678d5f78847e1df61328e6aa4e89f5a2b001a4ce2ebe7a2a3067b57498e7
|
||||||
DIST fleet-0.9.2.tar.gz 405420 SHA256 7b5c1dd091b304f8e6cbf31a102533a697d4e3212d34eeca53daa69445f71555 SHA512 b7280b1d714162569942db22ba029ff46b28413d81b1c3c9f94876fc7a1e879c58bf4471d813d5121a0a9a0f76d580b9fc146a01af5dc2303bf43536d6d23c7a WHIRLPOOL 9e314a6328ea15b876f083a3b68478b85d1c12d314d210b40e7ac7a1a5950716c27cb82d60a3c950a64107358c97b9ac9b1212bd4d24ece8e8a8f5389359033b
|
DIST fleet-0.9.2.tar.gz 405420 SHA256 7b5c1dd091b304f8e6cbf31a102533a697d4e3212d34eeca53daa69445f71555 SHA512 b7280b1d714162569942db22ba029ff46b28413d81b1c3c9f94876fc7a1e879c58bf4471d813d5121a0a9a0f76d580b9fc146a01af5dc2303bf43536d6d23c7a WHIRLPOOL 9e314a6328ea15b876f083a3b68478b85d1c12d314d210b40e7ac7a1a5950716c27cb82d60a3c950a64107358c97b9ac9b1212bd4d24ece8e8a8f5389359033b
|
||||||
|
@ -1,2 +1 @@
|
|||||||
DIST xstow-1.0.0.tar.bz2 153206 SHA256 0109f10fb25a474803ec357a38c17d806dd9a21eac39b21d79b48c2af571c0fe SHA512 1bc4d6d1c5bcc68c07ac9386c964878591e63e452f46ca974460005df385647937d689ce00221d81de54983036660107b36fce174ff4859bb597f32b60b02a6e WHIRLPOOL f5b0490deaf4be76109e81c55ac8f5588648c0bf5310b578211e402ec207617253cabeb7bf86279bb5df462be5d1b4be8df8ea093a73288d0dac9962bc75848c
|
|
||||||
DIST xstow-1.0.1.tar.bz2 153530 SHA256 b25279134689519c15fa5caea3d437c0e8c49d9cfa0c91cc45fb842025b1bf35 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b WHIRLPOOL 052f3ed2ddf3b6612d898a596aec4547578253aca1e1fa2dc7b3209646c029d59b589ede80ad40586b5c926e6e7826591f98d0137feddfcd4aa5fea66218a23a
|
DIST xstow-1.0.1.tar.bz2 153530 SHA256 b25279134689519c15fa5caea3d437c0e8c49d9cfa0c91cc45fb842025b1bf35 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b WHIRLPOOL 052f3ed2ddf3b6612d898a596aec4547578253aca1e1fa2dc7b3209646c029d59b589ede80ad40586b5c926e6e7826591f98d0137feddfcd4aa5fea66218a23a
|
||||||
|
@ -1,46 +0,0 @@
|
|||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.0-r1.ebuild,v 1.6 2013/05/10 06:11:33 patrick Exp $
|
|
||||||
|
|
||||||
inherit eutils
|
|
||||||
|
|
||||||
DESCRIPTION="replacement for GNU stow with extensions"
|
|
||||||
HOMEPAGE="http://xstow.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 ppc x86"
|
|
||||||
IUSE="ncurses static"
|
|
||||||
|
|
||||||
DEPEND="ncurses? ( sys-libs/ncurses )"
|
|
||||||
RDEPEND="${DEPEND}"
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
econf --disable-dependency-tracking\
|
|
||||||
$(use_with ncurses curses)\
|
|
||||||
$(use_enable static)
|
|
||||||
emake || die "emake failed."
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" \
|
|
||||||
install || die "emake install failed."
|
|
||||||
dodoc AUTHORS ChangeLog NEWS README TODO
|
|
||||||
|
|
||||||
# create new STOWDIR
|
|
||||||
dodir /var/lib/xstow
|
|
||||||
|
|
||||||
# install env.d file to add STOWDIR to PATH and LDPATH
|
|
||||||
doenvd "${FILESDIR}/99xstow" || die "doenvd failed"
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
|
|
||||||
elog "instead of /usr/local in order to avoid conflicts with the"
|
|
||||||
elog "symlink from /usr/lib64 -> /usr/lib. See Bug 246264 "
|
|
||||||
elog "(regarding app-admin/stow, equally applicable to XStow) for"
|
|
||||||
elog "more details on this change."
|
|
||||||
elog "For your convenience, PATH has been updated to include"
|
|
||||||
elog "/var/lib/bin."
|
|
||||||
}
|
|
@ -0,0 +1,40 @@
|
|||||||
|
patch by proxy maintainer, P. Healy, April 2015
|
||||||
|
# Bug 509960
|
||||||
|
--- pdumpfs.in_orig 2004-12-21 02:43:12.000000000 +0000
|
||||||
|
+++ pdumpfs.in 2015-04-01 10:58:22.671131947 +0100
|
||||||
|
@@ -48,7 +48,7 @@
|
||||||
|
#
|
||||||
|
|
||||||
|
require 'find'
|
||||||
|
-require 'ftools'
|
||||||
|
+require 'fileutils'
|
||||||
|
require 'getoptlong'
|
||||||
|
require 'date'
|
||||||
|
|
||||||
|
@@ -868,7 +868,7 @@
|
||||||
|
today = File.join(dest, datedir(start_time), base)
|
||||||
|
|
||||||
|
File.umask(0077)
|
||||||
|
- File.mkpath(today) unless @dry_run
|
||||||
|
+ FileUtils.mkpath(today) unless @dry_run
|
||||||
|
if latest
|
||||||
|
update_snapshot(src, latest, today)
|
||||||
|
else
|
||||||
|
@@ -1018,7 +1018,7 @@
|
||||||
|
|
||||||
|
case type
|
||||||
|
when "directory"
|
||||||
|
- File.mkpath(today)
|
||||||
|
+ FileUtils.mkpath(today)
|
||||||
|
when "unchanged"
|
||||||
|
File.force_link(latest, today)
|
||||||
|
when "updated"
|
||||||
|
@@ -1089,7 +1089,7 @@
|
||||||
|
|
||||||
|
case type
|
||||||
|
when "directory"
|
||||||
|
- File.mkpath(t)
|
||||||
|
+ FileUtils.mkpath(t)
|
||||||
|
when "new_file"
|
||||||
|
copy(s, t)
|
||||||
|
when "symlink"
|
@ -0,0 +1,12 @@
|
|||||||
|
patch by proxy maintainer, P. Healy, April 2015
|
||||||
|
# Bug 509960
|
||||||
|
--- tests/pdumpfs-test_orig 2004-08-10 07:54:28.000000000 +0100
|
||||||
|
+++ tests/pdumpfs-test 2015-04-01 11:24:35.948633870 +0100
|
||||||
|
@@ -17,6 +17,7 @@
|
||||||
|
|
||||||
|
../pdumpfs src dest > tmp.log || exit 1
|
||||||
|
diff -r src dest/$today/src || exit 1
|
||||||
|
+mkdir -p dest/$yesterday && rmdir dest/$yesterday
|
||||||
|
mv dest/$today dest/$yesterday
|
||||||
|
|
||||||
|
echo update > src/foo
|
@ -0,0 +1,31 @@
|
|||||||
|
# Copyright 1999-2015 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild,v 1.1 2015/04/18 15:03:00 alunduil Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
PYTHON_COMPAT=( python2_7 )
|
||||||
|
|
||||||
|
inherit distutils-r1
|
||||||
|
|
||||||
|
DESCRIPTION="Local/remote mirroring+incremental backup"
|
||||||
|
HOMEPAGE="http://rdiff-backup.nongnu.org/"
|
||||||
|
SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
|
||||||
|
IUSE="examples"
|
||||||
|
|
||||||
|
DEPEND="
|
||||||
|
>=net-libs/librsync-0.9.7
|
||||||
|
"
|
||||||
|
RDEPEND="
|
||||||
|
dev-python/pyxattr[${PYTHON_USEDEP}]
|
||||||
|
dev-python/pylibacl[${PYTHON_USEDEP}]
|
||||||
|
"
|
||||||
|
|
||||||
|
python_install_all() {
|
||||||
|
use examples && local EXAMPLES=( examples.html )
|
||||||
|
|
||||||
|
distutils-r1_python_install_all
|
||||||
|
}
|
@ -1 +1 @@
|
|||||||
DIST 0.108.tar.gz 96838 SHA256 2019882be0286df1c58efa8c588332106b89418a6bd0fce3de8da4ca16636986 SHA512 f72fb9c3e843341300b68e06bb153690734f6e506cdd9f0d9362c760ff48194ed1ed29e0b58a5050e7331069ad47a9902cc9e34bf616667baf84208f2b69a918 WHIRLPOOL 0af005d0b6dbdff23787c009153cae07c6907d111f57831611e85c49656e29e150ffd71683f349880cfb8975547ea3a3e655cdce31b047b355ecf097e7c7ba77
|
DIST pesign-0.108.tar.gz 96838 SHA256 2019882be0286df1c58efa8c588332106b89418a6bd0fce3de8da4ca16636986 SHA512 f72fb9c3e843341300b68e06bb153690734f6e506cdd9f0d9362c760ff48194ed1ed29e0b58a5050e7331069ad47a9902cc9e34bf616667baf84208f2b69a918 WHIRLPOOL 0af005d0b6dbdff23787c009153cae07c6907d111f57831611e85c49656e29e150ffd71683f349880cfb8975547ea3a3e655cdce31b047b355ecf097e7c7ba77
|
||||||
|
@ -1,47 +0,0 @@
|
|||||||
# Copyright 1999-2014 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-emacs/apel/apel-10.8.ebuild,v 1.9 2014/08/10 17:43:22 slyfox Exp $
|
|
||||||
|
|
||||||
EAPI=3
|
|
||||||
|
|
||||||
inherit elisp
|
|
||||||
|
|
||||||
DESCRIPTION="A Portable Emacs Library is a library for making portable Emacs Lisp programs"
|
|
||||||
HOMEPAGE="http://cvs.m17n.org/elisp/APEL/"
|
|
||||||
SRC_URI="ftp://ftp.jpl.org/pub/elisp/apel/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
cat <<-EOF >> APEL-CFG
|
|
||||||
(setq APEL_PREFIX "apel")
|
|
||||||
(setq EMU_PREFIX "apel")
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake PREFIX="${ED}/usr" \
|
|
||||||
LISPDIR="${ED}/${SITELISP}" \
|
|
||||||
VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
einstall PREFIX="${ED}/usr" \
|
|
||||||
LISPDIR="${ED}/${SITELISP}" \
|
|
||||||
VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" || die
|
|
||||||
|
|
||||||
elisp-site-file-install "${FILESDIR}/50apel-gentoo.el"
|
|
||||||
|
|
||||||
dodoc ChangeLog README*
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
elisp-site-regen
|
|
||||||
|
|
||||||
elog "See the README.en file in /usr/share/doc/${PF} for tips"
|
|
||||||
elog "on how to customize this package."
|
|
||||||
elog "And you need to rebuild packages depending on ${PN}."
|
|
||||||
}
|
|
@ -1,15 +1,13 @@
|
|||||||
https://bugs.gentoo.org/536490
|
https://bugs.gentoo.org/536490
|
||||||
|
https://bugs.gentoo.org/547026
|
||||||
|
|
||||||
--- Emacs-D-Mode-2.0.6-orig/d-mode.el
|
--- Emacs-D-Mode-2.0.6-orig/d-mode.el
|
||||||
+++ Emacs-D-Mode-2.0.6/d-mode.el
|
+++ Emacs-D-Mode-2.0.6/d-mode.el
|
||||||
@@ -66,6 +66,10 @@
|
@@ -66,6 +66,7 @@
|
||||||
;; necessary to get them compiled.)
|
;; necessary to get them compiled.)
|
||||||
;; Coment out 'when-compile part for debugging
|
;; Coment out 'when-compile part for debugging
|
||||||
(eval-when-compile
|
(eval-when-compile
|
||||||
+ (and (= emacs-major-version 24)
|
+ (require 'cl)
|
||||||
+ (= emacs-minor-version 4)
|
|
||||||
+ (null emacs-repository-version)
|
|
||||||
+ (require 'cl))
|
|
||||||
(require 'cc-langs)
|
(require 'cc-langs)
|
||||||
(require 'cc-fonts)
|
(require 'cc-fonts)
|
||||||
)
|
)
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
DIST docker-compose-1.1.0_rc2.tar.gz 46737 SHA256 7da03a3456a2628ba727d74b207fb62941d3395d1007bf2c230e81ac792e56ac SHA512 8ae4780479fa030328623cf04fdce122801b1957017899b70c93bb74a3ad11b4a8a70c2cb3f0b0f0db0c8c47e56a736fd6b892cfd8a8561c252235d7c2ac5797 WHIRLPOOL 62207db65d28710c2820f4f3b2390c42d7dba187cd210e93a5f8be5a01305000bf6739abb40439fd649c2f823cc39812da110e99f0461b2b3e1d5d565a71c187
|
DIST docker-compose-1.2.0.tar.gz 57150 SHA256 46ef3c5cb7dd79fa7fd1d5fc5ec5be6a5c634192bc09c604c0ea75adb89cb652 SHA512 d13f6d6d22979dbc4554c003e611097627e2273f06dd13a1c666c1ba138288597ebef08f1beaf6d342721391cb49ad5ce9ae2ff03367a041fc0c53fbb62c9ac4 WHIRLPOOL c7bb3e14a4c2788eb49241ce02dcaed5e49fe60652ca1a51d13e1712f946046415f5397d5bf892b5e0451059a4aee1b156ee7bdfdf64a22d000caae7b17254c0
|
||||||
DIST docker-compose-1.2.0_rc3.tar.gz 57366 SHA256 1d95191aebc31fd25b770217688407628390b5e5f09b1fd1a4e01ee0dc5fedeb SHA512 8a240648ecdb0bcb6e21ab5d217f8b7ad788732aa1648f8b6ce62db398562970fe4902e3ec9eeb528d9366195ab2d33d908b77c7d03f97322fe14a821b50d8f2 WHIRLPOOL 0776a5f1fd3fd157757910686e34b348991c17cfa0128118d09648dc42e79c97481a2e2be927ff3edebb76d0a6e66706eb9124aba840ba679d67705625c8a5f6
|
DIST docker-compose-1.2.0_rc3.tar.gz 57366 SHA256 1d95191aebc31fd25b770217688407628390b5e5f09b1fd1a4e01ee0dc5fedeb SHA512 8a240648ecdb0bcb6e21ab5d217f8b7ad788732aa1648f8b6ce62db398562970fe4902e3ec9eeb528d9366195ab2d33d908b77c7d03f97322fe14a821b50d8f2 WHIRLPOOL 0776a5f1fd3fd157757910686e34b348991c17cfa0128118d09648dc42e79c97481a2e2be927ff3edebb76d0a6e66706eb9124aba840ba679d67705625c8a5f6
|
||||||
DIST docker-compose-1.2.0_rc4.tar.gz 57629 SHA256 f164816b1c0349e602dfc251fc6ec674e7218a90979e5c8a7d38bf7eb061fc40 SHA512 1ae1ce6ab67615a5ca274507cdf3a782c98d379c7aa4de76917d2a1df00990dcb4210d14364a3bdb7744a56a8ac38127b41f4d91766d5c7de4f3eaefc7fb2558 WHIRLPOOL b5456e4d488054d4dec71cd2c1a720546f6bab58126ba598d3858cba666d86e42c0657431ec41fecca9b2c810a6e37ca1eeb6f5fbfc4ecdddd6ff55c491c1ced
|
DIST docker-compose-1.2.0_rc4.tar.gz 57629 SHA256 f164816b1c0349e602dfc251fc6ec674e7218a90979e5c8a7d38bf7eb061fc40 SHA512 1ae1ce6ab67615a5ca274507cdf3a782c98d379c7aa4de76917d2a1df00990dcb4210d14364a3bdb7744a56a8ac38127b41f4d91766d5c7de4f3eaefc7fb2558 WHIRLPOOL b5456e4d488054d4dec71cd2c1a720546f6bab58126ba598d3858cba666d86e42c0657431ec41fecca9b2c810a6e37ca1eeb6f5fbfc4ecdddd6ff55c491c1ced
|
||||||
|
@ -0,0 +1 @@
|
|||||||
|
d /run/libvirt/lxc 0755 root root -
|
@ -1,55 +0,0 @@
|
|||||||
http://bugs.gentoo.org/260726
|
|
||||||
|
|
||||||
--- wine-1.1.15/tools/winegcc/winegcc.c
|
|
||||||
+++ wine-1.1.15/tools/winegcc/winegcc.c
|
|
||||||
@@ -215,10 +215,13 @@
|
|
||||||
strarray* files;
|
|
||||||
};
|
|
||||||
|
|
||||||
+#undef FORCE_POINTER_SIZE
|
|
||||||
#ifdef __i386__
|
|
||||||
static const enum target_cpu build_cpu = CPU_x86;
|
|
||||||
+#define FORCE_POINTER_SIZE
|
|
||||||
#elif defined(__x86_64__)
|
|
||||||
static const enum target_cpu build_cpu = CPU_x86_64;
|
|
||||||
+#define FORCE_POINTER_SIZE
|
|
||||||
#elif defined(__sparc__)
|
|
||||||
static const enum target_cpu build_cpu = CPU_SPARC;
|
|
||||||
#elif defined(__ALPHA__)
|
|
||||||
@@ -968,6 +971,9 @@
|
|
||||||
opts.linker_args = strarray_alloc();
|
|
||||||
opts.compiler_args = strarray_alloc();
|
|
||||||
opts.winebuild_args = strarray_alloc();
|
|
||||||
+#ifdef FORCE_POINTER_SIZE
|
|
||||||
+ opts.force_pointer_size = sizeof(size_t);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* determine the processor type */
|
|
||||||
if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp;
|
|
||||||
--- wine-1.1.15/tools/winebuild/main.c
|
|
||||||
+++ wine-1.1.15/tools/winebuild/main.c
|
|
||||||
@@ -50,10 +50,13 @@
|
|
||||||
int link_ext_symbols = 0;
|
|
||||||
int force_pointer_size = 0;
|
|
||||||
|
|
||||||
+#undef FORCE_POINTER_SIZE
|
|
||||||
#ifdef __i386__
|
|
||||||
enum target_cpu target_cpu = CPU_x86;
|
|
||||||
+#define FORCE_POINTER_SIZE
|
|
||||||
#elif defined(__x86_64__)
|
|
||||||
enum target_cpu target_cpu = CPU_x86_64;
|
|
||||||
+#define FORCE_POINTER_SIZE
|
|
||||||
#elif defined(__sparc__)
|
|
||||||
enum target_cpu target_cpu = CPU_SPARC;
|
|
||||||
#elif defined(__ALPHA__)
|
|
||||||
@@ -574,6 +577,10 @@
|
|
||||||
signal( SIGTERM, exit_on_signal );
|
|
||||||
signal( SIGINT, exit_on_signal );
|
|
||||||
|
|
||||||
+#ifdef FORCE_POINTER_SIZE
|
|
||||||
+ force_pointer_size = sizeof(size_t);
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
output_file = stdout;
|
|
||||||
argv = parse_options( argc, argv, spec );
|
|
||||||
|
|
@ -1,574 +0,0 @@
|
|||||||
From 26603f25f73142a45b5b964bb9bb2e59bc0908d4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexandre Julliard <julliard@winehq.org>
|
|
||||||
Date: Thu, 24 Feb 2011 13:11:53 +0100
|
|
||||||
Subject: [PATCH] msxml3: Include the system libxml headers before the Windows
|
|
||||||
headers.
|
|
||||||
|
|
||||||
[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to wine-1.2.3]
|
|
||||||
---
|
|
||||||
dlls/msxml3/attribute.c | 6 ++++++
|
|
||||||
dlls/msxml3/bsc.c | 6 ++++++
|
|
||||||
dlls/msxml3/cdata.c | 5 +++++
|
|
||||||
dlls/msxml3/comment.c | 5 +++++
|
|
||||||
dlls/msxml3/dispex.c | 5 +++++
|
|
||||||
dlls/msxml3/docfrag.c | 5 +++++
|
|
||||||
dlls/msxml3/domdoc.c | 11 +++++++++--
|
|
||||||
dlls/msxml3/domimpl.c | 5 +++++
|
|
||||||
dlls/msxml3/element.c | 5 +++++
|
|
||||||
dlls/msxml3/entityref.c | 5 +++++
|
|
||||||
dlls/msxml3/factory.c | 5 +++++
|
|
||||||
dlls/msxml3/httprequest.c | 6 ++++++
|
|
||||||
dlls/msxml3/main.c | 15 +++++++++++++++
|
|
||||||
dlls/msxml3/msxml_private.h | 23 -----------------------
|
|
||||||
dlls/msxml3/node.c | 31 +++++++++++++++++++++++++++----
|
|
||||||
dlls/msxml3/nodelist.c | 5 +++++
|
|
||||||
dlls/msxml3/nodemap.c | 5 +++++
|
|
||||||
dlls/msxml3/parseerror.c | 5 +++++
|
|
||||||
dlls/msxml3/pi.c | 5 +++++
|
|
||||||
dlls/msxml3/queryresult.c | 9 +++++++--
|
|
||||||
dlls/msxml3/regsvr.c | 4 ++++
|
|
||||||
dlls/msxml3/saxreader.c | 10 +++++++---
|
|
||||||
dlls/msxml3/schema.c | 12 ++++++++++++
|
|
||||||
dlls/msxml3/text.c | 5 +++++
|
|
||||||
dlls/msxml3/xmldoc.c | 5 +++++
|
|
||||||
dlls/msxml3/xmlelem.c | 5 +++++
|
|
||||||
26 files changed, 174 insertions(+), 34 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
|
|
||||||
index d78fa47..3df93d6 100644
|
|
||||||
--- a/dlls/msxml3/attribute.c
|
|
||||||
+++ b/dlls/msxml3/attribute.c
|
|
||||||
@@ -23,6 +23,12 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+# include <libxml/HTMLtree.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c
|
|
||||||
index b24e04c..01a09a5 100644
|
|
||||||
--- a/dlls/msxml3/bsc.c
|
|
||||||
+++ b/dlls/msxml3/bsc.c
|
|
||||||
@@ -23,6 +23,12 @@
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <assert.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+# include <libxml/HTMLtree.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
|
|
||||||
index 3fba66c..caf8cd8 100644
|
|
||||||
--- a/dlls/msxml3/cdata.c
|
|
||||||
+++ b/dlls/msxml3/cdata.c
|
|
||||||
@@ -23,6 +23,11 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
|
|
||||||
index e74de07..1cabfa3 100644
|
|
||||||
--- a/dlls/msxml3/comment.c
|
|
||||||
+++ b/dlls/msxml3/comment.c
|
|
||||||
@@ -23,6 +23,11 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c
|
|
||||||
index 09b71fe..6b01b15 100644
|
|
||||||
--- a/dlls/msxml3/dispex.c
|
|
||||||
+++ b/dlls/msxml3/dispex.c
|
|
||||||
@@ -22,6 +22,11 @@
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <assert.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
|
|
||||||
index fff3f62..bebd252 100644
|
|
||||||
--- a/dlls/msxml3/docfrag.c
|
|
||||||
+++ b/dlls/msxml3/docfrag.c
|
|
||||||
@@ -23,6 +23,11 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
|
|
||||||
index 0007503..e6a61e4 100644
|
|
||||||
--- a/dlls/msxml3/domdoc.c
|
|
||||||
+++ b/dlls/msxml3/domdoc.c
|
|
||||||
@@ -25,6 +25,15 @@
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <assert.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+# include <libxml/xpathInternals.h>
|
|
||||||
+# include <libxml/xmlsave.h>
|
|
||||||
+# include <libxml/SAX2.h>
|
|
||||||
+# include <libxml/parserInternals.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
@@ -47,8 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
|
|
||||||
|
|
||||||
#ifdef HAVE_LIBXML2
|
|
||||||
|
|
||||||
-#include <libxml/xmlsave.h>
|
|
||||||
-
|
|
||||||
/* not defined in older versions */
|
|
||||||
#define XML_SAVE_FORMAT 1
|
|
||||||
#define XML_SAVE_NO_DECL 2
|
|
||||||
diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c
|
|
||||||
index dd518a1..c6794ac 100644
|
|
||||||
--- a/dlls/msxml3/domimpl.c
|
|
||||||
+++ b/dlls/msxml3/domimpl.c
|
|
||||||
@@ -23,6 +23,11 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
|
|
||||||
index 617c008..1b5c693 100644
|
|
||||||
--- a/dlls/msxml3/element.c
|
|
||||||
+++ b/dlls/msxml3/element.c
|
|
||||||
@@ -23,6 +23,11 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c
|
|
||||||
index db46193..1baea6e 100644
|
|
||||||
--- a/dlls/msxml3/entityref.c
|
|
||||||
+++ b/dlls/msxml3/entityref.c
|
|
||||||
@@ -23,6 +23,11 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
|
|
||||||
index 3fd229c..45df9f0 100644
|
|
||||||
--- a/dlls/msxml3/factory.c
|
|
||||||
+++ b/dlls/msxml3/factory.c
|
|
||||||
@@ -24,6 +24,11 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
|
|
||||||
index 4585484..be1a5f7 100644
|
|
||||||
--- a/dlls/msxml3/httprequest.c
|
|
||||||
+++ b/dlls/msxml3/httprequest.c
|
|
||||||
@@ -22,6 +22,12 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+# include <libxml/encoding.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
|
|
||||||
index 60b0cbd..47a89b1 100644
|
|
||||||
--- a/dlls/msxml3/main.c
|
|
||||||
+++ b/dlls/msxml3/main.c
|
|
||||||
@@ -25,6 +25,21 @@
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+# ifdef SONAME_LIBXSLT
|
|
||||||
+# ifdef HAVE_LIBXSLT_PATTERN_H
|
|
||||||
+# include <libxslt/pattern.h>
|
|
||||||
+# endif
|
|
||||||
+# ifdef HAVE_LIBXSLT_TRANSFORM_H
|
|
||||||
+# include <libxslt/transform.h>
|
|
||||||
+# endif
|
|
||||||
+# include <libxslt/xsltutils.h>
|
|
||||||
+# include <libxslt/xsltInternals.h>
|
|
||||||
+# endif
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
|
|
||||||
index e0279f1..e1fbb59 100644
|
|
||||||
--- a/dlls/msxml3/msxml_private.h
|
|
||||||
+++ b/dlls/msxml3/msxml_private.h
|
|
||||||
@@ -102,10 +102,6 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**);
|
|
||||||
|
|
||||||
#ifdef HAVE_LIBXML2
|
|
||||||
|
|
||||||
-#ifdef HAVE_LIBXML_PARSER_H
|
|
||||||
-#include <libxml/parser.h>
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
/* constructors */
|
|
||||||
extern IUnknown *create_domdoc( xmlNodePtr document );
|
|
||||||
extern IUnknown *create_xmldoc( void );
|
|
||||||
@@ -184,25 +180,6 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str)
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-void* libxslt_handle;
|
|
||||||
-#ifdef SONAME_LIBXSLT
|
|
||||||
-# ifdef HAVE_LIBXSLT_PATTERN_H
|
|
||||||
-# include <libxslt/pattern.h>
|
|
||||||
-# endif
|
|
||||||
-# ifdef HAVE_LIBXSLT_TRANSFORM_H
|
|
||||||
-# include <libxslt/transform.h>
|
|
||||||
-# endif
|
|
||||||
-# include <libxslt/xsltutils.h>
|
|
||||||
-# include <libxslt/xsltInternals.h>
|
|
||||||
-
|
|
||||||
-# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
|
|
||||||
-MAKE_FUNCPTR(xsltApplyStylesheet);
|
|
||||||
-MAKE_FUNCPTR(xsltCleanupGlobals);
|
|
||||||
-MAKE_FUNCPTR(xsltFreeStylesheet);
|
|
||||||
-MAKE_FUNCPTR(xsltParseStylesheetDoc);
|
|
||||||
-# undef MAKE_FUNCPTR
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText,
|
|
||||||
LONG line, LONG linepos, LONG filepos );
|
|
||||||
extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj );
|
|
||||||
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
|
|
||||||
index bbdcb5d..2980566 100644
|
|
||||||
--- a/dlls/msxml3/node.c
|
|
||||||
+++ b/dlls/msxml3/node.c
|
|
||||||
@@ -24,6 +24,23 @@
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <assert.h>
|
|
||||||
+
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+# include <libxml/HTMLtree.h>
|
|
||||||
+# ifdef SONAME_LIBXSLT
|
|
||||||
+# ifdef HAVE_LIBXSLT_PATTERN_H
|
|
||||||
+# include <libxslt/pattern.h>
|
|
||||||
+# endif
|
|
||||||
+# ifdef HAVE_LIBXSLT_TRANSFORM_H
|
|
||||||
+# include <libxslt/transform.h>
|
|
||||||
+# endif
|
|
||||||
+# include <libxslt/xsltutils.h>
|
|
||||||
+# include <libxslt/xsltInternals.h>
|
|
||||||
+# endif
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
@@ -33,16 +50,22 @@
|
|
||||||
|
|
||||||
#include "msxml_private.h"
|
|
||||||
|
|
||||||
-#ifdef HAVE_LIBXML2
|
|
||||||
-# include <libxml/HTMLtree.h>
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
#include "wine/debug.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(msxml);
|
|
||||||
|
|
||||||
#ifdef HAVE_LIBXML2
|
|
||||||
|
|
||||||
+#ifdef SONAME_LIBXSLT
|
|
||||||
+extern void* libxslt_handle;
|
|
||||||
+# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
|
|
||||||
+MAKE_FUNCPTR(xsltApplyStylesheet);
|
|
||||||
+MAKE_FUNCPTR(xsltCleanupGlobals);
|
|
||||||
+MAKE_FUNCPTR(xsltFreeStylesheet);
|
|
||||||
+MAKE_FUNCPTR(xsltParseStylesheetDoc);
|
|
||||||
+# undef MAKE_FUNCPTR
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
static const WCHAR szBinBase64[] = {'b','i','n','.','b','a','s','e','6','4',0};
|
|
||||||
static const WCHAR szString[] = {'s','t','r','i','n','g',0};
|
|
||||||
static const WCHAR szNumber[] = {'n','u','m','b','e','r',0};
|
|
||||||
diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c
|
|
||||||
index f643c5e..4b2bba9 100644
|
|
||||||
--- a/dlls/msxml3/nodelist.c
|
|
||||||
+++ b/dlls/msxml3/nodelist.c
|
|
||||||
@@ -23,6 +23,11 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
|
|
||||||
index 7d23ec8..d3d9c38 100644
|
|
||||||
--- a/dlls/msxml3/nodemap.c
|
|
||||||
+++ b/dlls/msxml3/nodemap.c
|
|
||||||
@@ -23,6 +23,11 @@
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c
|
|
||||||
index 4b0dc57..89f14ca 100644
|
|
||||||
--- a/dlls/msxml3/parseerror.c
|
|
||||||
+++ b/dlls/msxml3/parseerror.c
|
|
||||||
@@ -25,6 +25,11 @@
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <assert.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winerror.h"
|
|
||||||
diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
|
|
||||||
index 0baefe4..3ebc1bf 100644
|
|
||||||
--- a/dlls/msxml3/pi.c
|
|
||||||
+++ b/dlls/msxml3/pi.c
|
|
||||||
@@ -23,6 +23,11 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c
|
|
||||||
index 2c6f23e..8613b20 100644
|
|
||||||
--- a/dlls/msxml3/queryresult.c
|
|
||||||
+++ b/dlls/msxml3/queryresult.c
|
|
||||||
@@ -24,6 +24,13 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+# include <libxml/xpath.h>
|
|
||||||
+# include <libxml/xpathInternals.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
@@ -48,8 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
|
|
||||||
|
|
||||||
#ifdef HAVE_LIBXML2
|
|
||||||
|
|
||||||
-#include <libxml/xpath.h>
|
|
||||||
-
|
|
||||||
typedef struct _queryresult
|
|
||||||
{
|
|
||||||
DispatchEx dispex;
|
|
||||||
diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c
|
|
||||||
index 415e5af..864d61e 100644
|
|
||||||
--- a/dlls/msxml3/regsvr.c
|
|
||||||
+++ b/dlls/msxml3/regsvr.c
|
|
||||||
@@ -24,6 +24,10 @@
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <string.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
|
|
||||||
index eca9f1d..f2d340e 100644
|
|
||||||
--- a/dlls/msxml3/saxreader.c
|
|
||||||
+++ b/dlls/msxml3/saxreader.c
|
|
||||||
@@ -24,6 +24,13 @@
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <assert.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+# include <libxml/SAX2.h>
|
|
||||||
+# include <libxml/parserInternals.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
@@ -43,9 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
|
|
||||||
|
|
||||||
#ifdef HAVE_LIBXML2
|
|
||||||
|
|
||||||
-#include <libxml/SAX2.h>
|
|
||||||
-#include <libxml/parserInternals.h>
|
|
||||||
-
|
|
||||||
typedef struct _saxreader
|
|
||||||
{
|
|
||||||
const struct IVBSAXXMLReaderVtbl *lpVBSAXXMLReaderVtbl;
|
|
||||||
diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
|
|
||||||
index 72d7854..c1465c0 100644
|
|
||||||
--- a/dlls/msxml3/schema.c
|
|
||||||
+++ b/dlls/msxml3/schema.c
|
|
||||||
@@ -23,6 +23,18 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+# include <libxml/tree.h>
|
|
||||||
+# include <libxml/xmlschemas.h>
|
|
||||||
+# include <libxml/schemasInternals.h>
|
|
||||||
+# include <libxml/hash.h>
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/parserInternals.h>
|
|
||||||
+# include <libxml/xmlIO.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
|
|
||||||
index fdcb06b..72b2ffd 100644
|
|
||||||
--- a/dlls/msxml3/text.c
|
|
||||||
+++ b/dlls/msxml3/text.c
|
|
||||||
@@ -24,6 +24,11 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c
|
|
||||||
index d1a010f..0d1006e 100644
|
|
||||||
--- a/dlls/msxml3/xmldoc.c
|
|
||||||
+++ b/dlls/msxml3/xmldoc.c
|
|
||||||
@@ -23,6 +23,11 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
|
|
||||||
index a71b18b..a818d14 100644
|
|
||||||
--- a/dlls/msxml3/xmlelem.c
|
|
||||||
+++ b/dlls/msxml3/xmlelem.c
|
|
||||||
@@ -23,6 +23,11 @@
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#ifdef HAVE_LIBXML2
|
|
||||||
+# include <libxml/parser.h>
|
|
||||||
+# include <libxml/xmlerror.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
--
|
|
||||||
1.7.8.3
|
|
||||||
|
|
@ -1,214 +0,0 @@
|
|||||||
From 57c57e9dfae50f045503ae9f3107fa3748512483 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
|
||||||
Date: Sun, 3 Feb 2013 19:19:36 -0500
|
|
||||||
Subject: [PATCH] winebuild: Use $CCAS to assemble if found
|
|
||||||
|
|
||||||
Commit c14bdaf1 made winebuild use Clang to assemble if found.
|
|
||||||
|
|
||||||
However, just because a user has some version of Clang installed, it
|
|
||||||
does not mean that she wants to use Clang to assemble Wine. For example,
|
|
||||||
a user who has both Clang and GAS installed may want to use GAS to avoid
|
|
||||||
textrels (see https://bugs.gentoo.org/show_bug.cgi?id=455308).
|
|
||||||
|
|
||||||
This patch allows the user to override which assembler gets used by
|
|
||||||
exporting CCAS at Wine configure time; the name CCAS was chosen for
|
|
||||||
compatibility with automake's standard AM_PROG_AS macro.
|
|
||||||
---
|
|
||||||
configure | 106 ++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
configure.ac | 4 ++
|
|
||||||
tools/winebuild/Makefile.in | 5 ++-
|
|
||||||
tools/winebuild/utils.c | 12 +++++
|
|
||||||
4 files changed, 126 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/configure b/configure
|
|
||||||
index e3253ee..d0b7777 100755
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -732,6 +732,8 @@ FLEX
|
|
||||||
TOOLSDIR
|
|
||||||
WOW64_DISABLE
|
|
||||||
TARGETFLAGS
|
|
||||||
+ac_ct_CCAS
|
|
||||||
+CCAS
|
|
||||||
CPPBIN
|
|
||||||
ac_ct_CXX
|
|
||||||
CXXFLAGS
|
|
||||||
@@ -861,6 +863,7 @@ CPPFLAGS
|
|
||||||
CXX
|
|
||||||
CXXFLAGS
|
|
||||||
CCC
|
|
||||||
+CCAS
|
|
||||||
CPP
|
|
||||||
XMKMF'
|
|
||||||
|
|
||||||
@@ -1549,6 +1552,7 @@ Some influential environment variables:
|
|
||||||
you have headers in a nonstandard directory <include dir>
|
|
||||||
CXX C++ compiler command
|
|
||||||
CXXFLAGS C++ compiler flags
|
|
||||||
+ CCAS Assembler command
|
|
||||||
CPP C preprocessor
|
|
||||||
XMKMF Path to xmkmf, Makefile generator for X Window System
|
|
||||||
|
|
||||||
@@ -4075,6 +4079,108 @@ cat >>confdefs.h <<_ACEOF
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
|
|
||||||
+
|
|
||||||
+if test -n "$ac_tool_prefix"; then
|
|
||||||
+ for ac_prog in clang gas as
|
|
||||||
+ do
|
|
||||||
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
|
||||||
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
|
||||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
||||||
+if ${ac_cv_prog_CCAS+:} false; then :
|
|
||||||
+ $as_echo_n "(cached) " >&6
|
|
||||||
+else
|
|
||||||
+ if test -n "$CCAS"; then
|
|
||||||
+ ac_cv_prog_CCAS="$CCAS" # Let the user override the test.
|
|
||||||
+else
|
|
||||||
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
+for as_dir in $PATH
|
|
||||||
+do
|
|
||||||
+ IFS=$as_save_IFS
|
|
||||||
+ test -z "$as_dir" && as_dir=.
|
|
||||||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
||||||
+ ac_cv_prog_CCAS="$ac_tool_prefix$ac_prog"
|
|
||||||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
||||||
+ break 2
|
|
||||||
+ fi
|
|
||||||
+done
|
|
||||||
+ done
|
|
||||||
+IFS=$as_save_IFS
|
|
||||||
+
|
|
||||||
+fi
|
|
||||||
+fi
|
|
||||||
+CCAS=$ac_cv_prog_CCAS
|
|
||||||
+if test -n "$CCAS"; then
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCAS" >&5
|
|
||||||
+$as_echo "$CCAS" >&6; }
|
|
||||||
+else
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
+$as_echo "no" >&6; }
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ test -n "$CCAS" && break
|
|
||||||
+ done
|
|
||||||
+fi
|
|
||||||
+if test -z "$CCAS"; then
|
|
||||||
+ ac_ct_CCAS=$CCAS
|
|
||||||
+ for ac_prog in clang gas as
|
|
||||||
+do
|
|
||||||
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
||||||
+set dummy $ac_prog; ac_word=$2
|
|
||||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
+$as_echo_n "checking for $ac_word... " >&6; }
|
|
||||||
+if ${ac_cv_prog_ac_ct_CCAS+:} false; then :
|
|
||||||
+ $as_echo_n "(cached) " >&6
|
|
||||||
+else
|
|
||||||
+ if test -n "$ac_ct_CCAS"; then
|
|
||||||
+ ac_cv_prog_ac_ct_CCAS="$ac_ct_CCAS" # Let the user override the test.
|
|
||||||
+else
|
|
||||||
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
+for as_dir in $PATH
|
|
||||||
+do
|
|
||||||
+ IFS=$as_save_IFS
|
|
||||||
+ test -z "$as_dir" && as_dir=.
|
|
||||||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
||||||
+ ac_cv_prog_ac_ct_CCAS="$ac_prog"
|
|
||||||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
||||||
+ break 2
|
|
||||||
+ fi
|
|
||||||
+done
|
|
||||||
+ done
|
|
||||||
+IFS=$as_save_IFS
|
|
||||||
+
|
|
||||||
+fi
|
|
||||||
+fi
|
|
||||||
+ac_ct_CCAS=$ac_cv_prog_ac_ct_CCAS
|
|
||||||
+if test -n "$ac_ct_CCAS"; then
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CCAS" >&5
|
|
||||||
+$as_echo "$ac_ct_CCAS" >&6; }
|
|
||||||
+else
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
+$as_echo "no" >&6; }
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ test -n "$ac_ct_CCAS" && break
|
|
||||||
+done
|
|
||||||
+
|
|
||||||
+ if test "x$ac_ct_CCAS" = x; then
|
|
||||||
+ CCAS=""$CC""
|
|
||||||
+ else
|
|
||||||
+ case $cross_compiling:$ac_tool_warned in
|
|
||||||
+yes:)
|
|
||||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
||||||
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
||||||
+ac_tool_warned=yes ;;
|
|
||||||
+esac
|
|
||||||
+ CCAS=$ac_ct_CCAS
|
|
||||||
+ fi
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+
|
|
||||||
case $host in
|
|
||||||
*-darwin*)
|
|
||||||
if test "x$enable_win64" = "xyes"
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index c93cd08..760f325 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -126,6 +126,10 @@ dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E
|
|
||||||
AC_CHECK_TOOL(CPPBIN,cpp,cpp)
|
|
||||||
AC_DEFINE_UNQUOTED(EXEEXT,["$ac_exeext"],[Define to the file extension for executables.])
|
|
||||||
|
|
||||||
+dnl Analogous to AM_PROG_AS
|
|
||||||
+AC_ARG_VAR([CCAS],[Assembler command])
|
|
||||||
+AC_CHECK_TOOLS(CCAS,[clang gas as],["$CC"])
|
|
||||||
+
|
|
||||||
case $host in
|
|
||||||
*-darwin*)
|
|
||||||
if test "x$enable_win64" = "xyes"
|
|
||||||
diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in
|
|
||||||
index 2017129..3fe47a3 100644
|
|
||||||
--- a/tools/winebuild/Makefile.in
|
|
||||||
+++ b/tools/winebuild/Makefile.in
|
|
||||||
@@ -1,4 +1,7 @@
|
|
||||||
-DEFS = -D__WINESRC__ $(EXTRADEFS)
|
|
||||||
+DEFS = \
|
|
||||||
+ -DCCAS="\"@CCAS@\"" \
|
|
||||||
+ -D__WINESRC__ \
|
|
||||||
+ $(EXTRADEFS)
|
|
||||||
|
|
||||||
PROGRAMS = winebuild$(EXEEXT)
|
|
||||||
MANPAGE = winebuild.man
|
|
||||||
diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
|
|
||||||
index 262ff3a..1c5f918 100644
|
|
||||||
--- a/tools/winebuild/utils.c
|
|
||||||
+++ b/tools/winebuild/utils.c
|
|
||||||
@@ -352,6 +352,18 @@ struct strarray *get_as_command(void)
|
|
||||||
static int as_is_clang = 0;
|
|
||||||
struct strarray *args = strarray_init();
|
|
||||||
|
|
||||||
+ if (!as_command && strlen( CCAS ))
|
|
||||||
+ {
|
|
||||||
+ struct stat st;
|
|
||||||
+
|
|
||||||
+ if (!stat( CCAS, &st ))
|
|
||||||
+ as_command = CCAS;
|
|
||||||
+ else
|
|
||||||
+ as_command = find_tool( CCAS, NULL );
|
|
||||||
+
|
|
||||||
+ if (as_command && strstr( as_command, "clang" )) as_is_clang = 1;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (!as_command)
|
|
||||||
{
|
|
||||||
as_command = find_tool( "clang", NULL );
|
|
||||||
--
|
|
||||||
1.8.1.2
|
|
||||||
|
|
@ -1,233 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.28 2015/01/01 21:01:23 ryao Exp $
|
|
||||||
|
|
||||||
EAPI="5"
|
|
||||||
|
|
||||||
inherit eutils flag-o-matic multilib
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]] ; then
|
|
||||||
EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
|
|
||||||
inherit git-2 autotools
|
|
||||||
SRC_URI=""
|
|
||||||
#KEYWORDS=""
|
|
||||||
else
|
|
||||||
AUTOTOOLS_AUTO_DEPEND="no"
|
|
||||||
inherit autotools
|
|
||||||
MY_P="${PN}-${PV/_/-}"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
|
|
||||||
KEYWORDS="-* amd64 x86 ~x86-fbsd"
|
|
||||||
S=${WORKDIR}/${MY_P}
|
|
||||||
fi
|
|
||||||
|
|
||||||
pulse_patches() { echo "$1"/winepulse-{0.36,0.35-configure.ac,0.38-winecfg}.patch ; }
|
|
||||||
GV="1.0.0-x86"
|
|
||||||
DESCRIPTION="Free implementation of Windows(tm) on Unix"
|
|
||||||
HOMEPAGE="http://www.winehq.org/"
|
|
||||||
SRC_URI="${SRC_URI}
|
|
||||||
gecko? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}.cab )
|
|
||||||
pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm jack jpeg ldap mp3 nas ncurses openal +opengl +oss +perl png +prelink pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
|
|
||||||
REQUIRED_USE="elibc_glibc? ( threads )" #286560
|
|
||||||
RESTRICT="test" #72375
|
|
||||||
|
|
||||||
MLIB_DEPS="amd64? (
|
|
||||||
truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
|
|
||||||
X? (
|
|
||||||
>=app-emulation/emul-linux-x86-xlibs-2.1
|
|
||||||
>=app-emulation/emul-linux-x86-soundlibs-2.1
|
|
||||||
)
|
|
||||||
mp3? ( app-emulation/emul-linux-x86-soundlibs )
|
|
||||||
openal? ( app-emulation/emul-linux-x86-sdl )
|
|
||||||
opengl? ( app-emulation/emul-linux-x86-opengl )
|
|
||||||
scanner? ( app-emulation/emul-linux-x86-medialibs )
|
|
||||||
v4l? ( app-emulation/emul-linux-x86-medialibs )
|
|
||||||
app-emulation/emul-linux-x86-baselibs
|
|
||||||
>=sys-kernel/linux-headers-2.6
|
|
||||||
)"
|
|
||||||
RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 )
|
|
||||||
perl? ( dev-lang/perl dev-perl/XML-Simple )
|
|
||||||
capi? ( net-dialup/capi4k-utils )
|
|
||||||
ncurses? ( >=sys-libs/ncurses-5.2 )
|
|
||||||
fontconfig? ( media-libs/fontconfig:= )
|
|
||||||
gphoto2? ( media-libs/libgphoto2:= )
|
|
||||||
jack? ( media-sound/jack-audio-connection-kit )
|
|
||||||
openal? ( media-libs/openal:= )
|
|
||||||
dbus? ( sys-apps/dbus )
|
|
||||||
gnutls? ( net-libs/gnutls:= )
|
|
||||||
X? (
|
|
||||||
x11-libs/libICE
|
|
||||||
x11-libs/libSM
|
|
||||||
x11-libs/libXcursor
|
|
||||||
x11-libs/libXrandr
|
|
||||||
x11-libs/libXi
|
|
||||||
x11-libs/libXxf86vm
|
|
||||||
)
|
|
||||||
xinerama? ( x11-libs/libXinerama )
|
|
||||||
alsa? ( media-libs/alsa-lib )
|
|
||||||
nas? ( media-libs/nas )
|
|
||||||
cups? ( net-print/cups:= )
|
|
||||||
opengl? (
|
|
||||||
virtual/glu
|
|
||||||
virtual/opengl
|
|
||||||
)
|
|
||||||
pulseaudio? ( media-sound/pulseaudio )
|
|
||||||
gsm? ( media-sound/gsm:= )
|
|
||||||
jpeg? ( virtual/jpeg:0= )
|
|
||||||
ldap? ( net-nds/openldap:= )
|
|
||||||
mp3? ( >=media-sound/mpg123-1.5.0 )
|
|
||||||
samba? ( >=net-fs/samba-3.0.25 )
|
|
||||||
xml? ( dev-libs/libxml2 dev-libs/libxslt )
|
|
||||||
scanner? ( media-gfx/sane-backends:= )
|
|
||||||
ssl? ( dev-libs/openssl:0= )
|
|
||||||
png? ( media-libs/libpng:0= )
|
|
||||||
v4l? ( media-libs/libv4l )
|
|
||||||
!win64? ( ${MLIB_DEPS} )
|
|
||||||
win32? ( ${MLIB_DEPS} )
|
|
||||||
xcomposite? ( x11-libs/libXcomposite )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
pulseaudio? ( ${AUTOTOOLS_DEPEND} )
|
|
||||||
X? (
|
|
||||||
x11-proto/inputproto
|
|
||||||
x11-proto/xextproto
|
|
||||||
x11-proto/xf86vidmodeproto
|
|
||||||
)
|
|
||||||
xinerama? ( x11-proto/xineramaproto )
|
|
||||||
prelink? ( sys-devel/prelink )
|
|
||||||
virtual/pkgconfig
|
|
||||||
virtual/yacc
|
|
||||||
sys-devel/flex"
|
|
||||||
|
|
||||||
wine_build_environment_check() {
|
|
||||||
[[ ${MERGE_TYPE} = "binary" ]] && return 0
|
|
||||||
|
|
||||||
if use win64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
|
|
||||||
eerror "You need gcc-4.4+ to build 64-bit wine"
|
|
||||||
eerror
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_pretend() {
|
|
||||||
wine_build_environment_check || die
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
wine_build_environment_check || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
if [[ ${PV} == "9999" ]] ; then
|
|
||||||
git-2_src_unpack
|
|
||||||
else
|
|
||||||
unpack ${MY_P}.tar.bz2
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
local md5="$(md5sum server/protocol.def)"
|
|
||||||
if use pulseaudio ; then
|
|
||||||
EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
|
|
||||||
eautoreconf
|
|
||||||
fi
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.2.3-msxml3-libxml2-headers.patch #397993
|
|
||||||
epatch_user #282735
|
|
||||||
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
|
|
||||||
sed -i '/^MimeType/d' tools/wine.desktop || die #117785
|
|
||||||
}
|
|
||||||
|
|
||||||
do_configure() {
|
|
||||||
local builddir="${WORKDIR}/wine$1"
|
|
||||||
mkdir -p "${builddir}"
|
|
||||||
pushd "${builddir}" >/dev/null
|
|
||||||
|
|
||||||
ECONF_SOURCE=${S} \
|
|
||||||
econf \
|
|
||||||
--sysconfdir=/etc/wine \
|
|
||||||
$(use_with alsa) \
|
|
||||||
$(use_with capi) \
|
|
||||||
--without-cms \
|
|
||||||
$(use_with cups) \
|
|
||||||
$(use_with ncurses curses) \
|
|
||||||
--without-esd \
|
|
||||||
$(use_with fontconfig) \
|
|
||||||
$(use_with gnutls) \
|
|
||||||
$(use_with gphoto2 gphoto) \
|
|
||||||
$(use_with gsm) \
|
|
||||||
--without-hal \
|
|
||||||
$(use_with jack) \
|
|
||||||
$(use_with jpeg) \
|
|
||||||
$(use_with ldap) \
|
|
||||||
$(use_with mp3 mpg123) \
|
|
||||||
$(use_with nas) \
|
|
||||||
$(use_with openal) \
|
|
||||||
$(use_with opengl) \
|
|
||||||
$(use_with ssl openssl) \
|
|
||||||
$(use_with oss) \
|
|
||||||
$(use_with png) \
|
|
||||||
$(use_with threads pthread) \
|
|
||||||
$(use pulseaudio && use_with pulseaudio pulse) \
|
|
||||||
$(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) \
|
|
||||||
$2
|
|
||||||
|
|
||||||
emake -j1 depend
|
|
||||||
|
|
||||||
popd >/dev/null
|
|
||||||
}
|
|
||||||
src_configure() {
|
|
||||||
export LDCONFIG=/bin/true
|
|
||||||
use custom-cflags || strip-flags
|
|
||||||
|
|
||||||
if use win64 ; then
|
|
||||||
do_configure 64 --enable-win64
|
|
||||||
use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
|
|
||||||
else
|
|
||||||
ABI=x86 do_configure 32 --disable-win64
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
local b
|
|
||||||
for b in 64 32 ; do
|
|
||||||
local builddir="${WORKDIR}/wine${b}"
|
|
||||||
[[ -d ${builddir} ]] || continue
|
|
||||||
emake -C "${builddir}" all
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local b
|
|
||||||
for b in 64 32 ; do
|
|
||||||
local builddir="${WORKDIR}/wine${b}"
|
|
||||||
[[ -d ${builddir} ]] || continue
|
|
||||||
emake -C "${builddir}" install DESTDIR="${D}"
|
|
||||||
done
|
|
||||||
dodoc ANNOUNCE AUTHORS README
|
|
||||||
if use gecko ; then
|
|
||||||
insinto /usr/share/wine/gecko
|
|
||||||
doins "${DISTDIR}"/wine_gecko-${GV}.cab
|
|
||||||
fi
|
|
||||||
if ! use perl ; then
|
|
||||||
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
|
|
||||||
}
|
|
@ -1,213 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.20 2015/01/01 21:01:23 ryao Exp $
|
|
||||||
|
|
||||||
EAPI="5"
|
|
||||||
|
|
||||||
inherit eutils flag-o-matic multilib
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]] ; then
|
|
||||||
EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
|
|
||||||
inherit git-2
|
|
||||||
SRC_URI=""
|
|
||||||
#KEYWORDS=""
|
|
||||||
else
|
|
||||||
MY_P="${PN}-${PV/_/-}"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
|
|
||||||
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
|
|
||||||
S=${WORKDIR}/${MY_P}
|
|
||||||
fi
|
|
||||||
|
|
||||||
GV="1.3"
|
|
||||||
DESCRIPTION="Free implementation of Windows(tm) on Unix"
|
|
||||||
HOMEPAGE="http://www.winehq.org/"
|
|
||||||
SRC_URI="${SRC_URI}
|
|
||||||
gecko? (
|
|
||||||
mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
|
|
||||||
win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
|
|
||||||
)"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg ldap mp3 ncurses nls openal opencl +opengl +oss +perl png +prelink samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
|
|
||||||
REQUIRED_USE="elibc_glibc? ( threads )" #286560
|
|
||||||
RESTRICT="test" #72375
|
|
||||||
|
|
||||||
MLIB_DEPS="amd64? (
|
|
||||||
truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
|
|
||||||
X? (
|
|
||||||
>=app-emulation/emul-linux-x86-xlibs-2.1
|
|
||||||
>=app-emulation/emul-linux-x86-soundlibs-2.1
|
|
||||||
)
|
|
||||||
mp3? ( app-emulation/emul-linux-x86-soundlibs )
|
|
||||||
openal? ( app-emulation/emul-linux-x86-sdl )
|
|
||||||
opengl? ( app-emulation/emul-linux-x86-opengl )
|
|
||||||
scanner? ( app-emulation/emul-linux-x86-medialibs )
|
|
||||||
v4l? ( app-emulation/emul-linux-x86-medialibs )
|
|
||||||
app-emulation/emul-linux-x86-baselibs
|
|
||||||
>=sys-kernel/linux-headers-2.6
|
|
||||||
)"
|
|
||||||
RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 )
|
|
||||||
perl? ( dev-lang/perl dev-perl/XML-Simple )
|
|
||||||
capi? ( net-dialup/capi4k-utils )
|
|
||||||
ncurses? ( >=sys-libs/ncurses-5.2:= )
|
|
||||||
fontconfig? ( media-libs/fontconfig:= )
|
|
||||||
gphoto2? ( media-libs/libgphoto2:= )
|
|
||||||
openal? ( media-libs/openal:= )
|
|
||||||
dbus? ( sys-apps/dbus )
|
|
||||||
gnutls? ( net-libs/gnutls:= )
|
|
||||||
gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
|
|
||||||
X? (
|
|
||||||
x11-libs/libICE
|
|
||||||
x11-libs/libSM
|
|
||||||
x11-libs/libXcursor
|
|
||||||
x11-libs/libXrandr
|
|
||||||
x11-libs/libXi
|
|
||||||
x11-libs/libXxf86vm
|
|
||||||
)
|
|
||||||
xinerama? ( x11-libs/libXinerama )
|
|
||||||
alsa? ( media-libs/alsa-lib )
|
|
||||||
cups? ( net-print/cups:= )
|
|
||||||
opencl? ( virtual/opencl )
|
|
||||||
opengl? (
|
|
||||||
virtual/glu
|
|
||||||
virtual/opengl
|
|
||||||
)
|
|
||||||
gsm? ( media-sound/gsm:= )
|
|
||||||
jpeg? ( virtual/jpeg:0= )
|
|
||||||
ldap? ( net-nds/openldap:= )
|
|
||||||
mp3? ( >=media-sound/mpg123-1.5.0 )
|
|
||||||
nls? ( sys-devel/gettext )
|
|
||||||
samba? ( >=net-fs/samba-3.0.25 )
|
|
||||||
xml? ( dev-libs/libxml2 dev-libs/libxslt )
|
|
||||||
scanner? ( media-gfx/sane-backends:= )
|
|
||||||
ssl? ( dev-libs/openssl:0= )
|
|
||||||
png? ( media-libs/libpng:0= )
|
|
||||||
v4l? ( media-libs/libv4l )
|
|
||||||
!win64? ( ${MLIB_DEPS} )
|
|
||||||
win32? ( ${MLIB_DEPS} )
|
|
||||||
xcomposite? ( x11-libs/libXcomposite )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
X? (
|
|
||||||
x11-proto/inputproto
|
|
||||||
x11-proto/xextproto
|
|
||||||
x11-proto/xf86vidmodeproto
|
|
||||||
)
|
|
||||||
xinerama? ( x11-proto/xineramaproto )
|
|
||||||
prelink? ( sys-devel/prelink )
|
|
||||||
virtual/pkgconfig
|
|
||||||
virtual/yacc
|
|
||||||
sys-devel/flex"
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
if use win64 ; then
|
|
||||||
[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
|
|
||||||
&& die "you need gcc-4.4+ to build 64bit wine"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]] ; then
|
|
||||||
git-2_src_unpack
|
|
||||||
else
|
|
||||||
unpack ${MY_P}.tar.bz2
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
local md5="$(md5sum server/protocol.def)"
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
|
|
||||||
epatch_user #282735
|
|
||||||
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
|
|
||||||
sed -i '/^MimeType/d' tools/wine.desktop || die #117785
|
|
||||||
}
|
|
||||||
|
|
||||||
do_configure() {
|
|
||||||
local builddir="${WORKDIR}/wine$1"
|
|
||||||
mkdir -p "${builddir}"
|
|
||||||
pushd "${builddir}" >/dev/null
|
|
||||||
|
|
||||||
ECONF_SOURCE=${S} \
|
|
||||||
econf \
|
|
||||||
--sysconfdir=/etc/wine \
|
|
||||||
$(use_with alsa) \
|
|
||||||
$(use_with capi) \
|
|
||||||
--without-cms \
|
|
||||||
$(use_with cups) \
|
|
||||||
$(use_with ncurses curses) \
|
|
||||||
$(use_with fontconfig) \
|
|
||||||
$(use_with gnutls) \
|
|
||||||
$(use_with gphoto2 gphoto) \
|
|
||||||
$(use_with gsm) \
|
|
||||||
$(use_with gstreamer) \
|
|
||||||
--without-hal \
|
|
||||||
$(use_with jpeg) \
|
|
||||||
$(use_with ldap) \
|
|
||||||
$(use_with mp3 mpg123) \
|
|
||||||
$(use_with nls gettextpo) \
|
|
||||||
$(use_with openal) \
|
|
||||||
$(use_with opencl) \
|
|
||||||
$(use_with opengl) \
|
|
||||||
$(use_with ssl openssl) \
|
|
||||||
$(use_with oss) \
|
|
||||||
$(use_with png) \
|
|
||||||
$(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) \
|
|
||||||
$2
|
|
||||||
|
|
||||||
emake -j1 depend
|
|
||||||
|
|
||||||
popd >/dev/null
|
|
||||||
}
|
|
||||||
src_configure() {
|
|
||||||
export LDCONFIG=/bin/true
|
|
||||||
use custom-cflags || strip-flags
|
|
||||||
|
|
||||||
if use win64 ; then
|
|
||||||
do_configure 64 --enable-win64
|
|
||||||
use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
|
|
||||||
else
|
|
||||||
ABI=x86 do_configure 32 --disable-win64
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
local b
|
|
||||||
for b in 64 32 ; do
|
|
||||||
local builddir="${WORKDIR}/wine${b}"
|
|
||||||
[[ -d ${builddir} ]] || continue
|
|
||||||
emake -C "${builddir}" all
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local b
|
|
||||||
for b in 64 32 ; do
|
|
||||||
local builddir="${WORKDIR}/wine${b}"
|
|
||||||
[[ -d ${builddir} ]] || continue
|
|
||||||
emake -C "${builddir}" install DESTDIR="${D}"
|
|
||||||
done
|
|
||||||
dodoc ANNOUNCE AUTHORS README
|
|
||||||
if use gecko ; then
|
|
||||||
insinto /usr/share/wine/gecko
|
|
||||||
doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
|
|
||||||
use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
|
|
||||||
fi
|
|
||||||
if ! use perl ; then
|
|
||||||
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
|
|
||||||
}
|
|
@ -1,249 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.1.ebuild,v 1.15 2015/01/01 21:01:23 ryao Exp $
|
|
||||||
|
|
||||||
EAPI="5"
|
|
||||||
|
|
||||||
inherit autotools eutils flag-o-matic multilib pax-utils
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]] ; then
|
|
||||||
EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
|
|
||||||
inherit git-2
|
|
||||||
SRC_URI=""
|
|
||||||
#KEYWORDS=""
|
|
||||||
else
|
|
||||||
MY_P="${PN}-${PV/_/-}"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
|
|
||||||
KEYWORDS="-* amd64 x86 ~x86-fbsd"
|
|
||||||
S=${WORKDIR}/${MY_P}
|
|
||||||
fi
|
|
||||||
|
|
||||||
GV="1.4"
|
|
||||||
DESCRIPTION="Free implementation of Windows(tm) on Unix"
|
|
||||||
HOMEPAGE="http://www.winehq.org/"
|
|
||||||
SRC_URI="${SRC_URI}
|
|
||||||
gecko? (
|
|
||||||
mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
|
|
||||||
win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
|
|
||||||
)"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg ldap mp3 ncurses nls odbc openal opencl +opengl +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
|
|
||||||
REQUIRED_USE="elibc_glibc? ( threads )" #286560
|
|
||||||
RESTRICT="test" #72375
|
|
||||||
|
|
||||||
MLIB_DEPS="amd64? (
|
|
||||||
truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
|
|
||||||
X? (
|
|
||||||
>=app-emulation/emul-linux-x86-xlibs-2.1
|
|
||||||
>=app-emulation/emul-linux-x86-soundlibs-2.1
|
|
||||||
)
|
|
||||||
mp3? ( app-emulation/emul-linux-x86-soundlibs )
|
|
||||||
odbc? ( app-emulation/emul-linux-x86-db )
|
|
||||||
openal? ( app-emulation/emul-linux-x86-sdl )
|
|
||||||
opengl? ( app-emulation/emul-linux-x86-opengl )
|
|
||||||
scanner? ( app-emulation/emul-linux-x86-medialibs )
|
|
||||||
v4l? ( app-emulation/emul-linux-x86-medialibs )
|
|
||||||
app-emulation/emul-linux-x86-baselibs
|
|
||||||
>=sys-kernel/linux-headers-2.6
|
|
||||||
)"
|
|
||||||
RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 )
|
|
||||||
perl? ( dev-lang/perl dev-perl/XML-Simple )
|
|
||||||
capi? ( net-dialup/capi4k-utils )
|
|
||||||
ncurses? ( >=sys-libs/ncurses-5.2:= )
|
|
||||||
fontconfig? ( media-libs/fontconfig:= )
|
|
||||||
gphoto2? ( media-libs/libgphoto2:= )
|
|
||||||
openal? ( media-libs/openal:= )
|
|
||||||
udisks? (
|
|
||||||
sys-apps/dbus
|
|
||||||
sys-fs/udisks:0
|
|
||||||
)
|
|
||||||
gnutls? ( net-libs/gnutls:= )
|
|
||||||
gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
|
|
||||||
X? (
|
|
||||||
x11-libs/libICE
|
|
||||||
x11-libs/libSM
|
|
||||||
x11-libs/libXcursor
|
|
||||||
x11-libs/libXrandr
|
|
||||||
x11-libs/libXi
|
|
||||||
x11-libs/libXxf86vm
|
|
||||||
)
|
|
||||||
xinerama? ( x11-libs/libXinerama )
|
|
||||||
alsa? ( media-libs/alsa-lib )
|
|
||||||
cups? ( net-print/cups:= )
|
|
||||||
opencl? ( virtual/opencl )
|
|
||||||
opengl? (
|
|
||||||
virtual/glu
|
|
||||||
virtual/opengl
|
|
||||||
)
|
|
||||||
gsm? ( media-sound/gsm:= )
|
|
||||||
jpeg? ( virtual/jpeg:0= )
|
|
||||||
ldap? ( net-nds/openldap:= )
|
|
||||||
mp3? ( >=media-sound/mpg123-1.5.0 )
|
|
||||||
nls? ( sys-devel/gettext )
|
|
||||||
odbc? ( dev-db/unixODBC:= )
|
|
||||||
samba? ( >=net-fs/samba-3.0.25 )
|
|
||||||
selinux? ( sec-policy/selinux-wine )
|
|
||||||
xml? ( dev-libs/libxml2 dev-libs/libxslt )
|
|
||||||
scanner? ( media-gfx/sane-backends:= )
|
|
||||||
ssl? ( dev-libs/openssl:0= )
|
|
||||||
png? ( media-libs/libpng:0= )
|
|
||||||
v4l? ( media-libs/libv4l )
|
|
||||||
!win64? ( ${MLIB_DEPS} )
|
|
||||||
win32? ( ${MLIB_DEPS} )
|
|
||||||
xcomposite? ( x11-libs/libXcomposite )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
X? (
|
|
||||||
x11-proto/inputproto
|
|
||||||
x11-proto/xextproto
|
|
||||||
x11-proto/xf86vidmodeproto
|
|
||||||
)
|
|
||||||
xinerama? ( x11-proto/xineramaproto )
|
|
||||||
prelink? ( sys-devel/prelink )
|
|
||||||
virtual/pkgconfig
|
|
||||||
virtual/yacc
|
|
||||||
sys-devel/flex"
|
|
||||||
|
|
||||||
wine_build_environment_check() {
|
|
||||||
[[ ${MERGE_TYPE} = "binary" ]] && return 0
|
|
||||||
|
|
||||||
if use win64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
|
|
||||||
eerror "You need gcc-4.4+ to build 64-bit wine"
|
|
||||||
eerror
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use win32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; 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_build_environment_check || die
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
wine_build_environment_check || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
if [[ ${PV} == "9999" ]] ; then
|
|
||||||
git-2_src_unpack
|
|
||||||
else
|
|
||||||
unpack ${MY_P}.tar.bz2
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
local md5="$(md5sum server/protocol.def)"
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
|
|
||||||
epatch_user #282735
|
|
||||||
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
|
|
||||||
einfo "server/protocol.def was patched; running tools/make_requests"
|
|
||||||
tools/make_requests || die #432348
|
|
||||||
fi
|
|
||||||
eautoreconf
|
|
||||||
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
|
|
||||||
sed -i '/^MimeType/d' tools/wine.desktop || die #117785
|
|
||||||
}
|
|
||||||
|
|
||||||
do_configure() {
|
|
||||||
local builddir="${WORKDIR}/wine$1"
|
|
||||||
mkdir -p "${builddir}"
|
|
||||||
pushd "${builddir}" >/dev/null
|
|
||||||
|
|
||||||
ECONF_SOURCE=${S} \
|
|
||||||
econf \
|
|
||||||
--sysconfdir=/etc/wine \
|
|
||||||
$(use_with alsa) \
|
|
||||||
$(use_with capi) \
|
|
||||||
--without-cms \
|
|
||||||
$(use_with cups) \
|
|
||||||
$(use_with ncurses curses) \
|
|
||||||
$(use_with udisks dbus) \
|
|
||||||
$(use_with fontconfig) \
|
|
||||||
$(use_with gnutls) \
|
|
||||||
$(use_with gphoto2 gphoto) \
|
|
||||||
$(use_with gsm) \
|
|
||||||
$(use_with gstreamer) \
|
|
||||||
--without-hal \
|
|
||||||
$(use_with jpeg) \
|
|
||||||
$(use_with ldap) \
|
|
||||||
$(use_with mp3 mpg123) \
|
|
||||||
$(use_with nls gettext) \
|
|
||||||
$(use_with openal) \
|
|
||||||
$(use_with opencl) \
|
|
||||||
$(use_with opengl) \
|
|
||||||
$(use_with ssl openssl) \
|
|
||||||
$(use_with oss) \
|
|
||||||
$(use_with png) \
|
|
||||||
$(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) \
|
|
||||||
$2
|
|
||||||
|
|
||||||
emake -j1 depend
|
|
||||||
|
|
||||||
popd >/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
export LDCONFIG=/bin/true
|
|
||||||
use custom-cflags || strip-flags
|
|
||||||
|
|
||||||
if use win64 ; then
|
|
||||||
do_configure 64 --enable-win64
|
|
||||||
use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
|
|
||||||
else
|
|
||||||
ABI=x86 do_configure 32 --disable-win64
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
local b
|
|
||||||
for b in 64 32 ; do
|
|
||||||
local builddir="${WORKDIR}/wine${b}"
|
|
||||||
[[ -d ${builddir} ]] || continue
|
|
||||||
emake -C "${builddir}" all
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local b
|
|
||||||
for b in 64 32 ; do
|
|
||||||
local builddir="${WORKDIR}/wine${b}"
|
|
||||||
[[ -d ${builddir} ]] || continue
|
|
||||||
emake -C "${builddir}" install DESTDIR="${D}"
|
|
||||||
done
|
|
||||||
dodoc ANNOUNCE AUTHORS README
|
|
||||||
if use gecko ; then
|
|
||||||
insinto /usr/share/wine/gecko
|
|
||||||
doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
|
|
||||||
use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
|
|
||||||
fi
|
|
||||||
if ! use perl ; then
|
|
||||||
rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use win32 || ! use win64; then
|
|
||||||
pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
|
|
||||||
fi
|
|
||||||
use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
|
|
||||||
|
|
||||||
if use win64 && ! use win32; then
|
|
||||||
dosym /usr/bin/wine{64,} # 404331
|
|
||||||
dosym /usr/bin/wine{64,}-preloader
|
|
||||||
fi
|
|
||||||
}
|
|
@ -0,0 +1,547 @@
|
|||||||
|
# Copyright 1999-2015 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.41.ebuild,v 1.1 2015/04/19 03:45:33 tetromino Exp $
|
||||||
|
|
||||||
|
EAPI="5"
|
||||||
|
|
||||||
|
AUTOTOOLS_AUTORECONF=1
|
||||||
|
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-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
|
||||||
|
|
||||||
|
if [[ ${PV} == "9999" ]] ; then
|
||||||
|
EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
|
||||||
|
EGIT_BRANCH="master"
|
||||||
|
inherit git-r3
|
||||||
|
SRC_URI=""
|
||||||
|
#KEYWORDS=""
|
||||||
|
else
|
||||||
|
MY_P="${PN}-${PV/_/-}"
|
||||||
|
SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
|
||||||
|
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
|
||||||
|
S=${WORKDIR}/${MY_P}
|
||||||
|
fi
|
||||||
|
|
||||||
|
GV="2.36"
|
||||||
|
MV="4.5.6"
|
||||||
|
STAGING_P="wine-staging-${PV}"
|
||||||
|
STAGING_DIR="${WORKDIR}/${STAGING_P}"
|
||||||
|
WINE_GENTOO="wine-gentoo-2015.03.07"
|
||||||
|
GST_P="wine-1.7.34-gstreamer-v5"
|
||||||
|
DESCRIPTION="Free implementation of Windows(tm) on Unix"
|
||||||
|
HOMEPAGE="http://www.winehq.org/"
|
||||||
|
SRC_URI="${SRC_URI}
|
||||||
|
gecko? (
|
||||||
|
abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
|
||||||
|
abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
|
||||||
|
)
|
||||||
|
mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
|
||||||
|
gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
|
||||||
|
http://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}.tar.gz -> ${STAGING_P}.tar.gz )
|
||||||
|
pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.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 +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 +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
|
||||||
|
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
|
||||||
|
test? ( abi_x86_32 )
|
||||||
|
elibc_glibc? ( threads )
|
||||||
|
mono? ( abi_x86_32 )
|
||||||
|
pipelight? ( staging )
|
||||||
|
s3tc? ( staging )
|
||||||
|
vaapi? ( staging )
|
||||||
|
osmesa? ( opengl )" #286560
|
||||||
|
|
||||||
|
# FIXME: the test suite is unsuitable for us; many tests require net access
|
||||||
|
# or fail due to Xvfb's opengl limitations.
|
||||||
|
RESTRICT="test"
|
||||||
|
|
||||||
|
NATIVE_DEPEND="
|
||||||
|
truetype? ( >=media-libs/freetype-2.0.0 )
|
||||||
|
capi? ( net-dialup/capi4k-utils )
|
||||||
|
ncurses? ( >=sys-libs/ncurses-5.2:= )
|
||||||
|
udisks? ( sys-apps/dbus )
|
||||||
|
fontconfig? ( media-libs/fontconfig:= )
|
||||||
|
gphoto2? ( media-libs/libgphoto2:= )
|
||||||
|
openal? ( media-libs/openal:= )
|
||||||
|
gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
|
||||||
|
X? (
|
||||||
|
x11-libs/libXcursor
|
||||||
|
x11-libs/libXext
|
||||||
|
x11-libs/libXrandr
|
||||||
|
x11-libs/libXi
|
||||||
|
x11-libs/libXxf86vm
|
||||||
|
)
|
||||||
|
xinerama? ( x11-libs/libXinerama )
|
||||||
|
alsa? ( media-libs/alsa-lib )
|
||||||
|
cups? ( net-print/cups:= )
|
||||||
|
opencl? ( virtual/opencl )
|
||||||
|
opengl? (
|
||||||
|
virtual/glu
|
||||||
|
virtual/opengl
|
||||||
|
)
|
||||||
|
gsm? ( media-sound/gsm:= )
|
||||||
|
jpeg? ( virtual/jpeg:0= )
|
||||||
|
ldap? ( net-nds/openldap:= )
|
||||||
|
lcms? ( media-libs/lcms:2= )
|
||||||
|
mp3? ( >=media-sound/mpg123-1.5.0 )
|
||||||
|
netapi? ( net-fs/samba[netapi(+)] )
|
||||||
|
nls? ( sys-devel/gettext )
|
||||||
|
odbc? ( dev-db/unixODBC:= )
|
||||||
|
osmesa? ( media-libs/mesa[osmesa] )
|
||||||
|
pcap? ( net-libs/libpcap )
|
||||||
|
staging? ( sys-apps/attr )
|
||||||
|
pulseaudio? ( media-sound/pulseaudio )
|
||||||
|
xml? ( dev-libs/libxml2 dev-libs/libxslt )
|
||||||
|
scanner? ( media-gfx/sane-backends:= )
|
||||||
|
ssl? ( net-libs/gnutls:= )
|
||||||
|
png? ( media-libs/libpng:0= )
|
||||||
|
v4l? ( media-libs/libv4l )
|
||||||
|
vaapi? ( x11-libs/libva[X] )
|
||||||
|
xcomposite? ( x11-libs/libXcomposite )"
|
||||||
|
|
||||||
|
COMMON_DEPEND="
|
||||||
|
!amd64? ( ${NATIVE_DEPEND} )
|
||||||
|
amd64? (
|
||||||
|
abi_x86_64? ( ${NATIVE_DEPEND} )
|
||||||
|
abi_x86_32? (
|
||||||
|
truetype? ( || (
|
||||||
|
>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
|
||||||
|
>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
ncurses? ( || (
|
||||||
|
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
|
||||||
|
>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
udisks? ( || (
|
||||||
|
>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
|
||||||
|
>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
fontconfig? ( || (
|
||||||
|
app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
|
||||||
|
>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
gphoto2? ( || (
|
||||||
|
app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
|
||||||
|
>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
openal? ( || (
|
||||||
|
app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
|
||||||
|
>=media-libs/openal-1.15.1[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
gstreamer? ( || (
|
||||||
|
app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
|
||||||
|
(
|
||||||
|
>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
|
||||||
|
>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
|
||||||
|
)
|
||||||
|
) )
|
||||||
|
X? ( || (
|
||||||
|
app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
|
||||||
|
(
|
||||||
|
>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
|
||||||
|
>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
|
||||||
|
>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
|
||||||
|
>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
|
||||||
|
>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
|
||||||
|
)
|
||||||
|
) )
|
||||||
|
xinerama? ( || (
|
||||||
|
app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
|
||||||
|
>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
alsa? ( || (
|
||||||
|
app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
|
||||||
|
>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
cups? ( || (
|
||||||
|
app-emulation/emul-linux-x86-baselibs
|
||||||
|
>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
|
||||||
|
opengl? ( || (
|
||||||
|
app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
|
||||||
|
(
|
||||||
|
>=virtual/glu-9.0-r1[abi_x86_32(-)]
|
||||||
|
>=virtual/opengl-7.0-r1[abi_x86_32(-)]
|
||||||
|
)
|
||||||
|
) )
|
||||||
|
gsm? ( || (
|
||||||
|
app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
|
||||||
|
>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
jpeg? ( || (
|
||||||
|
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
|
||||||
|
>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
ldap? ( || (
|
||||||
|
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
|
||||||
|
>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
lcms? ( || (
|
||||||
|
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
|
||||||
|
>=media-libs/lcms-2.5:2[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
mp3? ( || (
|
||||||
|
app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
|
||||||
|
>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
|
||||||
|
nls? ( || (
|
||||||
|
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
|
||||||
|
>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
odbc? ( || (
|
||||||
|
app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
|
||||||
|
>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
osmesa? ( || (
|
||||||
|
>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
|
||||||
|
>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
pcap? ( net-libs/libpcap[abi_x86_32(-)] )
|
||||||
|
pulseaudio? ( || (
|
||||||
|
app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
|
||||||
|
>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
staging? ( || (
|
||||||
|
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
|
||||||
|
>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
xml? ( || (
|
||||||
|
>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
|
||||||
|
(
|
||||||
|
>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
|
||||||
|
>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
|
||||||
|
)
|
||||||
|
) )
|
||||||
|
scanner? ( || (
|
||||||
|
app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
|
||||||
|
>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
ssl? ( || (
|
||||||
|
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
|
||||||
|
>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
png? ( || (
|
||||||
|
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
|
||||||
|
>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
v4l? ( || (
|
||||||
|
app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
|
||||||
|
>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
|
||||||
|
xcomposite? ( || (
|
||||||
|
app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
|
||||||
|
>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
|
||||||
|
) )
|
||||||
|
)
|
||||||
|
)"
|
||||||
|
|
||||||
|
RDEPEND="${COMMON_DEPEND}
|
||||||
|
dos? ( games-emulation/dosbox )
|
||||||
|
perl? ( dev-lang/perl dev-perl/XML-Simple )
|
||||||
|
s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
|
||||||
|
samba? ( >=net-fs/samba-3.0.25 )
|
||||||
|
selinux? ( sec-policy/selinux-wine )
|
||||||
|
udisks? ( sys-fs/udisks:2 )
|
||||||
|
pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
|
||||||
|
|
||||||
|
# tools/make_requests requires perl
|
||||||
|
DEPEND="${COMMON_DEPEND}
|
||||||
|
amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
|
||||||
|
staging? ( dev-lang/perl dev-perl/XML-Simple )
|
||||||
|
X? (
|
||||||
|
x11-proto/inputproto
|
||||||
|
x11-proto/xextproto
|
||||||
|
x11-proto/xf86vidmodeproto
|
||||||
|
)
|
||||||
|
xinerama? ( x11-proto/xineramaproto )
|
||||||
|
prelink? ( sys-devel/prelink )
|
||||||
|
>=sys-kernel/linux-headers-2.6
|
||||||
|
virtual/pkgconfig
|
||||||
|
virtual/yacc
|
||||||
|
sys-devel/flex"
|
||||||
|
|
||||||
|
# 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_build_environment_check() {
|
||||||
|
[[ ${MERGE_TYPE} = "binary" ]] && return 0
|
||||||
|
|
||||||
|
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
|
||||||
|
eerror "You need gcc-4.4+ to build 64-bit wine"
|
||||||
|
eerror
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; 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_build_environment_check || die
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
wine_build_environment_check || die
|
||||||
|
}
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
if [[ ${PV} == "9999" ]] ; then
|
||||||
|
git-r3_src_unpack
|
||||||
|
if use staging || use pulseaudio; then
|
||||||
|
EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
|
||||||
|
unset ${PN}_LIVE_REPO;
|
||||||
|
EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
unpack ${MY_P}.tar.bz2
|
||||||
|
use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
|
||||||
|
fi
|
||||||
|
|
||||||
|
unpack "${WINE_GENTOO}.tar.bz2"
|
||||||
|
use gstreamer && unpack "${GST_P}.patch.bz2"
|
||||||
|
|
||||||
|
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.4_rc2-multilib-portage.patch #395615
|
||||||
|
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
|
||||||
|
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
|
||||||
|
)
|
||||||
|
if use gstreamer; then
|
||||||
|
# See http://bugs.winehq.org/show_bug.cgi?id=30557
|
||||||
|
ewarn "Applying experimental patch to fix GStreamer support. Note that"
|
||||||
|
ewarn "this patch has been reported to cause crashes in certain games."
|
||||||
|
|
||||||
|
# Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
|
||||||
|
# during shutdown" patch and "Added patch to implement shared memory
|
||||||
|
# wineserver communication for various user32 functions" prevents the
|
||||||
|
# gstreamer patch from applying cleanly.
|
||||||
|
# So undo the staging patch, apply gstreamer, then re-apply rebased staging
|
||||||
|
# patch on top.
|
||||||
|
if use staging; then
|
||||||
|
PATCHES+=(
|
||||||
|
"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
|
||||||
|
"${WORKDIR}/${GST_P}.patch"
|
||||||
|
"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
|
||||||
|
else
|
||||||
|
PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if use staging; then
|
||||||
|
ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
|
||||||
|
ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
|
||||||
|
ewarn "unless you can reproduce them with USE=-staging"
|
||||||
|
|
||||||
|
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 $?
|
||||||
|
elif use pulseaudio; then
|
||||||
|
PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
|
||||||
|
fi
|
||||||
|
autotools-utils_src_prepare
|
||||||
|
|
||||||
|
# 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' tools/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 # 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 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)
|
||||||
|
)
|
||||||
|
|
||||||
|
if use pulseaudio || use staging; then
|
||||||
|
myconf+=( $(use_with pulseaudio pulse) )
|
||||||
|
fi
|
||||||
|
use staging && myconf+=(
|
||||||
|
--with-xattr
|
||||||
|
$(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
|
||||||
|
|
||||||
|
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
|
||||||
|
use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
|
||||||
|
|
||||||
|
if use abi_x86_64 && ! use abi_x86_32; then
|
||||||
|
dosym /usr/bin/wine{64,} # 404331
|
||||||
|
dosym /usr/bin/wine{64,}-preloader
|
||||||
|
fi
|
||||||
|
|
||||||
|
# respect LINGUAS when installing man pages, #469418
|
||||||
|
for l in de fr pl; do
|
||||||
|
use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
gnome2_icon_savelist
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
gnome2_icon_cache_update
|
||||||
|
fdo-mime_desktop_database_update
|
||||||
|
|
||||||
|
if ! use gecko; then
|
||||||
|
ewarn "Without Wine Gecko, wine prefixes will not have a default"
|
||||||
|
ewarn "implementation of iexplore. Many older windows applications"
|
||||||
|
ewarn "rely upon the existence of an iexplore implementation, so"
|
||||||
|
ewarn "you will likely need to install an external one, like via winetricks"
|
||||||
|
fi
|
||||||
|
if ! use mono; then
|
||||||
|
ewarn "Without Wine Mono, wine prefixes will not have a default"
|
||||||
|
ewarn "implementation of .NET. Many windows applications rely upon"
|
||||||
|
ewarn "the existence of a .NET implementation, so you will likely need"
|
||||||
|
ewarn "to install an external one, like via winetricks"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postrm() {
|
||||||
|
gnome2_icon_cache_update
|
||||||
|
fdo-mime_desktop_database_update
|
||||||
|
}
|
@ -1,2 +1,2 @@
|
|||||||
DIST winetricks-20141130.tar.gz 164917 SHA256 6088f45cac80e0a05a52b0a8885739f98b2c5ae07062bfa2aee1265d63891b56 SHA512 b7fbbcbef1a197b65c0def1cffb238d2ac58862e60aa76503171098ff35cf190a072ae7cddf865f5b03a8269702a804c7ad8ada498b922814f0aad8b2970cee1 WHIRLPOOL 16347e85d161cbf78df9d46b1b49292fe0618e6bfc32d0115e104d0bba1e5cbd6f974e6872ddb7ac8679c8dcf9eccbe0b26841ce02723d1456e0a3c3645d53ed
|
DIST winetricks-20150416.tar.gz 171166 SHA256 6b1bda0d9ec34c7a8596d59a49fa29fbe00848d9f0fecbf9dff8b314d51a1945 SHA512 75997e0645eb0e984117c6998eeb5c10318ac0be9307e6d60485aae0894d4f631c0486c54f04e7622b2827cafef717e778bfbb4f33a5fc5cb2b8a37430a937b9 WHIRLPOOL 5dc99c1152f5c7d0c8f08dea75cbdb758de64ad6362b078675d90124d9722f73249dda811b19b6be60dc40a4e182ba9f76de577ae3200328acbbc9b570a167db
|
||||||
DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 SHA256 dded8c294cc5c2e71e4a5d1531ab165178cf3d2d1d890d0656368c2e499bfeb9 SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a WHIRLPOOL 268da9e06712a678fbbcfff8eac1fca364b5e46f0a9c48a591eb88f03260b1a55f203eb2908bfe1f0a534b77c866127ff6f7049b0e43fe8abeaaa26fe55de75b
|
DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 SHA256 dded8c294cc5c2e71e4a5d1531ab165178cf3d2d1d890d0656368c2e499bfeb9 SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a WHIRLPOOL 268da9e06712a678fbbcfff8eac1fca364b5e46f0a9c48a591eb88f03260b1a55f203eb2908bfe1f0a534b77c866127ff6f7049b0e43fe8abeaaa26fe55de75b
|
||||||
|
@ -1 +1 @@
|
|||||||
DIST eselect-scala-0.1.0.tar.gz 1789 SHA256 800155287671d75e95f998b9836c721615a746bda53165c659c63bf47627a81e SHA512 da14c3be21332c565a9f6dcce885240feea03296e97382e38f0b9903fce48ce3ff27dfc5fb4c3a3ead86be9d4ce553ae9f6af97b524d60c27e0bad57e9b236b1 WHIRLPOOL ecf9b367e56aa4de493b9d45af5ea491955fe8ab3bfc514699afaeecd8d175663a6c3cf76e6e4bb620266ddcdfa798f6a11ba49504ce956f4e582cb2e2465290
|
DIST eselect-scala-0.1.1.tar.gz 1781 SHA256 e3b477858897675c6ab970674b16844853df5949654a5cf526367ecb3579ed33 SHA512 2de1b6067c385d1fb0fa0c708467ebd5d491c3ee532888ad497008fe7f78a8f4be9843af444d71107e05c111579ed83015094c3eca5d6f2c338855af4b722363 WHIRLPOOL 76c0e8631f1584ac1cbb1ee609409cba4f20db93ad9e1a9ea83f0209d3b86016c911c5da9e23044597e57bcf8c53e43e33d2031d7edcd6c421ba06ea10d47ecc
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
# Copyright 1999-2015 Gentoo Foundation
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-scala/eselect-scala-0.1.0.ebuild,v 1.1 2015/04/17 14:36:02 gienah Exp $
|
# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild,v 1.1 2015/04/18 02:55:04 gienah Exp $
|
||||||
|
|
||||||
EAPI=5
|
EAPI=5
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue