parent
b4bb55aba8
commit
2190d46401
Binary file not shown.
Binary file not shown.
@ -1,6 +1,4 @@
|
||||
DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
|
||||
DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
|
||||
DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8
|
||||
DIST httpd-2.4.35.tar.bz2 7044336 BLAKE2B b0ec5de56bfdaf7c6cf7f6cd2fedbd8748c16a76bddbde8e3442d2102aa33bc2642cf1dacce7b5e38023ddfceee393cd0059b881cd25dc57c029900385a41f59 SHA512 f5d6a849850ebdf4e38b586c84cc1063d68ac4c6737895c9ac1c8796c22655681c55b4de77ed9f1f807338fdb9f7824faf911361aa31cc46f3c3a2cbabe20543
|
||||
DIST httpd-2.4.37.tar.bz2 7031632 BLAKE2B 53eb04e91a909b65107c587348860fbe3aa48474fa8beae5bed875c62655704e3b63f77534b2961e24bf861c9502b7a52de71a1e6099f092476135b8a50cede8 SHA512 e802915801bbe885a65dada04b0116d145b293fabfff734dddb61a79ca1c6d65326f51155d1b864b093c3ec00d0bdfdf1401ab55677bae1ea3da1d199d7bcad4
|
||||
DIST httpd-2.4.38.tar.bz2 7035030 BLAKE2B 52d965b0eae3402c268f1c5f5fb669ad84408699871d0518ba254c6e7c00f2198cba8cb6106114a62f0f6de67e0a8b921b5783af9530d165ed4d435312ce5164 SHA512 8bdc36fa2bd13fd83feee17fdce4a5316ed8f96c1ac32b636ba106572ba257815438c72068d2d0e900783a3fa25c90a5da34c3f83fc2c04a1dbdbf234f7ad448
|
||||
|
@ -1,105 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit flag-o-matic eutils multilib toolchain-funcs
|
||||
|
||||
DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
|
||||
HOMEPAGE="https://httpd.apache.org/"
|
||||
SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
|
||||
IUSE="libressl ssl"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND=">=dev-libs/apr-1.5.0:1=
|
||||
dev-libs/apr-util:1=
|
||||
dev-libs/expat
|
||||
dev-libs/libpcre
|
||||
kernel_linux? ( sys-apps/util-linux )
|
||||
ssl? (
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/libtool"
|
||||
|
||||
S="${WORKDIR}/httpd-${PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# This package really should upgrade to using pcre's .pc file.
|
||||
cat <<-\EOF >"${T}"/pcre-config
|
||||
#!/bin/bash
|
||||
flags=()
|
||||
for flag; do
|
||||
if [[ ${flag} == "--version" ]]; then
|
||||
flags+=( --modversion )
|
||||
else
|
||||
flags+=( "${flag}" )
|
||||
fi
|
||||
done
|
||||
exec ${PKG_CONFIG} libpcre "${flags[@]}"
|
||||
EOF
|
||||
chmod a+x "${T}"/pcre-config
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Brain dead check.
|
||||
tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
|
||||
|
||||
tc-export PKG_CONFIG
|
||||
|
||||
local myeconfargs=(
|
||||
--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
|
||||
--sbindir="${EPREFIX}"/usr/sbin
|
||||
--with-perl="${EPREFIX}"/usr/bin/perl
|
||||
--with-expat="${EPREFIX}"/usr
|
||||
--with-z="${EPREFIX}"/usr
|
||||
--with-apr="${SYSROOT}${EPREFIX}"/usr
|
||||
--with-apr-util="${SYSROOT}${EPREFIX}"/usr
|
||||
--with-pcre="${T}"/pcre-config
|
||||
$(use_enable ssl)
|
||||
$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
|
||||
)
|
||||
# econf overwrites the stuff from config.layout.
|
||||
ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
|
||||
econf "${myeconfargs[@]}"
|
||||
sed -i \
|
||||
-e '/^LTFLAGS/s:--silent::' \
|
||||
build/rules.mk build/config_vars.mk || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C support
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -C support DESTDIR="${D}" install
|
||||
dodoc CHANGES
|
||||
doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
|
||||
docs/man/{htcacheclean,rotatelogs}.8
|
||||
|
||||
# Providing compatiblity symlinks for #177697 (which we'll stop to install
|
||||
# at some point).
|
||||
pushd "${ED%/}"/usr/sbin >/dev/null || die
|
||||
local i
|
||||
for i in *; do
|
||||
dosym ${i} /usr/sbin/${i}2
|
||||
done
|
||||
popd >/dev/null || die
|
||||
|
||||
# Provide a symlink for ab-ssl
|
||||
if use ssl ; then
|
||||
dosym ab /usr/bin/ab-ssl
|
||||
dosym ab /usr/bin/ab2-ssl
|
||||
fi
|
||||
}
|
@ -1,105 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit flag-o-matic eutils multilib toolchain-funcs
|
||||
|
||||
DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
|
||||
HOMEPAGE="https://httpd.apache.org/"
|
||||
SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
|
||||
IUSE="libressl ssl"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND=">=dev-libs/apr-1.5.0:1=
|
||||
dev-libs/apr-util:1=
|
||||
dev-libs/expat
|
||||
dev-libs/libpcre
|
||||
kernel_linux? ( sys-apps/util-linux )
|
||||
ssl? (
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/libtool"
|
||||
|
||||
S="${WORKDIR}/httpd-${PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# This package really should upgrade to using pcre's .pc file.
|
||||
cat <<-\EOF >"${T}"/pcre-config
|
||||
#!/bin/bash
|
||||
flags=()
|
||||
for flag; do
|
||||
if [[ ${flag} == "--version" ]]; then
|
||||
flags+=( --modversion )
|
||||
else
|
||||
flags+=( "${flag}" )
|
||||
fi
|
||||
done
|
||||
exec ${PKG_CONFIG} libpcre "${flags[@]}"
|
||||
EOF
|
||||
chmod a+x "${T}"/pcre-config
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Brain dead check.
|
||||
tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
|
||||
|
||||
tc-export PKG_CONFIG
|
||||
|
||||
local myeconfargs=(
|
||||
--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
|
||||
--sbindir="${EPREFIX}"/usr/sbin
|
||||
--with-perl="${EPREFIX}"/usr/bin/perl
|
||||
--with-expat="${EPREFIX}"/usr
|
||||
--with-z="${EPREFIX}"/usr
|
||||
--with-apr="${SYSROOT}${EPREFIX}"/usr
|
||||
--with-apr-util="${SYSROOT}${EPREFIX}"/usr
|
||||
--with-pcre="${T}"/pcre-config
|
||||
$(use_enable ssl)
|
||||
$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
|
||||
)
|
||||
# econf overwrites the stuff from config.layout.
|
||||
ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
|
||||
econf "${myeconfargs[@]}"
|
||||
sed -i \
|
||||
-e '/^LTFLAGS/s:--silent::' \
|
||||
build/rules.mk build/config_vars.mk || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C support
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -C support DESTDIR="${D}" install
|
||||
dodoc CHANGES
|
||||
doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
|
||||
docs/man/{htcacheclean,rotatelogs}.8
|
||||
|
||||
# Providing compatiblity symlinks for #177697 (which we'll stop to install
|
||||
# at some point).
|
||||
pushd "${ED%/}"/usr/sbin >/dev/null || die
|
||||
local i
|
||||
for i in *; do
|
||||
dosym ${i} /usr/sbin/${i}2
|
||||
done
|
||||
popd >/dev/null || die
|
||||
|
||||
# Provide a symlink for ab-ssl
|
||||
if use ssl ; then
|
||||
dosym ab /usr/bin/ab-ssl
|
||||
dosym ab /usr/bin/ab2-ssl
|
||||
fi
|
||||
}
|
@ -1,3 +1,4 @@
|
||||
DIST salt-2016.11.10.tar.gz 10058200 BLAKE2B 4b6a42f6bf56421bc19458686ec23a1f945ceeb68b4ce7059fde036ba98d677fc8b61cb0f0c6ab249304b2f07d1b0250f6b91e7c443e12868649bf88f4d44d43 SHA512 e767e2c4c20e3a49a748b2699e4c640610280c0ba1c5955d94daffc7c36991ee632f02a50e338c65b35da146e234c36cc732214174b9bc5cbd62316b9ee40c28
|
||||
DIST salt-2017.7.8.tar.gz 12060430 BLAKE2B b2dde1b6f43bbb9b9db29b70dfd57591ae0e490e35ec7f4895b68b444ff77f9e997321d73697f791d345756abf451f11891b5f78a97c537c35dfe8bd24c43bbc SHA512 1e5123ee3dc194a33cf5da1e68a0419230b2b4eea26e7f66bf2d64754f0dbef9012abfbd498015f6b675725e580d72abf13c151b106639597337498b1fd42238
|
||||
DIST salt-2018.3.3.tar.gz 13953724 BLAKE2B 353f4ee23747f02200116157823b038fc8d361fb88f5f531a147d6c81497ba3f6cebf5a5abf4ac7f81199439bbf8a9cc46e03cdd76bfbb3c39f2b31a6158ca5c SHA512 f00ed83d5ec9d4767d7215fae8569ec560db61a0c8ded17469026e682e367c19811d33c6c53590a275ee24ad897a0eac09d8fde8ae9320d8706d6459ff3cc6da
|
||||
DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b
|
||||
DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56ff1a259da7c8618d37b3b022e12f09ac594a09f0ceec80fd9d3a6b6b9ec35b33e879b7a124e6612f2ec2a63a01c SHA512 de5a976213d011c230e423a172952effddb87168367958b8657eaaaf8fd2a8bec8471f547b6ff9e896a17064a13d387dbc12e12c605c8a241062e3238bd19eca
|
||||
|
@ -0,0 +1,76 @@
|
||||
diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py
|
||||
index 3874b0001c..40304075eb 100644
|
||||
--- a/tests/unit/grains/test_core.py
|
||||
+++ b/tests/unit/grains/test_core.py
|
||||
@@ -685,22 +685,6 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
|
||||
'Docker'
|
||||
)
|
||||
|
||||
- @skipIf(salt.utils.platform.is_windows(), 'System is Windows')
|
||||
- def test_xen_virtual(self):
|
||||
- '''
|
||||
- Test if OS grains are parsed correctly in Ubuntu Xenial Xerus
|
||||
- '''
|
||||
- with patch.object(os.path, 'isfile', MagicMock(return_value=False)):
|
||||
- with patch.dict(core.__salt__, {'cmd.run': MagicMock(return_value='')}), \
|
||||
- patch.object(os.path,
|
||||
- 'isfile',
|
||||
- MagicMock(side_effect=lambda x: True if x == '/sys/bus/xen/drivers/xenconsole' else False)):
|
||||
- log.debug('Testing Xen')
|
||||
- self.assertEqual(
|
||||
- core._virtual({'kernel': 'Linux'}).get('virtual_subtype'),
|
||||
- 'Xen PV DomU'
|
||||
- )
|
||||
-
|
||||
def _check_ipaddress(self, value, ip_v):
|
||||
'''
|
||||
check if ip address in a list is valid
|
||||
diff --git a/tests/unit/utils/test_asynchronous.py b/tests/unit/utils/test_asynchronous.py
|
||||
index 694a7aebfe..9e22c278e9 100644
|
||||
--- a/tests/unit/utils/test_asynchronous.py
|
||||
+++ b/tests/unit/utils/test_asynchronous.py
|
||||
@@ -35,19 +35,6 @@ class HelperB(object):
|
||||
|
||||
|
||||
class TestSyncWrapper(AsyncTestCase):
|
||||
- @tornado.testing.gen_test
|
||||
- def test_helpers(self):
|
||||
- '''
|
||||
- Test that the helper classes do what we expect within a regular asynchronous env
|
||||
- '''
|
||||
- ha = HelperA()
|
||||
- ret = yield ha.sleep()
|
||||
- self.assertTrue(ret)
|
||||
-
|
||||
- hb = HelperB()
|
||||
- ret = yield hb.sleep()
|
||||
- self.assertFalse(ret)
|
||||
-
|
||||
def test_basic_wrap(self):
|
||||
'''
|
||||
Test that we can wrap an asynchronous caller.
|
||||
@@ -55,24 +42,3 @@ class TestSyncWrapper(AsyncTestCase):
|
||||
sync = asynchronous.SyncWrapper(HelperA)
|
||||
ret = sync.sleep()
|
||||
self.assertTrue(ret)
|
||||
-
|
||||
- def test_double(self):
|
||||
- '''
|
||||
- Test when the asynchronous wrapper object itself creates a wrap of another thing
|
||||
-
|
||||
- This works fine since the second wrap is based on the first's IOLoop so we
|
||||
- don't have to worry about complex start/stop mechanics
|
||||
- '''
|
||||
- sync = asynchronous.SyncWrapper(HelperB)
|
||||
- ret = sync.sleep()
|
||||
- self.assertFalse(ret)
|
||||
-
|
||||
- def test_double_sameloop(self):
|
||||
- '''
|
||||
- Test asynchronous wrappers initiated from the same IOLoop, to ensure that
|
||||
- we don't wire up both to the same IOLoop (since it causes MANY problems).
|
||||
- '''
|
||||
- a = asynchronous.SyncWrapper(HelperA)
|
||||
- sync = asynchronous.SyncWrapper(HelperB, (a,))
|
||||
- ret = sync.sleep()
|
||||
- self.assertFalse(ret)
|
@ -0,0 +1,73 @@
|
||||
diff --git a/tests/unit/fileserver/test_gitfs.py b/tests/unit/fileserver/test_gitfs.py
|
||||
index 4e93df4e62..38c13efb6b 100644
|
||||
--- a/tests/unit/fileserver/test_gitfs.py
|
||||
+++ b/tests/unit/fileserver/test_gitfs.py
|
||||
@@ -151,6 +151,7 @@ class GitfsConfigTestCase(TestCase, LoaderModuleMockMixin):
|
||||
if exc.errno != errno.EEXIST:
|
||||
raise
|
||||
|
||||
+ @skipIf(True, 'currently failing on Gentoo')
|
||||
def test_per_saltenv_config(self):
|
||||
opts_override = textwrap.dedent('''
|
||||
gitfs_root: salt
|
||||
diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py
|
||||
index 445df0c98a..17ca123172 100644
|
||||
--- a/tests/unit/grains/test_core.py
|
||||
+++ b/tests/unit/grains/test_core.py
|
||||
@@ -710,6 +710,7 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
|
||||
)
|
||||
|
||||
@skipIf(not salt.utils.platform.is_linux(), 'System is not Linux')
|
||||
+ @skipIf(True, 'Test assumes running under Xen')
|
||||
def test_xen_virtual(self):
|
||||
'''
|
||||
Test if OS grains are parsed correctly in Ubuntu Xenial Xerus
|
||||
diff --git a/tests/unit/utils/test_asynchronous.py b/tests/unit/utils/test_asynchronous.py
|
||||
index 694a7aebfe..704f2d894f 100644
|
||||
--- a/tests/unit/utils/test_asynchronous.py
|
||||
+++ b/tests/unit/utils/test_asynchronous.py
|
||||
@@ -3,6 +3,8 @@
|
||||
# Import Python Libs
|
||||
from __future__ import absolute_import, print_function, unicode_literals
|
||||
|
||||
+from unittest import skipIf
|
||||
+
|
||||
# Import 3rd-party libs
|
||||
import tornado.testing
|
||||
import tornado.gen
|
||||
@@ -35,6 +37,7 @@ class HelperB(object):
|
||||
|
||||
|
||||
class TestSyncWrapper(AsyncTestCase):
|
||||
+ @skipIf(True, "fails in sandbox")
|
||||
@tornado.testing.gen_test
|
||||
def test_helpers(self):
|
||||
'''
|
||||
@@ -56,6 +59,7 @@ class TestSyncWrapper(AsyncTestCase):
|
||||
ret = sync.sleep()
|
||||
self.assertTrue(ret)
|
||||
|
||||
+ @skipIf(True, "fails in sandbox")
|
||||
def test_double(self):
|
||||
'''
|
||||
Test when the asynchronous wrapper object itself creates a wrap of another thing
|
||||
@@ -67,6 +71,7 @@ class TestSyncWrapper(AsyncTestCase):
|
||||
ret = sync.sleep()
|
||||
self.assertFalse(ret)
|
||||
|
||||
+ @skipIf(True, "fails in sandbox")
|
||||
def test_double_sameloop(self):
|
||||
'''
|
||||
Test asynchronous wrappers initiated from the same IOLoop, to ensure that
|
||||
diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
|
||||
index da666ef4c7..e3523049b7 100644
|
||||
--- a/tests/unit/utils/test_jinja.py
|
||||
+++ b/tests/unit/utils/test_jinja.py
|
||||
@@ -1102,6 +1102,7 @@ class TestCustomExtensions(TestCase):
|
||||
dict(opts=self.local_opts, saltenv='test', salt=self.local_salt))
|
||||
self.assertEqual(rendered, '16777216')
|
||||
|
||||
+ @skipIf(True, 'Skipping tests that require internet access')
|
||||
@flaky
|
||||
def test_http_query(self):
|
||||
'''
|
@ -0,0 +1,156 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python2_7 python3_6 )
|
||||
|
||||
inherit eutils systemd distutils-r1
|
||||
|
||||
DESCRIPTION="Salt is a remote execution and configuration manager"
|
||||
HOMEPAGE="http://saltstack.org/"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
|
||||
IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
|
||||
|
||||
RDEPEND="sys-apps/pciutils
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/libnacl[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/markupsafe[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
|
||||
<www-servers/tornado-5.0[${PYTHON_USEDEP}]
|
||||
virtual/python-futures[${PYTHON_USEDEP}]
|
||||
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
|
||||
openssl? (
|
||||
dev-libs/openssl:0=[-bindist]
|
||||
dev-python/pyopenssl[${PYTHON_USEDEP}]
|
||||
)
|
||||
raet? (
|
||||
>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
zeromq? (
|
||||
>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
|
||||
dev-python/pycryptodome[${PYTHON_USEDEP}]
|
||||
)
|
||||
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
|
||||
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
|
||||
portage? (
|
||||
|| (
|
||||
sys-apps/portage[${PYTHON_USEDEP}]
|
||||
sys-apps/portage-mgorny[${PYTHON_USEDEP}]
|
||||
)
|
||||
)
|
||||
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
|
||||
mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
|
||||
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
|
||||
selinux? ( sec-policy/selinux-salt )
|
||||
timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] )
|
||||
nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
|
||||
neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
|
||||
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
|
||||
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
|
||||
vim-syntax? ( app-vim/salt-vim )"
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
|
||||
dev-python/psutil[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-catchlog[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
dev-python/virtualenv[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/timelib[$(python_gen_usedep 'python2*')]
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
|
||||
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
|
||||
>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
|
||||
>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
|
||||
${RDEPEND}
|
||||
)"
|
||||
|
||||
DOCS=( README.rst AUTHORS )
|
||||
|
||||
REQUIRED_USE="|| ( raet zeromq )"
|
||||
RESTRICT="x86? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
|
||||
"${FILESDIR}/${PN}-2019.2.0-tests.patch"
|
||||
"${FILESDIR}/${PN}-2018.3.2-skip-zeromq-test-that-hangs.patch"
|
||||
)
|
||||
|
||||
python_prepare() {
|
||||
# remove tests with external dependencies that may not be available
|
||||
rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
|
||||
rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
|
||||
rm tests/unit/states/test_boto_vpc.py || die
|
||||
rm tests/unit/modules/test_{kubernetes,vsphere}.py || die
|
||||
|
||||
# allow the use of the renamed msgpack
|
||||
sed -i '/^msgpack/d' requirements/base.txt || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local svc
|
||||
USE_SETUPTOOLS=1 distutils-r1_python_install_all
|
||||
|
||||
for svc in minion master syndic api; do
|
||||
newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
|
||||
newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
|
||||
systemd_dounit "${FILESDIR}"/salt-${svc}.service
|
||||
done
|
||||
|
||||
insinto /etc/${PN}
|
||||
doins -r conf/*
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local tempdir
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 3072 || die
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
|
||||
mkdir "${T}/$(basename "${tempdir}")"
|
||||
mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
|
||||
|
||||
(
|
||||
cleanup() {
|
||||
rm -f "${tempdir}"
|
||||
rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
|
||||
}
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${tempdir}"
|
||||
ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
|
||||
|
||||
USE_SETUPTOOLS=1 SHELL="/bin/bash" \
|
||||
TMPDIR="${tempdir}" \
|
||||
${EPYTHON} tests/runtests.py \
|
||||
--unit-tests --no-report --verbose
|
||||
|
||||
) || die "testing failed"
|
||||
}
|
Binary file not shown.
@ -1,6 +1,9 @@
|
||||
DIST rarlinux-5.6.1_p20180930.tar.gz 552418 BLAKE2B 7a162a9e63336296e67064fe64d5bdefa4f0027bc23f27a419f14e5302fed7ed45bb78541ff7f3a417ed9f6e88700f4306d4ab3dbfb160a27dbf612df67f0c44 SHA512 b566d8d05068557987b69aa3b9610597c7226f7ff96ab935be33f3437b78d02dd539366b3a8499dc4c1d953a640a8a27f21b3f979969b71c6e3bde51a1118b00
|
||||
DIST rarlinux-5.7.0_beta2_p20190221.tar.gz 558880 BLAKE2B 91de934e542e8dfa347f42ca501b1b8b6f20ac1f00464dd43350abc791edd85bb6c10e5e1446500876b00a89375ab621a77ee582a9055cc6eb87f9c5821ec785 SHA512 f0f0c91ca60635649284051970179b584d206bb7427b41c379b4fbac4079a0d79a3821af79f8ec0deb12ae42c56a357445b64b6c24d15455a6bf2e36f1904b1c
|
||||
DIST rarlinux-5.7.0_p20190224.tar.gz 558744 BLAKE2B 3c7b9337767ce8045069b3a851878661e6cae950c69b09bc8c15b86c0fbf4d0b02ce55d198d1ce65ca9e5f227ab1188817f6bdfbce76ef1f8468caa4addfa733 SHA512 ed13c8191888c78dbd2f838f9f17d200bec827ac74024063f3c679fb2051b8e9b5e861d8ab4c9c7d0c8a14017c41386647b0bfd880d0d4855e8da06c17d9d270
|
||||
DIST rarlinux-x64-5.6.1_p20180930.tar.gz 541765 BLAKE2B c3c115fe168df801ce81fbb31de810893539c2f3bcfb176e65ab0db9994fba0d2e3aa848cf073068651e301c1b36cf3d885d80841e6cf63ddb22d3210c14ab64 SHA512 b873397cc44ffe722248638f0315a445e7f8b39ce310d45b79e27d8c2662bf7bc8a095a3e7c4a8fa92e24551328530955f6f18a8553a1612ea00bec8ccaf2e37
|
||||
DIST rarlinux-x64-5.7.0_beta2_p20190221.tar.gz 546553 BLAKE2B 740e60b9a83d9d8335ca573a9659e90e14e70f81c0c0c3b4a6fb235a316e1cb2e368494c980d80fb4799a32aea5ba4f80c2b28f3c3ae98ad6e1afb43ff9c0d0a SHA512 2027dd824d6c989eaeb2a2588100e40122a65f45c6682b00269b84aec43da3db4b7aa350ba58bab8ab68cb77fdad1b2d5854ae44b7629aa8db57b9046976d96d
|
||||
DIST rarlinux-x64-5.7.0_p20190224.tar.gz 546390 BLAKE2B cdf251bbf834c1826d138d811fcf9009a97f45876366192421e601b3075bcad87f760ed5740b00b1620cdd7c569800dd589ddf3fda80db1da30cb223edb0e43a SHA512 48a4aefca44250795687e9f435c13c0c730b86c1abd0c229a1e3234372f13b38c310956525b81e4a5fe9074b39ce7438baaa2c243e4b53259e46d22c53989e3e
|
||||
DIST winrar-x64-5.6.1_p20180930.exe 3190008 BLAKE2B c1411bd15b62ce63a5adc078ef2f7b2941ead91c683b8ade713b1e0a76075281f3c188d46de7d9f1da1caf37c4a4989bf9b35009401f8efa172fa0a4fddefdca SHA512 38c057b765a9a0ed51229018c9ececf94b8b6360a820e73db1af96412b6437614357f885c4c81ce89bc261bb3221d19cfb20284f16881eada0c46debe84f11b1
|
||||
DIST winrar-x64-5.7.0_beta2_p20190221.exe 3141680 BLAKE2B 6e74c9ad2c2f978d33a9f815a320fd1ede49e1e45c118e47cdb221a211cc27c6b4f59ff7b9856435923a80ee2bfc5785533f43d314669274efc2e4d15148fef4 SHA512 428489d587ea380c1eb6e4d8ef918c29e0562da85a01cdb70dafe1fb211e2ee159f5854331e3227b1c8176c89d8ef3c84fa071be33e2ae73be557a2394ba4401
|
||||
DIST winrar-x64-5.7.0_p20190224.exe 3142272 BLAKE2B 89b4adfc7317eb8def65f4e9f0ad7e23a9eb039dd451a97afd34a229b5fe0d19bf62cfbd507ade6a0cb32e1985d6dbd83ee61076673bfeda0d061fd1e7f22469 SHA512 a4853bcd410800818c3fcabf7d0e926612447604fbabfad2bc90c67717a50ca1c293882ff5ed3614b044d8bb1c1d9afe5dff90b836bb9c62efc994b52430c9e1
|
||||
|
@ -0,0 +1,109 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
DESCRIPTION="RAR compressor/uncompressor"
|
||||
HOMEPAGE="https://rarlab.com/"
|
||||
URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
|
||||
URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
|
||||
URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
|
||||
SRC_URI="x86? ( ${URI_x86} )
|
||||
amd64? ( ${URI_amd64} )
|
||||
all_sfx? (
|
||||
${URI_x86}
|
||||
${URI_amd64}
|
||||
${URI_w64}
|
||||
)"
|
||||
|
||||
LICENSE="RAR BSD BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE="all_sfx"
|
||||
RESTRICT="mirror bindist"
|
||||
|
||||
DEPEND="all_sfx? ( app-arch/unrar )"
|
||||
RDEPEND="sys-libs/glibc"
|
||||
|
||||
S="${WORKDIR}/${PN}"
|
||||
|
||||
QA_FLAGS_IGNORED="opt/rar/default.sfx
|
||||
opt/rar/default-elf32.sfx
|
||||
opt/rar/default-elf64.sfx
|
||||
opt/rar/default-win32.sfx
|
||||
opt/rar/default-win64.sfx
|
||||
opt/rar/WinCon.SFX
|
||||
opt/rar/WinCon64.SFX
|
||||
opt/rar/Zip.SFX
|
||||
opt/rar/Zip64.SFX
|
||||
opt/rar/unrar
|
||||
opt/rar/rar"
|
||||
QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
|
||||
|
||||
src_unpack() {
|
||||
local _file
|
||||
|
||||
for _file in ${A}; do
|
||||
if [[ "${_file}" == rarli* ]]; then
|
||||
if [[ "${_file}" =~ x64 ]]; then
|
||||
if ! use amd64; then
|
||||
continue
|
||||
fi
|
||||
|
||||
unpack "${_file}"
|
||||
elif [[ ! "${_file}" =~ x64 ]]; then
|
||||
if ! use x86; then
|
||||
continue
|
||||
fi
|
||||
|
||||
unpack "${_file}"
|
||||
else
|
||||
die "Unknown SRC file '${_file}'!"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
rm -f "${S}"/license.txt
|
||||
|
||||
if use all_sfx ; then
|
||||
mkdir sfx
|
||||
cd sfx
|
||||
for _file in ${A}; do
|
||||
if [[ "${_file}" == rarli* ]]; then
|
||||
unpack "${_file}"
|
||||
if [[ "${_file}" =~ x64 ]]; then
|
||||
mv rar/default.sfx default-elf64.sfx || die
|
||||
else
|
||||
mv rar/default.sfx default-elf32.sfx || die
|
||||
fi
|
||||
elif [[ "${_file}" == winrar* ]]; then
|
||||
ln -s "${DISTDIR}"/${_file} w64.rar || die
|
||||
unpack ./w64.rar
|
||||
mv Default.SFX default-win32.sfx || die
|
||||
mv Default64.SFX default-win64.sfx || die
|
||||
else
|
||||
die "Unknown SFX file '${_file}'!"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
exeinto /opt/rar
|
||||
doexe rar unrar || die
|
||||
|
||||
dodir /opt/bin
|
||||
dosym ../rar/rar /opt/bin/rar || die
|
||||
dosym ../rar/unrar /opt/bin/unrar || die
|
||||
|
||||
insinto /opt/rar
|
||||
if use all_sfx ; then
|
||||
doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
|
||||
else
|
||||
doins default.sfx || die
|
||||
fi
|
||||
doins rarfiles.lst || die
|
||||
dodoc *.txt
|
||||
}
|
@ -0,0 +1,70 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit flag-o-matic multilib toolchain-funcs
|
||||
|
||||
MY_PN="${PN}src"
|
||||
|
||||
DESCRIPTION="Uncompress rar files"
|
||||
HOMEPAGE="https://www.rarlab.com/rar_add.htm"
|
||||
SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="unRAR"
|
||||
# subslot = soname version
|
||||
SLOT="0/5"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
|
||||
|
||||
S=${WORKDIR}/unrar
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.5.5-build.patch
|
||||
"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
|
||||
else
|
||||
sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
|
||||
fi
|
||||
sed -i "${sed_args[@]}" makefile || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
mkdir -p build-{lib,bin}
|
||||
printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
|
||||
cp build-{lib,bin}/Makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
unrar_make() {
|
||||
emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
|
||||
}
|
||||
|
||||
unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
|
||||
ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
|
||||
ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
|
||||
|
||||
unrar_make -C build-bin
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin build-bin/unrar
|
||||
dodoc readme.txt
|
||||
|
||||
dolib.so build-lib/libunrar*
|
||||
|
||||
insinto /usr/include/libunrar${PV%.*.*}
|
||||
doins *.hpp
|
||||
dosym libunrar${PV%.*.*} /usr/include/libunrar
|
||||
|
||||
find "${ED}" -name "*.a" -delete || die
|
||||
}
|
Binary file not shown.
@ -1,3 +1,4 @@
|
||||
DIST diskimage-builder-2.19.0.tar.gz 359520 BLAKE2B 2ddbee82cc45267faa45e7fa8b80012096676ca792eed6aee766d24fd3a5297f7f21af94c84259308fd0a48b9c913ba94575333d792b7dcd67c09d6493ff3f2b SHA512 57da6f0507a96f873bc034862dd58649d8d9ff65c7ad83f8245658fed5919b47ac29c5f8d1bb9ff2d544304955c48fa1ff3a183d90ba47bcc8d1f88c09e4014c
|
||||
DIST diskimage-builder-2.20.0.tar.gz 366139 BLAKE2B 51399a4dad2dfb9100e4d196bae0cbe21d67a603ae8a3c5fb445de30cae7216d68090a8a4cdcd7839b9a11b472f5933d5d09814e60ad3ed1df3c373d012be97f SHA512 0d7e725eed0af0c549705029cf9af465d1ea10fa5ec82d6848a437d51783f8749ed613231fd4218db65f41b560eed16db5254788a097398ac267edf2ef04cea5
|
||||
DIST diskimage-builder-2.20.1.tar.gz 361740 BLAKE2B 7e334694b2a103f9c742da6f174e40456b8d190648c32209f333a030498b2347e7dfe0f96e2143f87d9573dabc68f1acabfbc292e5796b017128f5bb1368dd5b SHA512 09567f0c6f4de44330168c52af52070e348c1e2c53e9cd2140679f97c4da8c175f2627c7851e33c8ca9133065cd65fe0f2f8256ea7a6638cad2a9c87c5219fdc
|
||||
DIST diskimage-builder-2.20.2.tar.gz 361048 BLAKE2B 75a75b895b57a038bcea7b5a9a4936abd9cf99e4c351e72856e61ea7a2b95f5e62cfd43d11443919957fc844967e5e510ea3258bcaee6266481d6efe45c41664 SHA512 b16716217f8977be1787c74df213853adaecd384120438c31bd18cb603d8ca6bf7430bd54826c7c3b63488ce366aa3cba5c0e7b166fa245f740093abecc99fc9
|
||||
|
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Golden Disk Image builder."
|
||||
HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
|
||||
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
|
||||
DEPEND="${CDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
RDEPEND="${CDEPEND}
|
||||
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
|
||||
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
|
||||
<dev-python/networkx-2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
|
||||
>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
|
||||
<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
|
||||
app-emulation/qemu
|
||||
sys-block/parted
|
||||
sys-fs/multipath-tools
|
||||
sys-fs/dosfstools
|
||||
sys-apps/gptfdisk
|
||||
!dev-python/dib-utils[${PYTHON_USEDEP}]"
|
@ -1 +1 @@
|
||||
DIST gallium-nine-standalone-0_p20190113.tar.gz 58954 BLAKE2B 29be3f5501cc4463aa05216b7360e2a5a949c498dd1c3a0170d5a2f7f508c1fe3171f90f8e35bbe95530be5d6b98b70c5a99362e69d4a64615e40fbb9c8eb96a SHA512 2b2ab79b3d9f2c19967a16200cf69e7eba589d4d3d8918890b9504a5cb4895cd76000b6f3852baa738845e8508c6d67843f45d368225878d446ec6e907f75de4
|
||||
DIST gallium-nine-standalone-0.3.tar.gz 63887 BLAKE2B bd198617a5d3d3830bd5127b63eed2c82bff037141ae72ff9237ad5062fdbe9b6797e233eaf86e06d92153487c53389eb094b0be3b0cbdbf3fe565292a15cbb0 SHA512 80fedca58523fbf318109d2d3d5420e97d26ebf5b89b9f1965165c7a33c9dab9c62a65f14b75569b5126c549f5df91beef372d54e94dc90c608932eeb6a59829
|
||||
|
@ -0,0 +1,13 @@
|
||||
diff --git a/ninewinecfg/main.c b/ninewinecfg/main.c
|
||||
index 3d58d67..e69668d 100644
|
||||
--- a/ninewinecfg/main.c
|
||||
+++ b/ninewinecfg/main.c
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(ninecfg);
|
||||
|
||||
-static const char * const fn_nine_dll = "d3d9-nine.dll";
|
||||
+static const char * const fn_nine_dll = G9DLL;
|
||||
static const char * const fn_d3d9_dll = "d3d9.dll";
|
||||
static const char * const fn_nine_exe = "ninewinecfg.exe";
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -Naur a/ninewinecfg/main.c b/ninewinecfg/main.c
|
||||
--- a/ninewinecfg/main.c 2019-01-12 19:43:40.113737110 +0000
|
||||
+++ b/ninewinecfg/main.c 2019-01-12 19:46:54.213703713 +0000
|
||||
@@ -47,7 +47,7 @@
|
||||
#define WINE_STAGING 1
|
||||
#endif
|
||||
|
||||
-static const char * const fn_nine_dll = "d3d9-nine.dll";
|
||||
+static const char * const fn_nine_dll = G9DLL;
|
||||
static const char * const reg_path_dll_overrides = "Software\\Wine\\DllOverrides";
|
||||
static const char * const reg_path_dll_redirects = "Software\\Wine\\DllRedirects";
|
||||
static const char * const reg_key_d3d9 = "d3d9";
|
@ -1,3 +1,4 @@
|
||||
DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238
|
||||
DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957
|
||||
DIST vagrant-2.2.3.tar.gz 1236158 BLAKE2B 083b153bc723b94aa543e02b275d1864dba5b2d7408266f8fe3813ba19302725aabc25e20e5b4df004055ea1ffa937f16f27307626cec137a253a6dab2b8f972 SHA512 ff3d95968a51a37a397342c013ebcc3bbfe7ff5b76fb35fead92e9a3b770c85f2f4720514aa68878b0b6e4fbd92629832dc1ddf925691529adf0c84c8f44d84c
|
||||
DIST vagrant-2.2.4.tar.gz 1244111 BLAKE2B ac6b92c1f2b1cc3428b3be8985b07a087f6a075a2b60c93abc74dbff1f5679f648c0bbfc1af772fc10e90899b856a9f318d5d2e4f5a4c9e04452ed95ea356088 SHA512 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a
|
||||
|
@ -0,0 +1,90 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
USE_RUBY="ruby23 ruby24 ruby25"
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
|
||||
RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
|
||||
RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
inherit bash-completion-r1 ruby-fakegem
|
||||
|
||||
DESCRIPTION="A tool for building and distributing development environments"
|
||||
HOMEPAGE="https://vagrantup.com/"
|
||||
SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="+virtualbox"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
app-arch/libarchive
|
||||
net-misc/curl
|
||||
virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
|
||||
|
||||
ruby_add_rdepend "
|
||||
>=dev-ruby/bcrypt_pbkdf-1.0.0
|
||||
>=dev-ruby/childprocess-0.6.0
|
||||
>=dev-ruby/ed25519-1.2.4
|
||||
>=dev-ruby/erubis-2.7.0
|
||||
>=dev-ruby/hashicorp-checkpoint-0.1.5
|
||||
>=dev-ruby/i18n-1.1.1:1
|
||||
>=dev-ruby/listen-3.1.5
|
||||
<dev-ruby/log4r-1.1.11
|
||||
<dev-ruby/mime-types-3:*
|
||||
>=dev-ruby/net-ssh-5.1.0:*
|
||||
>=dev-ruby/net-sftp-2.1
|
||||
>=dev-ruby/net-scp-1.2.0
|
||||
dev-ruby/rest-client:2
|
||||
>=dev-ruby/rubyzip-1.2.2
|
||||
>=dev-ruby/vagrant_cloud-2.0.2
|
||||
"
|
||||
|
||||
# upstream specifies rake>=12 but it apparently doesn't need something this
|
||||
# recent. Because vagrant builds fine with rake 10 and because stabilizing rake
|
||||
# is tricky, we specify a lower dependency requirement here. This way, we'll be
|
||||
# able to stabilize vagrant sooner.
|
||||
ruby_add_bdepend "
|
||||
>=dev-ruby/rake-10.5.0
|
||||
"
|
||||
|
||||
all_ruby_prepare() {
|
||||
# remove bundler support
|
||||
sed -i '/[Bb]undler/d' Rakefile || die
|
||||
rm Gemfile || die
|
||||
|
||||
# loosen dependencies
|
||||
sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
|
||||
-e '/ruby_dep/s/<=/>=/' \
|
||||
-i ${PN}.gemspec || die
|
||||
|
||||
# remove windows-specific gems
|
||||
sed -e '/wdm\|winrm/d' \
|
||||
-i ${PN}.gemspec || die
|
||||
|
||||
# remove bsd-specific gems
|
||||
sed -e '/rb-kqueue/d' \
|
||||
-i ${PN}.gemspec || die
|
||||
|
||||
sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
|
||||
}
|
||||
|
||||
all_ruby_install() {
|
||||
all_fakegem_install
|
||||
|
||||
newbashcomp contrib/bash/completion.sh ${PN}
|
||||
|
||||
# provide executable similar to upstream:
|
||||
# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
|
||||
dobin "${PN}"
|
||||
|
||||
# directory for plugins.json
|
||||
keepdir /var/lib/vagrant
|
||||
|
||||
insinto /usr/share/vim/vimfiles/syntax/
|
||||
doins contrib/vim/vagrantfile.vim
|
||||
}
|
Binary file not shown.
Binary file not shown.
@ -1,3 +1,2 @@
|
||||
DIST pdfpc-4.1.1.tar.gz 96995 BLAKE2B f032cf0207cfb116ef98a171376d1cc80ae20f70eb7a63cf29dbd93e73c7bc1b0ef7638f9086d9908470d988830c4b420d9b96e7764af6219267d9ca6aad557a SHA512 51fa8e7743e02ba7e119dc86505f4513c174842a22d5755154775bd9abd945e7bcb9ba3c205cb27de25c38271762307136cb5370443131ea80cc0b9187e531bf
|
||||
DIST pdfpc-4.2.1.tar.gz 104515 BLAKE2B 96939731e4881e9dfadb5c00e449adaf8d3b88ca8d726621e9e1ffb1a5afab3e44f2c39a587704427cab53b1e06e7cfc6873e0b9e4ed284a6203f0c5280f8065 SHA512 27674c600c2212035996a8d362432655eb6d5ee12ec34af6f6417fe05a9f5ef051f9f528bac681ab7fafc32deb38b9788256122d43ef47d0fe75d5b8e2863679
|
||||
DIST pdfpc-4.3.0.tar.gz 107235 BLAKE2B 290a11f970ca16ea3ce3d724f1e62cd1b347b51dfc70162e61f80fb2ef630e18963c55ff99741c9c6a0fdd85c109371e660614b0af15b63dae524e21f534001c SHA512 a7e3efecd988ecdec8b0856a7a140ef8f6f3abcc56ecd7c1193f8b1c3723c9193fa3ea48dd9286d8c90d72983fc5a8ad75be7a40cd2c6196cc1361fa3c338ac0
|
||||
|
@ -1,44 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
VALA_MIN_API_VERSION="0.26"
|
||||
VALA_MAX_API_VERSION="0.36" # fix sed line if you increase this
|
||||
|
||||
inherit vala cmake-utils
|
||||
|
||||
DESCRIPTION="Presenter console with multi-monitor support for PDF files"
|
||||
HOMEPAGE="http://pdfpc.github.io"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="gstreamer"
|
||||
|
||||
RDEPEND="app-text/poppler[cairo]
|
||||
dev-libs/glib:2
|
||||
dev-libs/libgee:0.8
|
||||
gnome-base/librsvg
|
||||
gstreamer? ( media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0 )
|
||||
sys-apps/dbus
|
||||
x11-libs/gtk+:3"
|
||||
DEPEND="${RDEPEND}
|
||||
$(vala_depend)"
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
sed -i -e "s/valac-0.20/valac-0.36 valac-0.34 valac-0.32 valac-0.30 valac-0.28 valac-0.26/" cmake/vala/FindVala.cmake || die
|
||||
vala_src_prepare
|
||||
}
|
||||
|
||||
src_configure(){
|
||||
local mycmakeargs=(
|
||||
-DSYSCONFDIR="${EPREFIX}/etc"
|
||||
-DMOVIES=$(usex gstreamer on off)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
@ -1 +1 @@
|
||||
DIST tracker-miners-2.1.5.tar.xz 3455264 BLAKE2B 1e9149ae0767166fc8e936922e4e02d4391f7af3faf59525e32098fb10cb6c5f6970f13bdb35f675efc9f131672b3feb84cbdcd8d0f01c86d05880919fba463a SHA512 37bf6d44635843037613cfe681cd536a8b33ba34c092183d9d66289713deaaff5322d09028b447484e6bf72a01199c041fb295d6431d2f7cff3498ef8983f605
|
||||
DIST tracker-miners-2.1.6.tar.xz 3456848 BLAKE2B 60b4af9ea755b79c2d31150d744468c6b980238eef542b9be382316eaf7310e137c501f9f705319e203ac3fba11e554202f6d1ee8e5a1ebcdf9b0d59aaa5e380 SHA512 3ded014c98f7be2b610fbe76c3a2b006a9ec85b090d2d3ca3e943e89b58b520da291ebfebe9efd579fe330fd49fced8f792eeba3b8e56f91fd2358bdaff4cdf2
|
||||
|
@ -1,29 +0,0 @@
|
||||
From b55c22542de4f0f0166c6e5510ef0ec90bc69f18 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Mon, 10 Sep 2018 16:19:20 +0200
|
||||
Subject: [PATCH] build: Fix build with libav
|
||||
|
||||
The extractor rules defined an array inside an array, which configure_file()
|
||||
wouldn't accept.
|
||||
|
||||
(cherry picked from commit fff231c16b2ad9a2824f09c5b81f31ee220fba6f)
|
||||
---
|
||||
src/tracker-extract/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
|
||||
index 9834dc422..bf19f8bac 100644
|
||||
--- a/src/tracker-extract/meson.build
|
||||
+++ b/src/tracker-extract/meson.build
|
||||
@@ -60,7 +60,7 @@ if libjpeg.found()
|
||||
endif
|
||||
|
||||
if generic_media_handler_name == 'libav'
|
||||
- rules = ['90-libav-audio-generic.rule', ['90-libav-video-generic.rule']]
|
||||
+ rules = ['90-libav-audio-generic.rule', '90-libav-video-generic.rule']
|
||||
dependencies = [avcodec, avformat, avutil, tracker_miners_common_dep]
|
||||
modules += [['extract-libav', 'tracker-extract-libav.c', rules, dependencies]]
|
||||
endif
|
||||
--
|
||||
2.17.0
|
||||
|
@ -1,322 +0,0 @@
|
||||
From 5bb0709044fabe496601277ab5ba11a03500babe Mon Sep 17 00:00:00 2001
|
||||
From: Mart Raudsepp <leio@gentoo.org>
|
||||
Date: Fri, 15 Feb 2019 00:15:08 +0200
|
||||
Subject: [PATCH 1/5] build: Add feature options for all external deps
|
||||
|
||||
Automagic dependencies are bad for distributions. Add feature options
|
||||
for all of them that didn't have it before. If no options are specified,
|
||||
the behavior matches with before, but now it's possible to specify
|
||||
exactly what is linked to and what isn't.
|
||||
|
||||
Fixes: #39
|
||||
---
|
||||
meson.build | 40 +++++++++++++++++++++-------------------
|
||||
meson_options.txt | 37 +++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 58 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index fd536f2e6..4f0e9a968 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1,4 +1,6 @@
|
||||
-project('tracker-miners', 'c', 'vala', version: '2.1.5')
|
||||
+project('tracker-miners', 'c', 'vala',
|
||||
+ version: '2.1.5',
|
||||
+ meson_version: '>=0.47')
|
||||
|
||||
gnome = import('gnome')
|
||||
i18n = import('i18n')
|
||||
@@ -57,9 +59,9 @@ avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
|
||||
avformat = dependency('libavformat', version: '>= 0.8.4', required: false)
|
||||
avutil = dependency('libavutil', version: '>= 0.8.4', required: false)
|
||||
dbus = dependency('dbus-1', version: '> 1.3.1')
|
||||
-exempi = dependency('exempi-2.0', version: '> 2.1.0', required: false)
|
||||
-flac = dependency('flac', version: '> 1.2.1', required: false)
|
||||
-gexiv2 = dependency('gexiv2', required: false)
|
||||
+exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp'))
|
||||
+flac = dependency('flac', version: '> 1.2.1', required: get_option('flac'))
|
||||
+gexiv2 = dependency('gexiv2', required: get_option('raw'))
|
||||
gio = dependency('gio-2.0', version: '>' + glib_required)
|
||||
gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required)
|
||||
glib = dependency('glib-2.0', version: '>' + glib_required)
|
||||
@@ -72,25 +74,25 @@ gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false)
|
||||
gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false)
|
||||
icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false)
|
||||
icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false)
|
||||
-libcue = dependency('libcue', required: false)
|
||||
-libexif = dependency('libexif', version: '> 0.6', required: false)
|
||||
-libgsf = dependency('libgsf-1', version: '> 1.14.24', required: false)
|
||||
-libgxps = dependency('libgxps', required: false)
|
||||
-libiptcdata = dependency('libiptcdata', required: false)
|
||||
-libjpeg = dependency('libjpeg', required: false)
|
||||
-libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: false)
|
||||
-libpng = dependency('libpng', version: '> 0.89', required: false)
|
||||
+libcue = dependency('libcue', required: get_option('cue'))
|
||||
+libexif = dependency('libexif', version: '> 0.6', required: get_option('exif'))
|
||||
+libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf'))
|
||||
+libgxps = dependency('libgxps', required: get_option('xps'))
|
||||
+libiptcdata = dependency('libiptcdata', required: get_option('iptc'))
|
||||
+libjpeg = dependency('libjpeg', required: get_option('jpeg'))
|
||||
+libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso'))
|
||||
+libpng = dependency('libpng', version: '> 0.89', required: get_option('png'))
|
||||
libseccomp = dependency('libseccomp', version: '>= 2.0', required: false)
|
||||
-libtiff = dependency('libtiff-4', required: false)
|
||||
-libxml2 = dependency('libxml-2.0', version: '> 2.6')
|
||||
-libvorbis = dependency('vorbisfile', version: '> 0.22')
|
||||
-poppler = dependency('poppler-glib', version: '> 0.16.0', required: false)
|
||||
-taglib = dependency('taglib_c', version: '> 1.6', required: false)
|
||||
-totem_plparser = dependency('totem-plparser', required: false)
|
||||
+libtiff = dependency('libtiff-4', required: get_option('tiff'))
|
||||
+libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml'))
|
||||
+libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis'))
|
||||
+poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf'))
|
||||
+taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib'))
|
||||
+totem_plparser = dependency('totem-plparser', required: get_option('playlist'))
|
||||
upower = dependency('upower-glib', version: '> 0.9.0', required: false)
|
||||
zlib = dependency('zlib')
|
||||
|
||||
-libgif = cc.find_library('gif', required: false)
|
||||
+libgif = cc.find_library('gif', required: get_option('gif'))
|
||||
libmath = cc.find_library('m', required: false)
|
||||
|
||||
# FIXME: here we work around a quirk todo with Meson and Vala: the 'uuid'
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index a91ac6c0f..5fce7a529 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -35,6 +35,43 @@ option('text', type: 'boolean', value: 'true',
|
||||
option('unzip_ps_gz_files', type: 'boolean', value: 'true',
|
||||
description: 'Enable extractor for PS.GZ metadata')
|
||||
|
||||
+option('cue', type: 'feature', value: 'auto',
|
||||
+ description: 'Support cue sheet parsing')
|
||||
+option('exif', type: 'feature', value: 'auto',
|
||||
+ description: 'Support EXIF metadata')
|
||||
+option('flac', type: 'feature', value: 'auto',
|
||||
+ description: 'Support extracting metadata from Flac audio')
|
||||
+option('gif', type: 'feature', value: 'auto',
|
||||
+ description: 'Support extracting metadata from GIF images')
|
||||
+option('gsf', type: 'feature', value: 'auto',
|
||||
+ description: 'Support extracting metadata from MS & Open Office documents')
|
||||
+option('iptc', type: 'feature', value: 'auto',
|
||||
+ description: 'Support IPTC photo metadata')
|
||||
+option('iso', type: 'feature', value: 'auto',
|
||||
+ description: 'Support ISO image parsing')
|
||||
+option('jpeg', type: 'feature', value: 'auto',
|
||||
+ description: 'Support extracting metadata from JPEG images')
|
||||
+option('pdf', type: 'feature', value: 'auto',
|
||||
+ description: 'Support extracting metadata from PDF documents')
|
||||
+option('playlist', type: 'feature', value: 'auto',
|
||||
+ description: 'Support extracting metadata from playlists (w/ Totem)')
|
||||
+option('png', type: 'feature', value: 'auto',
|
||||
+ description: 'Support extracting metadata from PNG images')
|
||||
+option('raw', type: 'feature', value: 'auto',
|
||||
+ description: 'Support extracting metadata from RAW photos')
|
||||
+option('taglib', type: 'feature', value: 'auto',
|
||||
+ description: 'Support writeback for audio files using Taglib')
|
||||
+option('tiff', type: 'feature', value: 'auto',
|
||||
+ description: 'Support extracting metadata from TIFF images')
|
||||
+option('vorbis', type: 'feature', value: 'auto',
|
||||
+ description: 'Support extracting metadata from Vorbis (ogg/etc) files')
|
||||
+option('xml', type: 'feature', value: 'auto',
|
||||
+ description: 'Support extracting metadata from XML and HTML documents')
|
||||
+option('xmp', type: 'feature', value: 'auto',
|
||||
+ description: 'Support XMP metadata')
|
||||
+option('xps', type: 'feature', value: 'auto',
|
||||
+ description: 'Support extracting metadata from XPS documents')
|
||||
+
|
||||
option('battery_detection', type: 'combo', choices: ['auto', 'hal', 'upower', 'none'], value: 'auto',
|
||||
description: 'Enable upower or HAL for battery/mains power detection')
|
||||
option('charset_detection', type: 'combo', choices: ['auto', 'enca', 'icu', 'none'], value: 'auto',
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
||||
From b8c1768696c13275f5896374907fa192140ec922 Mon Sep 17 00:00:00 2001
|
||||
From: Mart Raudsepp <leio@gentoo.org>
|
||||
Date: Fri, 15 Feb 2019 00:18:09 +0200
|
||||
Subject: [PATCH 2/5] build: Fix minimum dep checks to allow the specified
|
||||
version too
|
||||
|
||||
Many of the minimum deps were expressed as "> x.y", but were meant to
|
||||
allow x.y itself as well. Change all to ">= x.y". This seems to be
|
||||
what was intended and was the case with autotools.
|
||||
---
|
||||
meson.build | 44 ++++++++++++++++++++++----------------------
|
||||
1 file changed, 22 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 4f0e9a968..4263faf95 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -58,38 +58,38 @@ endif
|
||||
avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
|
||||
avformat = dependency('libavformat', version: '>= 0.8.4', required: false)
|
||||
avutil = dependency('libavutil', version: '>= 0.8.4', required: false)
|
||||
-dbus = dependency('dbus-1', version: '> 1.3.1')
|
||||
-exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp'))
|
||||
-flac = dependency('flac', version: '> 1.2.1', required: get_option('flac'))
|
||||
+dbus = dependency('dbus-1', version: '>= 1.3.1')
|
||||
+exempi = dependency('exempi-2.0', version: '>= 2.1.0', required: get_option('xmp'))
|
||||
+flac = dependency('flac', version: '>= 1.2.1', required: get_option('flac'))
|
||||
gexiv2 = dependency('gexiv2', required: get_option('raw'))
|
||||
-gio = dependency('gio-2.0', version: '>' + glib_required)
|
||||
-gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required)
|
||||
-glib = dependency('glib-2.0', version: '>' + glib_required)
|
||||
-gmodule = dependency('gmodule-2.0', version: '>' + glib_required)
|
||||
-gobject = dependency('gobject-2.0', version: '>' + glib_required)
|
||||
+gio = dependency('gio-2.0', version: '>=' + glib_required)
|
||||
+gio_unix = dependency('gio-unix-2.0', version: '>=' + glib_required)
|
||||
+glib = dependency('glib-2.0', version: '>=' + glib_required)
|
||||
+gmodule = dependency('gmodule-2.0', version: '>=' + glib_required)
|
||||
+gobject = dependency('gobject-2.0', version: '>=' + glib_required)
|
||||
gstreamer = dependency('gstreamer-1.0', required: false)
|
||||
gstreamer_pbutils = dependency('gstreamer-pbutils-1.0', required: false)
|
||||
gstreamer_tag = dependency('gstreamer-tag-1.0', required: false)
|
||||
-gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false)
|
||||
-gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false)
|
||||
-icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false)
|
||||
-icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false)
|
||||
+gupnp_dlna = dependency('gupnp-dlna-2.0', version: '>= 0.9.4', required: false)
|
||||
+gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '>= 0.9.4', required: false)
|
||||
+icu_i18n = dependency('icu-i18n', version: '>= 4.8.1.1', required: false)
|
||||
+icu_uc = dependency('icu-uc', version: '>= 4.8.1.1', required: false)
|
||||
libcue = dependency('libcue', required: get_option('cue'))
|
||||
-libexif = dependency('libexif', version: '> 0.6', required: get_option('exif'))
|
||||
-libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf'))
|
||||
+libexif = dependency('libexif', version: '>= 0.6', required: get_option('exif'))
|
||||
+libgsf = dependency('libgsf-1', version: '>= 1.14.24', required: get_option('gsf'))
|
||||
libgxps = dependency('libgxps', required: get_option('xps'))
|
||||
libiptcdata = dependency('libiptcdata', required: get_option('iptc'))
|
||||
libjpeg = dependency('libjpeg', required: get_option('jpeg'))
|
||||
-libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso'))
|
||||
-libpng = dependency('libpng', version: '> 0.89', required: get_option('png'))
|
||||
+libosinfo = dependency('libosinfo-1.0', version: '>= 0.2.9', required: get_option('iso'))
|
||||
+libpng = dependency('libpng', version: '>= 0.89', required: get_option('png'))
|
||||
libseccomp = dependency('libseccomp', version: '>= 2.0', required: false)
|
||||
libtiff = dependency('libtiff-4', required: get_option('tiff'))
|
||||
-libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml'))
|
||||
-libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis'))
|
||||
-poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf'))
|
||||
-taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib'))
|
||||
+libxml2 = dependency('libxml-2.0', version: '>= 2.6', required: get_option('xml'))
|
||||
+libvorbis = dependency('vorbisfile', version: '>= 0.22', required: get_option('vorbis'))
|
||||
+poppler = dependency('poppler-glib', version: '>= 0.16.0', required: get_option('pdf'))
|
||||
+taglib = dependency('taglib_c', version: '>= 1.6', required: get_option('taglib'))
|
||||
totem_plparser = dependency('totem-plparser', required: get_option('playlist'))
|
||||
-upower = dependency('upower-glib', version: '> 0.9.0', required: false)
|
||||
+upower = dependency('upower-glib', version: '>= 0.9.0', required: false)
|
||||
zlib = dependency('zlib')
|
||||
|
||||
libgif = cc.find_library('gif', required: get_option('gif'))
|
||||
@@ -143,7 +143,7 @@ elif get_option('battery_detection') == 'upower'
|
||||
endif
|
||||
|
||||
if battery_detection_library_name == ''
|
||||
- hal = dependency('hal', version: '> 0.5', required: false)
|
||||
+ hal = dependency('hal', version: '>= 0.5', required: false)
|
||||
|
||||
if hal.found()
|
||||
battery_detection_library = hal
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
||||
From 6a215b9088abb9df4a837c1b74f281454f286ddf Mon Sep 17 00:00:00 2001
|
||||
From: Mart Raudsepp <leio@gentoo.org>
|
||||
Date: Fri, 15 Feb 2019 01:11:23 +0200
|
||||
Subject: [PATCH 3/5] build: Remove unnecessary vala language dependency
|
||||
|
||||
tracker-miners doesn't use any vala, but due to vala declared as
|
||||
a used language it does error out if valac isn't found. Remove the
|
||||
language and unused vapi helper variable.
|
||||
---
|
||||
meson.build | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 4263faf95..bfd2d624b 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1,4 +1,4 @@
|
||||
-project('tracker-miners', 'c', 'vala',
|
||||
+project('tracker-miners', 'c',
|
||||
version: '2.1.5',
|
||||
meson_version: '>=0.47')
|
||||
|
||||
@@ -385,7 +385,6 @@ tracker_writeback_modules_dir = join_paths(get_option('prefix'), get_option('lib
|
||||
tracker_uninstalled_extract_rules_dir = join_paths(meson.current_build_dir(), 'src', 'tracker-extract')
|
||||
|
||||
gsettings_schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas')
|
||||
-vapi_dir = join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi')
|
||||
|
||||
glib_mkenums = find_program('glib-mkenums')
|
||||
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
||||
From a163936b590184291c6ac6b8365eb5f7e9bf3474 Mon Sep 17 00:00:00 2001
|
||||
From: Mart Raudsepp <leio@gentoo.org>
|
||||
Date: Fri, 15 Feb 2019 01:12:25 +0200
|
||||
Subject: [PATCH 4/5] build: Remove unnecessary uuid util-linux hard dependency
|
||||
|
||||
tracker core might use uuid, but nothing in tracker-miners needs it
|
||||
---
|
||||
meson.build | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index bfd2d624b..8d23a1157 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -95,14 +95,6 @@ zlib = dependency('zlib')
|
||||
libgif = cc.find_library('gif', required: get_option('gif'))
|
||||
libmath = cc.find_library('m', required: false)
|
||||
|
||||
-# FIXME: here we work around a quirk todo with Meson and Vala: the 'uuid'
|
||||
-# pkg-config component corresponds to 'libuuid.vapi', but Meson assumes that
|
||||
-# .vapi name always matches pkg-config name, and will add `--pkg uuid` to the
|
||||
-# Vala commandline. By finding 'uuid' using find_library() instead, we get
|
||||
-# a dependency object back that won't cause any `--pkg` arguments to be added
|
||||
-# to the Vala commandline, but still works as expected for C code.
|
||||
-uuid = cc.find_library('uuid')
|
||||
-
|
||||
have_tracker_extract = get_option('extract')
|
||||
have_tracker_miner_apps = get_option('miner_apps')
|
||||
have_tracker_miner_fs = get_option('miner_fs')
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
||||
From cc87c22592868e700333f31f333bf850c89f0135 Mon Sep 17 00:00:00 2001
|
||||
From: Sam Thursfield <sam@afuera.me.uk>
|
||||
Date: Sun, 7 Oct 2018 23:42:28 +0200
|
||||
Subject: [PATCH 5/5] build: Fix breakage when libcue isn't found
|
||||
|
||||
Commit 6e281037a5f0abc introduced a regression on systems where libcue
|
||||
is not available.
|
||||
|
||||
Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/33
|
||||
|
||||
(cherry picked from commit fd0eb3cd98f279591cbe8635eadf42027dd5ddae)
|
||||
---
|
||||
meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 8d23a1157..d69588435 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -303,7 +303,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
|
||||
conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
|
||||
conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
|
||||
conf.set('HAVE_LIBCUE', libcue.found())
|
||||
-conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0')
|
||||
+conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0'))
|
||||
conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
|
||||
conf.set('HAVE_LIBEXIF', libexif.found())
|
||||
conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
|
||||
--
|
||||
2.17.0
|
||||
|
@ -1,42 +0,0 @@
|
||||
From 0d8b3388c415edebc75268358bab4ec2408d5685 Mon Sep 17 00:00:00 2001
|
||||
From: Sam Thursfield <sam@afuera.me.uk>
|
||||
Date: Sun, 18 Nov 2018 20:33:51 +0100
|
||||
Subject: [PATCH 1/2] meson: Fix bad string comparisons in
|
||||
create-miner-symlinks.sh script
|
||||
|
||||
This script creates symlinks from $prefix/share/tracker/miners to the
|
||||
real D-Bus .service files, which usually live in /usr/share/dbus-1.
|
||||
|
||||
The script was comparing strings incorrectly, leading to misbehaviour.
|
||||
|
||||
See https://gitlab.gnome.org/GNOME/tracker-miners/issues/38
|
||||
|
||||
(cherry picked from commit 949e7003c7027a9946b751c73e1e030d35c78bd7)
|
||||
---
|
||||
src/create-miner-symlinks.sh | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh
|
||||
index 114cc54c8..9d8ded2fb 100644
|
||||
--- a/src/create-miner-symlinks.sh
|
||||
+++ b/src/create-miner-symlinks.sh
|
||||
@@ -13,13 +13,13 @@ have_tracker_miner_fs="$4"
|
||||
have_tracker_miner_rss="$5"
|
||||
|
||||
mkdir -p ${DESTDIR}/${tracker_miner_services_dir}
|
||||
-if [[ "$have_tracker_miner_apps" -eq "true" ]]; then
|
||||
+if [[ "$have_tracker_miner_apps" == "true" ]]; then
|
||||
ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" "${DESTDIR}/${tracker_miner_services_dir}/"
|
||||
fi
|
||||
ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" "${DESTDIR}/${tracker_miner_services_dir}/"
|
||||
-if [[ "$have_tracker_miner_fs" -eq "true" ]]; then
|
||||
+if [[ "$have_tracker_miner_fs" == "true" ]]; then
|
||||
ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" "${DESTDIR}/${tracker_miner_services_dir}/"
|
||||
fi
|
||||
-if [[ "$have_tracker_miner_rss" -eq "true" ]]; then
|
||||
+if [[ "$have_tracker_miner_rss" == "true" ]]; then
|
||||
ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service" "${DESTDIR}/${tracker_miner_services_dir}/"
|
||||
fi
|
||||
--
|
||||
2.17.0
|
||||
|
@ -1,39 +0,0 @@
|
||||
From 191a67bae395eab322f1adc000c95d35b1a60c71 Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Bicha <jbicha@ubuntu.com>
|
||||
Date: Sun, 18 Nov 2018 16:42:53 -0500
|
||||
Subject: [PATCH 2/2] meson: fix bashism in equality check
|
||||
|
||||
Thanks https://rgeissert.blogspot.com/2012/12/a-bashism-week-testing-for-equality.html
|
||||
|
||||
and checkbashisms from Debian's devscripts
|
||||
|
||||
Closes: https://gitlab.gnome.org/GNOME/tracker-miners/issues/38
|
||||
(cherry picked from commit 0304f28a9963bff0c5b029d88dc36f91f53dcf65)
|
||||
---
|
||||
src/create-miner-symlinks.sh | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh
|
||||
index 9d8ded2fb..3ed270bca 100644
|
||||
--- a/src/create-miner-symlinks.sh
|
||||
+++ b/src/create-miner-symlinks.sh
|
||||
@@ -13,13 +13,13 @@ have_tracker_miner_fs="$4"
|
||||
have_tracker_miner_rss="$5"
|
||||
|
||||
mkdir -p ${DESTDIR}/${tracker_miner_services_dir}
|
||||
-if [[ "$have_tracker_miner_apps" == "true" ]]; then
|
||||
+if ([ "$have_tracker_miner_apps" = "true" ]); then
|
||||
ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" "${DESTDIR}/${tracker_miner_services_dir}/"
|
||||
fi
|
||||
ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" "${DESTDIR}/${tracker_miner_services_dir}/"
|
||||
-if [[ "$have_tracker_miner_fs" == "true" ]]; then
|
||||
+if ([ "$have_tracker_miner_fs" = "true" ]); then
|
||||
ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" "${DESTDIR}/${tracker_miner_services_dir}/"
|
||||
fi
|
||||
-if [[ "$have_tracker_miner_rss" == "true" ]]; then
|
||||
+if ([ "$have_tracker_miner_rss" = "true" ]); then
|
||||
ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service" "${DESTDIR}/${tracker_miner_services_dir}/"
|
||||
fi
|
||||
--
|
||||
2.17.0
|
||||
|
@ -1,42 +0,0 @@
|
||||
From b2d4b05a0c9e34b88aaf55b9f52497b07af8e862 Mon Sep 17 00:00:00 2001
|
||||
From: Mart Raudsepp <leio@gentoo.org>
|
||||
Date: Fri, 15 Feb 2019 21:11:29 +0200
|
||||
Subject: [PATCH] build: Only require seccomp when the CPU architecture
|
||||
supports it
|
||||
|
||||
---
|
||||
meson.build | 18 +++++++++++++++++-
|
||||
1 file changed, 17 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index ef48e77a6..65ad19cad 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -261,7 +261,23 @@ endif
|
||||
# Check for libseccomp
|
||||
##################################################################
|
||||
|
||||
-if not libseccomp.found() and host_machine.system() == 'linux'
|
||||
+host_system = host_machine.system()
|
||||
+host_cpu = host_machine.cpu()
|
||||
+unsupported_cpus = [
|
||||
+ 'alpha',
|
||||
+ 'ia64',
|
||||
+ 'm68k',
|
||||
+ 'parisc',
|
||||
+ 'parisc64',
|
||||
+ 'sh4',
|
||||
+ 'sparc',
|
||||
+ 'sparc64',
|
||||
+]
|
||||
+system_supports_seccomp = host_system == 'linux'
|
||||
+cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu)
|
||||
+seccomp_required = system_supports_seccomp and cpu_supports_seccomp
|
||||
+
|
||||
+if not libseccomp.found() and seccomp_required
|
||||
error('Libseccomp is mandatory for sandboxed metadata extraction')
|
||||
endif
|
||||
|
||||
--
|
||||
2.17.0
|
||||
|
@ -1,50 +0,0 @@
|
||||
From 02a54749117d609d75bad80331024661c2e598ce Mon Sep 17 00:00:00 2001
|
||||
From: Mart Raudsepp <leio@gentoo.org>
|
||||
Date: Fri, 15 Feb 2019 12:20:39 +0200
|
||||
Subject: [PATCH] libtracker-miners-common: improve path_evaluate_name
|
||||
environment handling
|
||||
|
||||
Under some environments $PWD might not point where we expect, so simply
|
||||
use g_get_current_dir() instead.
|
||||
g_getenv() is documented to return a pointer that may get overwritten
|
||||
by subsequent calls to g_getenv, g_setenv of g_unsetenv. As even after
|
||||
removing the second g_getenv, there's still g_setenv calls, take a copy.
|
||||
---
|
||||
.../libtracker-miners-common/tracker-file-utils-test.c | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/tests/libtracker-miners-common/tracker-file-utils-test.c b/tests/libtracker-miners-common/tracker-file-utils-test.c
|
||||
index 93b94472c..3f86a0cdc 100644
|
||||
--- a/tests/libtracker-miners-common/tracker-file-utils-test.c
|
||||
+++ b/tests/libtracker-miners-common/tracker-file-utils-test.c
|
||||
@@ -134,14 +134,14 @@ test_path_list_filter_duplicates_with_exceptions ()
|
||||
static void
|
||||
test_path_evaluate_name (void)
|
||||
{
|
||||
- gchar *result, *expected;
|
||||
-
|
||||
- const gchar *home = g_getenv ("HOME");
|
||||
- const gchar *pwd = g_getenv ("PWD");
|
||||
+ gchar *result, *expected, *home, *pwd;
|
||||
|
||||
const gchar *test = "/one/two";
|
||||
gchar *parent_dir;
|
||||
|
||||
+ home = g_strdup (g_getenv ("HOME"));
|
||||
+ pwd = g_get_current_dir ();
|
||||
+
|
||||
g_setenv ("TEST_TRACKER_DIR", test, TRUE);
|
||||
|
||||
|
||||
@@ -219,6 +219,8 @@ test_path_evaluate_name (void)
|
||||
result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ());
|
||||
g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ());
|
||||
|
||||
+ g_free (home);
|
||||
+ g_free (pwd);
|
||||
g_unsetenv ("TEST_TRACKER_DIR");
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
|
@ -0,0 +1,67 @@
|
||||
From 5d24ba00a7735ab3b7b381a102dc5536c12c8133 Mon Sep 17 00:00:00 2001
|
||||
From: Ernestas Kulik <ernestask@gnome.org>
|
||||
Date: Sun, 7 Oct 2018 11:40:41 +0300
|
||||
Subject: [PATCH 1/2] build: Fix libcue version comparison
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It currently performs a string comparison, as opposed to using
|
||||
version_compare(), which leads to results like
|
||||
“unknown >= 2.0.0 == True” when the dependency was not found.
|
||||
|
||||
Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/32
|
||||
|
||||
(cherry picked from commit 6e281037a5f0abc12e5e8902e445f264200980b0)
|
||||
---
|
||||
meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 4273638dd..c30ada4ed 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -317,7 +317,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
|
||||
conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
|
||||
conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
|
||||
conf.set('HAVE_LIBCUE', libcue.found())
|
||||
-conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0')
|
||||
+conf.set('HAVE_LIBCUE2', libcue.version().version_compare('>= 2.0.0'))
|
||||
conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
|
||||
conf.set('HAVE_LIBEXIF', libexif.found())
|
||||
conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
||||
From ff6a076330ba1b5a383196795b18e2c069ac54c6 Mon Sep 17 00:00:00 2001
|
||||
From: Sam Thursfield <sam@afuera.me.uk>
|
||||
Date: Sun, 7 Oct 2018 23:42:28 +0200
|
||||
Subject: [PATCH 2/2] build: Fix breakage when libcue isn't found
|
||||
|
||||
Commit 6e281037a5f0abc introduced a regression on systems where libcue
|
||||
is not available.
|
||||
|
||||
Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/33
|
||||
|
||||
(cherry picked from commit fd0eb3cd98f279591cbe8635eadf42027dd5ddae)
|
||||
---
|
||||
meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index c30ada4ed..28072646a 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -317,7 +317,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
|
||||
conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
|
||||
conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
|
||||
conf.set('HAVE_LIBCUE', libcue.found())
|
||||
-conf.set('HAVE_LIBCUE2', libcue.version().version_compare('>= 2.0.0'))
|
||||
+conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0'))
|
||||
conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
|
||||
conf.set('HAVE_LIBEXIF', libexif.found())
|
||||
conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
|
||||
--
|
||||
2.17.0
|
||||
|
Binary file not shown.
@ -1 +1 @@
|
||||
DIST blogc-0.15.0.tar.xz 335996 BLAKE2B c7fff528180c2124ea5c26ddd413f252d00570bcfe35645b8cdc8c7b3e289b52b38bd895e2ae5c2cab88d2a8143fa637118d75c719d69f685cef4c182bd9d6e3 SHA512 57a685938ef644b22b9271a0462260acb8ab8f9e9ff842415069011bb480923b8a4871742640eecc0babc7c65eefec3cab9051170dc6c3e69899e77d366a01c6
|
||||
DIST blogc-0.15.1.tar.xz 335708 BLAKE2B b8249c619a2d594895e02855cdae24e715393d4ff60d6eda4ed53c629c567e545ea78fca545a99e4bfa0f54545d8694f1ed40c001b7d1701963cf7a692351b21 SHA512 d22c67db483176d4cf873f0a4d2fd10a1413cee976e12fd49b3e35aa5edf80888dd7470e3523a08c45cf7fe700f578d9a0acc65863fd56776f91b30a13919573
|
||||
|
Binary file not shown.
Binary file not shown.
@ -1,3 +1,4 @@
|
||||
DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
|
||||
DIST mariadb-connector-c-3.0.7-src.tar.gz 667274 BLAKE2B 75d2d548d51889aecc8af56cbeb61f5eaf21e60924b70dd0559214de464eae209743febdb5d443797f853bc902352f7333aefe84cb367f61f7bf2c341a4a8ac2 SHA512 70facae6234f180d94c0526845a3bf7723d6de3b6871544cb8cea35311fec0537c6342fbf4f024d0dca58ee618642c38748ae73628fcba334064a3c15d307219
|
||||
DIST mariadb-connector-c-3.0.8-src.tar.gz 674455 BLAKE2B eca5972f8443c78cdc9f450e7e88ee1c69e2a004664916a0f7dfd9a1ab8242c9e11d3cafcd95323262223fba5d68c5d489d4f61fdddb8369cf603cdd563cfe51 SHA512 d9f970c7ac164ef7d8dd748bf2f749cc1f877a9c8f68a1d57e9ff62d95046bb9505619feca1f1d0d1cdefc1ac49489742aadf4ad9e47c8e6a9b8b40c56eed788
|
||||
DIST mariadb-connector-c-3.0.9-src.tar.gz 668142 BLAKE2B f61f855c334268b1cb079abc566a600093d7e0bdd164c22045000e337f43d2b57d14988cba1b3fd2f6316f6e0d949be7e67ac73410ddb1abc66e0faa16422946 SHA512 6f45bcd4bee07f6d72d1c4fee0bdb903ef4fa879eb7508156bc885a5657caf69b145d95647c4bc663eb2a2b03569b41ef9d87ca532b77901c2f67fd608048a1a
|
||||
|
@ -1,21 +0,0 @@
|
||||
--- a/mariadb_config/libmariadb.pc.in
|
||||
+++ b/mariadb_config/libmariadb.pc.in
|
||||
@@ -7,13 +7,12 @@
|
||||
#
|
||||
|
||||
prefix=@CMAKE_INSTALL_PREFIX@
|
||||
-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
|
||||
-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@
|
||||
+includedir=${prefix}/include
|
||||
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
|
||||
Name: libmariadb
|
||||
Version: @CPACK_PACKAGE_VERSION@
|
||||
+URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
|
||||
Description: MariaDB Connector/C dynamic library
|
||||
-Cflags: -I${includedir}
|
||||
-Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@
|
||||
-
|
||||
-
|
||||
+Cflags: -I${includedir}/mariadb
|
||||
+Libs: -L${libdir} -lmariadb
|
@ -0,0 +1,103 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
VCS_INHERIT=""
|
||||
if [[ "${PV}" == 9999 ]] ; then
|
||||
VCS_INHERIT="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
|
||||
else
|
||||
MY_PN=${PN#mariadb-}
|
||||
MY_PV=${PV/_b/-b}
|
||||
SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
|
||||
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
|
||||
fi
|
||||
|
||||
inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
|
||||
|
||||
MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS+=(
|
||||
/usr/include/mariadb/mariadb_version.h
|
||||
)
|
||||
|
||||
DESCRIPTION="C client library for MariaDB/MySQL"
|
||||
HOMEPAGE="https://mariadb.org/"
|
||||
LICENSE="LGPL-2.1"
|
||||
|
||||
SLOT="0/3"
|
||||
IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test"
|
||||
|
||||
DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
|
||||
virtual/libiconv:=[${MULTILIB_USEDEP}]
|
||||
curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
|
||||
kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
|
||||
app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
|
||||
ssl? (
|
||||
gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
|
||||
!gnutls? (
|
||||
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
|
||||
!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
|
||||
)
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
mysqlcompat? (
|
||||
!dev-db/mysql[client-libs(+)]
|
||||
!dev-db/mysql-cluster[client-libs(+)]
|
||||
!dev-db/mariadb[client-libs(+)]
|
||||
!dev-db/mariadb-galera[client-libs(+)]
|
||||
!dev-db/percona-server[client-libs(+)]
|
||||
!dev-db/mysql-connector-c )
|
||||
!>=dev-db/mariadb-10.2.0[client-libs(+)]
|
||||
"
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/gentoo-layout-3.0.patch
|
||||
"${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
# bug 508724 mariadb cannot use ld.gold
|
||||
tc-ld-disable-gold
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DWITH_EXTERNAL_ZLIB=ON
|
||||
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
|
||||
-DWITH_CURL=$(usex curl ON OFF)
|
||||
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
|
||||
-DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
|
||||
-DINSTALL_LIBDIR="$(get_libdir)"
|
||||
-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
|
||||
-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
|
||||
-DINSTALL_BINDIR=bin
|
||||
-DWITH_UNIT_TESTS=$(usex test ON OFF)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
cmake-utils_src_compile
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
cmake-utils_src_install
|
||||
if use mysqlcompat ; then
|
||||
dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
|
||||
dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
if ! use static-libs ; then
|
||||
find "${D}" -name "*.a" -delete || die
|
||||
fi
|
||||
if use mysqlcompat ; then
|
||||
dosym mariadb_config /usr/bin/mysql_config
|
||||
dosym mariadb /usr/include/mysql
|
||||
fi
|
||||
}
|
@ -1,145 +0,0 @@
|
||||
# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
|
||||
|
||||
# The following options will be passed to all MySQL clients
|
||||
[client]
|
||||
#password = your_password
|
||||
port = 3306
|
||||
socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
|
||||
|
||||
[mysql]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqladmin]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqlcheck]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqldump]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqlimport]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqlshow]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[myisamchk]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
|
||||
[myisampack]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
|
||||
# use [safe_mysqld] with mysql-3
|
||||
[mysqld_safe]
|
||||
err-log = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
|
||||
|
||||
# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
|
||||
[mysqld]
|
||||
character-set-server = utf8
|
||||
user = mysql
|
||||
port = 3306
|
||||
socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
|
||||
pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
|
||||
log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
|
||||
basedir = @GENTOO_PORTAGE_EPREFIX@/usr
|
||||
datadir = @DATADIR@
|
||||
skip-external-locking
|
||||
key_buffer = 16M
|
||||
max_allowed_packet = 1M
|
||||
table_open_cache = 64
|
||||
sort_buffer_size = 512K
|
||||
net_buffer_length = 8K
|
||||
read_buffer_size = 256K
|
||||
read_rnd_buffer_size = 512K
|
||||
myisam_sort_buffer_size = 8M
|
||||
language = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/english
|
||||
|
||||
# security:
|
||||
# using "localhost" in connects uses sockets by default
|
||||
# skip-networking
|
||||
bind-address = 127.0.0.1
|
||||
|
||||
log-bin
|
||||
server-id = 1
|
||||
|
||||
# point the following paths to different dedicated disks
|
||||
tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/
|
||||
#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
|
||||
|
||||
# you need the debug USE flag enabled to use the following directives,
|
||||
# if needed, uncomment them, start the server and issue
|
||||
# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
|
||||
# this will show you *exactly* what's happening in your server ;)
|
||||
|
||||
#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
|
||||
#gdb
|
||||
#debug = d:t:i:o,/tmp/mysqld.trace
|
||||
#one-thread
|
||||
|
||||
# uncomment the following directives if you are using BDB tables
|
||||
#bdb_cache_size = 4M
|
||||
#bdb_max_lock = 10000
|
||||
|
||||
# the following is the InnoDB configuration
|
||||
# if you wish to disable innodb instead
|
||||
# uncomment just the next line
|
||||
#skip-innodb
|
||||
#
|
||||
# the rest of the innodb config follows:
|
||||
# don't eat too much memory, we're trying to be safe on 64Mb boxes
|
||||
# you might want to bump this up a bit on boxes with more RAM
|
||||
innodb_buffer_pool_size = 16M
|
||||
# this is the default, increase it if you have lots of tables
|
||||
innodb_additional_mem_pool_size = 2M
|
||||
#
|
||||
# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
|
||||
# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
|
||||
# we have to take for the moment
|
||||
#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
|
||||
#innodb_log_arch_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
|
||||
#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
|
||||
# you may wish to change this size to be more suitable for your system
|
||||
# the max is there to avoid run-away growth on your machine
|
||||
innodb_data_file_path = ibdata1:10M:autoextend:max:128M
|
||||
# we keep this at around 25% of of innodb_buffer_pool_size
|
||||
# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
|
||||
innodb_log_file_size = 5M
|
||||
# this is the default, increase it if you have very large transactions going on
|
||||
innodb_log_buffer_size = 8M
|
||||
# this is the default and won't hurt you
|
||||
# you shouldn't need to tweak it
|
||||
innodb_log_files_in_group=2
|
||||
# see the innodb config docs, the other options are not always safe
|
||||
innodb_flush_log_at_trx_commit = 1
|
||||
innodb_lock_wait_timeout = 50
|
||||
innodb_file_per_table
|
||||
|
||||
[mysqldump]
|
||||
quick
|
||||
max_allowed_packet = 16M
|
||||
|
||||
[mysql]
|
||||
# uncomment the next directive if you are not familiar with SQL
|
||||
#safe-updates
|
||||
|
||||
[isamchk]
|
||||
key_buffer = 20M
|
||||
sort_buffer_size = 20M
|
||||
read_buffer = 2M
|
||||
write_buffer = 2M
|
||||
|
||||
[myisamchk]
|
||||
key_buffer = 20M
|
||||
sort_buffer_size = 20M
|
||||
read_buffer = 2M
|
||||
write_buffer = 2M
|
||||
|
||||
[mysqlhotcopy]
|
||||
interactive-timeout
|
@ -1,142 +0,0 @@
|
||||
# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
|
||||
|
||||
# The following options will be passed to all MySQL clients
|
||||
[client]
|
||||
#password = your_password
|
||||
port = 3306
|
||||
socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
|
||||
|
||||
[mysql]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqladmin]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqlcheck]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqldump]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqlimport]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqlshow]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[myisamchk]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
|
||||
[myisampack]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
|
||||
# use [safe_mysqld] with mysql-3
|
||||
[mysqld_safe]
|
||||
err-log = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
|
||||
|
||||
# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
|
||||
[mysqld]
|
||||
character-set-server = utf8
|
||||
user = mysql
|
||||
port = 3306
|
||||
socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
|
||||
pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
|
||||
log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
|
||||
basedir = @GENTOO_PORTAGE_EPREFIX@/usr
|
||||
datadir = @DATADIR@
|
||||
skip-external-locking
|
||||
key_buffer_size = 16M
|
||||
max_allowed_packet = 4M
|
||||
table_open_cache = 400
|
||||
sort_buffer_size = 512K
|
||||
net_buffer_length = 16K
|
||||
read_buffer_size = 256K
|
||||
read_rnd_buffer_size = 512K
|
||||
myisam_sort_buffer_size = 8M
|
||||
lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
|
||||
#Set this to your desired error message language
|
||||
lc_messages = en_US
|
||||
|
||||
# security:
|
||||
# using "localhost" in connects uses sockets by default
|
||||
# skip-networking
|
||||
bind-address = 127.0.0.1
|
||||
|
||||
log-bin
|
||||
server-id = 1
|
||||
|
||||
# point the following paths to different dedicated disks
|
||||
tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/
|
||||
#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
|
||||
|
||||
# you need the debug USE flag enabled to use the following directives,
|
||||
# if needed, uncomment them, start the server and issue
|
||||
# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
|
||||
# this will show you *exactly* what's happening in your server ;)
|
||||
|
||||
#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
|
||||
#gdb
|
||||
#debug = d:t:i:o,/tmp/mysqld.trace
|
||||
#one-thread
|
||||
|
||||
# the rest of the innodb config follows:
|
||||
# don't eat too much memory, we're trying to be safe on 64Mb boxes
|
||||
# you might want to bump this up a bit on boxes with more RAM
|
||||
innodb_buffer_pool_size = 128M
|
||||
#
|
||||
# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
|
||||
# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
|
||||
# we have to take for the moment
|
||||
#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
|
||||
#innodb_log_arch_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
|
||||
#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
|
||||
# you may wish to change this size to be more suitable for your system
|
||||
# the max is there to avoid run-away growth on your machine
|
||||
innodb_data_file_path = ibdata1:10M:autoextend:max:128M
|
||||
# we keep this at around 25% of of innodb_buffer_pool_size
|
||||
# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
|
||||
innodb_log_file_size = 48M
|
||||
# this is the default, increase it if you have very large transactions going on
|
||||
innodb_log_buffer_size = 8M
|
||||
# this is the default and won't hurt you
|
||||
# you shouldn't need to tweak it
|
||||
innodb_log_files_in_group=2
|
||||
# see the innodb config docs, the other options are not always safe
|
||||
innodb_flush_log_at_trx_commit = 1
|
||||
innodb_lock_wait_timeout = 50
|
||||
innodb_file_per_table
|
||||
|
||||
# Uncomment this to get FEDERATED engine support
|
||||
#plugin-load=federated=ha_federated.so
|
||||
loose-federated
|
||||
|
||||
[mysqldump]
|
||||
quick
|
||||
max_allowed_packet = 16M
|
||||
|
||||
[mysql]
|
||||
# uncomment the next directive if you are not familiar with SQL
|
||||
#safe-updates
|
||||
|
||||
[isamchk]
|
||||
key_buffer_size = 20M
|
||||
sort_buffer_size = 20M
|
||||
read_buffer = 2M
|
||||
write_buffer = 2M
|
||||
|
||||
[myisamchk]
|
||||
key_buffer_size = 20M
|
||||
sort_buffer_size = 20M
|
||||
read_buffer_size = 2M
|
||||
write_buffer_size = 2M
|
||||
|
||||
[mysqlhotcopy]
|
||||
interactive-timeout
|
||||
|
||||
[mariadb]
|
@ -1,130 +0,0 @@
|
||||
=== modified file 'lib/refcounted.h'
|
||||
--- a/lib/refcounted.h 2012-10-18 11:37:55.322732178 -0300
|
||||
+++ b/lib/refcounted.h 2012-10-18 11:40:10.303349659 -0300
|
||||
@@ -29,6 +29,7 @@
|
||||
#define MYSQLPP_REFCOUNTED_H
|
||||
|
||||
#include <memory>
|
||||
+#include <cstddef>
|
||||
|
||||
namespace mysqlpp {
|
||||
|
||||
=== modified file 'ssx/genv2.cpp'
|
||||
--- a/ssx/genv2.cpp 2013-02-14 12:29:16.523261203 -0500
|
||||
+++ b/ssx/genv2.cpp 2013-02-14 12:29:29.983070930 -0500
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <typeinfo>
|
||||
+#include <cstring>
|
||||
|
||||
using namespace std;
|
||||
|
||||
== modified file 'Makefile.in'
|
||||
--- a/Makefile.in 2013-02-14 13:14:10.954718894 -0500
|
||||
+++ b/Makefile.in 2013-02-14 13:15:23.463679996 -0500
|
||||
@@ -471,87 +471,87 @@
|
||||
$(RANLIB) $@
|
||||
|
||||
ssqlsxlat$(EXEEXT): $(SSQLSXLAT_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
|
||||
- $(CXX) -o $@ $(SSQLSXLAT_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp -lmysqlpp_ssqls2parse $(LIBS)
|
||||
+ $(CXX) -o $@ $(SSQLSXLAT_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp -lmysqlpp_ssqls2parse $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__ssqlsxlat___mac_setfilecmd)
|
||||
|
||||
test_array_index$(EXEEXT): $(TEST_ARRAY_INDEX_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_array_index___mac_setfilecmd)
|
||||
|
||||
test_cpool$(EXEEXT): $(TEST_CPOOL_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_CPOOL_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_CPOOL_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_cpool___mac_setfilecmd)
|
||||
|
||||
test_datetime$(EXEEXT): $(TEST_DATETIME_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_DATETIME_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_DATETIME_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_datetime___mac_setfilecmd)
|
||||
|
||||
test_inttypes$(EXEEXT): $(TEST_INTTYPES_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_inttypes___mac_setfilecmd)
|
||||
|
||||
test_insertpolicy$(EXEEXT): $(TEST_INSERTPOLICY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_insertpolicy___mac_setfilecmd)
|
||||
|
||||
test_manip$(EXEEXT): $(TEST_MANIP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_MANIP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_MANIP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_manip___mac_setfilecmd)
|
||||
|
||||
test_null_comparison$(EXEEXT): $(TEST_NULL_COMPARISON_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_null_comparison___mac_setfilecmd)
|
||||
|
||||
test_query_copy$(EXEEXT): $(TEST_QUERY_COPY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_query_copy___mac_setfilecmd)
|
||||
|
||||
test_qssqls$(EXEEXT): $(TEST_QSSQLS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_qssqls___mac_setfilecmd)
|
||||
|
||||
test_qstream$(EXEEXT): $(TEST_QSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_qstream___mac_setfilecmd)
|
||||
|
||||
test_sqlstream$(EXEEXT): $(TEST_SQLSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_sqlstream___mac_setfilecmd)
|
||||
|
||||
test_ssqls2$(EXEEXT): $(TEST_SSQLS2_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
|
||||
- $(CXX) -o $@ $(TEST_SSQLS2_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp -lmysqlpp_ssqls2parse $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_SSQLS2_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp -lmysqlpp_ssqls2parse $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_ssqls2___mac_setfilecmd)
|
||||
|
||||
test_string$(EXEEXT): $(TEST_STRING_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_STRING_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_STRING_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_string___mac_setfilecmd)
|
||||
|
||||
test_tcp$(EXEEXT): $(TEST_TCP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_TCP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_TCP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_tcp___mac_setfilecmd)
|
||||
|
||||
test_uds$(EXEEXT): $(TEST_UDS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_UDS_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_UDS_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_uds___mac_setfilecmd)
|
||||
|
||||
test_wnp$(EXEEXT): $(TEST_WNP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
|
||||
- $(CXX) -o $@ $(TEST_WNP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS)
|
||||
+ $(CXX) -o $@ $(TEST_WNP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(__test_wnp___mac_setfilecmd)
|
||||
|
@ -1,123 +0,0 @@
|
||||
--- a/CMakeLists.txt 2014-05-04 21:27:59.000000000 -0400
|
||||
+++ b/CMakeLists.txt 2014-05-04 21:47:31.460572470 -0400
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
if(COMMAND cmake_policy AND POLICY CMP0015)
|
||||
cmake_policy(SET CMP0015 NEW)
|
||||
-endif(COMMAND cmake_policy)
|
||||
+endif(COMMAND cmake_policy AND POLICY CMP0015)
|
||||
|
||||
#-----------------
|
||||
# CPPFLAGS, CXXFLAGS and LDFLAGS from the environment
|
||||
@@ -258,14 +258,14 @@
|
||||
${CPACK_RESOURCE_FILE_LICENSE}
|
||||
"${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
|
||||
"${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
|
||||
- DESTINATION "." OPTIONAL)
|
||||
+ DESTINATION "${INSTALL_DOCS}" OPTIONAL)
|
||||
|
||||
SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
|
||||
".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
|
||||
"install_manifest.txt")
|
||||
SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" )
|
||||
|
||||
-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$")
|
||||
+SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$")
|
||||
SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
|
||||
SET(CPACK_SOURCE_GENERATOR "TGZ")
|
||||
|
||||
@@ -292,10 +292,6 @@
|
||||
ADD_SUBDIRECTORY(cppconn)
|
||||
ADD_SUBDIRECTORY(driver)
|
||||
ADD_SUBDIRECTORY(examples)
|
||||
-ADD_SUBDIRECTORY(test)
|
||||
-ADD_SUBDIRECTORY(test/framework)
|
||||
-ADD_SUBDIRECTORY(test/CJUnitTestsPort)
|
||||
-ADD_SUBDIRECTORY(test/unit)
|
||||
|
||||
IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
|
||||
# see also README
|
||||
--- a/FindMySQL.cm 2014-05-04 22:20:50.000000000 -0400
|
||||
+++ b/FindMySQL.cm 2014-05-04 22:21:40.325384447 -0400
|
||||
@@ -58,7 +58,7 @@
|
||||
EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
|
||||
OUTPUT_VARIABLE _mysql_config_output
|
||||
)
|
||||
- STRING(REGEX MATCHALL "-m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}")
|
||||
+ STRING(REGEX MATCHALL " -m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}")
|
||||
STRING(REGEX REPLACE "[\r\n]$" "" MYSQL_CXXFLAGS "${_mysql_config_output}")
|
||||
# ADD_DEFINITIONS("${MYSQL_CXXFLAGS}")
|
||||
ELSE (MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
|
||||
diff -urN a/cppconn/CMakeLists.txt b/cppconn/CMakeLists.txt
|
||||
--- a/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
|
||||
+++ b/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
SET(MYSQLCPPCONN_INSTALL_HEADERS
|
||||
build_config.h
|
||||
- config.h
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h
|
||||
connection.h
|
||||
datatype.h
|
||||
driver.h
|
||||
diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt
|
||||
--- a/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
|
||||
+++ b/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200
|
||||
@@ -26,6 +26,9 @@
|
||||
|
||||
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
|
||||
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
|
||||
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
|
||||
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
|
||||
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
|
||||
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
|
||||
MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
|
||||
|
||||
@@ -149,20 +152,22 @@
|
||||
nativeapi/native_statement_wrapper.h
|
||||
nativeapi/mysql_native_resultset_wrapper.h
|
||||
nativeapi/native_resultset_wrapper.h
|
||||
- ../cppconn/warning.h
|
||||
- ../cppconn/statement.h
|
||||
- ../cppconn/sqlstring.h
|
||||
- ../cppconn/resultset_metadata.h
|
||||
- ../cppconn/resultset.h
|
||||
- ../cppconn/prepared_statement.h
|
||||
- ../cppconn/parameter_metadata.h
|
||||
- ../cppconn/metadata.h
|
||||
- ../cppconn/exception.h
|
||||
- ../cppconn/driver.h
|
||||
- ../cppconn/datatype.h
|
||||
- ../cppconn/connection.h
|
||||
- ../cppconn/config.h
|
||||
- ../cppconn/build_config.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
|
||||
|
||||
)
|
||||
|
||||
@@ -271,8 +276,8 @@
|
||||
)
|
||||
ELSE(WIN32)
|
||||
INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
|
||||
- LIBRARY DESTINATION lib
|
||||
- ARCHIVE DESTINATION lib
|
||||
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
||||
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
||||
)
|
||||
ENDIF(WIN32)
|
||||
|
@ -1,45 +0,0 @@
|
||||
diff -aruN a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp
|
||||
--- a/driver/nativeapi/libmysql_static_proxy.cpp 2014-11-19 08:37:11.000000000 -0500
|
||||
+++ b/driver/nativeapi/libmysql_static_proxy.cpp 2015-02-21 22:19:50.119234140 -0500
|
||||
@@ -319,7 +319,7 @@
|
||||
int
|
||||
LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg)
|
||||
{
|
||||
-#if MYSQL_VERSION_ID >= 50703
|
||||
+#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION )
|
||||
if (::mysql_get_option(mysql, option, arg)) {
|
||||
throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()");
|
||||
} else {
|
||||
diff -aruN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
|
||||
--- a/driver/mysql_connection.cpp 2014-11-19 08:37:11.000000000 -0500
|
||||
+++ b/driver/mysql_connection.cpp 2015-02-21 22:28:48.920210376 -0500
|
||||
@@ -1015,6 +1015,7 @@
|
||||
MY_CHARSET_INFO cs;
|
||||
proxy->get_character_set_info(&cs);
|
||||
*(static_cast<int *>(optionValue)) = cs.mbmaxlen;
|
||||
+#ifndef MARIADB_BASE_VERSION
|
||||
/* mysql_get_option() was added in mysql 5.7.3 version */
|
||||
} else if ( proxy->get_server_version() >= 50703 ) {
|
||||
try {
|
||||
@@ -1029,6 +1030,7 @@
|
||||
CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str());
|
||||
throw e;
|
||||
}
|
||||
+#endif /* MARIADB_BASE_VERSION */
|
||||
}
|
||||
}
|
||||
/* }}} */
|
||||
@@ -1046,11 +1048,13 @@
|
||||
MY_CHARSET_INFO cs;
|
||||
proxy->get_character_set_info(&cs);
|
||||
return cs.dir ? sql::SQLString(cs.dir) : "";
|
||||
+#ifndef MARIADB_BASE_VERSION
|
||||
} else if ( proxy->get_server_version() >= 50703 ) {
|
||||
const char* optionValue= NULL;
|
||||
if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) {
|
||||
return optionValue ? sql::SQLString(optionValue) : "";
|
||||
}
|
||||
+#endif /* MARIADB_BASE_VERSION */
|
||||
}
|
||||
return "";
|
||||
}
|
@ -1,43 +0,0 @@
|
||||
--- mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-08-30 18:05:12.000000000 +0200
|
||||
+++ mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-09-08 11:41:18.723838826 +0200
|
||||
@@ -18,6 +18,9 @@
|
||||
find_package(PkgConfig REQUIRED)
|
||||
|
||||
find_package(GTK2 2.20 REQUIRED gtk gtkmm)
|
||||
+if (NOT GTK2_FOUND)
|
||||
+ message( FATAL_ERROR "Not all GTK2 components were found!" )
|
||||
+endif()
|
||||
pkg_check_modules(GTHREAD REQUIRED gthread-2.0)
|
||||
pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
|
||||
set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS})
|
||||
@@ -32,7 +35,8 @@
|
||||
endif ()
|
||||
|
||||
# All known publicly available versions of Antlr3C are buggy
|
||||
-
|
||||
+# see: https://bugzilla.redhat.com/show_bug.cgi?id=966973
|
||||
+# patch seems to be only applied partially to antlr-3.4, bug is present in antlr-3.5, too
|
||||
if (SKIP_BUNDLED_ANTLR)
|
||||
find_package(Antlr3C)
|
||||
endif ()
|
||||
@@ -89,7 +93,8 @@
|
||||
pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12)
|
||||
pkg_check_modules(UUID REQUIRED uuid)
|
||||
pkg_check_modules(LIBZIP REQUIRED libzip)
|
||||
-if (UNIX)
|
||||
+
|
||||
+if (UNIX AND USE_GNOME_KEYRING)
|
||||
pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
|
||||
if (GNOME_KEYRING_FOUND)
|
||||
set(KEYRING_DEFINITION "HAVE_GNOME_KEYRING")
|
||||
@@ -99,7 +104,10 @@
|
||||
set(KEYRING_DEFINITION "HAVE_OLD_GNOME_KEYRING")
|
||||
endif()
|
||||
endif()
|
||||
+ if (NOT GNOME_KEYRING_FOUND)
|
||||
+ message( FATAL_ERROR "Gnome keyring libraries could not be found" )
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
include (CheckFunctionExists)
|
||||
|
@ -1,40 +0,0 @@
|
||||
--- plugins/migration/copytable/copytable.cpp.~1~ 2015-04-15 15:54:19.000000000 +0200
|
||||
+++ plugins/migration/copytable/copytable.cpp 2015-04-26 08:53:08.871167725 +0200
|
||||
@@ -1920,12 +1920,17 @@
|
||||
_incoming_data_charset = "latin1";
|
||||
|
||||
mysql_init(&_mysql);
|
||||
+/* This is optional has compiled in for MySQL >= 5.6.6
|
||||
+ * Looks like MariaDB does not support this as supposed,
|
||||
+ * so disable completly. */
|
||||
+#ifndef MARIADB_BASE_VERSION
|
||||
#if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH)
|
||||
#if MYSQL_CHECK_VERSION(5,6,6)
|
||||
if (is_mysql_version_at_least(5,6,6))
|
||||
mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str());
|
||||
#endif
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
// _bulk_insert_record is used to prepare a single record string, the connection
|
||||
// is needed to escape binary data properly
|
||||
--- plugins/migration/copytable/copytable.cpp.~1~ 2015-04-26 08:57:30.444285953 +0200
|
||||
+++ plugins/migration/copytable/copytable.cpp 2015-04-26 10:16:39.234711324 +0200
|
||||
@@ -2875,6 +2875,9 @@
|
||||
|
||||
// This function is used to create a legal SQL string that you can use in an SQL statement
|
||||
// This is needed because the escaping depends on the character set in use by the server
|
||||
+ #ifdef MARIADB_BASE_VERSION
|
||||
+ length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength);
|
||||
+ #else
|
||||
#if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH)
|
||||
#if MYSQL_CHECK_VERSION(5,7,6)
|
||||
if (is_mysql_version_at_least(5,7,6))
|
||||
@@ -2885,6 +2888,7 @@
|
||||
length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength);
|
||||
#endif
|
||||
#endif
|
||||
+ #endif
|
||||
|
||||
return true;
|
||||
}
|
@ -1,39 +0,0 @@
|
||||
Last-Update: 2015-10-24
|
||||
Forwarded: not-needed
|
||||
Bug-Upstream: https://bugs.mysql.com/bug.php?id=78668
|
||||
From: Marcin Szalowicz
|
||||
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
|
||||
Description: fix FTBFS
|
||||
~~~~
|
||||
library/forms/view.cpp:515:32: error: cannot convert 'boost::signals2::signal<bool()>::result_type {aka boost::optional<bool>}' to 'bool' in return
|
||||
return _signal_mouse_leave();
|
||||
^
|
||||
library/forms/CMakeFiles/mforms.dir/build.make:1865: recipe for target 'library/forms/CMakeFiles/mforms.dir/view.cpp.o' failed
|
||||
~~~~
|
||||
|
||||
--- a/library/forms/swig/mforms.i
|
||||
+++ b/library/forms/swig/mforms.i
|
||||
@@ -532,9 +532,9 @@
|
||||
void add_##method(PyObject *callback) { signal->connect(pycall_void_toolbaritem_fun(callback)); }
|
||||
|
||||
#define SWIG_ADD_SIGNAL_BOOL_INT_CALLBACK(method, signal)\
|
||||
void add_##method(PyObject *callback) { signal->connect(pycall_bool_int_fun(callback)); }\
|
||||
- bool call_##method(int i) { return (*signal)(i); }
|
||||
+ bool call_##method(int i) { return *( (*signal)(i) ); }
|
||||
|
||||
#define SWIG_ADD_SIGNAL_VOID_ENTRYACTION_CALLBACK(method, signal)\
|
||||
void add_##method(PyObject *callback) { signal->connect(pycall_void_entryaction_fun(callback)); }
|
||||
|
||||
--- a/library/forms/view.cpp
|
||||
+++ b/library/forms/view.cpp
|
||||
@@ -511,9 +511,9 @@
|
||||
|
||||
bool View::mouse_leave()
|
||||
{
|
||||
if (_signal_mouse_leave.num_slots() > 0)
|
||||
- return _signal_mouse_leave();
|
||||
+ return *_signal_mouse_leave();
|
||||
return false;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
@ -1,38 +0,0 @@
|
||||
Last-Update: 2016-11-13
|
||||
Forwarded: not-needed
|
||||
Author: Dmitry Smirnov <onlyjob@debian.org>
|
||||
Bug-Debian: https://bugs.debian.org/839356
|
||||
Description: fix FTBFS
|
||||
|
||||
--- mysql-workbench-6.3.4+dfsg.orig/library/forms/gtk/src/lf_popover.cpp
|
||||
+++ mysql-workbench-6.3.4+dfsg/library/forms/gtk/src/lf_popover.cpp
|
||||
@@ -380,7 +380,7 @@ void PopoverWidget::show_popover(const i
|
||||
if (_style == mforms::PopoverStyleTooltip)
|
||||
{
|
||||
Glib::RefPtr<Gdk::Window> wnd = this->get_window();
|
||||
- if (wnd != 0)
|
||||
+ if (wnd)
|
||||
{
|
||||
int xx;
|
||||
int yy;
|
||||
@@ -396,7 +396,7 @@ void PopoverWidget::show_popover(const i
|
||||
{
|
||||
Gdk::ModifierType mask;
|
||||
Glib::RefPtr<Gdk::Display> dsp = Gdk::Display::get_default();
|
||||
- if (dsp != 0)
|
||||
+ if (dsp)
|
||||
dsp->get_pointer(x, y, mask);
|
||||
}
|
||||
|
||||
--- mysql-workbench-6.3.4+dfsg.orig/library/forms/gtk/src/lf_popup.cpp
|
||||
+++ mysql-workbench-6.3.4+dfsg/library/forms/gtk/src/lf_popup.cpp
|
||||
@@ -81,7 +81,8 @@ void PopupImpl::on_screen_changed(const
|
||||
{
|
||||
d("\n");
|
||||
Glib::RefPtr<Gdk::Colormap> colormap = screen->get_rgba_colormap();
|
||||
- _have_rgba = colormap;
|
||||
+ if (colormap)
|
||||
+ _have_rgba = true;
|
||||
|
||||
if (!_have_rgba)
|
||||
colormap = screen->get_rgb_colormap();
|
@ -1,144 +0,0 @@
|
||||
# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
|
||||
|
||||
# The following options will be passed to all MySQL clients
|
||||
[client]
|
||||
#password = your_password
|
||||
port = 3306
|
||||
socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
|
||||
|
||||
[mysql]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqladmin]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqlcheck]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqldump]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqlimport]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[mysqlshow]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
default-character-set=utf8
|
||||
|
||||
[myisamchk]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
|
||||
[myisampack]
|
||||
character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
|
||||
|
||||
# use [safe_mysqld] with mysql-3
|
||||
[mysqld_safe]
|
||||
err-log = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
|
||||
|
||||
# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
|
||||
[mysqld]
|
||||
character-set-server = utf8
|
||||
user = mysql
|
||||
port = 3306
|
||||
socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
|
||||
pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
|
||||
log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
|
||||
basedir = @GENTOO_PORTAGE_EPREFIX@/usr
|
||||
datadir = @DATADIR@
|
||||
skip-external-locking
|
||||
key_buffer = 16M
|
||||
max_allowed_packet = 1M
|
||||
table_open_cache = 64
|
||||
sort_buffer_size = 512K
|
||||
net_buffer_length = 8K
|
||||
read_buffer_size = 256K
|
||||
read_rnd_buffer_size = 512K
|
||||
myisam_sort_buffer_size = 8M
|
||||
language = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/english
|
||||
|
||||
# security:
|
||||
# using "localhost" in connects uses sockets by default
|
||||
# skip-networking
|
||||
bind-address = 127.0.0.1
|
||||
|
||||
log-bin
|
||||
server-id = 1
|
||||
|
||||
# point the following paths to different dedicated disks
|
||||
tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/
|
||||
#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
|
||||
|
||||
# you need the debug USE flag enabled to use the following directives,
|
||||
# if needed, uncomment them, start the server and issue
|
||||
# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
|
||||
# this will show you *exactly* what's happening in your server ;)
|
||||
|
||||
#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
|
||||
#gdb
|
||||
#debug = d:t:i:o,/tmp/mysqld.trace
|
||||
#one-thread
|
||||
|
||||
# uncomment the following directives if you are using BDB tables
|
||||
#bdb_cache_size = 4M
|
||||
#bdb_max_lock = 10000
|
||||
|
||||
# the following is the InnoDB configuration
|
||||
# if you wish to disable innodb instead
|
||||
# uncomment just the next line
|
||||
#skip-innodb
|
||||
#
|
||||
# the rest of the innodb config follows:
|
||||
# don't eat too much memory, we're trying to be safe on 64Mb boxes
|
||||
# you might want to bump this up a bit on boxes with more RAM
|
||||
innodb_buffer_pool_size = 16M
|
||||
# this is the default, increase it if you have lots of tables
|
||||
innodb_additional_mem_pool_size = 2M
|
||||
#
|
||||
# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
|
||||
# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
|
||||
# we have to take for the moment
|
||||
#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
|
||||
#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
|
||||
# you may wish to change this size to be more suitable for your system
|
||||
# the max is there to avoid run-away growth on your machine
|
||||
innodb_data_file_path = ibdata1:10M:autoextend:max:128M
|
||||
# we keep this at around 25% of of innodb_buffer_pool_size
|
||||
# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
|
||||
innodb_log_file_size = 5M
|
||||
# this is the default, increase it if you have very large transactions going on
|
||||
innodb_log_buffer_size = 8M
|
||||
# this is the default and won't hurt you
|
||||
# you shouldn't need to tweak it
|
||||
innodb_log_files_in_group=2
|
||||
# see the innodb config docs, the other options are not always safe
|
||||
innodb_flush_log_at_trx_commit = 1
|
||||
innodb_lock_wait_timeout = 50
|
||||
innodb_file_per_table
|
||||
|
||||
[mysqldump]
|
||||
quick
|
||||
max_allowed_packet = 16M
|
||||
|
||||
[mysql]
|
||||
# uncomment the next directive if you are not familiar with SQL
|
||||
#safe-updates
|
||||
|
||||
[isamchk]
|
||||
key_buffer = 20M
|
||||
sort_buffer_size = 20M
|
||||
read_buffer = 2M
|
||||
write_buffer = 2M
|
||||
|
||||
[myisamchk]
|
||||
key_buffer = 20M
|
||||
sort_buffer_size = 20M
|
||||
read_buffer = 2M
|
||||
write_buffer = 2M
|
||||
|
||||
[mysqlhotcopy]
|
||||
interactive-timeout
|
@ -1,60 +0,0 @@
|
||||
diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c
|
||||
index c26c0d7..fa50c41 100644
|
||||
--- a/deps/lua/src/lua_cjson.c
|
||||
+++ b/deps/lua/src/lua_cjson.c
|
||||
@@ -46,7 +46,7 @@
|
||||
#include "strbuf.h"
|
||||
#include "fpconv.h"
|
||||
|
||||
-#include "../../../src/solarisfixes.h"
|
||||
+#include "solarisfixes.h"
|
||||
|
||||
#ifndef CJSON_MODNAME
|
||||
#define CJSON_MODNAME "cjson"
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 648127a..1f96d98 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -15,7 +15,7 @@
|
||||
release_hdr := $(shell sh -c './mkreleasehdr.sh')
|
||||
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
||||
OPTIMIZATION?=-O2
|
||||
-DEPENDENCY_TARGETS=hiredis linenoise lua geohash-int
|
||||
+DEPENDENCY_TARGETS=hiredis linenoise geohash-int
|
||||
|
||||
# Default settings
|
||||
STD=-std=c99 -pedantic -DREDIS_STATIC=''
|
||||
@@ -56,6 +56,7 @@ endif
|
||||
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -I../deps/geohash-int
|
||||
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
|
||||
FINAL_LIBS=-lm
|
||||
+FINAL_LIBS+=@LUA_LIBS@
|
||||
DEBUG=-g -ggdb
|
||||
|
||||
ifeq ($(uname_S),SunOS)
|
||||
@@ -80,7 +81,7 @@ endif
|
||||
endif
|
||||
endif
|
||||
# Include paths to dependencies
|
||||
-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
|
||||
+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise @LUA_CFLAGS@
|
||||
|
||||
ifeq ($(MALLOC),tcmalloc)
|
||||
FINAL_CFLAGS+= -DUSE_TCMALLOC
|
||||
@@ -118,6 +119,7 @@ endif
|
||||
REDIS_SERVER_NAME=redis-server
|
||||
REDIS_SENTINEL_NAME=redis-sentinel
|
||||
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o geo.o
|
||||
+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o
|
||||
REDIS_GEOHASH_OBJ=../deps/geohash-int/geohash.o ../deps/geohash-int/geohash_helper.o
|
||||
REDIS_CLI_NAME=redis-cli
|
||||
REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
|
||||
@@ -172,7 +174,7 @@ endif
|
||||
|
||||
# redis-server
|
||||
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
|
||||
- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS)
|
||||
+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS)
|
||||
|
||||
# redis-sentinel
|
||||
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
|
@ -1,30 +0,0 @@
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index fdbe36a..df224ae 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -26,12 +26,7 @@ PREFIX?=/usr/local
|
||||
INSTALL_BIN=$(PREFIX)/bin
|
||||
INSTALL=install
|
||||
|
||||
-# Default allocator
|
||||
-ifeq ($(uname_S),Linux)
|
||||
- MALLOC=jemalloc
|
||||
-else
|
||||
- MALLOC=libc
|
||||
-endif
|
||||
+MALLOC?=jemalloc
|
||||
|
||||
# Backwards compatibility for selecting an allocator
|
||||
ifeq ($(USE_TCMALLOC),yes)
|
||||
@@ -103,9 +98,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
|
||||
endif
|
||||
|
||||
ifeq ($(MALLOC),jemalloc)
|
||||
- DEPENDENCY_TARGETS+= jemalloc
|
||||
- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
|
||||
- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
|
||||
+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
|
||||
+ FINAL_LIBS+= -ljemalloc -ldl
|
||||
endif
|
||||
|
||||
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
|
@ -1,2 +1,2 @@
|
||||
DIST sqlcipher-3.4.1.tar.gz 13873645 BLAKE2B 8d910691fff6d31393a9e4adb549c084472b3f962f46a6ecd9f0860e5ad3c225d1e7bccd1fc4d87fb0641de0091408ef82521718c21e874a622f5304b6a7df08 SHA512 1c08ccdf438c0de23b1293192c687cb869db1ea904c47da5643c69f3a21f3f6a801fe8e87eb2e660acf0fe977b1f05bf8801b79162c609ffa3711706392c642b
|
||||
DIST sqlcipher-3.4.2.tar.gz 14743960 BLAKE2B 88ee265b02bb9a42734c2ef93070c8fd8e13d546d7cc85e7fbfd6e6046ccbf2626d75e14b19cbba379c99784c7311d0100de06235b99b4908c60c99890d8d7a2 SHA512 c620bf2b175e404afd60ebe76b5476f5a447ff5fcdfa31bebc3f4bd7f1ebfcd507ee423cd582c9b3d6431d8b57320171492da2586e1a739adb4f440e7443dc03
|
||||
DIST sqlcipher-4.0.1.tar.gz 17006324 BLAKE2B 44e8eb4e1230c3625b4fe1b4af608cd8edc25f3c6adf7e11450c8f9ddb7970fea92ff0823f3a1e631d1b0acfbab6cf078c80e4645c535d66de57f1d73b55ff47 SHA512 0fb48326860a10e9849b2f56fae0c310deae124c7203b54d51f92d346782be795d505c29eafbdfb7206f5e7be54c0f7228fe50c45bd9d2b23cca976b263264fc
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- a/src/crypto_openssl.c 2017-07-06 08:11:21.560000000 +0300
|
||||
+++ b/src/crypto_openssl.c 2017-07-06 08:11:32.180000000 +0300
|
||||
@@ -46,7 +46,7 @@
|
||||
static unsigned int openssl_init_count = 0;
|
||||
static sqlite3_mutex* openssl_rand_mutex = NULL;
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
static HMAC_CTX *HMAC_CTX_new(void)
|
||||
{
|
||||
HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
|
@ -0,0 +1,11 @@
|
||||
--- a/src/crypto_openssl.c 2017-12-21 14:31:28.000000000 -0500
|
||||
+++ b/src/crypto_openssl.c 2019-02-22 12:33:54.110516410 -0500
|
||||
@@ -47,7 +47,7 @@
|
||||
static unsigned int openssl_init_count = 0;
|
||||
static sqlite3_mutex* openssl_rand_mutex = NULL;
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x2080000L
|
||||
static HMAC_CTX *HMAC_CTX_new(void)
|
||||
{
|
||||
HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
|
@ -1,18 +1,12 @@
|
||||
DIST sqlite-autoconf-3230100.tar.gz 2675362 BLAKE2B 2dd075f0dc05425563a8e679bb463724296294b5845746f06b51a24c9601be203ee0f2213f43eaca0757fcbb54b777cee746d873c98f377a0b010d8066d7fcb5 SHA512 52cae7ed0678b763d40373ae260672b906861379428529a58a017cbc82419a6b109e0b2ac7ff5532e6d941693cc4ab68e6563f424b92b3b27c8916859a6e4826
|
||||
DIST sqlite-autoconf-3240000.tar.gz 2699252 BLAKE2B c8beb3b90bdd06f76cafeba859cbf91cf4d0cb313fc9202d210ccbad5fca7f9a062ede63387e814d664f0ae38bcfa48db222f466dbcd429fecfb53cfdac155c4 SHA512 eaec866de26003ec36559aab15dd18dc0e6029453002a4eec5e176bb35a712b8b06c235436e6c1a226b67c7eb90d7a26c2b3b3d9a5e6e92a5af485236b77c878
|
||||
DIST sqlite-autoconf-3250200.tar.gz 2763876 BLAKE2B 3d97cc60edf8f91855215bd59260362665c8ec7699510f2e07c7ba57e10c400dcc99bb392e216f798bef1ffa7120b48ee62ce144a871741ef57b3aefeab875d6 SHA512 5ef9a6dfbb0822257af1a3a379785a95ab02edecbbb53b57074ddd0b8dc294fc07cbb9a8a7acc4e1640fb1743525ed6331fecebbddce01bc017330b20e127ad9
|
||||
DIST sqlite-autoconf-3250300.tar.gz 2764429 BLAKE2B 6a79a8785c1e84002c031a86c6563e937a45d6ef4aae1b941d42c06cb8630210c33583f25e41f3f90b181ce47da650f81845ad88cafbf9c764164cf8b5d92e81 SHA512 5bc501d15367e097f4070185974b0c3a8246c06b205fb2258ed18870ff3fbf120ac5e0ba031a6744af89f7659206e28e7de2f0367bdb190b8412e453b43de4ba
|
||||
DIST sqlite-autoconf-3260000.tar.gz 2779667 BLAKE2B f4d737eb2249ce32fcb7541ba92f7362d417e84adb5f5c63778b6f427b3270b7e0b16e19daaef7fc7e4fca9ab462c96cdb00c65a731a90102f6bb256a27d84ae SHA512 8c3306b3814a0e9bc69b741f62bdb6efc9f1e07163ca3e3a1581994465de163a7924223522e812d6b3663c1525c7012a6f6d73ad333556eba9f97ce9326fbdb8
|
||||
DIST sqlite-autoconf-3270100.tar.gz 2797765 BLAKE2B a610528b626229e5379037cb2b8b405a564fecf7f999608bcd41b4ee3531259216c69897e4f2e1cdd78d092edf62c3fec40b6cb377d3c767b9f1bee05b09fa01 SHA512 1dca61b82ce1dbae2fe9c568ff97e0671900bab46b354bd0aadc1946cbc46b3ea84bd1504ae922f795d1ce10791bf7861a2873f045887646609e26b74919e8e4
|
||||
DIST sqlite-doc-3230100.zip 8882546 BLAKE2B 1e80647e3789b9130a93e881933fb1260794d9ccf359969a16bdeb0df5a51787eaf8404641c4b760bedd45063d46f8874fd74a4da1fef0234f3d8e92db754d76 SHA512 d3a42621480a928446c5f71d0f2ee68e245b071971da38438f9070bd5bcbe1930ea5bd20e06c68543df75badd2e4565abc94420df50b7152c9cd129587471471
|
||||
DIST sqlite-doc-3240000.zip 9030826 BLAKE2B 4444e3dd0ce782e19fa01c881e0b5453723419ef1cf95cbe751d759a264bbe288a5c23a2b6514ed459b99b11637349c02def68fed7df8625bfc161307e44564c SHA512 31e9046cea569d7ad1b3af176e1bb18cd59474afb6849871ead6e7c9c096f046162fb313a38684a8c944fad9f689c4c3c692be1d7dc6a8ef5a6685bbc7dfdab6
|
||||
DIST sqlite-doc-3250200.zip 9229732 BLAKE2B 9bc4499c2934d15428dd30e0522362a2c2e703061c293f1b657f01d3945612760be3b4f145ddf76d9cf87953fae26884646887e53c0c55683ce42bc239dcf952 SHA512 a0b764ca0eea0e9719d46b6e1f92db78578457c8331976d4712c56cd10fc062fd73629686a0e45dfdeb505fbfbe0c53652a5e64507702ff4e12b62a2fc8d8211
|
||||
DIST sqlite-autoconf-3270200.tar.gz 2797531 BLAKE2B e4d0de32308e519e4f5f68dc0ff1e2098209325ab962a09814aa6af517cb408d1ac70f32fff56cca4ad78bec7d6dedb5b21f222ae391e0fe7e20df5abd37f65a SHA512 0ac2515c7816932a4f725e657122c9f202bd7aba637bad9af5b4592b85efdd10a55ad34ac621b60a7aea91b1021c2ef0924c6ddfe05b2edb4f70e3d34b005972
|
||||
DIST sqlite-doc-3250300.zip 9265285 BLAKE2B 0722f00d849b18dabf82d317eb0deeb5567534a9cb55e189f28b18e7a26b863190911a02a26e21cf39b3106e7e1a872c445a3d8b53876a16d245e77affb6abc4 SHA512 a57cefbb2338a87721fb34f7a0d19129a58fbce026f80719af7dbbeb7512c91ab59e07719d860cc1cf742807ab7b0b5f92cff3bf52f4dbbad8c6ca34ad0a68ac
|
||||
DIST sqlite-doc-3260000.zip 9321276 BLAKE2B 8e3802212eb938a3997bf8eef971baf8802895a8c38e959b2409857228e9a92b24c3f51679f7dc4847df8d9800f0fff2c09e391b3e30de8b2782bbc5267d5d40 SHA512 e59f74369adb3ffe3afc235e4369101b8ba077f9cac34d524e2425278c3a30f63340613e5baa0fc3c693265525377b6830a1c6b5e97fb06702b89eb604b1eade
|
||||
DIST sqlite-doc-3270100.zip 9361284 BLAKE2B d9705bc5d3a40ec70df2fa16c9f3f7d3d4824ddcb59e101bc6d45bc5f6396c11ed9e5d548f59bc2f48cb515417bb03419e67f669a7e85678d05cb0c71a3a2c27 SHA512 a56cfe57702ab1ab342c24536bcd3c01c3c57fb9e863fc775f07275d236fc0617f7eb832ca5173bf5c4c5c4b7a0b4b80e2d19b91e7724b838bf141cf0852cc1f
|
||||
DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b1c3b81562fdea2317b58d876a0852136fe4f8a3ebc7679676f366e19c84d0ad2f54d3d8c73712145099975f80cf1a SHA512 69a87b76860c3b172d9e68b0fc0b8c157b606375e2b7d793ce4bd4b898ef737cd721189bc6a3342c749e224e60fa96203d449668c49dff2ebdc682b49630a59b
|
||||
DIST sqlite-src-3240000.zip 10980065 BLAKE2B 201a59cb34271e5ac79e96e4e2ea64f8b61aa99c44eedf61c0a21752ad4376caaf7980a6923dca66266b1a315d9867871d0d172c17907b4147c15431aa212a70 SHA512 812c2df7179abb1e445b5b3e161c940b120c53366a7b2c1f0bfc3599cd9921e5543ba39ca3f297eeaefec318f10c15f630f00f9cf04133c7cd419a04f3bbdd0e
|
||||
DIST sqlite-src-3250200.zip 11381811 BLAKE2B 6183436f66c862c32d1dfd59ea4ccb5eaf3dd516ffcf9d7edf786e8fbf56eff3cb84d08e291b2e86fae25e537bed452aed693bdb0f0d6bb6581da86641013557 SHA512 7354af2d45c574ba867fab8aabc6ff903279f028aebed50c71019066df78f61a0b941564c572c87b0f3ed3e5783bf325a690a9957d775228fbbb293dd9a5ad37
|
||||
DIST sqlite-doc-3270200.zip 9371606 BLAKE2B 6d65f59f21eafab82ede6c89d09b8828e5a5e6f7ad7233877fe938773be0aee6fd347d7bba0101cc1d2e376181e4cfbcc2e36d47567b65af9167c4d1ba7f3540 SHA512 00a7c51aeaea2d9338662553c331addca8cd4ae656f4090630b4b2c2e6ceffffd9bd3c6a97117915577cfd6dafeddf9da21f865ab378f86c4832ba0b1c419a2f
|
||||
DIST sqlite-src-3250300.zip 11384253 BLAKE2B dbc1d989b1f7ae26e34d629ae7926cfebacc0e3b9e07abb98ac6e6d2d801f111624d5b3f5a1d486580559ff0b42140bb798aa862df60946efa77d8b26c47fbd0 SHA512 7d6a38aea5626f7a32960fcdd109c647dd24a22ecf0772f01ffdba389f70fdfe6455f69733b22c220d4114a7d61d3d10097c23859d303e02d126988a1f663b65
|
||||
DIST sqlite-src-3260000.zip 11939787 BLAKE2B 89fc5294c203473a8817d23496b05b743aa9d64ac7c67c258432b6a48dfe41d554b09ed14820854333fe555442029e9c9ccea736be7b10be42d9184502938557 SHA512 02faacd831781f25a12ffc8858d648f481d8bbdb68814b18c4c96e3a661233d0e25d675b95feeb35eee4b5ea88e5e0a1fc5fbaecbe434d3f7246d80e81bff6a3
|
||||
DIST sqlite-src-3270100.zip 12247922 BLAKE2B 324488f345e1b15c4d31772d709a7591e9e278842267d84e44cf62e63cbf0acc4a8da2e0d280a5d43d48f67235c067fd97f791d67916803746c83310cbb62c49 SHA512 5ae0d3ee747df85e5dcd7cb64057ec64843079cfcf163558aa793194ec8ba0ad5570d9c8cb152b6510357ec074da6dba7cfd2f64466f06565c54cd175d9f8945
|
||||
DIST sqlite-src-3270200.zip 12248529 BLAKE2B b3c79b85bbfa376b31ebb4ad33aea3f0b60c1f6d1e6505e02758cffff41e44ea0c5b8c24892f0757502ed6213c0f97f00957632ddf0e5ffe25e9f8b7f62c6e9a SHA512 52f61e2fa54558b953dba62b27961eef8563f40e6b4a62638087cb22c7d1fdf2c915ea1071939e2e98f3ce6041da2c9bfb1bdbc1e8b8b4a049b8148e878a4e5e
|
||||
|
@ -1,14 +0,0 @@
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- /configure.ac
|
||||
+++ /configure.ac
|
||||
@@ -102,6 +102,9 @@
|
||||
[], [enable_dynamic_extensions=yes])
|
||||
if test x"$enable_dynamic_extensions" != "xno"; then
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
+ if test "${ac_cv_search_dlopen}" = "no" ; then
|
||||
+ DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1
|
||||
+ fi
|
||||
else
|
||||
DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1
|
||||
fi
|
@ -1,407 +0,0 @@
|
||||
Move some code to libsqlite3.so to avoid duplication.
|
||||
Link executables against libsqlite3.so.
|
||||
Increase timeout for fuzzcheck.
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- /Makefile.in
|
||||
+++ /Makefile.in
|
||||
@@ -308,6 +308,9 @@
|
||||
# Source code for extensions
|
||||
#
|
||||
SRC += \
|
||||
+ $(TOP)/ext/expert/sqlite3expert.c \
|
||||
+ $(TOP)/ext/expert/sqlite3expert.h
|
||||
+SRC += \
|
||||
$(TOP)/ext/fts1/fts1.c \
|
||||
$(TOP)/ext/fts1/fts1.h \
|
||||
$(TOP)/ext/fts1/fts1_hash.c \
|
||||
@@ -356,8 +359,11 @@
|
||||
$(TOP)/ext/rbu/sqlite3rbu.h \
|
||||
$(TOP)/ext/rbu/sqlite3rbu.c
|
||||
SRC += \
|
||||
+ $(TOP)/ext/misc/appendvfs.c \
|
||||
$(TOP)/ext/misc/json1.c \
|
||||
- $(TOP)/ext/misc/stmt.c
|
||||
+ $(TOP)/ext/misc/sqlar.c \
|
||||
+ $(TOP)/ext/misc/stmt.c \
|
||||
+ $(TOP)/ext/misc/zipfile.c
|
||||
|
||||
# Generated source code files
|
||||
#
|
||||
@@ -426,7 +432,6 @@
|
||||
# Statically linked extensions
|
||||
#
|
||||
TESTSRC += \
|
||||
- $(TOP)/ext/expert/sqlite3expert.c \
|
||||
$(TOP)/ext/expert/test_expert.c \
|
||||
$(TOP)/ext/misc/amatch.c \
|
||||
$(TOP)/ext/misc/carray.c \
|
||||
@@ -449,8 +454,7 @@
|
||||
$(TOP)/ext/misc/spellfix.c \
|
||||
$(TOP)/ext/misc/totype.c \
|
||||
$(TOP)/ext/misc/unionvtab.c \
|
||||
- $(TOP)/ext/misc/wholenumber.c \
|
||||
- $(TOP)/ext/misc/zipfile.c
|
||||
+ $(TOP)/ext/misc/wholenumber.c
|
||||
|
||||
# Source code to the library files needed by the test fixture
|
||||
#
|
||||
@@ -613,25 +617,25 @@
|
||||
|
||||
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
|
||||
$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
|
||||
- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
|
||||
+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \
|
||||
-rpath "$(TCLLIBDIR)" \
|
||||
-version-info "8:6:8" \
|
||||
-avoid-version
|
||||
|
||||
-sqlite3$(TEXE): shell.c sqlite3.c
|
||||
- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
|
||||
- shell.c sqlite3.c \
|
||||
- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
|
||||
+sqlite3$(TEXE): shell.c libsqlite3.la
|
||||
+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
|
||||
+ shell.c libsqlite3.la \
|
||||
+ $(LIBREADLINE)
|
||||
|
||||
-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
|
||||
+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
|
||||
-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
|
||||
+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
|
||||
-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
|
||||
+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
|
||||
- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
|
||||
srcck1$(BEXE): $(TOP)/tool/srcck1.c
|
||||
$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
|
||||
@@ -710,7 +714,7 @@
|
||||
# Rule to build the amalgamation
|
||||
#
|
||||
sqlite3.lo: sqlite3.c
|
||||
- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
|
||||
+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
|
||||
|
||||
# Rules to build the LEMON compiler generator
|
||||
#
|
||||
@@ -1004,14 +1008,9 @@
|
||||
# Source files that go into making shell.c
|
||||
SHELL_SRC = \
|
||||
$(TOP)/src/shell.c.in \
|
||||
- $(TOP)/ext/misc/appendvfs.c \
|
||||
$(TOP)/ext/misc/shathree.c \
|
||||
$(TOP)/ext/misc/fileio.c \
|
||||
$(TOP)/ext/misc/completion.c \
|
||||
- $(TOP)/ext/misc/sqlar.c \
|
||||
- $(TOP)/ext/expert/sqlite3expert.c \
|
||||
- $(TOP)/ext/expert/sqlite3expert.h \
|
||||
- $(TOP)/ext/misc/zipfile.c \
|
||||
$(TOP)/src/test_windirent.c
|
||||
|
||||
shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
|
||||
@@ -1170,15 +1169,15 @@
|
||||
|
||||
# Fuzz testing
|
||||
fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
|
||||
- ./fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
|
||||
./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
|
||||
|
||||
fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
|
||||
- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
|
||||
./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
|
||||
|
||||
valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
|
||||
- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
|
||||
+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
|
||||
valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
|
||||
|
||||
# The veryquick.test TCL tests.
|
||||
@@ -1209,24 +1208,23 @@
|
||||
smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
|
||||
./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
|
||||
|
||||
-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
|
||||
|
||||
-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
|
||||
- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
|
||||
+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
|
||||
|
||||
-sqltclsh$(TEXE): sqltclsh.c
|
||||
- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la
|
||||
+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
|
||||
- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
|
||||
+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
|
||||
|
||||
CHECKER_DEPS =\
|
||||
$(TOP)/tool/mkccode.tcl \
|
||||
- sqlite3.c \
|
||||
$(TOP)/src/tclsqlite.c \
|
||||
$(TOP)/ext/repair/sqlite3_checker.tcl \
|
||||
$(TOP)/ext/repair/checkindex.c \
|
||||
@@ -1237,30 +1235,30 @@
|
||||
sqlite3_checker.c: $(CHECKER_DEPS)
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
|
||||
|
||||
-sqlite3_checker$(TEXE): sqlite3_checker.c
|
||||
- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
|
||||
+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
|
||||
- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
|
||||
-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
|
||||
+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
|
||||
|
||||
-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
|
||||
+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
|
||||
-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
|
||||
+showjournal$(TEXE): $(TOP)/tool/showjournal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c
|
||||
|
||||
-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
|
||||
+showwal$(TEXE): $(TOP)/tool/showwal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c
|
||||
|
||||
showshm$(TEXE): $(TOP)/tool/showshm.c
|
||||
$(LTLINK) -o $@ $(TOP)/tool/showshm.c
|
||||
|
||||
-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
|
||||
+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
|
||||
rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
|
||||
$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
|
||||
@@ -1279,11 +1277,11 @@
|
||||
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
|
||||
$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
|
||||
|
||||
-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
|
||||
- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
|
||||
+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
|
||||
-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
|
||||
+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
|
||||
|
||||
# This target will fail if the SQLite amalgamation contains any exported
|
||||
# symbols that do not begin with "sqlite3_". It is run as part of the
|
||||
--- /configure.ac
|
||||
+++ /configure.ac
|
||||
@@ -590,6 +590,9 @@
|
||||
if test "${use_loadextension}" = "yes" ; then
|
||||
OPT_FEATURE_FLAGS=""
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
+ if test "${ac_cv_search_dlopen}" = "no" ; then
|
||||
+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
+ fi
|
||||
else
|
||||
OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
fi
|
||||
--- /ext/misc/sqlar.c
|
||||
+++ /ext/misc/sqlar.c
|
||||
@@ -14,6 +14,8 @@
|
||||
** for working with sqlar archives and used by the shell tool's built-in
|
||||
** sqlar support.
|
||||
*/
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+
|
||||
#include "sqlite3ext.h"
|
||||
SQLITE_EXTENSION_INIT1
|
||||
#include <zlib.h>
|
||||
@@ -119,3 +121,5 @@
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
+
|
||||
+#endif /* SQLITE_HAVE_ZLIB */
|
||||
--- /ext/misc/zipfile.c
|
||||
+++ /ext/misc/zipfile.c
|
||||
@@ -24,6 +24,8 @@
|
||||
** * No support for zip64 extensions
|
||||
** * Only the "inflate/deflate" (zlib) compression method is supported
|
||||
*/
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+
|
||||
#include "sqlite3ext.h"
|
||||
SQLITE_EXTENSION_INIT1
|
||||
#include <stdio.h>
|
||||
@@ -2175,3 +2177,5 @@
|
||||
(void)pzErrMsg; /* Unused parameter */
|
||||
return zipfileRegister(db);
|
||||
}
|
||||
+
|
||||
+#endif /* SQLITE_HAVE_ZLIB */
|
||||
--- /ext/repair/sqlite3_checker.c.in
|
||||
+++ /ext/repair/sqlite3_checker.c.in
|
||||
@@ -2,6 +2,7 @@
|
||||
** Read an SQLite database file and analyze its space utilization. Generate
|
||||
** text on standard output.
|
||||
*/
|
||||
+#define SQLITE_CORE 1
|
||||
#define TCLSH_INIT_PROC sqlite3_checker_init_proc
|
||||
#define SQLITE_ENABLE_DBPAGE_VTAB 1
|
||||
#define SQLITE_ENABLE_JSON1 1
|
||||
@@ -14,7 +15,7 @@
|
||||
#define SQLITE_OMIT_SHARED_CACHE 1
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
-INCLUDE sqlite3.c
|
||||
+#include "sqlite3.h"
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
INCLUDE $ROOT/ext/misc/btreeinfo.c
|
||||
INCLUDE $ROOT/ext/repair/checkindex.c
|
||||
--- /src/shell.c.in
|
||||
+++ /src/shell.c.in
|
||||
@@ -61,6 +61,7 @@
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
#include "sqlite3.h"
|
||||
+#include "ext/expert/sqlite3expert.h"
|
||||
typedef sqlite3_int64 i64;
|
||||
typedef sqlite3_uint64 u64;
|
||||
typedef unsigned char u8;
|
||||
@@ -124,6 +125,10 @@
|
||||
# define SHELL_USE_LOCAL_GETLINE 1
|
||||
#endif
|
||||
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+#include <zlib.h>
|
||||
+#endif
|
||||
+
|
||||
|
||||
#if defined(_WIN32) || defined(WIN32)
|
||||
# include <io.h>
|
||||
@@ -966,13 +971,6 @@
|
||||
INCLUDE ../ext/misc/shathree.c
|
||||
INCLUDE ../ext/misc/fileio.c
|
||||
INCLUDE ../ext/misc/completion.c
|
||||
-INCLUDE ../ext/misc/appendvfs.c
|
||||
-#ifdef SQLITE_HAVE_ZLIB
|
||||
-INCLUDE ../ext/misc/zipfile.c
|
||||
-INCLUDE ../ext/misc/sqlar.c
|
||||
-#endif
|
||||
-INCLUDE ../ext/expert/sqlite3expert.h
|
||||
-INCLUDE ../ext/expert/sqlite3expert.c
|
||||
|
||||
#if defined(SQLITE_ENABLE_SESSION)
|
||||
/*
|
||||
@@ -3522,7 +3520,9 @@
|
||||
sqlite3_shathree_init(p->db, 0, 0);
|
||||
sqlite3_completion_init(p->db, 0, 0);
|
||||
#ifdef SQLITE_HAVE_ZLIB
|
||||
+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_zipfile_init(p->db, 0, 0);
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_sqlar_init(p->db, 0, 0);
|
||||
#endif
|
||||
sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
|
||||
@@ -5411,6 +5411,7 @@
|
||||
goto end_ar_command;
|
||||
}
|
||||
sqlite3_fileio_init(cmd.db, 0, 0);
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_sqlar_init(cmd.db, 0, 0);
|
||||
sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
|
||||
shellPutsFunc, 0, 0);
|
||||
@@ -8367,6 +8368,7 @@
|
||||
#endif
|
||||
}
|
||||
data.out = stdout;
|
||||
+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_appendvfs_init(0,0,0);
|
||||
|
||||
/* Go ahead and open the database file if it already exists. If the
|
||||
--- /tool/mksqlite3c.tcl
|
||||
+++ /tool/mksqlite3c.tcl
|
||||
@@ -116,6 +116,7 @@
|
||||
rtree.h
|
||||
sqlite3session.h
|
||||
sqlite3.h
|
||||
+ sqlite3expert.h
|
||||
sqlite3ext.h
|
||||
sqlite3rbu.h
|
||||
sqliteicu.h
|
||||
@@ -400,6 +401,10 @@
|
||||
json1.c
|
||||
fts5.c
|
||||
stmt.c
|
||||
+ appendvfs.c
|
||||
+ sqlar.c
|
||||
+ sqlite3expert.c
|
||||
+ zipfile.c
|
||||
} {
|
||||
copy_file tsrc/$file
|
||||
}
|
||||
--- /tool/sqlite3_analyzer.c.in
|
||||
+++ /tool/sqlite3_analyzer.c.in
|
||||
@@ -14,9 +14,6 @@
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
#define SQLITE_OMIT_LOAD_EXTENSION 1
|
||||
-#ifndef USE_EXTERNAL_SQLITE
|
||||
-INCLUDE sqlite3.c
|
||||
-#endif
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
|
||||
const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
|
||||
--- /tool/sqltclsh.c.in
|
||||
+++ /tool/sqltclsh.c.in
|
||||
@@ -27,19 +27,17 @@
|
||||
#define SQLITE_OMIT_SHARED_CACHE 1
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
-INCLUDE sqlite3.c
|
||||
-INCLUDE $ROOT/ext/misc/appendvfs.c
|
||||
-#ifdef SQLITE_HAVE_ZLIB
|
||||
-INCLUDE $ROOT/ext/misc/zipfile.c
|
||||
-INCLUDE $ROOT/ext/misc/sqlar.c
|
||||
-#endif
|
||||
+#include "sqlite3.h"
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
|
||||
const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
|
||||
(void)interp;
|
||||
+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
|
||||
sqlite3_appendvfs_init(0,0,0);
|
||||
#ifdef SQLITE_HAVE_ZLIB
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
|
||||
+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
|
||||
#endif
|
||||
|
@ -1,24 +0,0 @@
|
||||
https://sqlite.org/src/info/b7178209152452e8
|
||||
|
||||
--- /src/attach.c
|
||||
+++ /src/attach.c
|
||||
@@ -502,6 +502,9 @@
|
||||
if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1;
|
||||
if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1;
|
||||
#endif
|
||||
+ if( pItem->fg.isTabFunc && sqlite3FixExprList(pFix, pItem->u1.pFuncArg) ){
|
||||
+ return 1;
|
||||
+ }
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
--- /test/triggerE.test
|
||||
+++ /test/triggerE.test
|
||||
@@ -57,6 +57,7 @@
|
||||
7 { BEFORE DELETE ON t1 BEGIN SELECT * FROM t2 ORDER BY ?; END; }
|
||||
8 { BEFORE UPDATE ON t1 BEGIN UPDATE t2 SET c = ?; END; }
|
||||
9 { BEFORE UPDATE ON t1 BEGIN UPDATE t2 SET c = 1 WHERE d = ?; END; }
|
||||
+ 10 { AFTER INSERT ON t1 BEGIN SELECT * FROM pragma_stats(?); END; }
|
||||
} {
|
||||
catchsql {drop trigger tr1}
|
||||
do_catchsql_test 1.1.$tn "CREATE TRIGGER tr1 $defn" [list 1 $errmsg]
|
@ -1,224 +0,0 @@
|
||||
https://sqlite.org/src/info/893e6089c875e947
|
||||
https://sqlite.org/src/info/576a8f69ae25883f
|
||||
https://sqlite.org/src/info/de508e831a43f02c
|
||||
|
||||
--- /ext/fts3/fts3.c
|
||||
+++ /ext/fts3/fts3.c
|
||||
@@ -3963,7 +3963,7 @@
|
||||
|
||||
#ifdef SQLITE_TEST
|
||||
if( rc==SQLITE_OK ){
|
||||
- rc = sqlite3Fts3ExprInitTestInterface(db);
|
||||
+ rc = sqlite3Fts3ExprInitTestInterface(db, pHash);
|
||||
}
|
||||
#endif
|
||||
|
||||
--- /ext/fts3/fts3Int.h
|
||||
+++ /ext/fts3/fts3Int.h
|
||||
@@ -584,7 +584,7 @@
|
||||
);
|
||||
void sqlite3Fts3ExprFree(Fts3Expr *);
|
||||
#ifdef SQLITE_TEST
|
||||
-int sqlite3Fts3ExprInitTestInterface(sqlite3 *db);
|
||||
+int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash*);
|
||||
int sqlite3Fts3InitTerm(sqlite3 *db);
|
||||
#endif
|
||||
|
||||
--- /ext/fts3/fts3_expr.c
|
||||
+++ /ext/fts3/fts3_expr.c
|
||||
@@ -1109,34 +1109,6 @@
|
||||
#include <stdio.h>
|
||||
|
||||
/*
|
||||
-** Function to query the hash-table of tokenizers (see README.tokenizers).
|
||||
-*/
|
||||
-static int queryTestTokenizer(
|
||||
- sqlite3 *db,
|
||||
- const char *zName,
|
||||
- const sqlite3_tokenizer_module **pp
|
||||
-){
|
||||
- int rc;
|
||||
- sqlite3_stmt *pStmt;
|
||||
- const char zSql[] = "SELECT fts3_tokenizer(?)";
|
||||
-
|
||||
- *pp = 0;
|
||||
- rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
|
||||
- if( rc!=SQLITE_OK ){
|
||||
- return rc;
|
||||
- }
|
||||
-
|
||||
- sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
|
||||
- if( SQLITE_ROW==sqlite3_step(pStmt) ){
|
||||
- if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){
|
||||
- memcpy((void *)pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- return sqlite3_finalize(pStmt);
|
||||
-}
|
||||
-
|
||||
-/*
|
||||
** Return a pointer to a buffer containing a text representation of the
|
||||
** expression passed as the first argument. The buffer is obtained from
|
||||
** sqlite3_malloc(). It is the responsibility of the caller to use
|
||||
@@ -1203,12 +1175,12 @@
|
||||
**
|
||||
** SELECT fts3_exprtest('simple', 'Bill col2:Bloggs', 'col1', 'col2');
|
||||
*/
|
||||
-static void fts3ExprTest(
|
||||
+static void fts3ExprTestCommon(
|
||||
+ int bRebalance,
|
||||
sqlite3_context *context,
|
||||
int argc,
|
||||
sqlite3_value **argv
|
||||
){
|
||||
- sqlite3_tokenizer_module const *pModule = 0;
|
||||
sqlite3_tokenizer *pTokenizer = 0;
|
||||
int rc;
|
||||
char **azCol = 0;
|
||||
@@ -1218,7 +1190,9 @@
|
||||
int ii;
|
||||
Fts3Expr *pExpr;
|
||||
char *zBuf = 0;
|
||||
- sqlite3 *db = sqlite3_context_db_handle(context);
|
||||
+ Fts3Hash *pHash = (Fts3Hash*)sqlite3_user_data(context);
|
||||
+ const char *zTokenizer = 0;
|
||||
+ char *zErr = 0;
|
||||
|
||||
if( argc<3 ){
|
||||
sqlite3_result_error(context,
|
||||
@@ -1227,23 +1201,17 @@
|
||||
return;
|
||||
}
|
||||
|
||||
- rc = queryTestTokenizer(db,
|
||||
- (const char *)sqlite3_value_text(argv[0]), &pModule);
|
||||
- if( rc==SQLITE_NOMEM ){
|
||||
- sqlite3_result_error_nomem(context);
|
||||
- goto exprtest_out;
|
||||
- }else if( !pModule ){
|
||||
- sqlite3_result_error(context, "No such tokenizer module", -1);
|
||||
- goto exprtest_out;
|
||||
- }
|
||||
-
|
||||
- rc = pModule->xCreate(0, 0, &pTokenizer);
|
||||
- assert( rc==SQLITE_NOMEM || rc==SQLITE_OK );
|
||||
- if( rc==SQLITE_NOMEM ){
|
||||
- sqlite3_result_error_nomem(context);
|
||||
- goto exprtest_out;
|
||||
+ zTokenizer = (const char*)sqlite3_value_text(argv[0]);
|
||||
+ rc = sqlite3Fts3InitTokenizer(pHash, zTokenizer, &pTokenizer, &zErr);
|
||||
+ if( rc!=SQLITE_OK ){
|
||||
+ if( rc==SQLITE_NOMEM ){
|
||||
+ sqlite3_result_error_nomem(context);
|
||||
+ }else{
|
||||
+ sqlite3_result_error(context, zErr, -1);
|
||||
+ }
|
||||
+ sqlite3_free(zErr);
|
||||
+ return;
|
||||
}
|
||||
- pTokenizer->pModule = pModule;
|
||||
|
||||
zExpr = (const char *)sqlite3_value_text(argv[1]);
|
||||
nExpr = sqlite3_value_bytes(argv[1]);
|
||||
@@ -1257,7 +1225,7 @@
|
||||
azCol[ii] = (char *)sqlite3_value_text(argv[ii+2]);
|
||||
}
|
||||
|
||||
- if( sqlite3_user_data(context) ){
|
||||
+ if( bRebalance ){
|
||||
char *zDummy = 0;
|
||||
rc = sqlite3Fts3ExprParse(
|
||||
pTokenizer, 0, azCol, 0, nCol, nCol, zExpr, nExpr, &pExpr, &zDummy
|
||||
@@ -1283,23 +1251,38 @@
|
||||
sqlite3Fts3ExprFree(pExpr);
|
||||
|
||||
exprtest_out:
|
||||
- if( pModule && pTokenizer ){
|
||||
- rc = pModule->xDestroy(pTokenizer);
|
||||
+ if( pTokenizer ){
|
||||
+ rc = pTokenizer->pModule->xDestroy(pTokenizer);
|
||||
}
|
||||
sqlite3_free(azCol);
|
||||
}
|
||||
|
||||
+static void fts3ExprTest(
|
||||
+ sqlite3_context *context,
|
||||
+ int argc,
|
||||
+ sqlite3_value **argv
|
||||
+){
|
||||
+ fts3ExprTestCommon(0, context, argc, argv);
|
||||
+}
|
||||
+static void fts3ExprTestRebalance(
|
||||
+ sqlite3_context *context,
|
||||
+ int argc,
|
||||
+ sqlite3_value **argv
|
||||
+){
|
||||
+ fts3ExprTestCommon(1, context, argc, argv);
|
||||
+}
|
||||
+
|
||||
/*
|
||||
** Register the query expression parser test function fts3_exprtest()
|
||||
** with database connection db.
|
||||
*/
|
||||
-int sqlite3Fts3ExprInitTestInterface(sqlite3* db){
|
||||
+int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash *pHash){
|
||||
int rc = sqlite3_create_function(
|
||||
- db, "fts3_exprtest", -1, SQLITE_UTF8, 0, fts3ExprTest, 0, 0
|
||||
+ db, "fts3_exprtest", -1, SQLITE_UTF8, (void*)pHash, fts3ExprTest, 0, 0
|
||||
);
|
||||
if( rc==SQLITE_OK ){
|
||||
rc = sqlite3_create_function(db, "fts3_exprtest_rebalance",
|
||||
- -1, SQLITE_UTF8, (void *)1, fts3ExprTest, 0, 0
|
||||
+ -1, SQLITE_UTF8, (void*)pHash, fts3ExprTestRebalance, 0, 0
|
||||
);
|
||||
}
|
||||
return rc;
|
||||
--- /test/fts3expr.test
|
||||
+++ /test/fts3expr.test
|
||||
@@ -409,7 +409,7 @@
|
||||
} {1 {Usage: fts3_exprtest(tokenizer, expr, col1, ...}}
|
||||
do_test fts3expr-5.2 {
|
||||
catchsql { SELECT fts3_exprtest('doesnotexist', 'a b', 'c') }
|
||||
-} {1 {No such tokenizer module}}
|
||||
+} {1 {unknown tokenizer: doesnotexist}}
|
||||
do_test fts3expr-5.3 {
|
||||
catchsql { SELECT fts3_exprtest('simple', 'a b OR', 'c') }
|
||||
} {1 {Error parsing expression}}
|
||||
--- /test/fts3expr4.test
|
||||
+++ /test/fts3expr4.test
|
||||
@@ -29,7 +29,8 @@
|
||||
}
|
||||
|
||||
proc do_icu_expr_test {tn expr res} {
|
||||
- uplevel [list do_test $tn [list test_fts3expr icu $expr] [list {*}$res]]
|
||||
+ set res2 [list {*}$res]
|
||||
+ uplevel [list do_test $tn [list test_fts3expr "icu en_US" $expr] $res2]
|
||||
}
|
||||
|
||||
proc do_simple_expr_test {tn expr res} {
|
||||
--- /test/zipfile2.test
|
||||
+++ /test/zipfile2.test
|
||||
@@ -52,17 +52,15 @@
|
||||
CREATE VIRTUAL TABLE fff USING zipfile('test''zip');
|
||||
}
|
||||
|
||||
-if {$::tcl_platform(platform)=="windows"} {
|
||||
- set res {1 {cannot open file: testdir}}
|
||||
-} else {
|
||||
- set res {1 {error in fread()}}
|
||||
-}
|
||||
do_test 2.0 {
|
||||
forcedelete testdir
|
||||
file mkdir testdir
|
||||
execsql { CREATE VIRTUAL TABLE hhh USING zipfile('testdir') }
|
||||
- catchsql { SELECT * FROM hhh }
|
||||
-} $res
|
||||
+ lindex [catchsql {
|
||||
+ SELECT * FROM hhh;
|
||||
+ INSERT INTO hhh(name, data) VALUES('1.txt', 'file data');
|
||||
+ }] 0
|
||||
+} 1
|
||||
|
||||
|
||||
set archive {
|
@ -1,14 +0,0 @@
|
||||
https://sqlite.org/src/info/b7178209152452e8
|
||||
|
||||
--- /sqlite3.c
|
||||
+++ /sqlite3.c
|
||||
@@ -102780,6 +102780,9 @@
|
||||
if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1;
|
||||
if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1;
|
||||
#endif
|
||||
+ if( pItem->fg.isTabFunc && sqlite3FixExprList(pFix, pItem->u1.pFuncArg) ){
|
||||
+ return 1;
|
||||
+ }
|
||||
}
|
||||
return 0;
|
||||
}
|
@ -1,14 +0,0 @@
|
||||
https://sqlite.org/src/info/27291f2d7fd4dadf
|
||||
|
||||
--- /src/shell.c.in
|
||||
+++ /src/shell.c.in
|
||||
@@ -5284,7 +5284,8 @@
|
||||
"SELECT "
|
||||
" ($dir || name),"
|
||||
" writefile(($dir || name), %s, mode, mtime) "
|
||||
- "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)";
|
||||
+ "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)"
|
||||
+ " AND name NOT GLOB '*..[/\\]*'";
|
||||
|
||||
const char *azExtraArg[] = {
|
||||
"sqlar_uncompress(data, sz)",
|
@ -1,407 +0,0 @@
|
||||
Move some code to libsqlite3.so to avoid duplication.
|
||||
Link executables against libsqlite3.so.
|
||||
Increase timeout for fuzzcheck.
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- /Makefile.in
|
||||
+++ /Makefile.in
|
||||
@@ -309,6 +309,9 @@
|
||||
# Source code for extensions
|
||||
#
|
||||
SRC += \
|
||||
+ $(TOP)/ext/expert/sqlite3expert.c \
|
||||
+ $(TOP)/ext/expert/sqlite3expert.h
|
||||
+SRC += \
|
||||
$(TOP)/ext/fts1/fts1.c \
|
||||
$(TOP)/ext/fts1/fts1.h \
|
||||
$(TOP)/ext/fts1/fts1_hash.c \
|
||||
@@ -357,8 +360,11 @@
|
||||
$(TOP)/ext/rbu/sqlite3rbu.h \
|
||||
$(TOP)/ext/rbu/sqlite3rbu.c
|
||||
SRC += \
|
||||
+ $(TOP)/ext/misc/appendvfs.c \
|
||||
$(TOP)/ext/misc/json1.c \
|
||||
- $(TOP)/ext/misc/stmt.c
|
||||
+ $(TOP)/ext/misc/sqlar.c \
|
||||
+ $(TOP)/ext/misc/stmt.c \
|
||||
+ $(TOP)/ext/misc/zipfile.c
|
||||
|
||||
# Generated source code files
|
||||
#
|
||||
@@ -427,7 +433,6 @@
|
||||
# Statically linked extensions
|
||||
#
|
||||
TESTSRC += \
|
||||
- $(TOP)/ext/expert/sqlite3expert.c \
|
||||
$(TOP)/ext/expert/test_expert.c \
|
||||
$(TOP)/ext/misc/amatch.c \
|
||||
$(TOP)/ext/misc/carray.c \
|
||||
@@ -450,8 +455,7 @@
|
||||
$(TOP)/ext/misc/spellfix.c \
|
||||
$(TOP)/ext/misc/totype.c \
|
||||
$(TOP)/ext/misc/unionvtab.c \
|
||||
- $(TOP)/ext/misc/wholenumber.c \
|
||||
- $(TOP)/ext/misc/zipfile.c
|
||||
+ $(TOP)/ext/misc/wholenumber.c
|
||||
|
||||
# Source code to the library files needed by the test fixture
|
||||
#
|
||||
@@ -615,25 +619,25 @@
|
||||
|
||||
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
|
||||
$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
|
||||
- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
|
||||
+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \
|
||||
-rpath "$(TCLLIBDIR)" \
|
||||
-version-info "8:6:8" \
|
||||
-avoid-version
|
||||
|
||||
-sqlite3$(TEXE): shell.c sqlite3.c
|
||||
- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
|
||||
- shell.c sqlite3.c \
|
||||
- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
|
||||
+sqlite3$(TEXE): shell.c libsqlite3.la
|
||||
+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
|
||||
+ shell.c libsqlite3.la \
|
||||
+ $(LIBREADLINE)
|
||||
|
||||
-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
|
||||
+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
|
||||
-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
|
||||
+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
|
||||
-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
|
||||
+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
|
||||
- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
|
||||
srcck1$(BEXE): $(TOP)/tool/srcck1.c
|
||||
$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
|
||||
@@ -712,7 +716,7 @@
|
||||
# Rule to build the amalgamation
|
||||
#
|
||||
sqlite3.lo: sqlite3.c
|
||||
- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
|
||||
+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
|
||||
|
||||
# Rules to build the LEMON compiler generator
|
||||
#
|
||||
@@ -1009,14 +1013,9 @@
|
||||
# Source files that go into making shell.c
|
||||
SHELL_SRC = \
|
||||
$(TOP)/src/shell.c.in \
|
||||
- $(TOP)/ext/misc/appendvfs.c \
|
||||
$(TOP)/ext/misc/shathree.c \
|
||||
$(TOP)/ext/misc/fileio.c \
|
||||
$(TOP)/ext/misc/completion.c \
|
||||
- $(TOP)/ext/misc/sqlar.c \
|
||||
- $(TOP)/ext/expert/sqlite3expert.c \
|
||||
- $(TOP)/ext/expert/sqlite3expert.h \
|
||||
- $(TOP)/ext/misc/zipfile.c \
|
||||
$(TOP)/src/test_windirent.c
|
||||
|
||||
shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
|
||||
@@ -1175,15 +1174,15 @@
|
||||
|
||||
# Fuzz testing
|
||||
fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
|
||||
- ./fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
|
||||
./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
|
||||
|
||||
fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
|
||||
- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
|
||||
./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
|
||||
|
||||
valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
|
||||
- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
|
||||
+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
|
||||
valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
|
||||
|
||||
# The veryquick.test TCL tests.
|
||||
@@ -1214,24 +1213,23 @@
|
||||
smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
|
||||
./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
|
||||
|
||||
-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
|
||||
|
||||
-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
|
||||
- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
|
||||
+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
|
||||
|
||||
-sqltclsh$(TEXE): sqltclsh.c
|
||||
- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la
|
||||
+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
|
||||
- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
|
||||
+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
|
||||
|
||||
CHECKER_DEPS =\
|
||||
$(TOP)/tool/mkccode.tcl \
|
||||
- sqlite3.c \
|
||||
$(TOP)/src/tclsqlite.c \
|
||||
$(TOP)/ext/repair/sqlite3_checker.tcl \
|
||||
$(TOP)/ext/repair/checkindex.c \
|
||||
@@ -1242,30 +1240,30 @@
|
||||
sqlite3_checker.c: $(CHECKER_DEPS)
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
|
||||
|
||||
-sqlite3_checker$(TEXE): sqlite3_checker.c
|
||||
- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
|
||||
+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
|
||||
- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
|
||||
-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
|
||||
+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
|
||||
|
||||
-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
|
||||
+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
|
||||
-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
|
||||
+showjournal$(TEXE): $(TOP)/tool/showjournal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c
|
||||
|
||||
-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
|
||||
+showwal$(TEXE): $(TOP)/tool/showwal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c
|
||||
|
||||
showshm$(TEXE): $(TOP)/tool/showshm.c
|
||||
$(LTLINK) -o $@ $(TOP)/tool/showshm.c
|
||||
|
||||
-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
|
||||
+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
|
||||
rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
|
||||
$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
|
||||
@@ -1284,11 +1282,11 @@
|
||||
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
|
||||
$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
|
||||
|
||||
-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
|
||||
- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
|
||||
+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
|
||||
-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
|
||||
+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
|
||||
|
||||
# This target will fail if the SQLite amalgamation contains any exported
|
||||
# symbols that do not begin with "sqlite3_". It is run as part of the
|
||||
--- /configure.ac
|
||||
+++ /configure.ac
|
||||
@@ -590,6 +590,9 @@
|
||||
if test "${use_loadextension}" = "yes" ; then
|
||||
OPT_FEATURE_FLAGS=""
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
+ if test "${ac_cv_search_dlopen}" = "no" ; then
|
||||
+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
+ fi
|
||||
else
|
||||
OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
fi
|
||||
--- /ext/misc/sqlar.c
|
||||
+++ /ext/misc/sqlar.c
|
||||
@@ -14,6 +14,8 @@
|
||||
** for working with sqlar archives and used by the shell tool's built-in
|
||||
** sqlar support.
|
||||
*/
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+
|
||||
#include "sqlite3ext.h"
|
||||
SQLITE_EXTENSION_INIT1
|
||||
#include <zlib.h>
|
||||
@@ -119,3 +121,5 @@
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
+
|
||||
+#endif /* SQLITE_HAVE_ZLIB */
|
||||
--- /ext/misc/zipfile.c
|
||||
+++ /ext/misc/zipfile.c
|
||||
@@ -24,6 +24,8 @@
|
||||
** * No support for zip64 extensions
|
||||
** * Only the "inflate/deflate" (zlib) compression method is supported
|
||||
*/
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+
|
||||
#include "sqlite3ext.h"
|
||||
SQLITE_EXTENSION_INIT1
|
||||
#include <stdio.h>
|
||||
@@ -2175,3 +2177,5 @@
|
||||
(void)pzErrMsg; /* Unused parameter */
|
||||
return zipfileRegister(db);
|
||||
}
|
||||
+
|
||||
+#endif /* SQLITE_HAVE_ZLIB */
|
||||
--- /ext/repair/sqlite3_checker.c.in
|
||||
+++ /ext/repair/sqlite3_checker.c.in
|
||||
@@ -2,6 +2,7 @@
|
||||
** Read an SQLite database file and analyze its space utilization. Generate
|
||||
** text on standard output.
|
||||
*/
|
||||
+#define SQLITE_CORE 1
|
||||
#define TCLSH_INIT_PROC sqlite3_checker_init_proc
|
||||
#define SQLITE_ENABLE_DBPAGE_VTAB 1
|
||||
#define SQLITE_ENABLE_JSON1 1
|
||||
@@ -14,7 +15,7 @@
|
||||
#define SQLITE_OMIT_SHARED_CACHE 1
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
-INCLUDE sqlite3.c
|
||||
+#include "sqlite3.h"
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
INCLUDE $ROOT/ext/misc/btreeinfo.c
|
||||
INCLUDE $ROOT/ext/repair/checkindex.c
|
||||
--- /src/shell.c.in
|
||||
+++ /src/shell.c.in
|
||||
@@ -61,6 +61,7 @@
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
#include "sqlite3.h"
|
||||
+#include "ext/expert/sqlite3expert.h"
|
||||
typedef sqlite3_int64 i64;
|
||||
typedef sqlite3_uint64 u64;
|
||||
typedef unsigned char u8;
|
||||
@@ -124,6 +125,10 @@
|
||||
# define SHELL_USE_LOCAL_GETLINE 1
|
||||
#endif
|
||||
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+#include <zlib.h>
|
||||
+#endif
|
||||
+
|
||||
|
||||
#if defined(_WIN32) || defined(WIN32)
|
||||
# include <io.h>
|
||||
@@ -939,13 +944,6 @@
|
||||
INCLUDE ../ext/misc/shathree.c
|
||||
INCLUDE ../ext/misc/fileio.c
|
||||
INCLUDE ../ext/misc/completion.c
|
||||
-INCLUDE ../ext/misc/appendvfs.c
|
||||
-#ifdef SQLITE_HAVE_ZLIB
|
||||
-INCLUDE ../ext/misc/zipfile.c
|
||||
-INCLUDE ../ext/misc/sqlar.c
|
||||
-#endif
|
||||
-INCLUDE ../ext/expert/sqlite3expert.h
|
||||
-INCLUDE ../ext/expert/sqlite3expert.c
|
||||
|
||||
#if defined(SQLITE_ENABLE_SESSION)
|
||||
/*
|
||||
@@ -3632,7 +3630,9 @@
|
||||
sqlite3_shathree_init(p->db, 0, 0);
|
||||
sqlite3_completion_init(p->db, 0, 0);
|
||||
#ifdef SQLITE_HAVE_ZLIB
|
||||
+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_zipfile_init(p->db, 0, 0);
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_sqlar_init(p->db, 0, 0);
|
||||
#endif
|
||||
sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
|
||||
@@ -5523,6 +5523,7 @@
|
||||
goto end_ar_command;
|
||||
}
|
||||
sqlite3_fileio_init(cmd.db, 0, 0);
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_sqlar_init(cmd.db, 0, 0);
|
||||
sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
|
||||
shellPutsFunc, 0, 0);
|
||||
@@ -8539,6 +8540,7 @@
|
||||
#endif
|
||||
}
|
||||
data.out = stdout;
|
||||
+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_appendvfs_init(0,0,0);
|
||||
|
||||
/* Go ahead and open the database file if it already exists. If the
|
||||
--- /tool/mksqlite3c.tcl
|
||||
+++ /tool/mksqlite3c.tcl
|
||||
@@ -116,6 +116,7 @@
|
||||
rtree.h
|
||||
sqlite3session.h
|
||||
sqlite3.h
|
||||
+ sqlite3expert.h
|
||||
sqlite3ext.h
|
||||
sqlite3rbu.h
|
||||
sqliteicu.h
|
||||
@@ -401,6 +402,10 @@
|
||||
json1.c
|
||||
fts5.c
|
||||
stmt.c
|
||||
+ appendvfs.c
|
||||
+ sqlar.c
|
||||
+ sqlite3expert.c
|
||||
+ zipfile.c
|
||||
} {
|
||||
copy_file tsrc/$file
|
||||
}
|
||||
--- /tool/sqlite3_analyzer.c.in
|
||||
+++ /tool/sqlite3_analyzer.c.in
|
||||
@@ -14,9 +14,6 @@
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
#define SQLITE_OMIT_LOAD_EXTENSION 1
|
||||
-#ifndef USE_EXTERNAL_SQLITE
|
||||
-INCLUDE sqlite3.c
|
||||
-#endif
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
|
||||
const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
|
||||
--- /tool/sqltclsh.c.in
|
||||
+++ /tool/sqltclsh.c.in
|
||||
@@ -27,19 +27,17 @@
|
||||
#define SQLITE_OMIT_SHARED_CACHE 1
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
-INCLUDE sqlite3.c
|
||||
-INCLUDE $ROOT/ext/misc/appendvfs.c
|
||||
-#ifdef SQLITE_HAVE_ZLIB
|
||||
-INCLUDE $ROOT/ext/misc/zipfile.c
|
||||
-INCLUDE $ROOT/ext/misc/sqlar.c
|
||||
-#endif
|
||||
+#include "sqlite3.h"
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
|
||||
const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
|
||||
(void)interp;
|
||||
+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
|
||||
sqlite3_appendvfs_init(0,0,0);
|
||||
#ifdef SQLITE_HAVE_ZLIB
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
|
||||
+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
|
||||
#endif
|
||||
|
@ -1,14 +0,0 @@
|
||||
https://sqlite.org/src/info/27291f2d7fd4dadf
|
||||
|
||||
--- /shell.c
|
||||
+++ /shell.c
|
||||
@@ -12786,7 +12786,8 @@
|
||||
"SELECT "
|
||||
" ($dir || name),"
|
||||
" writefile(($dir || name), %s, mode, mtime) "
|
||||
- "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)";
|
||||
+ "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)"
|
||||
+ " AND name NOT GLOB '*..[/\\]*'";
|
||||
|
||||
const char *azExtraArg[] = {
|
||||
"sqlar_uncompress(data, sz)",
|
@ -1,49 +0,0 @@
|
||||
https://sqlite.org/src/info/e8275b415a2f03bee
|
||||
https://sqlite.org/src/info/7fc2994434c7d9ed
|
||||
|
||||
--- /src/select.c
|
||||
+++ /src/select.c
|
||||
@@ -2318,6 +2318,13 @@
|
||||
Expr *pLimit; /* Saved LIMIT and OFFSET */
|
||||
int regLimit, regOffset; /* Registers used by LIMIT and OFFSET */
|
||||
|
||||
+#ifndef SQLITE_OMIT_WINDOWFUNC
|
||||
+ if( p->pWin ){
|
||||
+ sqlite3ErrorMsg(pParse, "cannot use window functions in recursive queries");
|
||||
+ return;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
/* Obtain authorization to do a recursive query */
|
||||
if( sqlite3AuthCheck(pParse, SQLITE_RECURSIVE, 0, 0, 0) ) return;
|
||||
|
||||
--- /test/with1.test
|
||||
+++ /test/with1.test
|
||||
@@ -865,6 +865,27 @@
|
||||
SELECT * FROM i;
|
||||
} {1 {recursive aggregate queries not supported}}
|
||||
|
||||
+# Or window-function recursive queries. Ticket e8275b41.
|
||||
+#
|
||||
+ifcapable windowfunc {
|
||||
+ do_catchsql_test 16.2 {
|
||||
+ WITH RECURSIVE
|
||||
+ i(x) AS (VALUES(1) UNION SELECT count(*) OVER () FROM i)
|
||||
+ SELECT * FROM i;
|
||||
+ } {1 {cannot use window functions in recursive queries}}
|
||||
+ do_catchsql_test 16.3 {
|
||||
+ WITH RECURSIVE
|
||||
+ t(id, parent) AS (VALUES(1,2)),
|
||||
+ q(id, parent, rn) AS (
|
||||
+ VALUES(1,2,3)
|
||||
+ UNION ALL
|
||||
+ SELECT t.*, ROW_NUMBER() OVER (ORDER BY t.id) AS rn
|
||||
+ FROM q JOIN t ON t.parent = q.id
|
||||
+ )
|
||||
+ SELECT * FROM q;
|
||||
+ } {1 {cannot use window functions in recursive queries}}
|
||||
+}
|
||||
+
|
||||
#-------------------------------------------------------------------------
|
||||
do_execsql_test 17.1 {
|
||||
WITH x(a) AS (
|
@ -1,19 +0,0 @@
|
||||
https://sqlite.org/src/info/e8275b415a2f03bee
|
||||
https://sqlite.org/src/info/7fc2994434c7d9ed
|
||||
|
||||
--- /sqlite3.c
|
||||
+++ /sqlite3.c
|
||||
@@ -125441,6 +125441,13 @@
|
||||
Expr *pLimit; /* Saved LIMIT and OFFSET */
|
||||
int regLimit, regOffset; /* Registers used by LIMIT and OFFSET */
|
||||
|
||||
+#ifndef SQLITE_OMIT_WINDOWFUNC
|
||||
+ if( p->pWin ){
|
||||
+ sqlite3ErrorMsg(pParse, "cannot use window functions in recursive queries");
|
||||
+ return;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
/* Obtain authorization to do a recursive query */
|
||||
if( sqlite3AuthCheck(pParse, SQLITE_RECURSIVE, 0, 0, 0) ) return;
|
||||
|
@ -0,0 +1,36 @@
|
||||
https://sqlite.org/src/info/29d02bf2fa9ecacb
|
||||
|
||||
--- /ext/session/sessionB.test
|
||||
+++ /ext/session/sessionB.test
|
||||
@@ -258,8 +258,7 @@
|
||||
INSERT INTO t2 VALUES('a', 'a', 'a', 'a');
|
||||
} {
|
||||
DELETE FROM t2 WHERE c = 'a';
|
||||
-} {
|
||||
-}
|
||||
+} {}
|
||||
|
||||
# INSERT + UPDATE
|
||||
do_patchconcat_test 4.3.4 {
|
||||
--- /test/fts3expr4.test
|
||||
+++ /test/fts3expr4.test
|
||||
@@ -68,7 +68,7 @@
|
||||
AND {AND {AND {PHRASE 3 0 *} {PHRASE 3 0 lol+}} {PHRASE 3 0 *}} {PHRASE 3 0 h4h+}
|
||||
}
|
||||
|
||||
-do_simple_expr_test 3.3 { * } { }
|
||||
+do_simple_expr_test 3.3 { * } {}
|
||||
do_simple_expr_test 3.4 { *a } { PHRASE 3 0 a }
|
||||
do_simple_expr_test 3.5 { a*b } { AND {PHRASE 3 0 a+} {PHRASE 3 0 b} }
|
||||
do_simple_expr_test 3.6 { *a*b } { AND {PHRASE 3 0 a+} {PHRASE 3 0 b} }
|
||||
--- /test/scanstatus.test
|
||||
+++ /test/scanstatus.test
|
||||
@@ -254,7 +254,7 @@
|
||||
}
|
||||
|
||||
do_execsql_test 4.1.1 { INSERT INTO t1 VALUES(1, 2, 3); }
|
||||
-do_scanstatus_test 4.1.2 { }
|
||||
+do_scanstatus_test 4.1.2 {}
|
||||
|
||||
do_execsql_test 4.2 {
|
||||
CREATE TABLE p1(x PRIMARY KEY);
|
@ -1,309 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
|
||||
|
||||
SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
|
||||
DOC_PV="${SRC_PV}"
|
||||
# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
|
||||
|
||||
DESCRIPTION="A SQL Database Engine in a C Library"
|
||||
HOMEPAGE="https://sqlite.org/"
|
||||
SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
|
||||
tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
|
||||
test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
|
||||
tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
|
||||
!tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="3"
|
||||
KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
|
||||
|
||||
RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
|
||||
icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
|
||||
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
|
||||
tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
|
||||
tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-arch/unzip )
|
||||
tcl? ( app-arch/unzip )
|
||||
test? (
|
||||
app-arch/unzip
|
||||
>=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}]
|
||||
)
|
||||
tools? ( app-arch/unzip )"
|
||||
|
||||
full_archive() {
|
||||
use tcl || use test || use tools
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if full_archive; then
|
||||
S="${WORKDIR}/${PN}-src-${SRC_PV}"
|
||||
else
|
||||
S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if full_archive; then
|
||||
eapply "${FILESDIR}/${PN}-3.23.0-full_archive-build.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.23.1-full_archive-tests.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix AC_CHECK_FUNCS.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
|
||||
sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
|
||||
else
|
||||
eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix AC_CHECK_FUNCS.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
|
||||
sed \
|
||||
-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
|
||||
-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
|
||||
-i configure.ac || die "sed failed"
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
|
||||
|
||||
options+=(
|
||||
--enable-$(full_archive && echo load-extension || echo dynamic-extensions)
|
||||
--enable-threadsafe
|
||||
)
|
||||
if ! full_archive; then
|
||||
options+=(--disable-static-shell)
|
||||
fi
|
||||
|
||||
# Support detection of misuse of SQLite API.
|
||||
# https://sqlite.org/compile.html#enable_api_armor
|
||||
append-cppflags -DSQLITE_ENABLE_API_ARMOR
|
||||
|
||||
# Support column metadata functions.
|
||||
# https://sqlite.org/c3ref/column_database_name.html
|
||||
append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
|
||||
|
||||
# Support sqlite_dbpage virtual table.
|
||||
# https://sqlite.org/compile.html#enable_dbpage_vtab
|
||||
append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
|
||||
|
||||
# Support dbstat virtual table.
|
||||
# https://sqlite.org/dbstat.html
|
||||
append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
|
||||
|
||||
# Support sqlite3_serialize() and sqlite3_deserialize() functions.
|
||||
# https://sqlite.org/compile.html#enable_deserialize
|
||||
# https://sqlite.org/c3ref/serialize.html
|
||||
# https://sqlite.org/c3ref/deserialize.html
|
||||
append-cppflags -DSQLITE_ENABLE_DESERIALIZE
|
||||
|
||||
# Support comments in output of EXPLAIN.
|
||||
# https://sqlite.org/compile.html#enable_explain_comments
|
||||
append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
|
||||
|
||||
# Support Full-Text Search versions 3, 4 and 5.
|
||||
# https://sqlite.org/fts3.html
|
||||
# https://sqlite.org/fts5.html
|
||||
append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
|
||||
options+=(--enable-fts5)
|
||||
|
||||
# Support hidden columns.
|
||||
append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
|
||||
|
||||
# Support JSON1 extension.
|
||||
# https://sqlite.org/json1.html
|
||||
append-cppflags -DSQLITE_ENABLE_JSON1
|
||||
|
||||
# Support memsys5 memory allocator.
|
||||
# https://sqlite.org/malloc.html#memsys5
|
||||
append-cppflags -DSQLITE_ENABLE_MEMSYS5
|
||||
|
||||
# Support sqlite_offset() function.
|
||||
# https://sqlite.org/lang_corefunc.html#sqlite_offset
|
||||
append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
|
||||
|
||||
# Support pre-update hook functions.
|
||||
# https://sqlite.org/c3ref/preupdate_count.html
|
||||
append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
|
||||
|
||||
# Support Resumable Bulk Update extension.
|
||||
# https://sqlite.org/rbu.html
|
||||
append-cppflags -DSQLITE_ENABLE_RBU
|
||||
|
||||
# Support R*Trees.
|
||||
# https://sqlite.org/rtree.html
|
||||
append-cppflags -DSQLITE_ENABLE_RTREE
|
||||
|
||||
# Support scan status functions.
|
||||
# https://sqlite.org/c3ref/stmt_scanstatus.html
|
||||
# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
|
||||
append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
|
||||
|
||||
# Support sqlite_stmt virtual table.
|
||||
# https://sqlite.org/stmt.html
|
||||
append-cppflags -DSQLITE_ENABLE_STMTVTAB
|
||||
|
||||
# Support Session extension.
|
||||
# https://sqlite.org/sessionintro.html
|
||||
options+=(--enable-session)
|
||||
|
||||
# Support unknown() function.
|
||||
# https://sqlite.org/compile.html#enable_unknown_sql_function
|
||||
append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
|
||||
|
||||
# Support unlock notification.
|
||||
# https://sqlite.org/unlock_notify.html
|
||||
append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
|
||||
|
||||
# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
|
||||
# https://sqlite.org/compile.html#enable_update_delete_limit
|
||||
append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
|
||||
|
||||
# Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements.
|
||||
# https://sqlite.org/pragma.html#pragma_function_list
|
||||
# https://sqlite.org/pragma.html#pragma_module_list
|
||||
# https://sqlite.org/pragma.html#pragma_pragma_list
|
||||
append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS
|
||||
|
||||
# Support soundex() function.
|
||||
# https://sqlite.org/lang_corefunc.html#soundex
|
||||
append-cppflags -DSQLITE_SOUNDEX
|
||||
|
||||
# debug USE flag.
|
||||
if full_archive; then
|
||||
options+=($(use_enable debug))
|
||||
else
|
||||
if use debug; then
|
||||
append-cppflags -DSQLITE_DEBUG
|
||||
else
|
||||
append-cppflags -DNDEBUG
|
||||
fi
|
||||
fi
|
||||
|
||||
# icu USE flag.
|
||||
if use icu; then
|
||||
# Support ICU extension.
|
||||
# https://sqlite.org/compile.html#enable_icu
|
||||
append-cppflags -DSQLITE_ENABLE_ICU
|
||||
if full_archive; then
|
||||
sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
else
|
||||
sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
fi
|
||||
fi
|
||||
|
||||
# readline USE flag.
|
||||
options+=(
|
||||
--disable-editline
|
||||
$(use_enable readline)
|
||||
)
|
||||
if full_archive && use readline; then
|
||||
options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
|
||||
fi
|
||||
|
||||
# secure-delete USE flag.
|
||||
if use secure-delete; then
|
||||
# Enable secure_delete pragma by default.
|
||||
# https://sqlite.org/pragma.html#pragma_secure_delete
|
||||
append-cppflags -DSQLITE_SECURE_DELETE
|
||||
fi
|
||||
|
||||
# static-libs USE flag.
|
||||
options+=($(use_enable static-libs static))
|
||||
|
||||
# tcl, test, tools USE flags.
|
||||
if full_archive; then
|
||||
options+=(--enable-tcl)
|
||||
fi
|
||||
|
||||
if [[ "${CHOST}" == *-mint* ]]; then
|
||||
append-cppflags -DSQLITE_OMIT_WAL
|
||||
fi
|
||||
|
||||
if [[ "${ABI}" == "x86" ]]; then
|
||||
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
|
||||
append-cflags -mfpmath=sse
|
||||
else
|
||||
append-cflags -ffloat-store
|
||||
fi
|
||||
fi
|
||||
|
||||
econf "${options[@]}"
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
|
||||
|
||||
if use tools && multilib_is_native_abi; then
|
||||
emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
if [[ "${EUID}" -eq 0 ]]; then
|
||||
ewarn "Skipping tests due to root permissions"
|
||||
return
|
||||
fi
|
||||
|
||||
emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
|
||||
|
||||
if use tools && multilib_is_native_abi; then
|
||||
install_tool() {
|
||||
if [[ -f ".libs/${1}" ]]; then
|
||||
newbin ".libs/${1}" "${2}"
|
||||
else
|
||||
newbin "${1}" "${2}"
|
||||
fi
|
||||
}
|
||||
|
||||
install_tool changeset sqlite3-changeset
|
||||
install_tool dbdump sqlite3-db-dump
|
||||
install_tool dbhash sqlite3-db-hash
|
||||
install_tool rbu sqlite3-rbu
|
||||
install_tool scrub sqlite3-scrub
|
||||
install_tool showdb sqlite3-show-db
|
||||
install_tool showjournal sqlite3-show-journal
|
||||
install_tool showshm sqlite3-show-shm
|
||||
install_tool showstat4 sqlite3-show-stat4
|
||||
install_tool showwal sqlite3-show-wal
|
||||
install_tool sqldiff sqlite3-diff
|
||||
install_tool sqlite3_analyzer sqlite3-analyzer
|
||||
install_tool sqlite3_checker sqlite3-checker
|
||||
install_tool sqlite3_expert sqlite3-expert
|
||||
install_tool sqltclsh sqlite3-tclsh
|
||||
|
||||
unset -f install_tool
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
prune_libtool_files
|
||||
|
||||
doman sqlite3.1
|
||||
|
||||
if use doc; then
|
||||
rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
|
||||
(
|
||||
docinto html
|
||||
dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
|
||||
)
|
||||
fi
|
||||
}
|
@ -1,308 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
|
||||
|
||||
SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
|
||||
DOC_PV="${SRC_PV}"
|
||||
# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
|
||||
|
||||
DESCRIPTION="SQL database engine"
|
||||
HOMEPAGE="https://sqlite.org/"
|
||||
SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
|
||||
tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
|
||||
test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
|
||||
tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
|
||||
!tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="3"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
|
||||
|
||||
RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
|
||||
icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
|
||||
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
|
||||
tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
|
||||
tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-arch/unzip )
|
||||
tcl? ( app-arch/unzip )
|
||||
test? (
|
||||
app-arch/unzip
|
||||
>=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}]
|
||||
)
|
||||
tools? ( app-arch/unzip )"
|
||||
|
||||
full_archive() {
|
||||
use tcl || use test || use tools
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if full_archive; then
|
||||
S="${WORKDIR}/${PN}-src-${SRC_PV}"
|
||||
else
|
||||
S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if full_archive; then
|
||||
eapply "${FILESDIR}/${PN}-3.24.0-full_archive-build.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.24.0-full_archive-archive_command_paths_handling.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix AC_CHECK_FUNCS.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
|
||||
sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
|
||||
else
|
||||
eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.24.0-nonfull_archive-archive_command_paths_handling.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix AC_CHECK_FUNCS.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
|
||||
sed \
|
||||
-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
|
||||
-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
|
||||
-i configure.ac || die "sed failed"
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
|
||||
|
||||
options+=(
|
||||
--enable-$(full_archive && echo load-extension || echo dynamic-extensions)
|
||||
--enable-threadsafe
|
||||
)
|
||||
if ! full_archive; then
|
||||
options+=(--disable-static-shell)
|
||||
fi
|
||||
|
||||
# Support detection of misuse of SQLite API.
|
||||
# https://sqlite.org/compile.html#enable_api_armor
|
||||
append-cppflags -DSQLITE_ENABLE_API_ARMOR
|
||||
|
||||
# Support column metadata functions.
|
||||
# https://sqlite.org/c3ref/column_database_name.html
|
||||
append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
|
||||
|
||||
# Support sqlite_dbpage virtual table.
|
||||
# https://sqlite.org/compile.html#enable_dbpage_vtab
|
||||
append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
|
||||
|
||||
# Support dbstat virtual table.
|
||||
# https://sqlite.org/dbstat.html
|
||||
append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
|
||||
|
||||
# Support sqlite3_serialize() and sqlite3_deserialize() functions.
|
||||
# https://sqlite.org/compile.html#enable_deserialize
|
||||
# https://sqlite.org/c3ref/serialize.html
|
||||
# https://sqlite.org/c3ref/deserialize.html
|
||||
append-cppflags -DSQLITE_ENABLE_DESERIALIZE
|
||||
|
||||
# Support comments in output of EXPLAIN.
|
||||
# https://sqlite.org/compile.html#enable_explain_comments
|
||||
append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
|
||||
|
||||
# Support Full-Text Search versions 3, 4 and 5.
|
||||
# https://sqlite.org/fts3.html
|
||||
# https://sqlite.org/fts5.html
|
||||
append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
|
||||
options+=(--enable-fts5)
|
||||
|
||||
# Support hidden columns.
|
||||
append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
|
||||
|
||||
# Support JSON1 extension.
|
||||
# https://sqlite.org/json1.html
|
||||
append-cppflags -DSQLITE_ENABLE_JSON1
|
||||
|
||||
# Support memsys5 memory allocator.
|
||||
# https://sqlite.org/malloc.html#memsys5
|
||||
append-cppflags -DSQLITE_ENABLE_MEMSYS5
|
||||
|
||||
# Support sqlite_offset() function.
|
||||
# https://sqlite.org/lang_corefunc.html#sqlite_offset
|
||||
append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
|
||||
|
||||
# Support pre-update hook functions.
|
||||
# https://sqlite.org/c3ref/preupdate_count.html
|
||||
append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
|
||||
|
||||
# Support Resumable Bulk Update extension.
|
||||
# https://sqlite.org/rbu.html
|
||||
append-cppflags -DSQLITE_ENABLE_RBU
|
||||
|
||||
# Support R*Trees.
|
||||
# https://sqlite.org/rtree.html
|
||||
append-cppflags -DSQLITE_ENABLE_RTREE
|
||||
|
||||
# Support scan status functions.
|
||||
# https://sqlite.org/c3ref/stmt_scanstatus.html
|
||||
# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
|
||||
append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
|
||||
|
||||
# Support sqlite_stmt virtual table.
|
||||
# https://sqlite.org/stmt.html
|
||||
append-cppflags -DSQLITE_ENABLE_STMTVTAB
|
||||
|
||||
# Support Session extension.
|
||||
# https://sqlite.org/sessionintro.html
|
||||
options+=(--enable-session)
|
||||
|
||||
# Support unknown() function.
|
||||
# https://sqlite.org/compile.html#enable_unknown_sql_function
|
||||
append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
|
||||
|
||||
# Support unlock notification.
|
||||
# https://sqlite.org/unlock_notify.html
|
||||
append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
|
||||
|
||||
# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
|
||||
# https://sqlite.org/compile.html#enable_update_delete_limit
|
||||
append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
|
||||
|
||||
# Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements.
|
||||
# https://sqlite.org/pragma.html#pragma_function_list
|
||||
# https://sqlite.org/pragma.html#pragma_module_list
|
||||
# https://sqlite.org/pragma.html#pragma_pragma_list
|
||||
append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS
|
||||
|
||||
# Support soundex() function.
|
||||
# https://sqlite.org/lang_corefunc.html#soundex
|
||||
append-cppflags -DSQLITE_SOUNDEX
|
||||
|
||||
# debug USE flag.
|
||||
if full_archive; then
|
||||
options+=($(use_enable debug))
|
||||
else
|
||||
if use debug; then
|
||||
append-cppflags -DSQLITE_DEBUG
|
||||
else
|
||||
append-cppflags -DNDEBUG
|
||||
fi
|
||||
fi
|
||||
|
||||
# icu USE flag.
|
||||
if use icu; then
|
||||
# Support ICU extension.
|
||||
# https://sqlite.org/compile.html#enable_icu
|
||||
append-cppflags -DSQLITE_ENABLE_ICU
|
||||
if full_archive; then
|
||||
sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
else
|
||||
sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
fi
|
||||
fi
|
||||
|
||||
# readline USE flag.
|
||||
options+=(
|
||||
--disable-editline
|
||||
$(use_enable readline)
|
||||
)
|
||||
if full_archive && use readline; then
|
||||
options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
|
||||
fi
|
||||
|
||||
# secure-delete USE flag.
|
||||
if use secure-delete; then
|
||||
# Enable secure_delete pragma by default.
|
||||
# https://sqlite.org/pragma.html#pragma_secure_delete
|
||||
append-cppflags -DSQLITE_SECURE_DELETE
|
||||
fi
|
||||
|
||||
# static-libs USE flag.
|
||||
options+=($(use_enable static-libs static))
|
||||
|
||||
# tcl, test, tools USE flags.
|
||||
if full_archive; then
|
||||
options+=(--enable-tcl)
|
||||
fi
|
||||
|
||||
if [[ "${CHOST}" == *-mint* ]]; then
|
||||
append-cppflags -DSQLITE_OMIT_WAL
|
||||
fi
|
||||
|
||||
if [[ "${ABI}" == "x86" ]]; then
|
||||
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
|
||||
append-cflags -mfpmath=sse
|
||||
else
|
||||
append-cflags -ffloat-store
|
||||
fi
|
||||
fi
|
||||
|
||||
econf "${options[@]}"
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
|
||||
|
||||
if use tools && multilib_is_native_abi; then
|
||||
emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
if [[ "${EUID}" -eq 0 ]]; then
|
||||
ewarn "Skipping tests due to root permissions"
|
||||
return
|
||||
fi
|
||||
|
||||
emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
|
||||
|
||||
if use tools && multilib_is_native_abi; then
|
||||
install_tool() {
|
||||
if [[ -f ".libs/${1}" ]]; then
|
||||
newbin ".libs/${1}" "${2}"
|
||||
else
|
||||
newbin "${1}" "${2}"
|
||||
fi
|
||||
}
|
||||
|
||||
install_tool changeset sqlite3-changeset
|
||||
install_tool dbdump sqlite3-db-dump
|
||||
install_tool dbhash sqlite3-db-hash
|
||||
install_tool rbu sqlite3-rbu
|
||||
install_tool scrub sqlite3-scrub
|
||||
install_tool showdb sqlite3-show-db
|
||||
install_tool showjournal sqlite3-show-journal
|
||||
install_tool showshm sqlite3-show-shm
|
||||
install_tool showstat4 sqlite3-show-stat4
|
||||
install_tool showwal sqlite3-show-wal
|
||||
install_tool sqldiff sqlite3-diff
|
||||
install_tool sqlite3_analyzer sqlite3-analyzer
|
||||
install_tool sqlite3_checker sqlite3-checker
|
||||
install_tool sqlite3_expert sqlite3-expert
|
||||
install_tool sqltclsh sqlite3-tclsh
|
||||
|
||||
unset -f install_tool
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
prune_libtool_files
|
||||
|
||||
doman sqlite3.1
|
||||
|
||||
if use doc; then
|
||||
rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
|
||||
(
|
||||
docinto html
|
||||
dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
|
||||
)
|
||||
fi
|
||||
}
|
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST avra-1.3.0.tar.bz2 314903 BLAKE2B f5eb831bf997ab22b8e40cc90eb7b769d008461550ecce2fc139f99cf9b76511e2f5ca078d82bb9d6526ad7b9e1497dac369a29a4d0eae3a01e19af177857ed9 SHA512 4215b87379a6c2a9b81048dfd717a05881e2dc38359e49812be44bb64ac3e45911367fdf73f0c9f753e67e9ea23d19f33365dc4140ec94d13f1d8077b978fb93
|
||||
DIST avra-1.4.0.tar.gz 380256 BLAKE2B 7864261d230ecb1c28377856db24481ef40933e9ac15cf00523f0edb53e9d0beb8d4966d90d80d775c43ae1870a39bbfb6586580d87916bba23457e97027169e SHA512 1df07ebcefc24f91dbf18c489baff314683ff5cde7cd87ea6aae5d0fddbd1e6d64016c100378e9fede414036bb1ffbc03584b35100575ec50a27ace44b22a0e9
|
||||
|
@ -0,0 +1,21 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="Atmel AVR Assembler"
|
||||
HOMEPAGE="https://github.com/hsoft/avra"
|
||||
SRC_URI="https://github.com/hsoft/avra/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
|
||||
src_compile() {
|
||||
emake PREFIX=/usr CFLAGS="${CFLAGS} \$(CDEFS)" LDFLAGS="${LDFLAGS}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake PREFIX=/usr DESTDIR="${ED}" install
|
||||
dodoc {AUTHORS,CHANGELOG.md,README.md,USAGE.md}
|
||||
}
|
@ -1,11 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<maintainer type="person">
|
||||
<email>vdupras@gentoo.org</email>
|
||||
<name>Virgil Dupras</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
Assembler for Atmel AVR microprocessors
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">avra</remote-id>
|
||||
<remote-id type="github">hsoft/avra</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
Binary file not shown.
Binary file not shown.
@ -1,3 +1,5 @@
|
||||
DIST gc-7.2e.tar.gz 1291186 BLAKE2B 8c320aac2d9deb8fcca2e93622aa122f96c4152d2b18bd284be32d5a041f357beaf8f3142548685fe167642070471862d04c0e6c3ba1c99bc9c05e63d6854005 SHA512 80d1d50e38714b4f198743cd8cd5ab80a35cfbb7f5f9d66c89f40319604e989125870f010d4499876978594a5823d7b61213224a68da8664b9e4f8e14076c999
|
||||
DIST gc-7.4.2.tar.gz 1082597 BLAKE2B 5ca30e786a995941fdf2d803d201e7263bdd7d9974a71f672ff259c75ee36dc5d499a614334e570100ddbcb25fd06176f48429b64bad95fb218c35ba584ad4c6 SHA512 2e21516addf268780641ee55c0cb3ecc2d96fa963faffee5beadcade9c6bf1ee49ee1a75b076b5d49ddde7c839fb94f4c3623ca8412d14c2a5bf6ca30d424a72
|
||||
DIST gc-7.6.10.tar.gz 1143650 BLAKE2B 5dce84de2e842c98dc552b4a6fc28311e241f419a792523be2e5cb0f7d5b34a57608f8c40e1d85cf06fb3f9c6212855438a0d20c23e2b2d9ba37485d91d78a3e SHA512 6952ff38ed39203c8ff9aae516d81cf5210f3f17fac030325ba58b89c266d2d6ffa281b996c481b9d821638a0334da68f00c15dc4774759ff1f7b57b4678f08f
|
||||
DIST gc-7.6.4.tar.gz 1120784 BLAKE2B e7cad27d2144fd37aebad44093e1a0814fe9a1cc887701e485681cdd01f3ea4477150697d535d0873a1255abff0765084119096c7ed61d3caeda439cf2a7644f SHA512 2c85be3e24b85732b3dc6f08fe98cf1a82b6fb2a22ec73090f80920721c737ef92cee8f0cd7ea7228d686005d164e7da54ce3907c3a1ba5eefa43355a472085e
|
||||
DIST gc-8.0.2.tar.gz 1159207 BLAKE2B f3dfcecbc9ba59c2abac868278eb6fdca4bda46a5303393a8fb63717f01bc19fa007b6530a536c32600db30f3a45d8d5558fe72adefecd9b97075dfadb3eddc2 SHA512 b1401abb2e82b143b9a2a9013f5b2efa4015b256e7ea8ef2c897ef3c0d2d41fc893413bf6a49efc1845018e8ab823adb485fb3358eb47715982259ace9ffd7c6
|
||||
|
@ -0,0 +1,53 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit multilib-minimal libtool
|
||||
|
||||
MY_P="gc-${PV}"
|
||||
|
||||
DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
|
||||
HOMEPAGE="http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
|
||||
SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="boehm-gc"
|
||||
# SONAME: libgc.so.1 libgccpp.so.1
|
||||
# We've been using subslot 0 for these instead of "1.1".
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="cxx static-libs +threads"
|
||||
|
||||
DEPEND="
|
||||
>=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]
|
||||
virtual/pkgconfig"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
elibtoolize #594754
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local config=(
|
||||
--disable-docs
|
||||
--with-libatomic-ops
|
||||
$(use_enable cxx cplusplus)
|
||||
$(use_enable static-libs static)
|
||||
$(use threads || echo --disable-threads)
|
||||
)
|
||||
|
||||
ECONF_SOURCE=${S} econf "${config[@]}"
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
local HTML_DOCS=( doc/*.html )
|
||||
einstalldocs
|
||||
dodoc doc/README{.environment,.linux,.macros}
|
||||
|
||||
# package provides .pc files
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
|
||||
newman doc/gc.man GC_malloc.1
|
||||
}
|
@ -0,0 +1,53 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit multilib-minimal libtool
|
||||
|
||||
MY_P="gc-${PV}"
|
||||
|
||||
DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
|
||||
HOMEPAGE="http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
|
||||
SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="boehm-gc"
|
||||
# SONAME: libgc.so.1 libgccpp.so.1
|
||||
# We've been using subslot 0 for these instead of "1.1".
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="cxx static-libs +threads"
|
||||
|
||||
DEPEND="
|
||||
>=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]
|
||||
virtual/pkgconfig"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
elibtoolize #594754
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local config=(
|
||||
--disable-docs
|
||||
--with-libatomic-ops
|
||||
$(use_enable cxx cplusplus)
|
||||
$(use_enable static-libs static)
|
||||
$(use threads || echo --disable-threads)
|
||||
)
|
||||
|
||||
ECONF_SOURCE=${S} econf "${config[@]}"
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
local HTML_DOCS=( doc/*.md )
|
||||
einstalldocs
|
||||
dodoc doc/README{.environment,.linux,.macros}
|
||||
|
||||
# package provides .pc files
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
|
||||
newman doc/gc.man GC_malloc.1
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue