From 39a95d7a1e4ad19ce7f417198c5a8da96499f90b Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 26 Dec 2020 18:50:34 +1100 Subject: [PATCH 1/3] lxd-lts: update to 4.0.4. --- srcpkgs/lxd-lts/template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template index 12a119181f2..42e8a958093 100644 --- a/srcpkgs/lxd-lts/template +++ b/srcpkgs/lxd-lts/template @@ -1,6 +1,6 @@ # Template file for 'lxd-lts' pkgname=lxd-lts -version=4.0.2 +version=4.0.4 revision=1 wrksrc="lxd-$version" build_style=go @@ -16,14 +16,11 @@ maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://linuxcontainers.org/lxd" distfiles="https://linuxcontainers.org/downloads/lxd/${wrksrc}.tar.gz" -checksum=8b712588e383c4326c27cfec5dd2c9fd4c9a4597f82549f55b1909e799f55e13 +checksum=372a666b84c7cbcb7ccbffbf4aa04a05b2fe22e5e0aafa022b700bbf211557f6 conflicts="lxd" provides="lxd-${version}_${revision}" system_groups="lxd" -_libdir="/usr/lib/sqlite-replication" -LDFLAGS="-L${XBPS_CROSS_BASE}${_libdir} -Wl,-R${_libdir}" - do_configure() { # the LXD tarball packages up the required dependencies ln -s "$wrksrc/_dist" "$GOPATH" From 46864c11c5e60946a247b02fed00067c7045563a Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 26 Dec 2020 18:59:08 +1100 Subject: [PATCH 2/3] sqlite-replication: remove. No longer required now that dqlite uses mainline sqlite. --- srcpkgs/sqlite-replication-bin | 1 - srcpkgs/sqlite-replication-devel | 1 - srcpkgs/sqlite-replication/template | 67 ----------------------------- 3 files changed, 69 deletions(-) delete mode 120000 srcpkgs/sqlite-replication-bin delete mode 120000 srcpkgs/sqlite-replication-devel delete mode 100644 srcpkgs/sqlite-replication/template diff --git a/srcpkgs/sqlite-replication-bin b/srcpkgs/sqlite-replication-bin deleted file mode 120000 index 33558ee2d69..00000000000 --- a/srcpkgs/sqlite-replication-bin +++ /dev/null @@ -1 +0,0 @@ -sqlite-replication \ No newline at end of file diff --git a/srcpkgs/sqlite-replication-devel b/srcpkgs/sqlite-replication-devel deleted file mode 120000 index 33558ee2d69..00000000000 --- a/srcpkgs/sqlite-replication-devel +++ /dev/null @@ -1 +0,0 @@ -sqlite-replication \ No newline at end of file diff --git a/srcpkgs/sqlite-replication/template b/srcpkgs/sqlite-replication/template deleted file mode 100644 index c0b40e5909a..00000000000 --- a/srcpkgs/sqlite-replication/template +++ /dev/null @@ -1,67 +0,0 @@ -# Template file for 'sqlite-replication' -pkgname=sqlite-replication -version=3.32.3 -revision=2 -wrksrc="sqlite-version-${version}-replication4" -build_style=gnu-configure -configure_args="--enable-replication --enable-threadsafe --enable-fts5 - --enable-dynamic-extensions" -hostmakedepends="tcl" -makedepends="libedit-devel" -short_desc="Replication Enabled SQL Database Engine in a C Library" -maintainer="Cameron Nemo " -license="Public Domain" -homepage="https://github.com/canonical/sqlite" -distfiles="${homepage}/archive/version-${version}+replication4.tar.gz" -checksum=8caab8703e8b7314e93dfcd6aa09ff306e416fb398bf421f194368ced821d4e6 -shlib_provides="libsqlite3.so.0" - -CFLAGS+="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \ - -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \ - -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 \ - -DSQLITE_ENABLE_FTS3_TOKENIZER=1 -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE=1" -# explicitly enable fdatasync -CFLAGS+=" -DHAVE_FDATASYNC" -disable_parallel_build=yes - -# explicitly set byte order to avoid bad autodetection macros -case "$XBPS_TARGET_ENDIAN" in - le) CFLAGS+=" -DSHA3_BYTEORDER=1234 -DSQLITE_BYTEORDER=1234";; - be) CFLAGS+=" -DSHA3_BYTEORDER=4321 -DSQLITE_BYTEORDER=4321";; -esac - -pre_configure() { - sed -i -e 's/ -ltinfo//g' configure -} - -do_configure() { - ./configure ${configure_args} \ - --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}/sqlite-replication -} - -post_install() { - local libdir="usr/lib${XBPS_TARGET_WORDSIZE}" - vmkdir "${libdir}/pkgconfig" - mv "${DESTDIR}/${libdir}"{/sqlite-replication,}/pkgconfig/sqlite3.pc - # Alpine just deletes the binary, but someone may want it for debugging - mv "$DESTDIR"/usr/bin/sqlite3{,.sqlite-replication} -} - -sqlite-replication-devel_package() { - depends="sqlite-replication>=${version}_${revision}" - conflicts="sqlite-devel>=0" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/sqlite-replication/*.a" - vmove "usr/lib/sqlite-replication/*.so" - } -} - -sqlite-replication-bin_package() { - short_desc+=" - cli tool" - pkg_install() { - vmove usr/bin - } -} From bda4a938f2cae08b4f541c5f0a6d6f5795a5dd02 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 23 Jan 2021 08:40:57 +1100 Subject: [PATCH 3/3] removed-packages: add sqlite-replication. --- srcpkgs/removed-packages/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index d8b7edf40b2..30b4ac8b2bd 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=15 +revision=16 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -175,6 +175,7 @@ replaces=" skypetab-ng<=20150201_3 soulseekqt<=20160117_2 spacefm-ng<=1.0.6_3 + sqlite-replication<=3.32.3_2 ttyload-git<=20141117_4 tuxc<=1.1_3 urlmatch-git<=20141116_2