diff options
7 files changed, 21 insertions, 21 deletions
diff --git a/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch index fe9f70ac0072..0308964a22a3 100644 --- a/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch +++ b/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch @@ -1,7 +1,7 @@ Fix building with dlopen() not available. ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -89,6 +89,9 @@ [], [enable_dynamic_extensions=yes]) if test x"$enable_dynamic_extensions" != "xno"; then diff --git a/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch index c2f97622fae5..32e290206b38 100644 --- a/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch +++ b/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch @@ -2,8 +2,8 @@ Link executables against libsqlite3.so. Increase timeout for fuzzcheck. Fix building with dlopen() not available. ---- Makefile.in -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -555,7 +555,7 @@ # Extra compiler options for various shell tools # @@ -123,8 +123,8 @@ Fix building with dlopen() not available. loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -570,6 +570,9 @@ if test "${use_loadextension}" = "yes" ; then OPT_FEATURE_FLAGS="" diff --git a/dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch index 7ddb61305eb1..e2b8889ff70b 100644 --- a/dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch +++ b/dev-db/sqlite/files/sqlite-3.14.0-full_tarball-build.patch @@ -2,8 +2,8 @@ Link executables against libsqlite3.so. Increase timeout for fuzzcheck. Fix building with dlopen() not available. ---- Makefile.in -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -559,6 +559,7 @@ # SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 @@ -133,8 +133,8 @@ Fix building with dlopen() not available. loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -584,6 +584,9 @@ if test "${use_loadextension}" = "yes" ; then OPT_FEATURE_FLAGS="" diff --git a/dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch b/dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch index 7a979ae49e32..15fb51e6127b 100644 --- a/dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch +++ b/dev-db/sqlite/files/sqlite-3.15.0-full_tarball-tests-icu.patch @@ -1,7 +1,7 @@ https://www.sqlite.org/src/info/afbbb6c66a85ff3f ---- ext/icu/icu.c -+++ ext/icu/icu.c +--- a/ext/icu/icu.c ++++ b/ext/icu/icu.c @@ -500,20 +500,20 @@ void *pContext; /* sqlite3_user_data() context */ void (*xFunc)(sqlite3_context*,int,sqlite3_value**); @@ -34,8 +34,8 @@ https://www.sqlite.org/src/info/afbbb6c66a85ff3f {"icu_load_collation", 2, SQLITE_UTF8, (void*)db, icuLoadCollation}, }; ---- test/cursorhint2.test -+++ test/cursorhint2.test +--- a/test/cursorhint2.test ++++ b/test/cursorhint2.test @@ -164,17 +164,19 @@ x2 {AND(EQ(c1,ADD(32,32)),EQ(c0,r[2]))} } diff --git a/dev-db/sqlite/sqlite-3.14.1.ebuild b/dev-db/sqlite/sqlite-3.14.1.ebuild index 9a00cfb55a81..e6ce8ce2d76e 100644 --- a/dev-db/sqlite/sqlite-3.14.1.ebuild +++ b/dev-db/sqlite/sqlite-3.14.1.ebuild @@ -50,7 +50,7 @@ pkg_setup() { src_prepare() { if full_tarball; then - epatch "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch" + eapply "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch" eapply_user @@ -58,7 +58,7 @@ src_prepare() { # 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 - epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch" + eapply "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch" eapply_user diff --git a/dev-db/sqlite/sqlite-3.14.2.ebuild b/dev-db/sqlite/sqlite-3.14.2.ebuild index 9a00cfb55a81..e6ce8ce2d76e 100644 --- a/dev-db/sqlite/sqlite-3.14.2.ebuild +++ b/dev-db/sqlite/sqlite-3.14.2.ebuild @@ -50,7 +50,7 @@ pkg_setup() { src_prepare() { if full_tarball; then - epatch "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch" + eapply "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch" eapply_user @@ -58,7 +58,7 @@ src_prepare() { # 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 - epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch" + eapply "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch" eapply_user diff --git a/dev-db/sqlite/sqlite-3.15.1.ebuild b/dev-db/sqlite/sqlite-3.15.1.ebuild index a38cdb2363fc..1ba34907bf17 100644 --- a/dev-db/sqlite/sqlite-3.15.1.ebuild +++ b/dev-db/sqlite/sqlite-3.15.1.ebuild @@ -50,8 +50,8 @@ pkg_setup() { src_prepare() { if full_tarball; then - epatch "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch" - epatch "${FILESDIR}/${PN}-3.15.0-full_tarball-tests-icu.patch" + eapply "${FILESDIR}/${PN}-3.14.0-full_tarball-build.patch" + eapply "${FILESDIR}/${PN}-3.15.0-full_tarball-tests-icu.patch" eapply_user @@ -59,7 +59,7 @@ src_prepare() { # 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 - epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch" + eapply "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch" eapply_user |