parent
5a954ff2bd
commit
115d9bbfca
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST qhexedit2-0.8.4.tar.gz 340766 BLAKE2B af24031fdd9f8d677f7e8ab8fd69667852dd971db30f5406b9aaaa08bf7f2dc692c87e99c141f355adc82c8226b5b29f53ce07ba63656d866f8688cb2cbc67f2 SHA512 8ed831d75c8ec1897dfd7ef497423908b26b0f56e6577928ed035654e52b437f64edd61cfcc1de6eaf5d1f29f9dc97da84d2edd7f427e3c09c9d75d7bc6504ff
|
||||
DIST qhexedit2-0.8.4_p20170719.tar.gz 342037 BLAKE2B 667a7c3e93ed3422f21da53b6811fca53b210cfaf2603cf2a61e377e68f295b5024a9fa73d444c1e50af274bdbc6faa62bc2ab4aad176a8b3a6d7540117c5a30 SHA512 3c412b9bbe4f84f6f445b6ad530fc51dc5422a0a5bb6184edc7df92595aa5215c345e2b16effae8de758b299c5f7f7d44cf54dd65a180941c30790194679baa8
|
||||
|
@ -0,0 +1,86 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_5,3_6} )
|
||||
|
||||
DISTUTILS_OPTIONAL=1
|
||||
|
||||
inherit distutils-r1 qmake-utils
|
||||
|
||||
EGIT_COMMIT="5f3ca79dbe8c765b685636a1751d242a6bfabb7d"
|
||||
DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
|
||||
HOMEPAGE="https://github.com/lancos/qhexedit2/"
|
||||
SRC_URI="https://github.com/lancos/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc +gui python"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.8.4-fixtest.patch"
|
||||
"${FILESDIR}/${PN}-0.8.4-setup.py.patch"
|
||||
)
|
||||
|
||||
RDEPEND="
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
python? (
|
||||
dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
|
||||
dev-python/sip[${PYTHON_USEDEP}]
|
||||
${PYTHON_DEPS}
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \
|
||||
-e "\$aINSTALLS += target" src/qhexedit.pro \
|
||||
|| die "src/qhexedit.pro: sed failed"
|
||||
use python && distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
eqmake5 src/qhexedit.pro
|
||||
if use gui; then
|
||||
cd example || die "can't cd example"
|
||||
eqmake5 qhexedit.pro
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
use python && distutils-r1_src_compile
|
||||
use gui && emake -C example
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
use python && distutils-r1_python_compile build_ext --library-dirs="${S}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd test || die "can't cd test"
|
||||
mkdir logs || die "can't create logs dir"
|
||||
eqmake5 chunks.pro
|
||||
emake
|
||||
./chunks || die "test run failed"
|
||||
grep -q "^NOK" logs/Summary.log && die "test failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake INSTALL_ROOT="${D}" install
|
||||
doheader src/*.h
|
||||
use python && distutils-r1_src_install
|
||||
use gui && dobin example/qhexedit
|
||||
if use doc; then
|
||||
dodoc -r doc/html
|
||||
dodoc doc/release.txt
|
||||
fi
|
||||
}
|
Binary file not shown.
Binary file not shown.
@ -1,3 +1,5 @@
|
||||
DIST fcitx-mozc-2.18.2612.102.1.patch 140722 BLAKE2B a412b8dd94bcf44f7fd946bcc1072f3dde7d8d8da55d3ad04ef5d8ef851a63f4d4d8e7e6249172a9d1e75e1f1672e32e6a673e6016d94b034f80d23b660a80e2 SHA512 725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb
|
||||
DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3 SHA512 e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
|
||||
DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
|
||||
DIST mozc-2.20.2673.102.tar.gz 48624369 BLAKE2B 0d80065f989c1f61e5f2852e7f471dd83777323b21499c118dc87f4fd6596329ab096dd64db3419895090ab61d6aef9a07e61c7fddeaf4f3a40ce3f3acbad949 SHA512 ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae
|
||||
DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
|
||||
|
@ -0,0 +1,274 @@
|
||||
--- /src/gyp/defines.gypi
|
||||
+++ /src/gyp/defines.gypi
|
||||
@@ -71,6 +71,12 @@
|
||||
# use_libibus represents if ibus library is used or not.
|
||||
# This option is only for Linux.
|
||||
'use_libibus%': '0',
|
||||
+
|
||||
+ # use_libgtest represents if gtest library is used or not.
|
||||
+ 'use_libgtest%': '0',
|
||||
+
|
||||
+ # use_libjsoncpp represents if jsoncpp library is used or not.
|
||||
+ 'use_libjsoncpp%': '0',
|
||||
},
|
||||
'target_defaults': {
|
||||
'defines': [
|
||||
--- /src/net/jsoncpp.gyp
|
||||
+++ /src/net/jsoncpp.gyp
|
||||
@@ -31,32 +31,57 @@
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'jsoncpp',
|
||||
- 'type': 'static_library',
|
||||
- 'variables': {
|
||||
- 'jsoncpp_root': '<(third_party_dir)/jsoncpp',
|
||||
- 'jsoncpp_srcs': [
|
||||
- '<(jsoncpp_root)/src/lib_json/json_reader.cpp',
|
||||
- '<(jsoncpp_root)/src/lib_json/json_value.cpp',
|
||||
- '<(jsoncpp_root)/src/lib_json/json_writer.cpp',
|
||||
- ],
|
||||
- 'jsoncpp_include_dirs': ['<(jsoncpp_root)/include'],
|
||||
- 'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'],
|
||||
- },
|
||||
- 'defines': [
|
||||
- '<@(jsoncpp_additional_macros)',
|
||||
+ 'conditions': [
|
||||
+ ['use_libjsoncpp==1', {
|
||||
+ 'type': 'none',
|
||||
+ 'variables': {
|
||||
+ 'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'],
|
||||
+ },
|
||||
+ 'all_dependent_settings': {
|
||||
+ 'defines': [
|
||||
+ '<@(jsoncpp_additional_macros)',
|
||||
+ ],
|
||||
+ 'cflags': [
|
||||
+ '<!@(pkg-config --cflags jsoncpp)',
|
||||
+ ],
|
||||
+ 'link_settings': {
|
||||
+ 'libraries': [
|
||||
+ '<!@(pkg-config --libs-only-l jsoncpp)',
|
||||
+ ],
|
||||
+ 'ldflags': [
|
||||
+ '<!@(pkg-config --libs-only-L jsoncpp)',
|
||||
+ ],
|
||||
+ }
|
||||
+ },
|
||||
+ }, {
|
||||
+ 'type': 'static_library',
|
||||
+ 'variables': {
|
||||
+ 'jsoncpp_root': '<(third_party_dir)/jsoncpp',
|
||||
+ 'jsoncpp_srcs': [
|
||||
+ '<(jsoncpp_root)/src/lib_json/json_reader.cpp',
|
||||
+ '<(jsoncpp_root)/src/lib_json/json_value.cpp',
|
||||
+ '<(jsoncpp_root)/src/lib_json/json_writer.cpp',
|
||||
+ ],
|
||||
+ 'jsoncpp_include_dirs': ['<(jsoncpp_root)/include'],
|
||||
+ 'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'],
|
||||
+ },
|
||||
+ 'defines': [
|
||||
+ '<@(jsoncpp_additional_macros)',
|
||||
+ ],
|
||||
+ 'sources': [
|
||||
+ '<@(jsoncpp_srcs)',
|
||||
+ 'jsoncpp.h',
|
||||
+ ],
|
||||
+ 'include_dirs': [
|
||||
+ '<@(jsoncpp_include_dirs)',
|
||||
+ ],
|
||||
+ 'all_dependent_settings': {
|
||||
+ 'defines': [
|
||||
+ '<@(jsoncpp_additional_macros)',
|
||||
+ ],
|
||||
+ },
|
||||
+ }],
|
||||
],
|
||||
- 'sources': [
|
||||
- '<@(jsoncpp_srcs)',
|
||||
- 'jsoncpp.h',
|
||||
- ],
|
||||
- 'include_dirs': [
|
||||
- '<@(jsoncpp_include_dirs)',
|
||||
- ],
|
||||
- 'all_dependent_settings': {
|
||||
- 'defines': [
|
||||
- '<@(jsoncpp_additional_macros)',
|
||||
- ],
|
||||
- },
|
||||
},
|
||||
],
|
||||
}
|
||||
--- /src/net/jsoncpp.h
|
||||
+++ /src/net/jsoncpp.h
|
||||
@@ -35,7 +35,7 @@
|
||||
// Mozc basically disables C++ exception.
|
||||
#define JSON_USE_EXCEPTION 0
|
||||
#endif // !JSON_USE_EXCEPTION
|
||||
-#include "third_party/jsoncpp/include/json/json.h"
|
||||
+#include <json/json.h>
|
||||
#define MOZC_JSONCPP_JSON_H_INCLUDED
|
||||
#endif // !MOZC_JSONCPP_JSON_H_INCLUDED
|
||||
|
||||
--- /src/testing/testing.gyp
|
||||
+++ /src/testing/testing.gyp
|
||||
@@ -53,66 +53,101 @@
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'testing',
|
||||
- 'type': 'static_library',
|
||||
- 'variables': {
|
||||
- 'gtest_defines': [
|
||||
- 'GTEST_LANG_CXX11=1',
|
||||
- 'GTEST_HAS_TR1_TUPLE=0', # disable tr1 tuple in favor of C++11 tuple.
|
||||
- ],
|
||||
- 'gtest_dir': '<(third_party_dir)/gtest/googletest',
|
||||
- 'gmock_dir': '<(third_party_dir)/gtest/googlemock',
|
||||
- 'conditions': [
|
||||
- ['_toolset=="target" and target_platform=="Android"', {
|
||||
- 'gtest_defines': [
|
||||
- 'GTEST_HAS_RTTI=0', # Android NDKr7 requires this.
|
||||
- 'GTEST_HAS_CLONE=0',
|
||||
- 'GTEST_HAS_GLOBAL_WSTRING=0',
|
||||
- 'GTEST_HAS_POSIX_RE=0',
|
||||
- 'GTEST_HAS_STD_WSTRING=0',
|
||||
- 'GTEST_OS_LINUX=1',
|
||||
- 'GTEST_OS_LINUX_ANDROID=1',
|
||||
- ],
|
||||
- }],
|
||||
- ],
|
||||
- },
|
||||
- 'sources': [
|
||||
- '<(gmock_dir)/src/gmock-cardinalities.cc',
|
||||
- '<(gmock_dir)/src/gmock-internal-utils.cc',
|
||||
- '<(gmock_dir)/src/gmock-matchers.cc',
|
||||
- '<(gmock_dir)/src/gmock-spec-builders.cc',
|
||||
- '<(gmock_dir)/src/gmock.cc',
|
||||
- '<(gtest_dir)/src/gtest-death-test.cc',
|
||||
- '<(gtest_dir)/src/gtest-filepath.cc',
|
||||
- '<(gtest_dir)/src/gtest-port.cc',
|
||||
- '<(gtest_dir)/src/gtest-printers.cc',
|
||||
- '<(gtest_dir)/src/gtest-test-part.cc',
|
||||
- '<(gtest_dir)/src/gtest-typed-test.cc',
|
||||
- '<(gtest_dir)/src/gtest.cc',
|
||||
- ],
|
||||
- 'include_dirs': [
|
||||
- '<(gmock_dir)',
|
||||
- '<(gmock_dir)/include',
|
||||
- '<(gtest_dir)',
|
||||
- '<(gtest_dir)/include',
|
||||
- ],
|
||||
- 'defines': [
|
||||
- '<@(gtest_defines)',
|
||||
- ],
|
||||
- 'all_dependent_settings': {
|
||||
- 'defines': [
|
||||
- '<@(gtest_defines)',
|
||||
- ],
|
||||
- 'include_dirs': [
|
||||
- '<(gmock_dir)/include',
|
||||
- '<(gtest_dir)/include',
|
||||
- ],
|
||||
- },
|
||||
'conditions': [
|
||||
- ['(_toolset=="target" and compiler_target=="clang") or '
|
||||
- '(_toolset=="host" and compiler_host=="clang")', {
|
||||
- 'cflags': [
|
||||
- '-Wno-missing-field-initializers',
|
||||
- '-Wno-unused-private-field',
|
||||
+ ['use_libgtest==1', {
|
||||
+ 'type': 'none',
|
||||
+ 'variables': {
|
||||
+ 'gtest_defines': [
|
||||
+ 'GTEST_LANG_CXX11=1',
|
||||
+ 'GTEST_HAS_TR1_TUPLE=0', # disable tr1 tuple in favor of C++11 tuple.
|
||||
+ ],
|
||||
+ 'conditions': [
|
||||
+ ['_toolset=="target" and target_platform=="Android"', {
|
||||
+ 'gtest_defines': [
|
||||
+ 'GTEST_HAS_RTTI=0', # Android NDKr7 requires this.
|
||||
+ 'GTEST_HAS_CLONE=0',
|
||||
+ 'GTEST_HAS_GLOBAL_WSTRING=0',
|
||||
+ 'GTEST_HAS_POSIX_RE=0',
|
||||
+ 'GTEST_HAS_STD_WSTRING=0',
|
||||
+ 'GTEST_OS_LINUX=1',
|
||||
+ 'GTEST_OS_LINUX_ANDROID=1',
|
||||
+ ],
|
||||
+ }],
|
||||
+ ],
|
||||
+ },
|
||||
+ 'all_dependent_settings': {
|
||||
+ 'defines': [
|
||||
+ '<@(gtest_defines)',
|
||||
+ ],
|
||||
+ 'link_settings': {
|
||||
+ 'libraries': [
|
||||
+ '-lgmock -lgtest',
|
||||
+ ],
|
||||
+ },
|
||||
+ },
|
||||
+ }, {
|
||||
+ 'type': 'static_library',
|
||||
+ 'variables': {
|
||||
+ 'gtest_defines': [
|
||||
+ 'GTEST_LANG_CXX11=1',
|
||||
+ 'GTEST_HAS_TR1_TUPLE=0', # disable tr1 tuple in favor of C++11 tuple.
|
||||
+ ],
|
||||
+ 'gtest_dir': '<(third_party_dir)/gtest/googletest',
|
||||
+ 'gmock_dir': '<(third_party_dir)/gtest/googlemock',
|
||||
+ 'conditions': [
|
||||
+ ['_toolset=="target" and target_platform=="Android"', {
|
||||
+ 'gtest_defines': [
|
||||
+ 'GTEST_HAS_RTTI=0', # Android NDKr7 requires this.
|
||||
+ 'GTEST_HAS_CLONE=0',
|
||||
+ 'GTEST_HAS_GLOBAL_WSTRING=0',
|
||||
+ 'GTEST_HAS_POSIX_RE=0',
|
||||
+ 'GTEST_HAS_STD_WSTRING=0',
|
||||
+ 'GTEST_OS_LINUX=1',
|
||||
+ 'GTEST_OS_LINUX_ANDROID=1',
|
||||
+ ],
|
||||
+ }],
|
||||
+ ],
|
||||
+ },
|
||||
+ 'sources': [
|
||||
+ '<(gmock_dir)/src/gmock-cardinalities.cc',
|
||||
+ '<(gmock_dir)/src/gmock-internal-utils.cc',
|
||||
+ '<(gmock_dir)/src/gmock-matchers.cc',
|
||||
+ '<(gmock_dir)/src/gmock-spec-builders.cc',
|
||||
+ '<(gmock_dir)/src/gmock.cc',
|
||||
+ '<(gtest_dir)/src/gtest-death-test.cc',
|
||||
+ '<(gtest_dir)/src/gtest-filepath.cc',
|
||||
+ '<(gtest_dir)/src/gtest-port.cc',
|
||||
+ '<(gtest_dir)/src/gtest-printers.cc',
|
||||
+ '<(gtest_dir)/src/gtest-test-part.cc',
|
||||
+ '<(gtest_dir)/src/gtest-typed-test.cc',
|
||||
+ '<(gtest_dir)/src/gtest.cc',
|
||||
+ ],
|
||||
+ 'include_dirs': [
|
||||
+ '<(gmock_dir)',
|
||||
+ '<(gmock_dir)/include',
|
||||
+ '<(gtest_dir)',
|
||||
+ '<(gtest_dir)/include',
|
||||
+ ],
|
||||
+ 'defines': [
|
||||
+ '<@(gtest_defines)',
|
||||
+ ],
|
||||
+ 'all_dependent_settings': {
|
||||
+ 'defines': [
|
||||
+ '<@(gtest_defines)',
|
||||
+ ],
|
||||
+ 'include_dirs': [
|
||||
+ '<(gmock_dir)/include',
|
||||
+ '<(gtest_dir)/include',
|
||||
+ ],
|
||||
+ },
|
||||
+ 'conditions': [
|
||||
+ ['(_toolset=="target" and compiler_target=="clang") or '
|
||||
+ '(_toolset=="host" and compiler_host=="clang")', {
|
||||
+ 'cflags': [
|
||||
+ '-Wno-missing-field-initializers',
|
||||
+ '-Wno-unused-private-field',
|
||||
+ ],
|
||||
+ }],
|
||||
],
|
||||
}],
|
||||
],
|
@ -0,0 +1,322 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
PYTHON_COMPAT=(python2_7)
|
||||
|
||||
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
|
||||
|
||||
if [[ "${PV}" == "9999" ]]; then
|
||||
inherit git-r3
|
||||
|
||||
EGIT_REPO_URI="https://github.com/google/mozc"
|
||||
EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
|
||||
else
|
||||
MOZC_GIT_REVISION="afb03ddfe72dde4cf2409863a3bfea160f7a66d8"
|
||||
JAPANESE_USAGE_DICTIONARY_GIT_REVISION="e5b3425575734c323e1d947009dd74709437b684"
|
||||
JAPANESE_USAGE_DICTIONARY_DATE="20120416091336"
|
||||
FCITX_PATCH_VERSION="2.23.2815.102.1"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Mozc - Japanese input method editor"
|
||||
HOMEPAGE="https://github.com/google/mozc"
|
||||
if [[ "${PV}" == "9999" ]]; then
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz
|
||||
https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
|
||||
fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
|
||||
fi
|
||||
|
||||
# Mozc: BSD
|
||||
# src/data/dictionary_oss: ipadic, public-domain
|
||||
# src/data/unicode: unicode
|
||||
# japanese-usage-dictionary: BSD-2
|
||||
LICENSE="BSD BSD-2 ipadic public-domain unicode"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc64 ~x86"
|
||||
IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
|
||||
REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
|
||||
|
||||
RDEPEND=">=dev-libs/protobuf-3.0.0:=
|
||||
emacs? ( virtual/emacs )
|
||||
fcitx4? ( app-i18n/fcitx:4 )
|
||||
gui? (
|
||||
app-i18n/zinnia
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese )
|
||||
handwriting-tomoe? ( app-i18n/zinnia-tomoe )
|
||||
)
|
||||
ibus? (
|
||||
>=app-i18n/ibus-1.4.1
|
||||
dev-libs/glib:2
|
||||
x11-libs/libxcb
|
||||
)
|
||||
renderer? (
|
||||
dev-libs/glib:2
|
||||
x11-libs/cairo
|
||||
x11-libs/gtk+:2
|
||||
x11-libs/pango
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
dev-util/gyp
|
||||
dev-util/ninja
|
||||
virtual/pkgconfig
|
||||
test? (
|
||||
>=dev-cpp/gtest-1.8.0
|
||||
dev-libs/jsoncpp
|
||||
)"
|
||||
|
||||
S="${WORKDIR}/${P}/src"
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
execute() {
|
||||
einfo "$@"
|
||||
"$@"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ "${PV}" == "9999" ]]; then
|
||||
git-r3_src_unpack
|
||||
|
||||
if use fcitx4; then
|
||||
local EGIT_SUBMODULES=()
|
||||
git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
|
||||
git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
|
||||
fi
|
||||
else
|
||||
unpack ${P}.tar.gz
|
||||
mv mozc-${MOZC_GIT_REVISION} ${P} || die
|
||||
|
||||
unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
|
||||
cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
|
||||
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
|
||||
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
|
||||
|
||||
if use fcitx4; then
|
||||
if [[ "${PV}" == "9999" ]]; then
|
||||
cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
|
||||
else
|
||||
eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch"
|
||||
fi
|
||||
fi
|
||||
|
||||
eapply_user
|
||||
|
||||
sed \
|
||||
-e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
|
||||
-e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
|
||||
-e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
|
||||
-i build_mozc.py || die
|
||||
|
||||
sed \
|
||||
-e "s/'release_extra_cflags%': \['-O2'\]/'release_extra_cflags%': []/" \
|
||||
-e "s/'debug_extra_cflags%': \['-O0', '-g'\]/'debug_extra_cflags%': []/" \
|
||||
-i gyp/common.gypi || die
|
||||
|
||||
local ar=($(tc-getAR))
|
||||
local cc=($(tc-getCC))
|
||||
local cxx=($(tc-getCXX))
|
||||
local ld=($(tc-getLD))
|
||||
local nm=($(tc-getNM))
|
||||
local readelf=($(tc-getPROG READELF readelf))
|
||||
|
||||
# Use absolute paths. Non-absolute paths are mishandled by GYP.
|
||||
ar[0]=$(type -P ${ar[0]})
|
||||
cc[0]=$(type -P ${cc[0]})
|
||||
cxx[0]=$(type -P ${cxx[0]})
|
||||
ld[0]=$(type -P ${ld[0]})
|
||||
nm[0]=$(type -P ${nm[0]})
|
||||
readelf[0]=$(type -P ${readelf[0]})
|
||||
|
||||
sed \
|
||||
-e "s:<!(which ar):${ar[@]}:" \
|
||||
-e "s:<!(which clang):${cc[@]}:" \
|
||||
-e "s:<!(which clang++):${cxx[@]}:" \
|
||||
-e "s:<!(which ld):${ld[@]}:" \
|
||||
-e "s:<!(which nm):${nm[@]}:" \
|
||||
-e "s:<!(which readelf):${readelf[@]}:" \
|
||||
-i gyp/common.gypi || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use debug; then
|
||||
BUILD_TYPE="Debug"
|
||||
else
|
||||
BUILD_TYPE="Release"
|
||||
fi
|
||||
|
||||
local gyp_arguments=()
|
||||
|
||||
if tc-is-gcc; then
|
||||
gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
|
||||
elif tc-is-clang; then
|
||||
gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
|
||||
else
|
||||
gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
|
||||
fi
|
||||
|
||||
gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
|
||||
gyp_arguments+=(-D use_fcitx5=NO)
|
||||
gyp_arguments+=(-D use_libgtest=$(usex test 1 0))
|
||||
gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
|
||||
gyp_arguments+=(-D use_libjsoncpp=$(usex test 1 0))
|
||||
gyp_arguments+=(-D use_libprotobuf=1)
|
||||
gyp_arguments+=(-D use_libzinnia=$(usex gui 1 0))
|
||||
gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
|
||||
|
||||
gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
|
||||
gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
|
||||
|
||||
if use handwriting-tegaki; then
|
||||
gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model")
|
||||
elif use handwriting-tomoe; then
|
||||
gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model")
|
||||
fi
|
||||
|
||||
if use ibus; then
|
||||
gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
|
||||
gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
|
||||
fi
|
||||
|
||||
unset AR CC CXX LD NM READELF
|
||||
|
||||
execute "${PYTHON}" build_mozc.py gyp \
|
||||
--gypdir="${EPREFIX}/usr/bin" \
|
||||
--server_dir="${EPREFIX}/usr/libexec/mozc" \
|
||||
--verbose \
|
||||
$(usex gui "" --noqt) \
|
||||
-- "${gyp_arguments[@]}" || die "Configuration failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local targets=(server/server.gyp:mozc_server)
|
||||
if use emacs; then
|
||||
targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
|
||||
fi
|
||||
if use fcitx4; then
|
||||
targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
|
||||
fi
|
||||
if use gui; then
|
||||
targets+=(gui/gui.gyp:mozc_tool)
|
||||
fi
|
||||
if use ibus; then
|
||||
targets+=(unix/ibus/ibus.gyp:ibus_mozc)
|
||||
fi
|
||||
if use renderer; then
|
||||
targets+=(renderer/renderer.gyp:mozc_renderer)
|
||||
fi
|
||||
if use test; then
|
||||
targets+=(gyp/tests.gyp:unittests)
|
||||
fi
|
||||
|
||||
execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed"
|
||||
|
||||
if use emacs; then
|
||||
elisp-compile unix/emacs/*.el
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
exeinto /usr/libexec/mozc
|
||||
doexe out_linux/${BUILD_TYPE}/mozc_server
|
||||
|
||||
if use gui; then
|
||||
doexe out_linux/${BUILD_TYPE}/mozc_tool
|
||||
fi
|
||||
|
||||
if use renderer; then
|
||||
doexe out_linux/${BUILD_TYPE}/mozc_renderer
|
||||
fi
|
||||
|
||||
insinto /usr/libexec/mozc/documents
|
||||
doins data/installer/credits_en.html
|
||||
|
||||
if use emacs; then
|
||||
dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
|
||||
elisp-install ${PN} unix/emacs/*.{el,elc}
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
|
||||
fi
|
||||
|
||||
if use fcitx4; then
|
||||
exeinto /usr/$(get_libdir)/fcitx
|
||||
doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
|
||||
|
||||
insinto /usr/share/fcitx/addon
|
||||
doins unix/fcitx/fcitx-mozc.conf
|
||||
|
||||
insinto /usr/share/fcitx/inputmethod
|
||||
doins unix/fcitx/mozc.conf
|
||||
|
||||
insinto /usr/share/fcitx/mozc/icon
|
||||
newins data/images/product_icon_32bpp-128.png mozc.png
|
||||
local image
|
||||
for image in data/images/unix/ui-*.png; do
|
||||
newins "${image}" "mozc-${image#data/images/unix/ui-}"
|
||||
done
|
||||
|
||||
local locale mo_file
|
||||
for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
|
||||
locale="${mo_file##*/}"
|
||||
locale="${locale%.mo}"
|
||||
insinto /usr/share/locale/${locale}/LC_MESSAGES
|
||||
newins "${mo_file}" fcitx-mozc.mo
|
||||
done
|
||||
fi
|
||||
|
||||
if use ibus; then
|
||||
exeinto /usr/libexec
|
||||
newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
|
||||
|
||||
insinto /usr/share/ibus/component
|
||||
doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
|
||||
|
||||
insinto /usr/share/ibus-mozc
|
||||
newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
|
||||
local image
|
||||
for image in data/images/unix/ui-*.png; do
|
||||
newins "${image}" "${image#data/images/unix/ui-}"
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use emacs; then
|
||||
elisp-site-regen
|
||||
|
||||
elog "USAGE IN EMACS"
|
||||
elog
|
||||
elog "mozc-mode is minor mode to input Japanese text using Mozc server."
|
||||
elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
|
||||
elog
|
||||
elog "In order to use mozc-mode by default, the following settings should be added to"
|
||||
elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
|
||||
elog
|
||||
elog " (require 'mozc)"
|
||||
elog " (set-language-environment \"Japanese\")"
|
||||
elog " (setq default-input-method \"japanese-mozc\")"
|
||||
elog
|
||||
elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
|
||||
elog "by default) will enable mozc-mode."
|
||||
elog
|
||||
elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
|
||||
elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
@ -1,3 +1,2 @@
|
||||
DIST scim-1.4.14.tar.gz 1519287 BLAKE2B 6bd2f7328e9a75c392b0f8d1d096b09b55dc88489e4524213743a9be61b29b2d610d20394d59aa83001d17d7a210e30627ab06148a4677b02344a2872608babd SHA512 00fe7a1b40b69aae123c0a1e67eb3744ad1e6b1e66726bb011a7426bd28012c52b346c62f08c7ecf0977ac3e88ee416337c9fa89b39142d5eea338d99641f5df
|
||||
DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
|
||||
DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
|
||||
|
@ -1,112 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="4"
|
||||
inherit eutils flag-o-matic multilib gnome2-utils autotools-utils qmake-utils
|
||||
|
||||
DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
|
||||
HOMEPAGE="http://www.scim-im.org/"
|
||||
SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
|
||||
IUSE="doc gtk3 qt4"
|
||||
|
||||
RDEPEND="x11-libs/libX11
|
||||
dev-libs/glib:2
|
||||
gtk3? ( x11-libs/gtk+:3 )
|
||||
!gtk3? ( x11-libs/gtk+:2 )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
)
|
||||
>=dev-libs/atk-1
|
||||
>=x11-libs/pango-1
|
||||
!app-i18n/scim-cvs"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-doc/doxygen
|
||||
>=app-text/docbook-xsl-stylesheets-1.73.1 )
|
||||
dev-lang/perl
|
||||
virtual/pkgconfig
|
||||
>=dev-util/intltool-0.33
|
||||
sys-devel/libtool"
|
||||
AUTOTOOLS_IN_SOURCE_BUILD=1
|
||||
DOCS=(
|
||||
README
|
||||
AUTHORS
|
||||
ChangeLog
|
||||
docs/developers
|
||||
docs/scim.cfg
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local gtk_version
|
||||
if use gtk3; then
|
||||
gtk_version="--with-gtk-version=3"
|
||||
else
|
||||
gtk_version="--with-gtk-version=2"
|
||||
fi
|
||||
|
||||
# bug #83625
|
||||
filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
|
||||
local myeconfargs=(
|
||||
$(use_with doc doxygen)
|
||||
--enable-ld-version-script
|
||||
$gtk_version
|
||||
--disable-qt3-immodule
|
||||
$(use_enable qt4 qt4-immodule)
|
||||
--with-qt4-moc="$(qt4_get_bindir)/moc"
|
||||
)
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
autotools-utils_src_compile
|
||||
use doc && emake docs
|
||||
}
|
||||
|
||||
src_install() {
|
||||
use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/docs/html/")
|
||||
autotools-utils_src_install
|
||||
|
||||
sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
|
||||
insinto /etc/X11/xinit/xinput.d
|
||||
doins "${T}/${PN}.conf"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog
|
||||
elog "To use SCIM with both GTK2 and XIM, you should use the following"
|
||||
elog "in your user startup scripts such as .gnomerc or .xinitrc:"
|
||||
elog
|
||||
elog "LANG='your_language' scim -d"
|
||||
elog "export XMODIFIERS=@im=SCIM"
|
||||
elog "export GTK_IM_MODULE=\"scim\""
|
||||
elog "export QT_IM_MODULE=\"scim\""
|
||||
elog
|
||||
elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
|
||||
elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
|
||||
elog
|
||||
elog "To use Chinese input methods:"
|
||||
elog " # emerge app-i18n/scim-tables app-i18n/scim-pinyin"
|
||||
elog "To use Korean input methods:"
|
||||
elog " # emerge app-i18n/scim-hangul"
|
||||
elog "To use Japanese input methods:"
|
||||
elog " # emerge app-i18n/scim-anthy"
|
||||
elog "To use various input methods (more than 30 languages):"
|
||||
elog " # emerge app-i18n/scim-m17n"
|
||||
elog
|
||||
elog "Please modify ${EPREFIX}/etc/scim/global and add your UTF-8 locale to"
|
||||
elog "/SupportedUnicodeLocales entry."
|
||||
elog
|
||||
ewarn
|
||||
ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
|
||||
ewarn
|
||||
|
||||
gnome2_query_immodules_gtk2
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_query_immodules_gtk2
|
||||
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +1 @@
|
||||
DIST m17n-db-1.6.3.tar.gz 1384587 BLAKE2B 2b2e66120894d1ea80deb65123553d1f168999dd7efc8824e033a6549108ee9b84dabb40e14f8516e25324d9b3c0da205a4e2a0453c12acd3959dc15211abe29 SHA512 4a808b7f8298b9c15c479e7e2dbe26dfe39b0756da5f7a5f968700950d5e41527ce935bc6ced6e65d5e0d57c5f8402dba7f6001144f805129def8237d272625f
|
||||
DIST m17n-db-1.6.4.tar.gz 1390344 BLAKE2B a54194565093cea04ca19d9f49f442b5df080e72a0380bcc0210c921e13efcdf27eaecd4860f1755220a6c9a37e7474f54c9646eef70e07263a1462f96120161 SHA512 54016284335630fca5403e540863aaff5f135429c5716c35404fc38d40544c03a213ad26af5ea7eb82567b11f4645608f66cde95036187e6e23ce0dae17e2324
|
||||
DIST m17n-db-1.7.0.tar.gz 1939608 BLAKE2B 1b79e6ad32336a9ce34e14a52907b4064c410f70e356797ef59b1c9b8c83180453d820475b4dfb486eb1eb1d063607274b561a5120a60db0e0cfccad53d67eca SHA512 02c3cb347e9f5c840a723de9ed85be84fc9fb5f86d4963f0d1c6b669045d37d10e5efcf5ac0e0c3cb7249fb391b0dd32bd50fbc3332455aaf0b49d96fc09b2f2
|
||||
|
@ -1,26 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
DESCRIPTION="Database for the m17n library"
|
||||
HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
|
||||
SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="sys-devel/gettext"
|
||||
RDEPEND="virtual/libintl"
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
docinto FORMATS
|
||||
dodoc FORMATS/*
|
||||
|
||||
docinto UNIDATA
|
||||
dodoc UNIDATA/*
|
||||
}
|
@ -1,26 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
DESCRIPTION="Database for the m17n library"
|
||||
HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
|
||||
SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="sys-devel/gettext"
|
||||
RDEPEND="virtual/libintl"
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
docinto FORMATS
|
||||
dodoc FORMATS/*
|
||||
|
||||
docinto UNIDATA
|
||||
dodoc UNIDATA/*
|
||||
}
|
@ -1,15 +1,12 @@
|
||||
DIST sqlite-autoconf-3190300.tar.gz 2542682 BLAKE2B bcbc3ce87b569c2d84c099776db292b10fc0100ec10a285bbb8819b996994aa020d5576620363e9b45debf27481e3f17a8589b71aa7551f4ee44b137d4c538a1 SHA512 7896c99726da75818f1027d5675b24724bc89c738874c868868e60c09d4509ad5a6da93f54cfcecb3a1052e4f164f7cb864ede333b9ccfb4f6b811b052ca1d3d
|
||||
DIST sqlite-autoconf-3200000.tar.gz 2565548 BLAKE2B 29d88fb8597b6ef7c7b3613c73d8b912cd22e1354c664a2edae0b5d0379103b1025a54d83f24ee74159bed3b928627cb1a50c8df48658ba0cdc5ce7fdbfa5920 SHA512 f5b0ffcc27adeed5b27b29962d03defa167151868f2281c5642a8ddfa10ac8971aff22081a5b46bd36bcf664bd271975e80249ec403b73656658b33af084ec94
|
||||
DIST sqlite-autoconf-3200100.tar.gz 2565638 BLAKE2B bd1d32c211ea906cb2dbf78ea54d364db1a642d8a3b2751a427521a9da3391a2cd23c1ecdc5ff70b68f4166c583e69373f566cb04847295542185ab598e79c1b SHA512 56e3d326ea2225cadc628c3518d46d9f7c4bafa0e3612f2b7ab0dc0d79fcbb7e095f6d84a9a48e1c6d83adcdc8706ad5ac4404f0f622c7fe38cfde3a7e7e69f0
|
||||
DIST sqlite-autoconf-3210000.tar.gz 2568942 BLAKE2B 83a7095fd5fd5447a3c16816ceb9f51f393de9689942bd4eb4c6eafe357a1dd1783500f8faf2765fa6628da6a39f550237b661af1337ac063ca285f5f0a5218e SHA512 8f00708965eacef171620c49538f75768d350ec3f2bfef412a5c70af865ab03b6a64ce1e65d9fdb3d66f4d00262a30fc162b01fd69f63c05c14d5243374b6298
|
||||
DIST sqlite-autoconf-3220000.tar.gz 2644649 BLAKE2B e73fd7846362e6cc07eb96ea18e8883c1473c2b07c6e0c89e7e65726c5a6556b50bac71904a5b3a431ba40ff72b32e55c3e5ab7461567b5643560a0790a9a4dd SHA512 13e791bb1d7ba7edb5d84f4945f36ce2e03898a5bb1612d28799ef35a100f32e85cbb38f4ef65a7b43d020e5d48bf09b2e79cbb2003cc8aca2b09458b8c5d5bc
|
||||
DIST sqlite-doc-3190300.zip 5649351 BLAKE2B f0bc52bebe6e3c4be227d8f6cf2689fb2f6d46e6472d61334a7959697d4017dcee87c4ff146293f13a88e69990c2e7f291e4ad8ae5359c378e1bcecf6dfe2aa1 SHA512 4f99b6797f76dab1859eaf4596c42d6b10a80a1ad9dcb33b82fcc4ef80a8e8299ac24c0d2a0f41debf9e82d43c9ecf9675547eb6163756f29afe847613ef75f3
|
||||
DIST sqlite-doc-3200000.zip 5695366 BLAKE2B 0e6dba7666d449875026772204943c892e8984a85cd517a33d7a5bdccb352070fc2cc8012b9b57b70c2436587ab5d6840ef329253bcb27c7c1cd10b0b4c30c06 SHA512 0dfa9487c5e4084a9c17e8bf83a92b9a2cd53642efeff0b12051ecdeaf11e3896031f1b4d59021354a293b8acc8c6fcab827961721fda7a5de8415460d3bd280
|
||||
DIST sqlite-autoconf-3230100.tar.gz 2675362 BLAKE2B 2dd075f0dc05425563a8e679bb463724296294b5845746f06b51a24c9601be203ee0f2213f43eaca0757fcbb54b777cee746d873c98f377a0b010d8066d7fcb5 SHA512 52cae7ed0678b763d40373ae260672b906861379428529a58a017cbc82419a6b109e0b2ac7ff5532e6d941693cc4ab68e6563f424b92b3b27c8916859a6e4826
|
||||
DIST sqlite-doc-3200100.zip 5759028 BLAKE2B a633672b739160873e64b89e1350c85b0002fd8f268b6ae0f5189de12f411125fbb309585175727b8915fe1468b3e70e7c33239826232c3e7bc8c1c59132bec0 SHA512 518ca59644cecfcd67f511268112e421c5d7bbd77ef1e33304bf306ef110becf1e2a7fe37c506ec6892edb9d5c6ee77657b374c2e061f49890d18af062dea2b3
|
||||
DIST sqlite-doc-3210000.zip 5800635 BLAKE2B c9e15fe7373045783d05bd7b0a70f980e3c8a3c0ec4243f85fe338788830a58e82f1c6b3c053efe75caa33e99a6162e2f9831e4f5b9577c0bf90a305ee2f0381 SHA512 799c7279166b489d1a5acc9410808c2d4b78e64037fc15b60764180fe1c698f35e27e86793140302f560cfa583baa2c33e416d5c9e1842ec58c6cb6093729334
|
||||
DIST sqlite-doc-3220000.zip 5856836 BLAKE2B 1be73848040f3ae9734a44c94e4c36cae269d79abb20467f9f8368754e1ae07f4c25490be985b44d08f427e281fc268c6569dc0f5bbb6254621c62798507d687 SHA512 f9141d3907e5c1a3008d3b7e111e46e7ff1f010358eb682d3e1187a67deb7cca7ba1d5fbc5b19da26ee8df3a0c71a098fd0e8d8ca89c25e5ad2b3e12ba7dc312
|
||||
DIST sqlite-src-3190300.zip 10193997 BLAKE2B 2286d410594cb04acc79e4877101cbd5018cb84802394fbe4fe9ceaca4e9b20064372f5189d8d70bc7c034789fa92799224939e46f35f8fe47fb42d08f9b29e1 SHA512 514c3de6346bdea359036a79c880133f0eeed4cdfc9e811d662dc343f91ea43edda0f9760405a48e7f61ea1dd3478980cc7d3b5409ef27adcb5311a06e36297e
|
||||
DIST sqlite-src-3200000.zip 10575632 BLAKE2B 2f0f41129e56477531f59d91e02469ccf5e21eaadce57a2a81bde9bcd549c12d55a496f27fd07bf0ded78b55aa8a6e4d48e5073638dc87eaeef8e989906fccfb SHA512 40fe7972902d041f012c7739c8712aa40069aebc7be680fde8f43b33fed885bfc42331bfb7200651486484edb71cbdd77ddb9c119d0847bdfb0e92063090f029
|
||||
DIST sqlite-doc-3230100.zip 8882546 BLAKE2B 1e80647e3789b9130a93e881933fb1260794d9ccf359969a16bdeb0df5a51787eaf8404641c4b760bedd45063d46f8874fd74a4da1fef0234f3d8e92db754d76 SHA512 d3a42621480a928446c5f71d0f2ee68e245b071971da38438f9070bd5bcbe1930ea5bd20e06c68543df75badd2e4565abc94420df50b7152c9cd129587471471
|
||||
DIST sqlite-src-3200100.zip 10575637 BLAKE2B e45bad50d728e749c258546dd75a9d647ca35584092c663fed176fdd69164623bbe58afd15cd74fcd32a0cec893cffdb0f096873188c42ec5595ef7d635c79ad SHA512 845a0d64c9356aadf178c04dd716bbd37a7353526b06cfa8e8f65653cf6a1893a5c5e8c78d20b43910c34d9167272cf517749c91ed0ba7686977e3d0327e8939
|
||||
DIST sqlite-src-3210000.zip 10577695 BLAKE2B 21f110d4cdda95864a39b9b9b65985d29e1409ed38a9bda692d33dde845c115476cd77dc3b9cd1b7359ff383dc3050cbf0437b113ea128392aef50dd3b778d46 SHA512 3a054422da80d750fd5ab297f9d2728f4e7b55fa790a72d55da8c381835571992d56b349e50d4680b04c9e2e44d6fa83009c2df3ffa045f43ff9059bb8736894
|
||||
DIST sqlite-src-3220000.zip 10721627 BLAKE2B ed4cf93c36c095edeccd6ee4dac5419c516264a42eb9d6d2e333b1d4a134c6198dfcd2bbae41dff811616f0dc7f9e9bb487f9c5b5f631fcb5885540a84bf527a SHA512 e35defb0ffcc10100399051bc734746de40fa3dc5cd673eac470fb58cd8bd6d911b6dacb5e8489e2dd79c6ae75faaeb8c02384f64c4595963e62bd3faeb9446c
|
||||
DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b1c3b81562fdea2317b58d876a0852136fe4f8a3ebc7679676f366e19c84d0ad2f54d3d8c73712145099975f80cf1a SHA512 69a87b76860c3b172d9e68b0fc0b8c157b606375e2b7d793ce4bd4b898ef737cd721189bc6a3342c749e224e60fa96203d449668c49dff2ebdc682b49630a59b
|
||||
|
@ -1,158 +0,0 @@
|
||||
Link executables against libsqlite3.so.
|
||||
Increase timeout for fuzzcheck.
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- Makefile.in
|
||||
+++ Makefile.in
|
||||
@@ -562,6 +562,7 @@
|
||||
#
|
||||
SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
|
||||
# SHELL_OPT += -DSQLITE_ENABLE_FTS5
|
||||
+SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
|
||||
SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
|
||||
SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
|
||||
FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
|
||||
@@ -587,25 +588,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): $(TOP)/src/shell.c sqlite3.c
|
||||
- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
|
||||
- $(TOP)/src/shell.c sqlite3.c \
|
||||
- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
|
||||
+sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la
|
||||
+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
|
||||
+ $(TOP)/src/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
|
||||
@@ -681,7 +682,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
|
||||
#
|
||||
@@ -1107,13 +1108,13 @@
|
||||
|
||||
# Fuzz testing
|
||||
fuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
- ./fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
|
||||
|
||||
fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
|
||||
|
||||
valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA)
|
||||
- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
|
||||
+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
|
||||
|
||||
# The veryquick.test TCL tests.
|
||||
#
|
||||
@@ -1143,36 +1144,35 @@
|
||||
smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
|
||||
./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
|
||||
|
||||
-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
|
||||
+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
|
||||
echo "#define TCLSH 2" > $@
|
||||
- echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@
|
||||
- cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@
|
||||
+ cat $(TOP)/src/tclsqlite.c >> $@
|
||||
echo "static const char *tclsh_main_loop(void){" >> $@
|
||||
echo "static const char *zMainloop = " >> $@
|
||||
$(TCLSH_CMD) $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@
|
||||
echo "; return zMainloop; }" >> $@
|
||||
|
||||
-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)
|
||||
|
||||
-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
|
||||
|
||||
-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)
|
||||
@@ -1191,11 +1191,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
|
||||
@@ -584,6 +584,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
|
@ -0,0 +1,407 @@
|
||||
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
|
||||
|
@ -0,0 +1,24 @@
|
||||
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]
|
@ -0,0 +1,14 @@
|
||||
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,19 +1,19 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>arfrever.fta@gmail.com</email>
|
||||
<name>Arfrever Frehtes Taifersar Arahesis</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="secure-delete">Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty</flag>
|
||||
<flag name="tools">Install additional tools</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:sqlite:sqlite</remote-id>
|
||||
</upstream>
|
||||
<maintainer type="person">
|
||||
<email>arfrever.fta@gmail.com</email>
|
||||
<name>Arfrever Frehtes Taifersar Arahesis</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="secure-delete">Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty</flag>
|
||||
<flag name="tools">Install additional tools</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:sqlite:sqlite</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
@ -1,261 +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/2017/${PN}-doc-${DOC_PV}.zip )
|
||||
tcl? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
|
||||
test? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
|
||||
tools? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
|
||||
!tcl? ( !test? ( !tools? ( https://sqlite.org/2017/${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 ~arm-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="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:0[${MULTILIB_USEDEP}]
|
||||
)
|
||||
tools? ( app-arch/unzip )"
|
||||
|
||||
full_tarball() {
|
||||
use tcl || use test || use tools
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if full_tarball; then
|
||||
S="${WORKDIR}/${PN}-src-${SRC_PV}"
|
||||
else
|
||||
S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if full_tarball; then
|
||||
eapply -p0 "${FILESDIR}/${PN}-3.20.0-full_tarball-build.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 -p0 "${FILESDIR}/${PN}-3.16.0-nonfull_tarball-build.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}" options=()
|
||||
|
||||
options+=(
|
||||
--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
|
||||
--enable-threadsafe
|
||||
)
|
||||
if ! full_tarball; 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 dbstat virtual table.
|
||||
# https://sqlite.org/dbstat.html
|
||||
append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
|
||||
|
||||
# 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 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 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 soundex() function.
|
||||
# https://sqlite.org/lang_corefunc.html#soundex
|
||||
append-cppflags -DSQLITE_SOUNDEX
|
||||
|
||||
# debug USE flag.
|
||||
if full_tarball; 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_tarball; 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_tarball && 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_tarball; then
|
||||
options+=(--enable-tcl)
|
||||
fi
|
||||
|
||||
if [[ "${CHOST}" == *-mint* ]]; then
|
||||
append-cppflags -DSQLITE_OMIT_WAL
|
||||
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 showstat4 showwal sqldiff sqlite3_analyzer
|
||||
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 showstat4 sqlite3-show-stat4
|
||||
install_tool showwal sqlite3-show-wal
|
||||
install_tool sqldiff sqlite3-diff
|
||||
install_tool sqlite3_analyzer sqlite3-analyzer
|
||||
|
||||
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 Pony_Prog2000-2.07c.tar.gz 653300 BLAKE2B 7b20450dfefb4370fb813b5532e6ba504b6ac8e598a2e46615ba522537e91b7798f6f86fbf93320fc71be5fe756ceef3351304196da191f7e68670f75ab5f865 SHA512 33cd14fa8283ce8af8265a48df7d960c7c2779551d0f204f6728a9e1e54204f52ea608c4e6090dc56f7634a02abd9bb960230f75a3a9716b1639708a57c31809
|
||||
DIST ponyprog-3.0.0.tar.gz 933166 BLAKE2B 46eb0a720c91ed187ef06907b28d8b84ecbe4c62a92cabf2b9ff58c553e3f8afc949e523d6b97af0cbf168c545b71e0395e02e5c182714a76bbacce645a1d890 SHA512 a1779b28e03f824fb242d6eb063f0e038af26602c26d5392884f69cbbccac8a934660dffa9bec7489aeb2656e35f21e2b097fc6fe011f278046894e180023881
|
||||
|
@ -0,0 +1,17 @@
|
||||
--- a/desktop/ponyprog.desktop
|
||||
+++ b/desktop/ponyprog.desktop
|
||||
@@ -1,12 +1,12 @@
|
||||
[Desktop Entry]
|
||||
-Version=3.0.0
|
||||
+Version=1.1
|
||||
Name=Ponyprog
|
||||
Comment=EEPROM and microcontroller flasher
|
||||
GenericName=Ponyprog
|
||||
TryExec=ponyprog
|
||||
Exec=ponyprog
|
||||
Terminal=false
|
||||
-Icon=ponyprog.png
|
||||
+Icon=ponyprog
|
||||
Type=Application
|
||||
Categories=Utility;Qt;
|
||||
|
@ -0,0 +1,124 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,9 +1,7 @@
|
||||
PROJECT(ponyprog)
|
||||
|
||||
# Configure CMake ...
|
||||
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
|
||||
-CMAKE_POLICY(SET CMP0003 OLD)
|
||||
-CMAKE_POLICY(SET CMP0015 OLD)
|
||||
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
|
||||
|
||||
# set the Qt version to 4 or 5
|
||||
OPTION (USE_QT5 "Using of Qt5 version for compiling" ON)
|
||||
@@ -52,13 +50,7 @@
|
||||
OPTION (USE_PROFILER "Include in binary file profiling information" OFF)
|
||||
|
||||
|
||||
-
|
||||
-IF(${USE_DEBUGGER})
|
||||
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
|
||||
-ELSE()
|
||||
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall")
|
||||
-ENDIF()
|
||||
-
|
||||
+ADD_COMPILE_OPTIONS("-Wall")
|
||||
MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")
|
||||
|
||||
INCLUDE(CheckIncludeFile)
|
||||
@@ -202,7 +194,6 @@
|
||||
SET ( UI_HEADERS_DIR temp )
|
||||
SET ( UI_SOURCES_DIR temp )
|
||||
|
||||
-ADD_SUBDIRECTORY(qhexedit2/src)
|
||||
ADD_SUBDIRECTORY(SrcPony)
|
||||
|
||||
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/qhexedit2/src/ ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ )
|
||||
@@ -265,6 +256,8 @@
|
||||
MESSAGE(STATUS "QT LIBRARIES: ${QT_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Multimedia_LIBRARIES} ${Qt5PrintSupport_LIBRARIES} ${Qt5Core_LIBRARIES}")
|
||||
ENDIF()
|
||||
|
||||
+TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} qhexedit)
|
||||
+
|
||||
ADD_CUSTOM_TARGET (tags
|
||||
COMMAND ctags -R -f tags ${CMAKE_SOURCE_DIR}/SrcPony
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
--- a/distribution/posix/CMakeLists.txt
|
||||
+++ b/distribution/posix/CMakeLists.txt
|
||||
@@ -5,6 +5,8 @@
|
||||
SET(CPACK_INSTALL_PREFIX "/usr")
|
||||
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr")
|
||||
|
||||
+INCLUDE(GNUInstallDirs)
|
||||
+
|
||||
MESSAGE("CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}")
|
||||
|
||||
# SET( CPACK_PACKAGE_GROUP "${PONYPROG_CPACK_PACKAGE_GROUP}" )
|
||||
@@ -12,46 +14,40 @@
|
||||
SET( CPACK_PACKAGE_SHLIBDEPS "${PONYPROG_CPACK_PACKAGE_SHLIBDEPS}" )
|
||||
# SET( CPACK_PACKAGE_DEPENDS "${PONYPROG_CPACK_PACKAGE_DEPENDS}" )
|
||||
|
||||
-INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog"
|
||||
- DESTINATION "bin/"
|
||||
- COMPONENT "application"
|
||||
- PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
|
||||
+INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog"
|
||||
+ DESTINATION "${CMAKE_INSTALL_BINDIR}"
|
||||
+ COMPONENT "application"
|
||||
)
|
||||
|
||||
-INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons/"
|
||||
- DESTINATION "share/icons/"
|
||||
- COMPONENT "application"
|
||||
- DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
|
||||
+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons/"
|
||||
+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons"
|
||||
+ COMPONENT "application"
|
||||
FILES_MATCHING PATTERN "*.png"
|
||||
)
|
||||
|
||||
-INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang/"
|
||||
- DESTINATION "share/ponyprog/lang/"
|
||||
- COMPONENT "lang files"
|
||||
- DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
|
||||
+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang/"
|
||||
+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ponyprog/lang"
|
||||
+ COMPONENT "lang files"
|
||||
FILES_MATCHING PATTERN "*.utf"
|
||||
- )
|
||||
+ )
|
||||
|
||||
-INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/distribution/innosetup/"
|
||||
- DESTINATION "share/doc/ponyprog/"
|
||||
- COMPONENT "help files"
|
||||
- DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
|
||||
+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/distribution/innosetup/"
|
||||
+ DESTINATION "${CMAKE_INSTALL_DOCDIR}"
|
||||
+ COMPONENT "help files"
|
||||
FILES_MATCHING PATTERN "*.jpg" PATTERN "*.html"
|
||||
- )
|
||||
+ )
|
||||
|
||||
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/copyright"
|
||||
- DESTINATION "share/doc/ponyprog/"
|
||||
- COMPONENT "application"
|
||||
- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
|
||||
- )
|
||||
+INSTALL(FILES "${PROJECT_SOURCE_DIR}/copyright"
|
||||
+ DESTINATION "${CMAKE_INSTALL_DOCDIR}"
|
||||
+ COMPONENT "application"
|
||||
+ )
|
||||
# MESSAGE("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}")
|
||||
|
||||
INSTALL(FILES "${PROJECT_SOURCE_DIR}/desktop/ponyprog.desktop"
|
||||
- DESTINATION "share/applications/"
|
||||
- COMPONENT "application"
|
||||
- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
|
||||
+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications/"
|
||||
+ COMPONENT "application"
|
||||
)
|
||||
-
|
||||
+
|
||||
SET(CPACK_INSTALL_CMAKE_PROJECTS "${PONYPROG_CPACK_INSTALL_CMAKE_PROJECTS}")
|
||||
|
||||
SET(PONYPROG_PACKAGE_DIRECTORY "${CURRENT_BUILD_DIR}")
|
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="EEPROM and microcontroller programmer/flasher"
|
||||
HOMEPAGE="https://github.com/lancos/ponyprog/"
|
||||
SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND=">=app-editors/qhexedit2-0.8.4_p20170719
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtmultimedia:5
|
||||
dev-qt/qtprintsupport:5"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-fix-build-system.patch
|
||||
"${FILESDIR}"/${P}-desktop-qa.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "To use the COM port in user mode (not as root), you need to"
|
||||
elog "be in the 'uucp' group."
|
||||
elog
|
||||
elog "To use the LPT port in user mode (not as root) you need a kernel with"
|
||||
elog "ppdev, parport and parport_pc compiled in or as modules. You need the"
|
||||
elog "rights to write to /dev/parport? devices."
|
||||
}
|
Binary file not shown.
@ -0,0 +1,69 @@
|
||||
# From 8d89a385b71a2e4cce0fba0cfc8d91b63485edc5 Mon Sep 17 00:00:00 2001
|
||||
# From: Christian Heimes <christian@python.org>
|
||||
# Date: Sat, 24 Mar 2018 18:38:14 +0100
|
||||
# Subject: [PATCH] [3.6] bpo-33127: Compatibility patch for LibreSSL 2.7.0
|
||||
# (GH-6210) (GH-6214)
|
||||
#
|
||||
# LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects
|
||||
# LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and
|
||||
# LibreSSL < 2.7.
|
||||
|
||||
# Documentation updates and fixes for failing tests will be provided in
|
||||
# another patch set.
|
||||
|
||||
# Signed-off-by: Christian Heimes <christian@python.org>.
|
||||
# (cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1)
|
||||
|
||||
# Co-authored-by: Christian Heimes <christian@python.org>
|
||||
# Patch modified by Aaron Bauman <bman@gentoo.org> for 3.5.5
|
||||
|
||||
--- a/Modules/_ssl.c 2018-04-13 18:33:17.397649561 -0400
|
||||
+++ b/Modules/_ssl.c 2018-04-13 18:40:22.319852014 -0400
|
||||
@@ -101,6 +101,12 @@
|
||||
|
||||
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
# define OPENSSL_VERSION_1_1 1
|
||||
+# define PY_OPENSSL_1_1_API 1
|
||||
+#endif
|
||||
+
|
||||
+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */
|
||||
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
|
||||
+# define PY_OPENSSL_1_1_API 1
|
||||
#endif
|
||||
|
||||
/* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1
|
||||
@@ -129,16 +135,18 @@
|
||||
#define INVALID_SOCKET (-1)
|
||||
#endif
|
||||
|
||||
-#ifdef OPENSSL_VERSION_1_1
|
||||
-/* OpenSSL 1.1.0+ */
|
||||
-#ifndef OPENSSL_NO_SSL2
|
||||
-#define OPENSSL_NO_SSL2
|
||||
-#endif
|
||||
-#else /* OpenSSL < 1.1.0 */
|
||||
-#if defined(WITH_THREAD)
|
||||
+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */
|
||||
+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD)
|
||||
#define HAVE_OPENSSL_CRYPTO_LOCK
|
||||
#endif
|
||||
|
||||
+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2)
|
||||
+#define OPENSSL_NO_SSL2
|
||||
+#endif
|
||||
+
|
||||
+#ifndef PY_OPENSSL_1_1_API
|
||||
+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */
|
||||
+
|
||||
#define TLS_method SSLv23_method
|
||||
|
||||
static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)
|
||||
@@ -187,7 +195,7 @@
|
||||
{
|
||||
return store->param;
|
||||
}
|
||||
-#endif /* OpenSSL < 1.1.0 or LibreSSL */
|
||||
+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */
|
||||
|
||||
|
||||
enum py_ssl_error {
|
@ -0,0 +1,114 @@
|
||||
From 8d89a385b71a2e4cce0fba0cfc8d91b63485edc5 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Heimes <christian@python.org>
|
||||
Date: Sat, 24 Mar 2018 18:38:14 +0100
|
||||
Subject: [PATCH] [3.6] bpo-33127: Compatibility patch for LibreSSL 2.7.0
|
||||
(GH-6210) (GH-6214)
|
||||
|
||||
LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects
|
||||
LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and
|
||||
LibreSSL < 2.7.
|
||||
|
||||
Documentation updates and fixes for failing tests will be provided in
|
||||
another patch set.
|
||||
|
||||
Signed-off-by: Christian Heimes <christian@python.org>.
|
||||
(cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1)
|
||||
|
||||
Co-authored-by: Christian Heimes <christian@python.org>
|
||||
---
|
||||
Lib/test/test_ssl.py | 1 +
|
||||
.../2018-03-24-15-08-24.bpo-33127.olJmHv.rst | 1 +
|
||||
Modules/_ssl.c | 24 ++++++++++++-------
|
||||
Tools/ssl/multissltests.py | 3 ++-
|
||||
4 files changed, 20 insertions(+), 9 deletions(-)
|
||||
create mode 100644 Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst
|
||||
|
||||
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
|
||||
index 8dd3b41450..9785a59a7e 100644
|
||||
--- a/Lib/test/test_ssl.py
|
||||
+++ b/Lib/test/test_ssl.py
|
||||
@@ -1687,6 +1687,7 @@ class SimpleBackgroundTests(unittest.TestCase):
|
||||
self.assertEqual(len(ctx.get_ca_certs()), 1)
|
||||
|
||||
@needs_sni
|
||||
+ @unittest.skipUnless(hasattr(ssl, "PROTOCOL_TLSv1_2"), "needs TLS 1.2")
|
||||
def test_context_setget(self):
|
||||
# Check that the context of a connected socket can be replaced.
|
||||
ctx1 = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
|
||||
diff --git a/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst b/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst
|
||||
new file mode 100644
|
||||
index 0000000000..635aabbde0
|
||||
--- /dev/null
|
||||
+++ b/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst
|
||||
@@ -0,0 +1 @@
|
||||
+The ssl module now compiles with LibreSSL 2.7.1.
|
||||
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
|
||||
index c54e43c2b4..5e007da858 100644
|
||||
--- a/Modules/_ssl.c
|
||||
+++ b/Modules/_ssl.c
|
||||
@@ -106,6 +106,12 @@ struct py_ssl_library_code {
|
||||
|
||||
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
# define OPENSSL_VERSION_1_1 1
|
||||
+# define PY_OPENSSL_1_1_API 1
|
||||
+#endif
|
||||
+
|
||||
+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */
|
||||
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
|
||||
+# define PY_OPENSSL_1_1_API 1
|
||||
#endif
|
||||
|
||||
/* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1
|
||||
@@ -152,16 +158,18 @@ struct py_ssl_library_code {
|
||||
#define INVALID_SOCKET (-1)
|
||||
#endif
|
||||
|
||||
-#ifdef OPENSSL_VERSION_1_1
|
||||
-/* OpenSSL 1.1.0+ */
|
||||
-#ifndef OPENSSL_NO_SSL2
|
||||
-#define OPENSSL_NO_SSL2
|
||||
-#endif
|
||||
-#else /* OpenSSL < 1.1.0 */
|
||||
-#if defined(WITH_THREAD)
|
||||
+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */
|
||||
+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD)
|
||||
#define HAVE_OPENSSL_CRYPTO_LOCK
|
||||
#endif
|
||||
|
||||
+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2)
|
||||
+#define OPENSSL_NO_SSL2
|
||||
+#endif
|
||||
+
|
||||
+#ifndef PY_OPENSSL_1_1_API
|
||||
+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */
|
||||
+
|
||||
#define TLS_method SSLv23_method
|
||||
#define TLS_client_method SSLv23_client_method
|
||||
#define TLS_server_method SSLv23_server_method
|
||||
@@ -227,7 +235,7 @@ SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s)
|
||||
return s->tlsext_tick_lifetime_hint;
|
||||
}
|
||||
|
||||
-#endif /* OpenSSL < 1.1.0 or LibreSSL */
|
||||
+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */
|
||||
|
||||
|
||||
enum py_ssl_error {
|
||||
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
|
||||
index ce5bbd8530..ba4529ae06 100755
|
||||
--- a/Tools/ssl/multissltests.py
|
||||
+++ b/Tools/ssl/multissltests.py
|
||||
@@ -57,8 +57,9 @@ LIBRESSL_OLD_VERSIONS = [
|
||||
]
|
||||
|
||||
LIBRESSL_RECENT_VERSIONS = [
|
||||
- "2.5.3",
|
||||
"2.5.5",
|
||||
+ "2.6.4",
|
||||
+ "2.7.1",
|
||||
]
|
||||
|
||||
# store files in ../multissl
|
||||
--
|
||||
2.17.0
|
||||
|
Binary file not shown.
@ -1,3 +1 @@
|
||||
DIST m17n-lib-1.6.3.tar.gz 1033048 BLAKE2B 869fac61545ecb94d063282cd257732b0d46cab01dd3a7b49901315f1f81f65fa5e7b782429766e8f8248c83c355d57f0d40251bbdfb35ee065f4c6d165aacaf SHA512 66177e5be17e330230d31bfff8a3cc7415ad79f9bfaf8f4c4baea02f1f19bf2d3628210c697a9b14d07dcb9bac8ca256e6c5102cbaae65876bf49aa2150cfd80
|
||||
DIST m17n-lib-1.6.4.tar.gz 1034422 BLAKE2B ccb991dddd55e8f149b37f2e9ee6e84c5f8a9600494c16cba7ee55ab0a96c56b338383bfd88de5c81f2dc3609a40b4e3c645b8eaa6905bfe08aba56dbedc91ae SHA512 751f22efdaf4fb3e23d17ca07e20c65c59d60ff4f90a384bd9a8e9e8b01503d87c76cfc4c3c9717d8549a08c705b1c444939816a7eb07ca77b029b4f457f58c3
|
||||
DIST m17n-lib-1.7.0.tar.gz 1063169 BLAKE2B 61192d26dec8a8bdb55b6a819c5b1aa5503e4320d57864889065c9490ee6720f5b258fbef10d5944f69f5a9ccbe49ea5494c8b0a10d536592c301f46df6826c5 SHA512 26fc1be02a5e487a2fa5f2f63d991f3c745aa1b78e20d931fe4b265125266501cc8d402aa3cb5c1b71a7d4c0f7a0bf5b2c3b17ec5f4f8e0f5ee3052ad4e205b7
|
||||
|
@ -1,63 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils autotools
|
||||
|
||||
DESCRIPTION="Multilingual Library for Unix/Linux"
|
||||
HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
|
||||
SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
|
||||
#IUSE="anthy gd ispell"
|
||||
IUSE="gd X"
|
||||
|
||||
RDEPEND="
|
||||
X? (
|
||||
x11-libs/libXaw
|
||||
x11-libs/libXft
|
||||
x11-libs/libX11
|
||||
gd? ( media-libs/gd[png] )
|
||||
dev-libs/fribidi
|
||||
>=media-libs/freetype-2.1
|
||||
media-libs/fontconfig
|
||||
>=dev-libs/libotf-0.9.4
|
||||
)
|
||||
dev-libs/libxml2
|
||||
~dev-db/m17n-db-${PV}"
|
||||
# linguas_th? ( || ( app-i18n/libthai app-i18n/wordcut ) )
|
||||
# anthy? ( app-i18n/anthy )
|
||||
# ispell? ( app-text/ispell )
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${PN}-gui.patch \
|
||||
"${FILESDIR}"/${PN}-parallel-make.patch
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=
|
||||
|
||||
if use X; then
|
||||
myconf+=" --with-gui $(use_with gd)"
|
||||
else
|
||||
myconf+=" --without-gui --without-gd"
|
||||
fi
|
||||
|
||||
econf ${myconf} || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# bug #363239
|
||||
emake -j1 DESTDIR="${D}" install || die
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README TODO
|
||||
}
|
@ -1,73 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils autotools
|
||||
|
||||
DESCRIPTION="Multilingual Library for Unix/Linux"
|
||||
HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
|
||||
SRC_URI="http://download.savannah.gnu.org/releases/m17n/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
|
||||
IUSE="anthy athena anthy bidi fontconfig gd spell libotf libxml2 X xft"
|
||||
|
||||
RDEPEND="
|
||||
anthy? ( app-i18n/anthy )
|
||||
spell? ( app-text/aspell )
|
||||
libxml2? ( dev-libs/libxml2 )
|
||||
X? (
|
||||
athena? ( x11-libs/libXaw )
|
||||
bidi? ( dev-libs/fribidi )
|
||||
fontconfig? ( media-libs/fontconfig )
|
||||
gd? ( media-libs/gd[png] )
|
||||
libotf? ( >=dev-libs/libotf-0.9.4 )
|
||||
xft? (
|
||||
>=media-libs/freetype-2.1
|
||||
x11-libs/libXft )
|
||||
x11-libs/libX11
|
||||
)
|
||||
~dev-db/m17n-db-${PV}"
|
||||
# athena? ( x11-libs/libXaw )
|
||||
# athena shoud be enabled to build m17n-edit properly when X is enabled.
|
||||
|
||||
# linguas_th? ( || ( app-i18n/libthai app-i18n/wordcut ) )
|
||||
#
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${PN}-gui.patch \
|
||||
"${FILESDIR}"/${PN}-parallel-make.patch \
|
||||
"${FILESDIR}"/${PN}-configure.patch \
|
||||
"${FILESDIR}"/${PN}-ispell.patch
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="$(use_with anthy) $(use_with spell ispell) $(use_with libxml2)"
|
||||
|
||||
if use X; then
|
||||
myconf+=" --with-x --with-gui $(use_with athena) $(use_with bidi fribidi)
|
||||
$(use_with fontconfig) $(use_with xft freetype) $(use_with gd) $(use_with libotf)
|
||||
$(use_with xft)"
|
||||
else
|
||||
myconf+=" --without-x --without-gui --without-athena --without-fribidi
|
||||
--without-fontconfig --without-freetype --without-gd --without-libotf
|
||||
--without-xft"
|
||||
fi
|
||||
|
||||
econf ${myconf} || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# bug #363239
|
||||
emake -j1 DESTDIR="${D}" install || die
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README TODO
|
||||
}
|
@ -1,48 +0,0 @@
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 2865fb7..75cbd45 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -6,7 +6,7 @@ libname = libonig.la
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
#AM_CFLAGS = -DNOT_RUBY
|
||||
AM_CFLAGS =
|
||||
-INCLUDES = -I$(top_srcdir) -I$(includedir)
|
||||
+INCLUDES = -I$(top_srcdir)
|
||||
|
||||
SUBDIRS = . sample
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 1e21f96..51b56d8 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -25,7 +25,7 @@ dnl check for COMBINATION_EXPLOSION
|
||||
AC_ARG_ENABLE(combination-explosion-check,
|
||||
[ --enable-combination-explosion-check enable combination explosion check],
|
||||
[comb_expl_check=$enableval])
|
||||
-if test "${comb_expl_check}" = yes; then
|
||||
+if test "x${comb_expl_check}" = xyes; then
|
||||
AC_DEFINE(USE_COMBINATION_EXPLOSION_CHECK,1,[Define if combination explosion check])
|
||||
fi
|
||||
|
||||
@@ -33,7 +33,7 @@ dnl check for CRNL_AS_LINE_TERMINATOR
|
||||
AC_ARG_ENABLE(crnl-as-line-terminator,
|
||||
[ --enable-crnl-as-line-terminator enable CR+NL as line terminator],
|
||||
[crnl_as_line_terminator=$enableval])
|
||||
-if test "${crnl_as_line_terminator}" = yes; then
|
||||
+if test "x${crnl_as_line_terminator}" = xyes; then
|
||||
AC_DEFINE(USE_CRNL_AS_LINE_TERMINATOR,1,[Define if enable CR+NL as line terminator])
|
||||
fi
|
||||
|
||||
diff --git a/sample/Makefile.am b/sample/Makefile.am
|
||||
index af33057..347af94 100644
|
||||
--- a/sample/Makefile.am
|
||||
+++ b/sample/Makefile.am
|
||||
@@ -2,7 +2,7 @@ noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl
|
||||
|
||||
libname = $(top_builddir)/libonig.la
|
||||
LDADD = $(libname)
|
||||
-INCLUDES = -I$(top_srcdir) -I$(includedir)
|
||||
+INCLUDES = -I$(top_srcdir)
|
||||
|
||||
encode_SOURCES = encode.c
|
||||
listcap_SOURCES = listcap.c
|
@ -1,22 +0,0 @@
|
||||
https://github.com/kkos/oniguruma/issues/57
|
||||
https://github.com/kkos/oniguruma/commit/690313a061f7a4fa614ec5cc8368b4f2284e059b
|
||||
|
||||
Author: K.Kosako <kosako@sofnec.co.jp>
|
||||
|
||||
--- a/regexec.c
|
||||
+++ b/regexec.c
|
||||
@@ -1473,14 +1473,9 @@
|
||||
break;
|
||||
|
||||
case OP_EXACT1: MOP_IN(OP_EXACT1);
|
||||
-#if 0
|
||||
DATA_ENSURE(1);
|
||||
if (*p != *s) goto fail;
|
||||
p++; s++;
|
||||
-#endif
|
||||
- if (*p != *s++) goto fail;
|
||||
- DATA_ENSURE(0);
|
||||
- p++;
|
||||
MOP_OUT;
|
||||
break;
|
||||
|
@ -1,39 +0,0 @@
|
||||
https://github.com/kkos/oniguruma/issues/55
|
||||
https://github.com/kkos/oniguruma/commit/f015fbdd95f76438cd86366467bb2b39870dd7c6
|
||||
https://github.com/kkos/oniguruma/commit/b4bf968ad52afe14e60a2dc8a95d3555c543353a
|
||||
|
||||
Author: K.Kosako <kosako@sofnec.co.jp>
|
||||
|
||||
--- a/regparse.c
|
||||
+++ b/regparse.c
|
||||
@@ -3064,7 +3064,7 @@
|
||||
PUNFETCH;
|
||||
prev = p;
|
||||
num = scan_unsigned_octal_number(&p, end, 3, enc);
|
||||
- if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
|
||||
+ if (num < 0 || num >= 256) return ONIGERR_TOO_BIG_NUMBER;
|
||||
if (p == prev) { /* can't read nothing. */
|
||||
num = 0; /* but, it's not error */
|
||||
}
|
||||
@@ -3436,7 +3436,7 @@
|
||||
if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_OCTAL3)) {
|
||||
prev = p;
|
||||
num = scan_unsigned_octal_number(&p, end, (c == '0' ? 2:3), enc);
|
||||
- if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
|
||||
+ if (num < 0 || num >= 256) return ONIGERR_TOO_BIG_NUMBER;
|
||||
if (p == prev) { /* can't read nothing. */
|
||||
num = 0; /* but, it's not error */
|
||||
}
|
||||
@@ -4084,7 +4084,12 @@
|
||||
switch (*state) {
|
||||
case CCS_VALUE:
|
||||
if (*type == CCV_SB)
|
||||
+ {
|
||||
+ if (*vs > 0xff)
|
||||
+ return ONIGERR_INVALID_CODE_POINT_VALUE;
|
||||
+
|
||||
BITSET_SET_BIT(cc->bs, (int )(*vs));
|
||||
+ }
|
||||
else if (*type == CCV_CODE_POINT) {
|
||||
r = add_code_range(&(cc->mbuf), env, *vs, *vs);
|
||||
if (r < 0) return r;
|
@ -1,16 +0,0 @@
|
||||
https://github.com/kkos/oniguruma/issues/58
|
||||
https://github.com/kkos/oniguruma/commit/9690d3ab1f9bcd2db8cbe1fe3ee4a5da606b8814
|
||||
|
||||
Author: K.Kosako <kosako@sofnec.co.jp>
|
||||
|
||||
--- a/regexec.c
|
||||
+++ b/regexec.c
|
||||
@@ -3154,6 +3154,8 @@
|
||||
}
|
||||
else {
|
||||
UChar *q = p + reg->dmin;
|
||||
+
|
||||
+ if (q >= end) return 0; /* fail */
|
||||
while (p < q) p += enclen(reg->enc, p);
|
||||
}
|
||||
}
|
@ -1,18 +0,0 @@
|
||||
https://github.com/kkos/oniguruma/issues/60
|
||||
https://github.com/kkos/oniguruma/commit/3b63d12038c8d8fc278e81c942fa9bec7c704c8b
|
||||
|
||||
Author: K.Kosako <kosako@sofnec.co.jp>
|
||||
|
||||
--- a/regparse.c
|
||||
+++ b/regparse.c
|
||||
@@ -4081,7 +4081,9 @@
|
||||
}
|
||||
}
|
||||
|
||||
- *state = CCS_VALUE;
|
||||
+ if (*state != CCS_START)
|
||||
+ *state = CCS_VALUE;
|
||||
+
|
||||
*type = CCV_CLASS;
|
||||
return 0;
|
||||
}
|
@ -1,43 +0,0 @@
|
||||
https://github.com/kkos/oniguruma/issues/59
|
||||
https://github.com/kkos/oniguruma/commit/b690371bbf97794b4a1d3f295d4fb9a8b05d402d
|
||||
|
||||
Author: K.Kosako <kosako@sofnec.co.jp>
|
||||
|
||||
--- a/regexec.c
|
||||
+++ b/regexec.c
|
||||
@@ -3207,18 +3207,25 @@
|
||||
}
|
||||
else {
|
||||
if (reg->dmax != ONIG_INFINITE_DISTANCE) {
|
||||
- *low = p - reg->dmax;
|
||||
- if (*low > s) {
|
||||
- *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s,
|
||||
- *low, (const UChar** )low_prev);
|
||||
- if (low_prev && IS_NULL(*low_prev))
|
||||
- *low_prev = onigenc_get_prev_char_head(reg->enc,
|
||||
- (pprev ? pprev : s), *low);
|
||||
+ if (p - str < reg->dmax) {
|
||||
+ *low = (UChar* )str;
|
||||
+ if (low_prev)
|
||||
+ *low_prev = onigenc_get_prev_char_head(reg->enc, str, *low);
|
||||
}
|
||||
else {
|
||||
- if (low_prev)
|
||||
- *low_prev = onigenc_get_prev_char_head(reg->enc,
|
||||
- (pprev ? pprev : str), *low);
|
||||
+ *low = p - reg->dmax;
|
||||
+ if (*low > s) {
|
||||
+ *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s,
|
||||
+ *low, (const UChar** )low_prev);
|
||||
+ if (low_prev && IS_NULL(*low_prev))
|
||||
+ *low_prev = onigenc_get_prev_char_head(reg->enc,
|
||||
+ (pprev ? pprev : s), *low);
|
||||
+ }
|
||||
+ else {
|
||||
+ if (low_prev)
|
||||
+ *low_prev = onigenc_get_prev_char_head(reg->enc,
|
||||
+ (pprev ? pprev : str), *low);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,13 +0,0 @@
|
||||
--- a/src/regcomp.c
|
||||
+++ b/src/regcomp.c
|
||||
@@ -3619,8 +3619,8 @@
|
||||
switch (en->type) {
|
||||
case ENCLOSURE_MEMORY:
|
||||
{
|
||||
- if (env->curr_max_regnum < en->regnum)
|
||||
- env->curr_max_regnum = en->regnum;
|
||||
+ if (env->curr_max_regnum < en->m.regnum)
|
||||
+ env->curr_max_regnum = en->m.regnum;
|
||||
|
||||
r = setup_comb_exp_check(NODE_ENCLOSURE_BODY(en), state, env);
|
||||
}
|
@ -1,49 +0,0 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -18,7 +18,7 @@
|
||||
AC_ARG_ENABLE(combination-explosion-check,
|
||||
[ --enable-combination-explosion-check enable combination explosion check],
|
||||
[comb_expl_check=$enableval])
|
||||
-if test "${comb_expl_check}" = yes; then
|
||||
+if test "x${comb_expl_check}" = xyes; then
|
||||
AC_DEFINE(USE_COMBINATION_EXPLOSION_CHECK,1,[Define if combination explosion check])
|
||||
fi
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
AC_ARG_ENABLE(crnl-as-line-terminator,
|
||||
[ --enable-crnl-as-line-terminator enable CR+NL as line terminator],
|
||||
[crnl_as_line_terminator=$enableval])
|
||||
-if test "${crnl_as_line_terminator}" = yes; then
|
||||
+if test "x${crnl_as_line_terminator}" = xyes; then
|
||||
AC_DEFINE(USE_CRNL_AS_LINE_TERMINATOR,1,[Define if enable CR+NL as line terminator])
|
||||
fi
|
||||
|
||||
--- a/sample/Makefile.am
|
||||
+++ b/sample/Makefile.am
|
||||
@@ -1,10 +1,10 @@
|
||||
#noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl
|
||||
|
||||
-lib_onig = ../src/libonig.la
|
||||
+lib_onig = $(top_builddir)/src/libonig.la
|
||||
LDADD = $(lib_onig)
|
||||
|
||||
AM_LDFLAGS = -L$(prefix)/lib
|
||||
-AM_CPPFLAGS = -I../src -I$(includedir)
|
||||
+AM_CPPFLAGS = -I$(top_srcdir)/src
|
||||
|
||||
TESTS = encode listcap names posix simple sql syntax user_property bug_fix
|
||||
|
||||
--- a/test/Makefile.am
|
||||
+++ b/test/Makefile.am
|
||||
@@ -1,9 +1,9 @@
|
||||
## Makefile.am for Oniguruma
|
||||
-lib_onig = ../src/libonig.la
|
||||
+lib_onig = $(top_builddir)/src/libonig.la
|
||||
|
||||
AM_LDFLAGS = -L$(prefix)/lib
|
||||
AM_CFLAGS =
|
||||
-AM_CPPFLAGS = -I../src -I$(includedir)
|
||||
+AM_CPPFLAGS = -I$(top_srcdir)/src
|
||||
|
||||
TESTS = testc testp testcu
|
||||
|
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=4
|
||||
# Needed for a sane .so versionning on fbsd, please dont drop
|
||||
AUTOTOOLS_AUTORECONF=1
|
||||
|
||||
inherit eutils autotools-multilib
|
||||
|
||||
MY_P=onig-${PV}
|
||||
|
||||
DESCRIPTION="a regular expression library for different character encodings"
|
||||
HOMEPAGE="https://github.com/kkos/oniguruma"
|
||||
SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
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 ~x86-solaris"
|
||||
IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-5.9.3-makefile.patch )
|
||||
DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} )
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_enable combination-explosion-check)
|
||||
$(use_enable crnl-as-line-terminator)
|
||||
)
|
||||
autotools-multilib_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
autotools-multilib_src_install
|
||||
use static-libs || prune_libtool_files
|
||||
}
|
@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools ltprune multilib-minimal
|
||||
|
||||
MY_P="onig-${PV}"
|
||||
|
||||
DESCRIPTION="a regular expression library for different character encodings"
|
||||
HOMEPAGE="https://github.com/kkos/oniguruma"
|
||||
SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0/2" # sub-slot matches SONAME major
|
||||
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 ~x86-solaris"
|
||||
IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
|
||||
|
||||
S="${WORKDIR}/${MY_P/_p1/}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.9.3-makefile.patch
|
||||
"${FILESDIR}"/${P/_p1/}-CVE-2017-9224.patch
|
||||
"${FILESDIR}"/${P/_p1/}-CVE-2017-9226.patch
|
||||
"${FILESDIR}"/${P/_p1/}-CVE-2017-9227.patch
|
||||
"${FILESDIR}"/${P/_p1/}-CVE-2017-9228.patch
|
||||
"${FILESDIR}"/${P/_p1/}-CVE-2017-9229.patch
|
||||
)
|
||||
DOCS=( AUTHORS HISTORY README{,.ja} doc/. )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
mv configure.{in,ac} || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
$(use_enable combination-explosion-check) \
|
||||
$(use_enable crnl-as-line-terminator) \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
prune_libtool_files
|
||||
}
|
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools ltprune multilib-minimal
|
||||
|
||||
MY_P="onig-${PV}"
|
||||
|
||||
DESCRIPTION="a regular expression library for different character encodings"
|
||||
HOMEPAGE="https://github.com/kkos/oniguruma"
|
||||
SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0/4" # sub-slot matches SONAME major
|
||||
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 ~x86-solaris"
|
||||
IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-gentoo.patch
|
||||
"${FILESDIR}"/${PN}-combination-explosion-check.patch
|
||||
)
|
||||
DOCS=( AUTHORS HISTORY README{,.ja} doc/. )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
$(use_enable combination-explosion-check) \
|
||||
$(use_enable crnl-as-line-terminator) \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
prune_libtool_files
|
||||
}
|
@ -1,16 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=RCAPUTO
|
||||
MODULE_VERSION=1.222
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="high-level interface to cddb/freedb protocol"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ia64 ppc sparc x86"
|
||||
IUSE=""
|
||||
|
||||
SRC_TEST=no
|
@ -1,14 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=JMOORE
|
||||
MODULE_VERSION=1.09
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="The Perl CGI::FastTemplate Module"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ia64 ppc sparc x86"
|
||||
IUSE=""
|
@ -1,30 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=LEONT
|
||||
DIST_VERSION=0.013
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Verify requirements in a CPAN::Meta object"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
IUSE="test"
|
||||
|
||||
# CPAN::Meta::Prereqs -> perl-CPAN-Meta
|
||||
RDEPEND="
|
||||
>=virtual/perl-CPAN-Meta-2.132.830
|
||||
>=virtual/perl-CPAN-Meta-Requirements-2.121.0
|
||||
virtual/perl-Exporter
|
||||
>=virtual/perl-Module-Metadata-1.0.23
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=virtual/perl-ExtUtils-MakeMaker-6.300.0
|
||||
test? (
|
||||
virtual/perl-File-Spec
|
||||
dev-perl/Test-Deep
|
||||
>=virtual/perl-Test-Simple-0.880.0
|
||||
)
|
||||
"
|
@ -1,2 +1 @@
|
||||
DIST CPAN-Meta-Check-0.013.tar.gz 12555 BLAKE2B 148a66ee49cce352eba1dce4d1c89af6410a2143aa4ddd3516208ff333168bcc432629ce6f973e0e5912d234e54f82b3510bf26b49714b2fe6bf2796a2ccc48e SHA512 c7bb972ce6afd21f415d0bca03f9ebefe0298e8b7db32e42f0195ae5da535da079f482c9d2bf598cb39d234b467397eb4b949b93c34c4d02b113caf76fd5a9c5
|
||||
DIST CPAN-Meta-Check-0.014.tar.gz 13187 BLAKE2B 49e21dd269265f6ce279fe88430d9eb3b7bcd65e932da18eb7b6e762a69c20683279c9413157b8df432c480a8950097ee288013e648e062fe55280088276a48c SHA512 a10af09a7ce771ca3983adea8053d141750fd09849609a28e7f973831fd3a3ece55281841aec93c099154bb59135986da4983bf612ae4e956c45dbb3f2770f5e
|
||||
|
@ -1,21 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=PETDANCE
|
||||
MODULE_VERSION=1.14
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="convenience wrappers around Carp::Assert"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="virtual/perl-Scalar-List-Utils
|
||||
dev-perl/Carp-Assert"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-perl/Test-Exception )"
|
||||
|
||||
SRC_TEST="do"
|
@ -1,2 +1 @@
|
||||
DIST Carp-Assert-More-1.14.tar.gz 10304 BLAKE2B 8fb42bd9c90632666d6b3c27a3fa32779ba2ab0c3aa9c992fb57ed8fc28155088fb803112f4fda95f69306164c3293246f07f168402b538eb291103e2d6a4994 SHA512 0411908afd5cc45cedce83fb10e67f78f7513fa788421d9c4e0f0f0064bf6fdd7154c2414a449456ff4c600f31eba138fb4d3f94e68743af4b71f7368c30b398
|
||||
DIST Carp-Assert-More-1.16.tar.gz 12290 BLAKE2B 818badbd216e70813993ea859796a16c531c767211ed6b294fab870dd342117b5445db73601f4fc955ec907d1340bfce6f17a784580bac8823a9d72153af38ea SHA512 9f81604574eab5a0a5003ad747ffec3a3dd33bc63e67d12697e4e30de8cb234a73e225f82a4d0f31576e19382cc2d6a402962f5fe1e4c5289e080ca23b30c0fe
|
||||
|
@ -1,22 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=NEILB
|
||||
DIST_VERSION=1.06
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="A clone of the classic Eliza program"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ~arm ppc ppc64 x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
virtual/perl-Carp
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
test? ( >=virtual/perl-Test-Simple-0.880.0 )
|
||||
"
|
@ -1,23 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=GRANTG
|
||||
DIST_VERSION=1.07
|
||||
DIST_EXAMPLES=("examples/*")
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="A clone of the classic Eliza program"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
virtual/perl-Carp
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
test? ( >=virtual/perl-Test-Simple-0.880.0 )
|
||||
"
|
@ -1,3 +1 @@
|
||||
DIST Chatbot-Eliza-1.06.tar.gz 40050 BLAKE2B 0395d7ae58aa69b7db4ca572a42acb6d590c94847c51b2a05b7a90bd2a37bf76aa9d8bed1f8ee18f0cd185232f6c589aa2713b4c11d71ddabd672063c8f6268c SHA512 3626b7abe24a70855bdb6c297376447a2fda58e51802dffd56ddce7b65ed0bed427623cc410c23c7a4323d7bd90e12302cf4b2fe941f76bf2a0a7e4840330b47
|
||||
DIST Chatbot-Eliza-1.07.tar.gz 40241 BLAKE2B e0fb454498f6be1019b4aa173ff3a6476ab0454a329d721b657c73aa1b0af454fd139a90098365fae6b60ae7f630aa8b4c5372d85833707823189889d983a633 SHA512 d9155ca13d9fc6f6741d9e99da764df25df5e762717eccb6e944c86a5f51d60eedc240f2cb8bde6f508ce075f96f605352fdb8f606eeb59896e2437a85c54109
|
||||
DIST Chatbot-Eliza-1.08.tar.gz 40294 BLAKE2B 74c84eec13daecab44d15d2d8a27c9c08f1ac590948e9e89842df3cf77f28c3abb7c00b6763f563f54063c4151e9ca22a044411276424b980d6ecc0041b92334 SHA512 9d90fc0064541167c85491e03bb8a8d8bee16986cd7a07a1e1ff99d4e80bb854e1d87869b9bb2f6b33de5c84bf479aa95a045a234317226f53f490eebde506d0
|
||||
|
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=HAARG
|
||||
DIST_VERSION=0.31
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="A pragma to use the C3 method resolution order algortihm"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-aix ~ppc-macos ~x64-macos ~x86-solaris"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-perl/Algorithm-C3-0.70.0
|
||||
virtual/perl-Scalar-List-Utils
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
test? (
|
||||
>=virtual/perl-Test-Simple-0.470.0
|
||||
)
|
||||
"
|
@ -1,2 +1 @@
|
||||
DIST Class-C3-0.31.tar.gz 27257 BLAKE2B 87a3e583dbc04893c8691236b0c7ef1e5d0630aab7732b426e4244a2871601f2e11919e1669e584656e58bd7e7c20e353a9b154029e52c36ff91247f359b0c9f SHA512 f299e69e6ecfb51536babe89994a66e44179583c1e43cb79e23072f82db35ca3d2cabbc8119bdd59ed7d2119337ada79e55338a6d7b8509a40ea7896cd7f6173
|
||||
DIST Class-C3-0.33.tar.gz 27163 BLAKE2B 81f970446076796e05412bb300170dcc65fec20b9f10bb112e412be1019eba4af16ec3276af20c6432862a835b48ebab976d4d4ca3b1410af049036fd6aa3639 SHA512 f72cff75c1222d7b42041b44b5ec7c8ff79e8c53f84ff11e1976a69dcde49093c52e66ebc19ce72f70c99332a9528a07a7d9eab7c74f5b6ce77464434b36cd7b
|
||||
|
@ -1,19 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=KWILLIAMS
|
||||
MODULE_VERSION=0.12
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Class-Container module for perl"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ia64 ppc sparc x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-perl/Params-Validate-0.24-r1
|
||||
>=virtual/perl-Scalar-List-Utils-1.08"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-perl/Module-Build-0.28"
|
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=TMTM
|
||||
MY_P=${PN}-v${PV}
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Simple Database Abstraction"
|
||||
|
||||
LICENSE="|| ( Artistic GPL-2 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
# Tests aren't possible since they require interaction with the DB's
|
||||
|
||||
RDEPEND=">=dev-perl/Class-Data-Inheritable-0.02
|
||||
>=dev-perl/Class-Accessor-0.18
|
||||
>=dev-perl/Class-Trigger-0.07
|
||||
virtual/perl-File-Temp
|
||||
virtual/perl-Storable
|
||||
virtual/perl-Test-Simple
|
||||
virtual/perl-Scalar-List-Utils
|
||||
dev-perl/Clone
|
||||
>=dev-perl/Ima-DBI-0.33
|
||||
virtual/perl-version
|
||||
>=dev-perl/UNIVERSAL-moniker-0.06"
|
||||
DEPEND="${RDEPEND}"
|
@ -1,16 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=TMTM
|
||||
MODULE_VERSION=0.08
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Inheritable, overridable class data"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
export OPTIMIZE="${CFLAGS}"
|
@ -1,24 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=TOKUHIROM
|
||||
MODULE_VERSION=0.03
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Automated accessor generation"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
dev-perl/Module-Build
|
||||
virtual/perl-CPAN-Meta
|
||||
>=virtual/perl-Parse-CPAN-Meta-1.441.400
|
||||
"
|
||||
# see bug 542584 for Parse::CPAN::Meta
|
||||
|
||||
SRC_TEST="do"
|
||||
PREFER_BUILDPL="no"
|
@ -1,2 +1 @@
|
||||
DIST Class-ErrorHandler-0.03.tar.gz 10061 BLAKE2B f0b1f7dc2046ffa2e9fac321d96979f66594c4e766f56bf4d33f40eb004915b974bb1117fac159acc4d2d2470132227cb11a619f9ebb97eb596e48a358b7e792 SHA512 aefc6497b8ebdd3efe1643a84051b2739879f5472753a484b8eb14a29ba1826806bdc17ddb46efb50e969ceedae309fe7cfa965d9c45054b40fe2fbaed7b60a7
|
||||
DIST Class-ErrorHandler-0.04.tar.gz 9821 BLAKE2B f92318211d23b42652eee40aaf538567f0047daeb8b7b5bc80c91759c5e103314ca3bf712524ffe66897873e10b689be13ce10ad0a83604743c3dc927d24f320 SHA512 9e235da1c2091f9422723af4528305b8ed2b50920a865e6fee76380a8c512fcd837d752f4ea5146df12c506c776e88c1075419ab3809be3296995387df759c83
|
||||
|
@ -1,18 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=DROLSKY
|
||||
MODULE_VERSION=1.7
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Provide utility methods for factory classes"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-perl/Module-Build-0.28"
|
@ -1,15 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=SMUELLER
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Report the search path thru an ISA tree"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
SRC_TEST="do"
|
@ -1,31 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=DROLSKY
|
||||
MODULE_VERSION=0.06
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="XS implementation of parts of Class::Load"
|
||||
|
||||
LICENSE="Artistic-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~x64-macos"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-perl/Class-Load-0.200.0
|
||||
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-perl/Module-Build-0.360.100
|
||||
test? (
|
||||
>=virtual/perl-Test-Simple-0.880.0
|
||||
>=dev-perl/Module-Implementation-0.40.0
|
||||
dev-perl/Test-Fatal
|
||||
dev-perl/Test-Requires
|
||||
)
|
||||
"
|
||||
|
||||
SRC_TEST=do
|
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=ETHER
|
||||
DIST_VERSION=0.09
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="XS implementation of parts of Class::Load"
|
||||
|
||||
LICENSE="Artistic-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-perl/Class-Load-0.200.0
|
||||
virtual/perl-XSLoader
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
test? (
|
||||
virtual/perl-File-Spec
|
||||
>=virtual/perl-CPAN-Meta-2.120.900
|
||||
>=virtual/perl-Test-Simple-0.880.0
|
||||
>=dev-perl/Module-Implementation-0.40.0
|
||||
dev-perl/Test-Fatal
|
||||
dev-perl/Test-Requires
|
||||
virtual/perl-version
|
||||
)
|
||||
"
|
@ -1,3 +1 @@
|
||||
DIST Class-Load-XS-0.06.tar.gz 56141 BLAKE2B e3612af5f8741a4766df09fb2488cec5df80b242d05d40435d9b537acf7af87f5043263de3a2efa85464df5493d6dda6f72faf15317657adc349a202dc4f6a21 SHA512 07effa62cef0c27f25c5918e7dbc9aec3aa2ad88dfd06963cef2908c562532ea3048feb97717f0a120ca40250f3629f31a2d9d2263036e6de61158bebb6afe36
|
||||
DIST Class-Load-XS-0.09.tar.gz 73186 BLAKE2B bda5f8541aa2dbb31effcc415377a23924ed42264bd3a937eb7103df41a17f6fa9165e39b90c96a40cac70ffbd805b920b3d30714e6ec926b4e6d216c229f7f8 SHA512 9b24637cf7b035ba369f05e42c0bd5a8590e001f2395b46df078635a50bb3df58ad57850be0010d092ae2530d9a545bbcc5f0055f6ae7f166c93905c022d469d
|
||||
DIST Class-Load-XS-0.10.tar.gz 77930 BLAKE2B 8d7540797a11fadf5f1d3622df0f39a1a8e97ec35aff807c04e55bfaf3ae3438c0cf777bfae8a39b44b4948b42fd05f8dbf476617b3321a1dee2149bd013a4b9 SHA512 16ab845dc393567f0b0e9597eda7d7678b8a41d218823a166bacdfd4dc93e704a6aff98662340b8d7f4d045a60530071bb84ea8da8be5a6930af47722207d126
|
||||
|
@ -1,16 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=DSCHWEI
|
||||
MODULE_VERSION=1.10
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="A grammar-based, user-friendly config parser"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~hppa ~sparc x86"
|
||||
IUSE=""
|
||||
|
||||
SRC_TEST="do"
|
@ -1,17 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=DSCHWEI
|
||||
DIST_VERSION=1.11
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="A grammar-based, user-friendly config parser"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="virtual/perl-ExtUtils-MakeMaker"
|
@ -1,3 +1 @@
|
||||
DIST Config-Grammar-1.10.tar.gz 17877 BLAKE2B d2a9fbe3e7fc9bc91905b2459057242958453e4fa81fdaa5a50ee47d0d762e620d8826bd3b451122df280b324df7a63d070d8bc87c955aee72e77ed83aabdca5 SHA512 0891984da560a9dd758fff0678cd577898f4b1796d275dfbed27d411941aca7830f7b6f8a4a4a913572bf0ea7b62414b3d852c0a37b5e629db6ae437c1db0690
|
||||
DIST Config-Grammar-1.11.tar.gz 18955 BLAKE2B 4753f0fae155d228182a766cc0312197677fff56b7c84959a0c868ef387019fda4596f8825944519d4d7ccc777171d12a1fc9bb03550eea189009e677749fbba SHA512 d80f63fdad8f30cef914842299a491a4abcd1ed0e122e9cb61375a22ea0261fc4e8b3b7b928086a4bacccb511b96cd52ea7f31e14bdd8ee78beff69ed2e9ccc4
|
||||
DIST Config-Grammar-1.12.tar.gz 26163 BLAKE2B ed0e1e38698dc1d3d09f7eb5026765a6a91d599b2d222016ac82d44d8da18035603e2ae97e13c1066d7bf0259993e0e9bcde2257f17c18854b9e713b74896332 SHA512 44d46019b32d891830d224b6002c2c73fd59c772b0308ac27ab68b5899bb921c74184a0c354a41c8bef3eb876eb1fdc0f07334bcaf4394d907059fae903ba12e
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue