root
5 years ago
parent
c6f9e4647e
commit
1780da538a
Binary file not shown.
Binary file not shown.
@ -0,0 +1,210 @@
|
||||
diff --git a/salt/modules/dockercompose.py b/salt/modules/dockercompose.py
|
||||
index 61e937536c..0f37e0d43a 100644
|
||||
--- a/salt/modules/dockercompose.py
|
||||
+++ b/salt/modules/dockercompose.py
|
||||
@@ -241,7 +241,7 @@ def __load_docker_compose(path):
|
||||
None, None)
|
||||
try:
|
||||
with salt.utils.files.fopen(file_path, 'r') as fl:
|
||||
- loaded = yaml.load(fl)
|
||||
+ loaded = yaml.safe_load(fl)
|
||||
except EnvironmentError:
|
||||
return None, __standardize_result(False,
|
||||
'Could not read {0}'.format(file_path),
|
||||
@@ -371,7 +371,7 @@ def __load_compose_definitions(path, definition):
|
||||
None, None)
|
||||
else:
|
||||
try:
|
||||
- loaded_definition = yaml.load(definition)
|
||||
+ loaded_definition = yaml.safe_load(definition)
|
||||
except yaml.YAMLError as yerr:
|
||||
msg = 'Could not parse {0} {1}'.format(definition, yerr)
|
||||
return None, None, __standardize_result(False, msg,
|
||||
diff --git a/salt/serializers/yaml.py b/salt/serializers/yaml.py
|
||||
index c95b40e48f..2154e5dcab 100644
|
||||
--- a/salt/serializers/yaml.py
|
||||
+++ b/salt/serializers/yaml.py
|
||||
@@ -72,6 +72,7 @@ def serialize(obj, **options):
|
||||
'''
|
||||
|
||||
options.setdefault('Dumper', Dumper)
|
||||
+ options.setdefault('default_flow_style', None)
|
||||
try:
|
||||
response = yaml.dump(obj, **options)
|
||||
if response.endswith('\n...\n'):
|
||||
diff --git a/salt/serializers/yamlex.py b/salt/serializers/yamlex.py
|
||||
index 2e4ba6fb2b..e42634f580 100644
|
||||
--- a/salt/serializers/yamlex.py
|
||||
+++ b/salt/serializers/yamlex.py
|
||||
@@ -182,6 +182,7 @@ def serialize(obj, **options):
|
||||
'''
|
||||
|
||||
options.setdefault('Dumper', Dumper)
|
||||
+ options.setdefault('default_flow_style', None)
|
||||
try:
|
||||
response = yaml.dump(obj, **options)
|
||||
if response.endswith('\n...\n'):
|
||||
diff --git a/salt/utils/yamldumper.py b/salt/utils/yamldumper.py
|
||||
index 9892c87d23..3692ea324a 100644
|
||||
--- a/salt/utils/yamldumper.py
|
||||
+++ b/salt/utils/yamldumper.py
|
||||
@@ -115,6 +115,7 @@ def dump(data, stream=None, **kwargs):
|
||||
'''
|
||||
if 'allow_unicode' not in kwargs:
|
||||
kwargs['allow_unicode'] = True
|
||||
+ kwargs.setdefault('default_flow_style', None)
|
||||
return yaml.dump(data, stream, **kwargs)
|
||||
|
||||
|
||||
@@ -126,4 +127,5 @@ def safe_dump(data, stream=None, **kwargs):
|
||||
'''
|
||||
if 'allow_unicode' not in kwargs:
|
||||
kwargs['allow_unicode'] = True
|
||||
+ kwargs.setdefault('default_flow_style', None)
|
||||
return yaml.dump(data, stream, Dumper=SafeOrderedDumper, **kwargs)
|
||||
diff --git a/tests/integration/utils/test_win_runas.py b/tests/integration/utils/test_win_runas.py
|
||||
index 3042a77991..d4057a4d03 100644
|
||||
--- a/tests/integration/utils/test_win_runas.py
|
||||
+++ b/tests/integration/utils/test_win_runas.py
|
||||
@@ -539,7 +539,7 @@ class RunAsTest(ModuleCase):
|
||||
win32serviceutil.StartService('test service')
|
||||
wait_for_service('test service')
|
||||
with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
|
||||
- ret = yaml.load(fp)
|
||||
+ ret = yaml.safe_load(fp)
|
||||
assert ret['retcode'] == 1, ret
|
||||
|
||||
@with_system_user('test-runas', on_existing='delete', delete=True,
|
||||
@@ -560,7 +560,7 @@ class RunAsTest(ModuleCase):
|
||||
win32serviceutil.StartService('test service')
|
||||
wait_for_service('test service')
|
||||
with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
|
||||
- ret = yaml.load(fp)
|
||||
+ ret = yaml.safe_load(fp)
|
||||
assert ret['retcode'] == 1, ret
|
||||
|
||||
@with_system_user('test-runas-admin', on_existing='delete', delete=True,
|
||||
@@ -581,7 +581,7 @@ class RunAsTest(ModuleCase):
|
||||
win32serviceutil.StartService('test service')
|
||||
wait_for_service('test service')
|
||||
with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
|
||||
- ret = yaml.load(fp)
|
||||
+ ret = yaml.safe_load(fp)
|
||||
assert ret['retcode'] == 0, ret
|
||||
|
||||
@with_system_user('test-runas-admin', on_existing='delete', delete=True,
|
||||
@@ -602,7 +602,7 @@ class RunAsTest(ModuleCase):
|
||||
win32serviceutil.StartService('test service')
|
||||
wait_for_service('test service')
|
||||
with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
|
||||
- ret = yaml.load(fp)
|
||||
+ ret = yaml.safe_load(fp)
|
||||
assert ret['retcode'] == 0, ret
|
||||
|
||||
def test_runas_service_system_user(self):
|
||||
@@ -621,5 +621,5 @@ class RunAsTest(ModuleCase):
|
||||
win32serviceutil.StartService('test service')
|
||||
wait_for_service('test service')
|
||||
with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
|
||||
- ret = yaml.load(fp)
|
||||
+ ret = yaml.safe_load(fp)
|
||||
assert ret['retcode'] == 0, ret
|
||||
diff --git a/tests/unit/serializers/test_serializers.py b/tests/unit/serializers/test_serializers.py
|
||||
index 3bf42b67d7..ea42d617d7 100644
|
||||
--- a/tests/unit/serializers/test_serializers.py
|
||||
+++ b/tests/unit/serializers/test_serializers.py
|
||||
@@ -68,9 +68,24 @@ class TestSerializers(TestCase):
|
||||
serialized = yamlex.serialize(data)
|
||||
assert serialized == '{foo: bar}', serialized
|
||||
|
||||
+ serialized = yamlex.serialize(data, default_flow_style=False)
|
||||
+ assert serialized == 'foo: bar', serialized
|
||||
+
|
||||
deserialized = yamlex.deserialize(serialized)
|
||||
assert deserialized == data, deserialized
|
||||
|
||||
+ serialized = yaml.serialize(data)
|
||||
+ assert serialized == '{foo: bar}', serialized
|
||||
+
|
||||
+ deserialized = yaml.deserialize(serialized)
|
||||
+ assert deserialized == data, deserialized
|
||||
+
|
||||
+ serialized = yaml.serialize(data, default_flow_style=False)
|
||||
+ assert serialized == 'foo: bar', serialized
|
||||
+
|
||||
+ deserialized = yaml.deserialize(serialized)
|
||||
+ assert deserialized == data, deserialized
|
||||
+
|
||||
@skipIf(not yamlex.available, SKIP_MESSAGE % 'sls')
|
||||
def test_serialize_complex_sls(self):
|
||||
data = OrderedDict([
|
||||
@@ -84,6 +99,12 @@ class TestSerializers(TestCase):
|
||||
deserialized = yamlex.deserialize(serialized)
|
||||
assert deserialized == data, deserialized
|
||||
|
||||
+ serialized = yaml.serialize(data)
|
||||
+ assert serialized == '{bar: 2, baz: true, foo: 1}', serialized
|
||||
+
|
||||
+ deserialized = yaml.deserialize(serialized)
|
||||
+ assert deserialized == data, deserialized
|
||||
+
|
||||
@skipIf(not yaml.available, SKIP_MESSAGE % 'yaml')
|
||||
@skipIf(not yamlex.available, SKIP_MESSAGE % 'sls')
|
||||
def test_compare_sls_vs_yaml(self):
|
||||
diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py
|
||||
index 677cd0778b..5c2f1fd8fd 100644
|
||||
--- a/tests/unit/utils/test_schema.py
|
||||
+++ b/tests/unit/utils/test_schema.py
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
# Import python libs
|
||||
from __future__ import absolute_import, print_function, unicode_literals
|
||||
+import sys
|
||||
import copy
|
||||
|
||||
# Import Salt Testing Libs
|
||||
@@ -506,7 +507,7 @@ class ConfigTestCase(TestCase):
|
||||
{'personal_access_token': 'foo'},
|
||||
Requirements.serialize()
|
||||
)
|
||||
- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
|
||||
+ self.assertIn("'ssh_key_file' is a required property", excinfo.exception.message)
|
||||
|
||||
def test_boolean_config(self):
|
||||
item = schema.BooleanItem(title='Hungry', description='Are you hungry?')
|
||||
@@ -1730,7 +1731,10 @@ class ConfigTestCase(TestCase):
|
||||
|
||||
with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
|
||||
jsonschema.validate({'item': {'sides': '4', 'color': 'blue'}}, TestConf.serialize())
|
||||
- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
|
||||
+ if sys.hexversion >= 0x03000000:
|
||||
+ self.assertIn("'4' is not of type 'boolean'", excinfo.exception.message)
|
||||
+ else:
|
||||
+ self.assertIn("u'4' is not of type u'boolean'", excinfo.exception.message)
|
||||
|
||||
class TestConf(schema.Schema):
|
||||
item = schema.DictItem(
|
||||
@@ -1833,7 +1837,10 @@ class ConfigTestCase(TestCase):
|
||||
|
||||
with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
|
||||
jsonschema.validate({'item': ['maybe']}, TestConf.serialize())
|
||||
- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
|
||||
+ if sys.hexversion >= 0x03000000:
|
||||
+ self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message)
|
||||
+ else:
|
||||
+ self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message)
|
||||
|
||||
with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
|
||||
jsonschema.validate({'item': 2}, TestConf.serialize())
|
||||
@@ -1885,7 +1892,10 @@ class ConfigTestCase(TestCase):
|
||||
|
||||
with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
|
||||
jsonschema.validate({'item': ['maybe']}, TestConf.serialize())
|
||||
- self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
|
||||
+ if sys.hexversion >= 0x03000000:
|
||||
+ self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message)
|
||||
+ else:
|
||||
+ self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message)
|
||||
|
||||
with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
|
||||
jsonschema.validate({'item': 2}, TestConf.serialize())
|
||||
@ -0,0 +1,20 @@
|
||||
diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py
|
||||
index be26b3f093..ca971556d5 100644
|
||||
--- a/tests/unit/modules/test_boto_apigateway.py
|
||||
+++ b/tests/unit/modules/test_boto_apigateway.py
|
||||
@@ -169,6 +169,7 @@ def _has_required_botocore():
|
||||
return True
|
||||
|
||||
|
||||
+@skipIf(True, "Causes machines to OOM")
|
||||
class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
|
||||
conn = None
|
||||
|
||||
@@ -207,6 +208,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
|
||||
self.addCleanup(delattr, self, 'conn')
|
||||
|
||||
|
||||
+@skipIf(True, "Causes machines to OOM")
|
||||
class BotoApiGatewayTestCaseMixin(object):
|
||||
def _diff_list_dicts(self, listdict1, listdict2, sortkey):
|
||||
'''
|
||||
Binary file not shown.
Binary file not shown.
@ -1,6 +0,0 @@
|
||||
CXX ?= g++
|
||||
CXXFLAGS ?= -O3
|
||||
LIBS=-lpthread
|
||||
|
||||
qpress:
|
||||
$(CXX) $(CXXFLAGS) qpress.cpp aio.cpp quicklz.c utilities.cpp -o $@ $(LIBS)
|
||||
@ -0,0 +1,7 @@
|
||||
--- a/makefile
|
||||
+++ b/makefile
|
||||
@@ -1,2 +1 @@
|
||||
-g++: qpress.cpp aio.cpp quicklz.c utilities.cpp
|
||||
- g++ -O3 -o qpress qpress.cpp aio.cpp quicklz.c utilities.cpp -lpthread
|
||||
\ No newline at end of file
|
||||
+qpress: aio.o quicklz.o utilities.o
|
||||
@ -0,0 +1,7 @@
|
||||
--- a/qpress.cpp
|
||||
+++ b/qpress.cpp
|
||||
@@ -1,3 +1,4 @@
|
||||
+#include <unistd.h>
|
||||
/*
|
||||
qpress - portable high-speed file archiver
|
||||
Copyright Lasse Reinhold 2006-2010
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST cdemu-daemon-3.2.2.tar.bz2 82366 BLAKE2B d21436a5dbf1c6d953aa7ceb58e5d4580931391ea407c45de8f7c7154c181aef76535833bf02999d77d3a9e0c624db1124a9d333d028e206844a1256b3c5dde0 SHA512 4010bad27d5f595d20e1666700d32c2fb3f943f2e50645317bcc8fbbbba58cd61b3f6d3276e91fff55f449e44291abc776a56ded7c4f0bb7901ac247da72d7fe
|
||||
DIST cdemu-daemon-3.2.3.tar.bz2 83130 BLAKE2B 2be64beb662ebeb51d75a34bccece5f5eede8abe447d4d0be60bf1bbe4e1f9ac6eeaa67783f763f4966571cf4e13fb9b61610ead40d8a13842400f48bb3b1618 SHA512 a1c7fdea9e32e71591a29de98f28dd4d2d0ffb972861916ab287ff33f5f070da8fcc113b602e4b02fd08a72f7361ae85440ef5eb156e312a849cd716207026a7
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
|
||||
HOMEPAGE="http://cdemu.org"
|
||||
SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
COMMON_DEPEND=">=dev-libs/glib-2.38:2
|
||||
>=dev-libs/libmirage-3.2.0:=
|
||||
>=media-libs/libao-0.8.0:="
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-util/intltool
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
sys-apps/dbus
|
||||
>=sys-fs/vhba-20130607"
|
||||
|
||||
DOCS=( AUTHORS README )
|
||||
|
||||
pkg_postinst() {
|
||||
elog "You will need to load the vhba module to use cdemu devices:"
|
||||
elog " # modprobe vhba"
|
||||
elog "To automatically load the vhba module at boot time, edit your"
|
||||
elog "/etc/conf.d/modules file."
|
||||
|
||||
if [[ -e "${ROOT}/etc/conf.d/cdemud" ]]; then
|
||||
elog
|
||||
elog "${PN} no longer installs an init.d service; instead, it is"
|
||||
elog "automatically activated when needed via dbus."
|
||||
elog "You can therefore remove ${ROOT}/etc/conf.d/cdemud"
|
||||
fi
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST cdemu-client-3.2.1.tar.bz2 43584 BLAKE2B d34c09203b7b4e70161d62aee48d531b083952174fd2357bf0fc7b69a0fd59200bedb9ca87fe2d2c18c953979c84e9db3fec4d5fb500375f0bcc155dcaf5cedb SHA512 913c26754d16c339d7ddb4e00cc7d5b754ad6cc7f1a156c9448b51ed09468cf9e8a2bc74ed123a621278d2ad281e447d33ee06c3416bc1d0d2e6c2becd539154
|
||||
DIST cdemu-client-3.2.2.tar.bz2 44305 BLAKE2B 3a656bfda48a502752cb2b14df413a26467a1512b867cc1519f3dfd21b764a8086135a70b13272f258eb079ce169f58af55665e56238a7ba57cf4e9d84f07751 SHA512 ab5c1b1c741945618581bedb18a6eebdcb55915dc811e4247f0c3afe17729f7fbfaaaec10302e444a2f237c5a1401aa402a614685a84c63442907982e759ff41
|
||||
|
||||
@ -0,0 +1,53 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{5,6,7} )
|
||||
|
||||
inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
|
||||
|
||||
DESCRIPTION="Command-line tool for controlling cdemu-daemon"
|
||||
HOMEPAGE="http://cdemu.org"
|
||||
SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+cdemu-daemon"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
|
||||
DEPEND="
|
||||
dev-util/desktop-file-utils
|
||||
>=dev-util/intltool-0.21
|
||||
>=sys-devel/gettext-0.18
|
||||
virtual/pkgconfig"
|
||||
|
||||
S=${WORKDIR}/cdemu-client-${PV}
|
||||
|
||||
DOCS=( AUTHORS README )
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
python_fix_shebang src/cdemu
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DPOST_INSTALL_HOOKS=OFF
|
||||
-DCMAKE_INSTALL_COMPLETIONSDIR="$(get_bashcompdir)"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST gcdemu-3.2.1.tar.bz2 52231 BLAKE2B f6b0025f6c5e79fe7312bf15b467327152e561db33f6190847e4e702cb98ff8005b37fe997c721b5c76cd64d64bafef1c015a9151c0ee200c52efcb849c93dba SHA512 c2da75d985981ccd0b44f210745670501fecd0ae7c60bde783fc5f91ab4c629c6eab9e8b35df906b5669b6518d3bdf36c5814b513c0f3e2d703659d23df1c82e
|
||||
DIST gcdemu-3.2.2.tar.bz2 52251 BLAKE2B 9defe9972e0ec1a594cc354113ef4877846a9abc152ea6768e7089c76b20e8cb488e2c988d92cc459abd10fbf4cdd9d2f5ad425b1ffd23dffca75d18352a0a3e SHA512 831c49e7929c379585fa48b0860054b8246c1798c783dc390edd781fca0e8c85450cb49d1e920e3f0ff29130c1049cd12e0c117851377557826803dfad9e8a8f
|
||||
|
||||
@ -0,0 +1,54 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{5,6,7} )
|
||||
|
||||
inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
|
||||
|
||||
DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
|
||||
HOMEPAGE="http://cdemu.org/"
|
||||
SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
# librsvg for pixbuf-loader
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
app-cdr/cdemu-daemon:0/7
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
gnome-base/librsvg:2
|
||||
x11-libs/gdk-pixbuf[introspection]
|
||||
x11-libs/gtk+:3[introspection]
|
||||
x11-libs/libnotify[introspection]"
|
||||
DEPEND="
|
||||
dev-util/desktop-file-utils
|
||||
>=dev-util/intltool-0.21
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig"
|
||||
|
||||
DOCS=( AUTHORS README )
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
python_fix_shebang src/gcdemu
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_desktop_database_update
|
||||
gnome2_schemas_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
gnome2_schemas_update
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1 @@
|
||||
DIST apache-mode-1.1.el.gz 3468 BLAKE2B aa89b18877049fa8399ef75dd048e40eb84c20dec4365b08bcb1d1df2a14e4a2d63a2baff3bfeed1bb01fdd0489a757b3377ad21d311c03e958650e68a0f927b SHA512 4eb42a0b4db847026832f14473dfc6cfea6c436eaed5a52c2ca3ba27cc89b0b36b0e7be1472048e1c559f3b5d5a5e7e85b9e2cb9c5563bf781f241b540e141f1
|
||||
DIST apache-mode-2.2.0.tar.gz 16077 BLAKE2B 25b153dde0488febd361463b0f43207bd10680f7db2f28f32aa1955f9edc5a07c501646580afd124c7787da3283aa2ee4a2209bfd57f68bf73d5ad07fac41ca7 SHA512 3b309291813b309215250fc1ae1ff206df6474981302a145c305adebb6ffe6a20338b9d8fd5fef1ba491a6bd2427d372178f02d90af214dd24d389c574789aa5
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="Major mode for editing Apache configuration files"
|
||||
HOMEPAGE="http://www.keelhaul.me.uk/linux/#apachemode"
|
||||
SRC_URI="mirror://gentoo/${P}.el.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc x86"
|
||||
IUSE=""
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
@ -1,67 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="The Insidious Big Brother Database"
|
||||
HOMEPAGE="http://bbdb.sourceforge.net/"
|
||||
SRC_URI="http://bbdb.sourceforge.net/${P}.tar.gz
|
||||
http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/point-at.el
|
||||
http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/dates.el"
|
||||
|
||||
LICENSE="GPL-2+ Texinfo-manual"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
|
||||
IUSE="tex"
|
||||
|
||||
RDEPEND="tex? ( virtual/tex-base )"
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
TEXMF="/usr/share/texmf-site"
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e '0,/^--- bbdb-mail-folders.el ---$/d;/^--- end ---$/,$d' \
|
||||
bits/bbdb-mail-folders.el || die "sed failed"
|
||||
sed -i -e '/^;/,$!d' bits/bbdb-sort-mailrc.el || die "sed failed"
|
||||
cp "${DISTDIR}"/{dates,point-at}.el bits || die "cp failed"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -j1
|
||||
BYTECOMPFLAGS="-L bits -L lisp" elisp-compile bits/*.el || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
elisp-install ${PN} lisp/*.el{,c} || die
|
||||
elisp-install ${PN}/bits bits/*.el{,c} || die
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
|
||||
doinfo texinfo/*.info*
|
||||
dodoc ChangeLog INSTALL README bits/*.txt
|
||||
newdoc bits/README README.bits
|
||||
if use tex; then
|
||||
insinto "${TEXMF}"/tex/plain/bbdb
|
||||
doins tex/*.tex
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elisp-site-regen
|
||||
use tex && texconfig rehash
|
||||
|
||||
elog "If you use encryption or signing, you may specify the encryption"
|
||||
elog "method by customising variable \"bbdb/pgp-method\". For details,"
|
||||
elog "see the documentation of this variable. Depending on the Emacs"
|
||||
elog "version, installation of additional packages like app-emacs/gnus"
|
||||
elog "or app-emacs/mailcrypt may be required."
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
elisp-site-regen
|
||||
use tex && texconfig rehash
|
||||
}
|
||||
@ -1,4 +0,0 @@
|
||||
(add-to-list 'load-path "@SITELISP@")
|
||||
(add-to-list 'load-path "@SITELISP@/bits")
|
||||
(require 'bbdb)
|
||||
(bbdb-initialize)
|
||||
Binary file not shown.
@ -0,0 +1,25 @@
|
||||
From c4c267a90d412bc6d072615d38ce891325282b6d Mon Sep 17 00:00:00 2001
|
||||
From: James Le Cuirot <chewi@gentoo.org>
|
||||
Date: Tue, 27 Aug 2019 22:22:57 +0100
|
||||
Subject: [PATCH] Add missing X11/Xatom.h include
|
||||
|
||||
It is sometimes (but not always?) included by SDL2.
|
||||
---
|
||||
libfsemu/src/ml/x11.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libfsemu/src/ml/x11.c b/libfsemu/src/ml/x11.c
|
||||
index c20073d3..4dc5487c 100644
|
||||
--- a/libfsemu/src/ml/x11.c
|
||||
+++ b/libfsemu/src/ml/x11.c
|
||||
@@ -26,6 +26,7 @@ extern SDL_Window* g_fs_ml_window;
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/keysym.h>
|
||||
+#include <X11/Xatom.h>
|
||||
#ifdef USE_X11_XTEST
|
||||
#include <X11/extensions/XTest.h>
|
||||
#endif
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -0,0 +1,533 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
|
||||
PLOCALE_BACKUP="en"
|
||||
|
||||
inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
|
||||
|
||||
MY_PN="${PN%%-*}"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
|
||||
EGIT_BRANCH="master"
|
||||
inherit git-r3
|
||||
SRC_URI=""
|
||||
#KEYWORDS=""
|
||||
else
|
||||
MAJOR_V=$(ver_cut 1)
|
||||
MINOR_V=$(ver_cut 2)
|
||||
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
|
||||
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
|
||||
fi
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
GWP_V="20180120"
|
||||
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
|
||||
|
||||
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
|
||||
HOMEPAGE="https://www.winehq.org/"
|
||||
SRC_URI="${SRC_URI}
|
||||
https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
|
||||
"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="${PV}"
|
||||
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
|
||||
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
|
||||
X? ( truetype )
|
||||
elibc_glibc? ( threads )
|
||||
osmesa? ( opengl )
|
||||
test? ( abi_x86_32 )
|
||||
vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
|
||||
|
||||
# FIXME: the test suite is unsuitable for us; many tests require net access
|
||||
# or fail due to Xvfb's opengl limitations.
|
||||
RESTRICT="test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
X? (
|
||||
x11-libs/libXcursor[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXext[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXfixes[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXrandr[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXi[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
|
||||
)
|
||||
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
|
||||
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
|
||||
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
|
||||
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
|
||||
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
|
||||
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
|
||||
gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
|
||||
gstreamer? (
|
||||
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
|
||||
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
|
||||
)
|
||||
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
|
||||
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
|
||||
lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
|
||||
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
|
||||
mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
|
||||
ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
|
||||
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
|
||||
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
|
||||
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
|
||||
openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
|
||||
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
|
||||
opengl? (
|
||||
virtual/glu[${MULTILIB_USEDEP}]
|
||||
virtual/opengl[${MULTILIB_USEDEP}]
|
||||
)
|
||||
osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
|
||||
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
|
||||
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
|
||||
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
|
||||
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
|
||||
sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
|
||||
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
|
||||
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
|
||||
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
|
||||
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
|
||||
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
|
||||
vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
|
||||
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
|
||||
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
|
||||
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
|
||||
xml? (
|
||||
dev-libs/libxml2[${MULTILIB_USEDEP}]
|
||||
dev-libs/libxslt[${MULTILIB_USEDEP}]
|
||||
)"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
app-emulation/wine-desktop-common
|
||||
>app-eselect/eselect-wine-0.3
|
||||
!app-emulation/wine:0
|
||||
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
|
||||
gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
|
||||
mono? ( app-emulation/wine-mono:4.7.5 )
|
||||
perl? (
|
||||
dev-lang/perl
|
||||
dev-perl/XML-Simple
|
||||
)
|
||||
pulseaudio? (
|
||||
realtime? ( sys-auth/rtkit )
|
||||
)
|
||||
samba? ( >=net-fs/samba-3.0.25[winbind] )
|
||||
selinux? ( sec-policy/selinux-wine )
|
||||
udisks? ( sys-fs/udisks:2 )"
|
||||
|
||||
# tools/make_requests requires perl
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
sys-devel/flex
|
||||
>=sys-kernel/linux-headers-2.6
|
||||
virtual/pkgconfig
|
||||
virtual/yacc
|
||||
X? ( x11-base/xorg-proto )
|
||||
prelink? ( sys-devel/prelink )
|
||||
xinerama? ( x11-base/xorg-proto )"
|
||||
|
||||
# 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"
|
||||
|
||||
PATCHES=(
|
||||
"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
|
||||
"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
|
||||
"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
|
||||
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
|
||||
)
|
||||
PATCHES_BIN=()
|
||||
|
||||
# https://bugs.gentoo.org/show_bug.cgi?id=635222
|
||||
if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
|
||||
DEPEND+=" dev-util/patchbin"
|
||||
fi
|
||||
|
||||
wine_compiler_check() {
|
||||
[[ ${MERGE_TYPE} = "binary" ]] && return 0
|
||||
|
||||
# GCC-specific bugs
|
||||
if tc-is-gcc; then
|
||||
# bug #549768
|
||||
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
|
||||
ebegin "Checking for gcc-5 ms_abi compiler bug"
|
||||
$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
|
||||
# Run in subshell to prevent "Aborted" message
|
||||
( "${T}"/pr66838 || false ) >/dev/null 2>&1
|
||||
if ! eend $?; then
|
||||
eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
|
||||
eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
|
||||
eerror "or use gcc-config to select a different compiler version."
|
||||
eerror "See https://bugs.gentoo.org/549768"
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
# bug #574044
|
||||
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
|
||||
ebegin "Checking for gcc-5-3 stack realignment compiler bug"
|
||||
# Compile in subshell to prevent "Aborted" message
|
||||
( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
|
||||
if ! eend $?; then
|
||||
eerror "Wine cannot be built with this version of gcc-5.3"
|
||||
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
|
||||
eerror "or use gcc-config to select a different compiler version."
|
||||
eerror "See https://bugs.gentoo.org/574044"
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Ensure compiler support
|
||||
if use abi_x86_64; then
|
||||
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
|
||||
# Compile in subshell to prevent "Aborted" message
|
||||
( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
|
||||
if ! eend $?; then
|
||||
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
|
||||
eerror
|
||||
eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
wine_build_environment_check() {
|
||||
[[ ${MERGE_TYPE} = "binary" ]] && return 0
|
||||
|
||||
if use abi_x86_64; then
|
||||
if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
|
||||
eerror "You need gcc-4.4+ to compile 64-bit wine"
|
||||
die
|
||||
elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
|
||||
eerror "You need clang-3.8+ to compile 64-bit wine"
|
||||
die
|
||||
fi
|
||||
fi
|
||||
if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
|
||||
ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
|
||||
ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
|
||||
ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
|
||||
fi
|
||||
if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
|
||||
if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
|
||||
ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
|
||||
ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
|
||||
ewarn "See package.env in man 5 portage for more information on how to do this."
|
||||
ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
|
||||
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
|
||||
eerror "See https://bugs.gentoo.org/487864 for more details."
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
wine_env_vcs_vars() {
|
||||
local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
|
||||
local pn_live_val="${pn_live_var}"
|
||||
eval pn_live_val='$'${pn_live_val}
|
||||
if [[ ! -z ${EGIT_COMMIT} ]]; then
|
||||
eerror "Commits must now be specified using the environmental variables"
|
||||
eerror "EGIT_OVERRIDE_COMMIT_WINE"
|
||||
eerror
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
wine_build_environment_check || die
|
||||
|
||||
# Verify OSS support
|
||||
if use oss && ! use kernel_FreeBSD; then
|
||||
if ! has_version ">=media-sound/oss-4"; then
|
||||
eerror "You cannot build wine with USE=oss without having support from a"
|
||||
eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
|
||||
eerror
|
||||
die
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
wine_build_environment_check || die
|
||||
wine_env_vcs_vars || die
|
||||
|
||||
WINE_VARIANT="${PN#wine}-${PV}"
|
||||
WINE_VARIANT="${WINE_VARIANT#-}"
|
||||
|
||||
MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
|
||||
MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
|
||||
MY_DATADIR="${MY_DATAROOTDIR}"
|
||||
MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
|
||||
MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
|
||||
MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
|
||||
MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
|
||||
MY_MANDIR="${MY_DATADIR}/man"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
l10n_find_plocales_changes "${S}/po" "" ".po"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
|
||||
eapply_bin(){
|
||||
local patch
|
||||
for patch in ${PATCHES_BIN[@]}; do
|
||||
patchbin --nogit < "${patch}" || die
|
||||
done
|
||||
}
|
||||
|
||||
local md5="$(md5sum server/protocol.def)"
|
||||
|
||||
default
|
||||
eapply_bin
|
||||
eautoreconf
|
||||
|
||||
# Modification of the server protocol requires regenerating the server requests
|
||||
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
|
||||
einfo "server/protocol.def was patched; running tools/make_requests"
|
||||
tools/make_requests || die #432348
|
||||
fi
|
||||
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
|
||||
if ! use run-exes; then
|
||||
sed -i '/^MimeType/d' loader/wine.desktop || die #117785
|
||||
fi
|
||||
|
||||
# Edit wine.desktop to work for specific variant
|
||||
sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
|
||||
|
||||
# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
|
||||
cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
|
||||
|
||||
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
|
||||
|
||||
# Fix manpage generation for locales #469418 and abi_x86_64 #617864
|
||||
|
||||
# Duplicate manpages input files for wine64
|
||||
local f
|
||||
for f in loader/*.man.in; do
|
||||
cp ${f} ${f/wine/wine64} || die
|
||||
done
|
||||
# Add wine64 manpages to Makefile
|
||||
if use abi_x86_64; then
|
||||
sed -i "/wine.man.in/i \
|
||||
\\\twine64.man.in \\\\" loader/Makefile.in || die
|
||||
sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
|
||||
\164\2/' loader/Makefile.in || die
|
||||
fi
|
||||
|
||||
rm_man_file(){
|
||||
local file="${1}"
|
||||
loc=${2}
|
||||
sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
|
||||
}
|
||||
|
||||
while read f; do
|
||||
l10n_for_each_disabled_locale_do rm_man_file "${f}"
|
||||
done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
wine_compiler_check || die
|
||||
|
||||
export LDCONFIG=/bin/true
|
||||
use custom-cflags || strip-flags
|
||||
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
--prefix="${MY_PREFIX}"
|
||||
--datarootdir="${MY_DATAROOTDIR}"
|
||||
--datadir="${MY_DATADIR}"
|
||||
--docdir="${MY_DOCDIR}"
|
||||
--includedir="${MY_INCLUDEDIR}"
|
||||
--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
|
||||
--libexecdir="${MY_LIBEXECDIR}"
|
||||
--localstatedir="${MY_LOCALSTATEDIR}"
|
||||
--mandir="${MY_MANDIR}"
|
||||
--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 gssapi)
|
||||
$(use_with gstreamer)
|
||||
--without-hal
|
||||
$(use_with jpeg)
|
||||
$(use_with kerberos krb5)
|
||||
$(use_with ldap)
|
||||
$(use_enable mono mscoree)
|
||||
$(use_with mp3 mpg123)
|
||||
$(use_with netapi)
|
||||
$(use_with nls gettext)
|
||||
$(use_with openal)
|
||||
$(use_with opencl)
|
||||
$(use_with opengl)
|
||||
$(use_with osmesa)
|
||||
$(use_with oss)
|
||||
$(use_with pcap)
|
||||
$(use_with png)
|
||||
$(use_with pulseaudio pulse)
|
||||
$(use_with threads pthread)
|
||||
$(use_with scanner sane)
|
||||
$(use_with sdl)
|
||||
$(use_enable test tests)
|
||||
$(use_with truetype freetype)
|
||||
$(use_with udev)
|
||||
$(use_with v4l)
|
||||
$(use_with vkd3d)
|
||||
$(use_with vulkan)
|
||||
$(use_with X x)
|
||||
$(use_with X xfixes)
|
||||
$(use_with xcomposite)
|
||||
$(use_with xinerama)
|
||||
$(use_with xml)
|
||||
$(use_with xml xslt)
|
||||
)
|
||||
|
||||
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 ${MY_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 )
|
||||
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
|
||||
|
||||
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
|
||||
rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
|
||||
"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
|
||||
fi
|
||||
|
||||
# Remove wineconsole if neither backend is installed #551124
|
||||
if ! use X && ! use ncurses; then
|
||||
rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
|
||||
rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
|
||||
rm_wineconsole() {
|
||||
rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
|
||||
}
|
||||
multilib_foreach_abi rm_wineconsole
|
||||
fi
|
||||
|
||||
use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
|
||||
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
|
||||
|
||||
if use abi_x86_64 && ! use abi_x86_32; then
|
||||
dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
|
||||
dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
|
||||
fi
|
||||
|
||||
# Failglob for binloops, shouldn't be necessary, but including to stay safe
|
||||
eshopts_push -s failglob #615218
|
||||
# Make wrappers for binaries for handling multiple variants
|
||||
# Note: wrappers instead of symlinks because some are shell which use basename
|
||||
local b
|
||||
for b in "${D%/}${MY_PREFIX}"/bin/*; do
|
||||
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
|
||||
done
|
||||
eshopts_pop
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
eselect wine register ${P}
|
||||
if [[ ${PN} == "wine-vanilla" ]]; then
|
||||
eselect wine register --vanilla ${P} || die
|
||||
fi
|
||||
|
||||
eselect wine update --all --if-unset || die
|
||||
|
||||
xdg_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_prerm() {
|
||||
eselect wine deregister ${P}
|
||||
if [[ ${PN} == "wine-vanilla" ]]; then
|
||||
eselect wine deregister --vanilla ${P} || die
|
||||
fi
|
||||
|
||||
eselect wine update --all --if-unset || die
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,24 @@
|
||||
From 88ac2b4a1386bc05f0e3965f31949039eaf4d3ff Mon Sep 17 00:00:00 2001
|
||||
From: Pino Toscano <pino@kde.org>
|
||||
Date: Sat, 25 May 2019 07:12:17 +0200
|
||||
Subject: cmake: find PostgreSQL 12
|
||||
|
||||
---
|
||||
cmake/modules/FindPostgreSQL.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
|
||||
index 56e6e56..1579be0 100644
|
||||
--- a/cmake/modules/FindPostgreSQL.cmake
|
||||
+++ b/cmake/modules/FindPostgreSQL.cmake
|
||||
@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e
|
||||
set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
|
||||
|
||||
set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
|
||||
- "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
|
||||
+ "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
|
||||
|
||||
# Define additional search paths for root directories.
|
||||
foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
|
||||
--
|
||||
cgit v1.1
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue