Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use sqlite3/[>=3.45.0 <4] for compatibility with Qt recipes #25961

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/adding_packages/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ version range only when a requirement for a newer version is needed.
* meson: `[>=1.2.3 <2]`
* pkgconf: `[>=2.2 <3]`
* xz_utils: `[>=5.4.5 <6]`
* sqlite3: `[>=3.45.0 <4]`

Conan maintainers may introduce this for other dependencies over time. Outside of the cases outlined above, version ranges are not allowed in ConanCenter recipes.

Expand Down
2 changes: 1 addition & 1 deletion recipes/apr-util/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def requirements(self):
if self.options.with_mysql:
self.requires("libmysqlclient/8.1.0")
if self.options.with_sqlite3:
self.requires("sqlite3/3.45.0")
self.requires("sqlite3/[>=3.45.0 <4]")
if self.options.with_expat:
self.requires("expat/[>=2.6.2 <3]")
if self.options.with_postgresql:
Expand Down
2 changes: 1 addition & 1 deletion recipes/behaviortree.cpp/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def requirements(self):
if self._with_minitrace:
self.requires("minitrace/cci.20230905")
if self._with_sqlite3:
self.requires("sqlite3/3.44.2")
self.requires("sqlite3/[>=3.45.0 <4]")
if self._with_tinyxml2:
self.requires("tinyxml2/10.0.0")
if self._with_zeromq:
Expand Down
2 changes: 1 addition & 1 deletion recipes/botan/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def requirements(self):
if self.options.with_zlib:
self.requires("zlib/[>=1.2.11 <2]")
if self.options.with_sqlite3:
self.requires("sqlite3/3.45.1")
self.requires("sqlite3/[>=3.45.0 <4]")
if self.options.with_boost:
self.requires("boost/1.84.0")

Expand Down
2 changes: 1 addition & 1 deletion recipes/cpython/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def requirements(self):
# TODO: Add nis when available.
raise ConanInvalidConfiguration("nis is not available on CCI (yet)")
if self.options.get_safe("with_sqlite3"):
self.requires("sqlite3/3.45.2")
self.requires("sqlite3/[>=3.45.0 <4]")
if self.options.get_safe("with_tkinter"):
self.requires("tk/8.6.10")
if self.options.get_safe("with_curses", False):
Expand Down
2 changes: 1 addition & 1 deletion recipes/cyrus-sasl/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def requirements(self):
if self.options.get_safe("with_mysql"):
self.requires("libmysqlclient/8.1.0")
if self.options.get_safe("with_sqlite3"):
self.requires("sqlite3/3.44.2")
self.requires("sqlite3/[>=3.45.0 <4]")

def validate(self):
if is_msvc(self) and not self.options.shared:
Expand Down
2 changes: 1 addition & 1 deletion recipes/dlib/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def requirements(self):
if self.options.get_safe("with_webp"):
self.requires("libwebp/1.3.2")
if self.options.with_sqlite3:
self.requires("sqlite3/3.45.0")
self.requires("sqlite3/[>=3.45.0 <4]")
if self.options.with_openblas:
self.requires("openblas/0.3.26")

Expand Down
2 changes: 1 addition & 1 deletion recipes/drogon/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def requirements(self):
if self.options.get_safe("with_mysql"):
self.requires("libmysqlclient/8.1.0")
if self.options.get_safe("with_sqlite"):
self.requires("sqlite3/3.45.0")
self.requires("sqlite3/[>=3.45.0 <4]")
if self.options.get_safe("with_redis"):
self.requires("hiredis/1.2.0")
if self.options.get_safe("with_yaml_cpp", False):
Expand Down
2 changes: 1 addition & 1 deletion recipes/elfutils/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def layout(self):
def requirements(self):
self.requires("zlib/[>=1.2.11 <2]")
if self.options.with_sqlite3:
self.requires("sqlite3/3.44.2")
self.requires("sqlite3/[>=3.45.0 <4]")
if self.options.with_bzlib:
self.requires("bzip2/1.0.8")
if self.options.with_lzma:
Expand Down
2 changes: 1 addition & 1 deletion recipes/gdal/post_3.5.0/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def requirements(self):
if self.options.with_spatialite:
self.requires("libspatialite/5.0.1")
if self.options.with_sqlite3:
self.requires("sqlite3/3.44.2")
self.requires("sqlite3/[>=3.45.0 <4]")
if self.options.with_tiledb:
self.requires("tiledb/2.17.4")
if self.options.with_webp:
Expand Down
2 changes: 1 addition & 1 deletion recipes/gdal/pre_3.5.0/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ def requirements(self):
# if self.options.with_spatialite:
# self.requires("libspatialite/4.3.0a")
if self.options.get_safe("with_sqlite3"):
self.requires("sqlite3/3.44.2")
self.requires("sqlite3/[>=3.45.0 <4]")
# if self.options.with_rasterlite2:
# self.requires("rasterlite2/x.x.x")
if self.options.get_safe("with_pcre"):
Expand Down
2 changes: 1 addition & 1 deletion recipes/librasterlite/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def requirements(self):
self.requires("libpng/1.6.40")
self.requires("libspatialite/5.0.1")
self.requires("libtiff/4.5.1")
self.requires("sqlite3/3.42.0")
self.requires("sqlite3/[>=3.45.0 <4]")

def build_requirements(self):
if not is_msvc(self):
Expand Down
2 changes: 1 addition & 1 deletion recipes/librasterlite2/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def requirements(self):
self.requires("libspatialite/5.0.1")
self.requires("libtiff/4.5.1")
self.requires("libxml2/2.11.4")
self.requires("sqlite3/3.42.0")
self.requires("sqlite3/[>=3.45.0 <4]")
self.requires("zlib/1.2.13")
if self.options.with_openjpeg:
self.requires("openjpeg/2.5.0")
Expand Down
2 changes: 1 addition & 1 deletion recipes/libspatialite/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def layout(self):
def requirements(self):
# Included in public spatialite/sqlite.h
# https://www.gaia-gis.it/fossil/libspatialite/file?name=src/headers/spatialite/sqlite.h&ci=tip
self.requires("sqlite3/3.44.2", transitive_headers=True, transitive_libs=True)
self.requires("sqlite3/[>=3.45.0 <4]", transitive_headers=True, transitive_libs=True)
self.requires("zlib/[>=1.2.11 <2]")
if self.options.with_proj:
self.requires("proj/9.3.1")
Expand Down
4 changes: 2 additions & 2 deletions recipes/libwebsockets/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def requirements(self):
self.requires("libmount/2.39.2")

if self.options.with_sqlite3:
self.requires("sqlite3/3.44.2")
self.requires("sqlite3/[>=3.45.0 <4]")

if self.options.with_ssl == "openssl":
self.requires("openssl/[>=1.1.1w <4]", transitive_headers=True)
Expand Down Expand Up @@ -440,7 +440,7 @@ def _patch_sources(self):
save(self, project_include_file, 'find_package(OpenSSL REQUIRED)\nset(OPENSSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})')

# Prevent locating and copying OpenSSL binaries (not needed by the recipe)
replace_in_file(self,
replace_in_file(self,
os.path.join(self.source_folder, "cmake", "FindOpenSSLbins.cmake"),
"if(OPENSSL_FOUND)", "if(FALSE)")

Expand Down
2 changes: 1 addition & 1 deletion recipes/mfast/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def requirements(self):
self.requires("boost/1.75.0", transitive_headers=True)
self.requires("tinyxml2/9.0.0")
if self.options.with_sqlite3:
self.requires("sqlite3/3.43.1")
self.requires("sqlite3/[>=3.45.0 <4]")

def validate(self):
if self.settings.compiler.get_safe("cppstd"):
Expand Down
2 changes: 1 addition & 1 deletion recipes/oatpp-sqlite/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def layout(self):

def requirements(self):
self.requires(f"oatpp/{self.version}", transitive_headers=True)
self.requires("sqlite3/3.45.0")
self.requires("sqlite3/[>=3.45.0 <4]")

def validate(self):
if self.info.settings.compiler.get_safe("cppstd"):
Expand Down
2 changes: 1 addition & 1 deletion recipes/openslide/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def requirements(self):
self.requires("libtiff/4.6.0")
self.requires("libxml2/[>=2.12.5 <3]")
self.requires("openjpeg/2.5.2")
self.requires("sqlite3/3.45.3")
self.requires("sqlite3/[>=3.45.0 <4]")
self.requires("zlib/[>=1.2.11 <2]")
if self.options.jpeg == "libjpeg":
self.requires("libjpeg/9e")
Expand Down
2 changes: 1 addition & 1 deletion recipes/osgearth/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def requirements(self):
if self.options.with_geos:
self.requires("geos/3.11.1")
if self.options.with_sqlite3:
self.requires("sqlite3/3.42.0")
self.requires("sqlite3/[>=3.45.0 <4]")
if self.options.with_draco:
self.requires("draco/1.4.3")
# if self.options.with_basisu:
Expand Down
2 changes: 1 addition & 1 deletion recipes/poco/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def requirements(self):
if self.options.enable_xml:
self.requires("expat/[>=2.6.2 <3]", transitive_headers=True)
if self.options.enable_data_sqlite:
self.requires("sqlite3/3.45.0")
self.requires("sqlite3/[>=3.45.0 <4]")
if self.options.enable_apacheconnector:
self.requires("apr/1.7.4")
self.requires("apr-util/1.6.1")
Expand Down
2 changes: 1 addition & 1 deletion recipes/proj/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def layout(self):

def requirements(self):
self.requires("nlohmann_json/3.11.3")
self.requires("sqlite3/3.44.2")
self.requires("sqlite3/[>=3.45.0 <4]")
if self.options.get_safe("with_tiff"):
self.requires("libtiff/4.6.0")
if self.options.get_safe("with_curl"):
Expand Down
2 changes: 1 addition & 1 deletion recipes/soci/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def configure(self):

def requirements(self):
if self.options.with_sqlite3:
self.requires("sqlite3/3.44.2")
self.requires("sqlite3/[>=3.45.0 <4]")
if self.options.with_odbc and self.settings.os != "Windows":
self.requires("odbc/2.3.11")
if self.options.with_mysql:
Expand Down
2 changes: 1 addition & 1 deletion recipes/sqlite_orm/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def layout(self):
basic_layout(self, src_folder="src")

def requirements(self):
self.requires("sqlite3/3.45.0", transitive_headers=True, transitive_libs=True)
self.requires("sqlite3/[>=3.45.0 <4]", transitive_headers=True, transitive_libs=True)

def package_id(self):
self.info.clear()
Expand Down
2 changes: 1 addition & 1 deletion recipes/sqlitecpp/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def configure(self):
self.options.rm_safe("fPIC")

def requirements(self):
self.requires("sqlite3/3.45.0")
self.requires("sqlite3/[>=3.45.0 <4]")

def validate(self):
if Version(self.version) >= "3.0.0" and self.info.settings.compiler.get_safe("cppstd"):
Expand Down
2 changes: 1 addition & 1 deletion recipes/sqlpp11-connector-sqlite3/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def requirements(self):
if self.options.with_sqlcipher:
self.requires("sqlcipher/4.5.1", transitive_headers=True, transitive_libs=True)
else:
self.requires("sqlite3/3.44.2", transitive_headers=True, transitive_libs=True)
self.requires("sqlite3/[>=3.45.0 <4]", transitive_headers=True, transitive_libs=True)

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand Down
4 changes: 2 additions & 2 deletions recipes/wt/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def requirements(self):
if self.options.with_ssl:
self.requires("openssl/[>=1.1 <4]")
if self.options.get_safe("with_sqlite"):
self.requires("sqlite3/3.44.2")
self.requires("sqlite3/[>=3.45.0 <4]")
if self.options.get_safe("with_mysql"):
self.requires("libmysqlclient/8.1.0", transitive_headers=True, transitive_libs=True)
if self.options.get_safe("with_postgres"):
Expand All @@ -118,7 +118,7 @@ def requirements(self):
self.requires("libunwind/1.7.2")
if self.options.with_haru:
self.requires("libharu/2.4.3")

def validate(self):
miss_boost_required_comp = any(self.dependencies["boost"].options.get_safe(f"without_{boost_comp}", True)
for boost_comp in self._required_boost_components)
Expand Down