* [PR PATCH] tracker: update to 3.5.0.
@ 2023-03-24 0:59 oreo639
2023-03-24 1:31 ` [PR PATCH] [Updated] " oreo639
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: oreo639 @ 2023-03-24 0:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/42967
tracker: update to 3.5.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-42967.patch --]
[-- Type: text/x-diff, Size: 4267 bytes --]
From 523dcef686ca5627154cd5c9221df114b59994eb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:33:41 -0700
Subject: [PATCH 1/2] tracker: update to 3.5.0.
---
srcpkgs/tracker/patches/disable-cli-test.patch | 14 +++++++-------
srcpkgs/tracker/template | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tracker/patches/disable-cli-test.patch
index 7b3f90302925..98db4cbf3fe9 100644
--- a/srcpkgs/tracker/patches/disable-cli-test.patch
+++ b/srcpkgs/tracker/patches/disable-cli-test.patch
@@ -1,11 +1,11 @@
fails to create database and then times out at creating a http server
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
-@@ -35,7 +35,6 @@ functional_tests = [
- 'collation',
- 'ontology-changes',
- 'ontology-rollback',
-- 'cli',
- 'portal',
- ]
+@@ -18,7 +18,6 @@ testconf.set('TEST_TAP_ENABLED', get_opt
+ subdir('config')
+ functional_tests = [
+- 'test_cli',
+ 'test_coalesce',
+ 'test_collation',
+ 'test_concurrent_query',
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index df004713e155..16f14211f4b5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,6 +1,6 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.4.2
+version=3.5.0
revision=1
build_style=meson
build_helper="gir"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Tracker"
changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=4e6df142a4f704878fca98ebb5a224750e5ea546aa2aaabaa726a73540bd1731
+checksum=13294275dbbbad9634b3a8390c08e6f12bebfe84f6ccafb72b27b0c23ba8da2f
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From ccaf0bf663869b6655eaac416c439dba3c11d820 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:34:00 -0700
Subject: [PATCH 2/2] tracker-miners: update to 3.5.0.
---
srcpkgs/tracker-miners/patches/build.patch | 25 ----------------------
srcpkgs/tracker-miners/template | 4 ++--
2 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
deleted file mode 100644
index 9fd55b1d6324..000000000000
--- a/srcpkgs/tracker-miners/patches/build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8d709c3b55dc92621d5871fb429a02c78cc4b2d8 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 23:57:32 +0200
-Subject: [PATCH] fix build
-
----
- src/libtracker-miner/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/libtracker-miner/meson.build src/libtracker-miner/meson.build
-index a226623..9eacee3 100644
---- a/src/libtracker-miner/meson.build
-+++ b/src/libtracker-miner/meson.build
-@@ -40,7 +40,7 @@ endif
-
- libtracker_miner = library(
- 'tracker-miner-' + tracker_api_version,
-- miner_enums[0], miner_enums[1], miner_sources,
-+ miner_enums[0], miner_enums[1], tracker_miners_common_enum_header, miner_sources,
- c_args: tracker_c_args,
- install: true,
- install_dir: tracker_internal_libs_dir,
---
-2.28.0
-
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 3e7966c2b4a9..09af42dbc977 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.4.3
+version=3.5.0
revision=1
build_style=meson
build_helper=qemu
@@ -27,7 +27,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=8e4f3976472641b648d0f8f20debae1b1629ca5b560b8616e117d29d756fbeeb
+checksum=17966603dc432a98526b490586a48acd7f9f59935f7895dfc51729a46a6901a3
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] tracker: update to 3.5.0.
2023-03-24 0:59 [PR PATCH] tracker: update to 3.5.0 oreo639
@ 2023-03-24 1:31 ` oreo639
2023-03-24 1:49 ` oreo639
2023-03-24 19:47 ` [PR PATCH] [Merged]: " paper42
2 siblings, 0 replies; 4+ messages in thread
From: oreo639 @ 2023-03-24 1:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/42967
tracker: update to 3.5.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-42967.patch --]
[-- Type: text/x-diff, Size: 21408 bytes --]
From 0c4147e35473b11283aa5436d9815b02c4299619 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:33:41 -0700
Subject: [PATCH 1/2] tracker: update to 3.5.0.
---
...812d31697ba430ebb843133304b46991d637.patch | 477 ++++++++++++++++++
.../tracker/patches/disable-cli-test.patch | 14 +-
srcpkgs/tracker/template | 4 +-
3 files changed, 486 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/tracker/patches/6409812d31697ba430ebb843133304b46991d637.patch
diff --git a/srcpkgs/tracker/patches/6409812d31697ba430ebb843133304b46991d637.patch b/srcpkgs/tracker/patches/6409812d31697ba430ebb843133304b46991d637.patch
new file mode 100644
index 000000000000..210af5b2c782
--- /dev/null
+++ b/srcpkgs/tracker/patches/6409812d31697ba430ebb843133304b46991d637.patch
@@ -0,0 +1,477 @@
+From d06090c19ad982467142df858c91ffd0bacfca29 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Tue, 21 Mar 2023 20:12:59 +0100
+Subject: [PATCH 1/7] tests: Pass right type/width to varargs TrackerBatch API
+
+We specify G_TYPE_INT64 but pass an unspecified integer that gets
+promoted to 32-bit. This wreaks havoc in the GValue varargs collection
+glib code.
+
+Specify the right type in our tests, so that we don't hit this bug.
+
+Closes: https://gitlab.gnome.org/GNOME/tracker/-/issues/397
+---
+ tests/libtracker-sparql/tracker-batch-test.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/libtracker-sparql/tracker-batch-test.c b/tests/libtracker-sparql/tracker-batch-test.c
+index 9b9f81b8c0..a49eeed8c0 100644
+--- a/tests/libtracker-sparql/tracker-batch-test.c
++++ b/tests/libtracker-sparql/tracker-batch-test.c
+@@ -525,7 +525,7 @@ batch_statement_insert (TestFixture *test_fixture,
+ "codec", G_TYPE_STRING, "png",
+ "interlaced", G_TYPE_BOOLEAN, FALSE,
+ "exposure", G_TYPE_DOUBLE, 0.12345678901,
+- "resolution", G_TYPE_INT64, 123,
++ "resolution", G_TYPE_INT64, (gint64) 123,
+ "created", G_TYPE_DATE_TIME, date,
+ NULL);
+
+@@ -556,7 +556,7 @@ batch_statement_update (TestFixture *test_fixture,
+ "codec", G_TYPE_STRING, "jpeg",
+ "interlaced", G_TYPE_BOOLEAN, TRUE,
+ "exposure", G_TYPE_DOUBLE, 1.23456789012,
+- "resolution", G_TYPE_INT64, 234,
++ "resolution", G_TYPE_INT64, (gint64) 234,
+ "created", G_TYPE_DATE_TIME, date,
+ NULL);
+ tracker_batch_execute (batch, NULL, &error);
+@@ -571,7 +571,7 @@ batch_statement_update (TestFixture *test_fixture,
+ "codec", G_TYPE_STRING, "png",
+ "interlaced", G_TYPE_BOOLEAN, FALSE,
+ "exposure", G_TYPE_DOUBLE, 0.12345678901,
+- "resolution", G_TYPE_INT64, 123,
++ "resolution", G_TYPE_INT64, (gint64) 123,
+ "created", G_TYPE_DATE_TIME, date,
+ NULL);
+ tracker_batch_execute (batch, NULL, &error);
+@@ -601,7 +601,7 @@ batch_statement_update_same_batch (TestFixture *test_fixture,
+ "codec", G_TYPE_STRING, "jpeg",
+ "interlaced", G_TYPE_BOOLEAN, TRUE,
+ "exposure", G_TYPE_DOUBLE, 1.23456789012,
+- "resolution", G_TYPE_INT64, 234,
++ "resolution", G_TYPE_INT64, (gint64) 234,
+ "created", G_TYPE_DATE_TIME, date,
+ NULL);
+ tracker_batch_add_statement (batch, stmt,
+@@ -609,7 +609,7 @@ batch_statement_update_same_batch (TestFixture *test_fixture,
+ "codec", G_TYPE_STRING, "png",
+ "interlaced", G_TYPE_BOOLEAN, FALSE,
+ "exposure", G_TYPE_DOUBLE, 0.12345678901,
+- "resolution", G_TYPE_INT64, 123,
++ "resolution", G_TYPE_INT64, (gint64) 123,
+ "created", G_TYPE_DATE_TIME, date,
+ NULL);
+ tracker_batch_execute (batch, NULL, &error);
+@@ -641,7 +641,7 @@ batch_statement_delete (TestFixture *test_fixture,
+ "codec", G_TYPE_STRING, "png",
+ "interlaced", G_TYPE_BOOLEAN, FALSE,
+ "exposure", G_TYPE_DOUBLE, 0.12345678901,
+- "resolution", G_TYPE_INT64, 123,
++ "resolution", G_TYPE_INT64, (gint64) 123,
+ "created", G_TYPE_DATE_TIME, date,
+ NULL);
+ tracker_batch_execute (batch, NULL, &error);
+@@ -683,7 +683,7 @@ batch_statement_delete_same_batch (TestFixture *test_fixture,
+ "codec", G_TYPE_STRING, "png",
+ "interlaced", G_TYPE_BOOLEAN, FALSE,
+ "exposure", G_TYPE_DOUBLE, 0.12345678901,
+- "resolution", G_TYPE_INT64, 123,
++ "resolution", G_TYPE_INT64, (gint64) 123,
+ "created", G_TYPE_DATE_TIME, date,
+ NULL);
+ tracker_batch_add_statement (batch, del_stmt,
+--
+GitLab
+
+
+From 798355cf7d3bb8225d45ce99bf194f57b187b2b0 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Tue, 21 Mar 2023 12:13:37 +0100
+Subject: [PATCH 2/7] ci: Update stable fedora image to F37
+
+Fedora 35 is somewhat stale already.
+---
+ .gitlab-ci.yml | 32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
+index a473dc69ea..7d478c1031 100644
+--- a/.gitlab-ci.yml
++++ b/.gitlab-ci.yml
+@@ -131,10 +131,10 @@ check-merge-request:
+ BASE_TAG: '2022-03-07.0'
+ FDO_DISTRIBUTION_PACKAGES: 'alpine-sdk asciidoc bash-completion dbus dbus-dev git glib-dev gobject-introspection-dev gtk-doc icu-dev json-glib-dev libsoup-dev libxml2-dev meson py3-gobject3 py3-setuptools py3-tappy sqlite-dev gcovr'
+
+-.tracker.fedora:35@x86_64:
++.tracker.fedora:37@x86_64:
+ extends: .tracker.fedora@common
+ variables:
+- FDO_DISTRIBUTION_VERSION: 35
++ FDO_DISTRIBUTION_VERSION: 37
+ FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
+
+ .tracker.fedora:rawhide@x86_64:
+@@ -143,10 +143,10 @@ check-merge-request:
+ FDO_DISTRIBUTION_VERSION: rawhide
+ FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
+
+-.tracker.fedora:35@aarch64:
++.tracker.fedora:37@aarch64:
+ extends: .tracker.fedora@common
+ variables:
+- FDO_DISTRIBUTION_VERSION: 35
++ FDO_DISTRIBUTION_VERSION: 37
+ FDO_DISTRIBUTION_TAG: "aarch64-${BASE_TAG}"
+ tags:
+ - aarch64
+@@ -166,7 +166,7 @@ check-merge-request:
+ build-fedora-container@x86_64:
+ extends:
+ - .fdo.container-build@fedora
+- - .tracker.fedora:35@x86_64
++ - .tracker.fedora:37@x86_64
+ stage: prepare
+ variables:
+ GIT_STRATEGY: none
+@@ -191,7 +191,7 @@ build-fedora-rawhide-container@x86_64:
+ build-fedora-container@aarch64:
+ extends:
+ - .fdo.container-build@fedora
+- - .tracker.fedora:35@aarch64
++ - .tracker.fedora:37@aarch64
+ stage: prepare
+ variables:
+ GIT_STRATEGY: none
+@@ -227,7 +227,7 @@ build-alpine-container@x86_64:
+ check-code-style:
+ extends:
+ - .fdo.distribution-image@fedora
+- - .tracker.fedora:35@x86_64
++ - .tracker.fedora:37@x86_64
+ needs:
+ - build-fedora-container@x86_64
+ stage: code-review
+@@ -250,7 +250,7 @@ check-code-style:
+ build-fedora@x86_64:
+ extends:
+ - .fdo.distribution-image@fedora
+- - .tracker.fedora:35@x86_64
++ - .tracker.fedora:37@x86_64
+ needs:
+ - build-fedora-container@x86_64
+ <<: *build
+@@ -267,7 +267,7 @@ build-fedora-rawhide@x86_64:
+ build-fedora@aarch64:
+ extends:
+ - .fdo.distribution-image@fedora
+- - .tracker.fedora:35@aarch64
++ - .tracker.fedora:37@aarch64
+ needs:
+ - build-fedora-container@aarch64
+ allow_failure: true
+@@ -340,7 +340,7 @@ build-alpine-latest@x86_64:
+ test-fedora@x86_64:
+ extends:
+ - .fdo.distribution-image@fedora
+- - .tracker.fedora:35@x86_64
++ - .tracker.fedora:37@x86_64
+ needs:
+ - build-fedora@x86_64
+ <<: *test
+@@ -362,7 +362,7 @@ test-fedora-rawhide@x86_64:
+ test-fedora@aarch64:
+ extends:
+ - .fdo.distribution-image@fedora
+- - .tracker.fedora:35@aarch64
++ - .tracker.fedora:37@aarch64
+ needs:
+ - build-fedora@aarch64
+ allow_failure: true
+@@ -387,7 +387,7 @@ test-alpine@x86_64:
+ test-website:
+ extends:
+ - .fdo.distribution-image@fedora
+- - .tracker.fedora:35@x86_64
++ - .tracker.fedora:37@x86_64
+ stage: test
+ script:
+ - export install_prefix="$(pwd)/tracker-install"
+@@ -410,7 +410,7 @@ test-website:
+ coverage:
+ extends:
+ - .fdo.distribution-image@fedora
+- - .tracker.fedora:35@x86_64
++ - .tracker.fedora:37@x86_64
+ stage: analysis
+ allow_failure: true
+ script:
+@@ -439,7 +439,7 @@ coverage:
+ coverity:
+ extends:
+ - .fdo.distribution-image@fedora
+- - .tracker.fedora:35@x86_64
++ - .tracker.fedora:37@x86_64
+ stage: analysis
+ allow_failure: true
+ script:
+@@ -465,7 +465,7 @@ coverity:
+ static-scan:
+ extends:
+ - .fdo.distribution-image@fedora
+- - .tracker.fedora:35@x86_64
++ - .tracker.fedora:37@x86_64
+ stage: analysis
+ needs:
+ - build-fedora-container@x86_64
+@@ -480,7 +480,7 @@ static-scan:
+ pages:
+ extends:
+ - .fdo.distribution-image@fedora
+- - .tracker.fedora:35@x86_64
++ - .tracker.fedora:37@x86_64
+ stage: website
+ script:
+ - mv website public
+--
+GitLab
+
+
+From bb27cf0bb4b10d5ca992ecda9c0e308512150311 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Tue, 21 Mar 2023 12:24:21 +0100
+Subject: [PATCH 3/7] ci: Add targets for aarch64 rawhide
+
+In addition to testing stable Fedora (even old, till the previous commit)
+on aarch64, test this architecture on Rawhide as well, in order to spot
+possible endianness regressions from our dependencies.
+---
+ .gitlab-ci.yml | 41 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 41 insertions(+)
+
+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
+index 7d478c1031..af34a6a586 100644
+--- a/.gitlab-ci.yml
++++ b/.gitlab-ci.yml
+@@ -151,6 +151,14 @@ check-merge-request:
+ tags:
+ - aarch64
+
++.tracker.fedora:rawhide@aarch64:
++ extends: .tracker.fedora@common
++ variables:
++ FDO_DISTRIBUTION_VERSION: rawhide
++ FDO_DISTRIBUTION_TAG: "aarch64-${BASE_TAG}"
++ tags:
++ - aarch64
++
+ .tracker.ubuntu:rolling@x86_64:
+ extends: .tracker.ubuntu@common
+ variables:
+@@ -200,6 +208,18 @@ build-fedora-container@aarch64:
+ - check-commit-log
+ - check-merge-request
+
++build-fedora-rawhide-container@aarch64:
++ extends:
++ - .fdo.container-build@fedora
++ - .tracker.fedora:rawhide@aarch64
++ stage: prepare
++ variables:
++ GIT_STRATEGY: none
++ needs:
++ - repo-sanity
++ - check-commit-log
++ - check-merge-request
++
+ build-ubuntu-container@x86_64:
+ extends:
+ - .fdo.container-build@ubuntu
+@@ -275,6 +295,17 @@ build-fedora@aarch64:
+ NO_DOCS: "true"
+ <<: *build
+
++build-fedora-rawhide@aarch64:
++ extends:
++ - .fdo.distribution-image@fedora
++ - .tracker.fedora:rawhide@aarch64
++ needs:
++ - build-fedora-rawhide-container@aarch64
++ allow_failure: true
++ variables:
++ NO_DOCS: "true"
++ <<: *build
++
+ build-ubuntu-rolling@x86_64:
+ extends:
+ - .fdo.distribution-image@ubuntu
+@@ -368,6 +399,15 @@ test-fedora@aarch64:
+ allow_failure: true
+ <<: *test
+
++test-fedora-rawhide@aarch64:
++ extends:
++ - .fdo.distribution-image@fedora
++ - .tracker.fedora:rawhide@aarch64
++ needs:
++ - build-fedora-rawhide@aarch64
++ allow_failure: true
++ <<: *test
++
+ test-ubuntu@x86_64:
+ extends:
+ - .fdo.distribution-image@ubuntu
+@@ -434,6 +474,7 @@ coverage:
+ - test-fedora@x86_64
+ - test-fedora-rawhide@x86_64
+ - test-fedora@aarch64
++ - test-fedora-rawhide@aarch64
+ - test-alpine@x86_64
+
+ coverity:
+--
+GitLab
+
+
+From e255b4a39a88e66cf1fc9e254a97ca283b93989b Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Tue, 21 Mar 2023 15:52:19 +0100
+Subject: [PATCH 4/7] ci: Do not consume gcovr output
+
+Provide a hint to CI logs if gcovr fails to get a JSON summary.
+---
+ .gitlab-ci.yml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
+index af34a6a586..baaf5306c1 100644
+--- a/.gitlab-ci.yml
++++ b/.gitlab-ci.yml
+@@ -345,7 +345,7 @@ build-alpine-latest@x86_64:
+ - gcovr --root=.. --filter='\.\./src/'
+ --exclude=../utils --exclude=../examples --exclude=../docs/reference
+ --exclude='\.\./build/.*\.[ch]$' --exclude='.*/tests/.*\.[ch]$'
+- --json --print-summary --output=../coverage-${CI_JOB_NAME}.json 2>/dev/null
++ --json --print-summary --output=../coverage-${CI_JOB_NAME}.json
+ - popd
+ - |
+ echo "Distribution: "
+--
+GitLab
+
+
+From c5ef034180de4027ec7139c7d7d2b27c9cc5c2f6 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Tue, 21 Mar 2023 15:52:53 +0100
+Subject: [PATCH 5/7] ci: Update alpine image
+
+Hopefully gets us again past gcovr JSON format version mismatches,
+and allows merging those from the different CI test runs.
+---
+ .gitlab-ci.yml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
+index baaf5306c1..0990fa0330 100644
+--- a/.gitlab-ci.yml
++++ b/.gitlab-ci.yml
+@@ -128,8 +128,8 @@ check-merge-request:
+
+ .tracker.alpine@common:
+ variables:
+- BASE_TAG: '2022-03-07.0'
+- FDO_DISTRIBUTION_PACKAGES: 'alpine-sdk asciidoc bash-completion dbus dbus-dev git glib-dev gobject-introspection-dev gtk-doc icu-dev json-glib-dev libsoup-dev libxml2-dev meson py3-gobject3 py3-setuptools py3-tappy sqlite-dev gcovr'
++ BASE_TAG: '2023-03-21.1'
++ FDO_DISTRIBUTION_PACKAGES: 'alpine-sdk asciidoc bash-completion dbus dbus-dev git glib-dev gobject-introspection-dev gtk-doc icu-dev json-glib-dev libsoup-dev libxml2-dev meson py3-gobject3 py3-setuptools py3-tappy sqlite-dev gcovr vala'
+
+ .tracker.fedora:37@x86_64:
+ extends: .tracker.fedora@common
+--
+GitLab
+
+
+From b3f8ada5007b22820357607d548d249a2a24d6ff Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Tue, 21 Mar 2023 16:37:13 +0100
+Subject: [PATCH 6/7] ci: Pass --merge-mode-functions to gcovr
+
+This may be necessary with the switch to gcovr >= 6.0.
+---
+ .gitlab-ci.yml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
+index 0990fa0330..ca6d746db1 100644
+--- a/.gitlab-ci.yml
++++ b/.gitlab-ci.yml
+@@ -345,6 +345,7 @@ build-alpine-latest@x86_64:
+ - gcovr --root=.. --filter='\.\./src/'
+ --exclude=../utils --exclude=../examples --exclude=../docs/reference
+ --exclude='\.\./build/.*\.[ch]$' --exclude='.*/tests/.*\.[ch]$'
++ --merge-mode-functions=separate
+ --json --print-summary --output=../coverage-${CI_JOB_NAME}.json
+ - popd
+ - |
+@@ -456,8 +457,10 @@ coverage:
+ script:
+ - mkdir coveragereport
+ - gcovr --add-tracefile 'coverage-*.json'
++ --merge-mode-functions=separate
+ --html-details --print-summary --output coveragereport/index.html
+ - gcovr --add-tracefile 'coverage-*.json'
++ --merge-mode-functions=separate
+ --xml --output coveragereport/coverage.xml
+ coverage: '/^lines: (\d+\.\d+\%)/'
+ artifacts:
+--
+GitLab
+
+
+From 13196660ad70d5916a1e30951dfd55af591473db Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Tue, 21 Mar 2023 20:22:30 +0100
+Subject: [PATCH 7/7] ci: Run tests for libsoup 2.x
+
+Since we are departing from test beds that have libsoup2 only
+into ones that have soup2 available but soup3 is also available and
+enabled by default, the several paths skewed the coverage testing
+paths.
+
+Add a test target for soup2 specifically, so we get some of it back
+and spot regressions in libsoup2 support.
+---
+ .gitlab-ci.yml | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
+index ca6d746db1..096d96c38b 100644
+--- a/.gitlab-ci.yml
++++ b/.gitlab-ci.yml
+@@ -448,6 +448,16 @@ test-website:
+ needs:
+ - build-fedora-container@x86_64
+
++test-soup2@x86_64:
++ extends:
++ - .fdo.distribution-image@fedora
++ - .tracker.fedora:37@x86_64
++ needs:
++ - build-fedora@x86_64
++ before_script:
++ - meson configure -Dsoup=soup2 build
++ <<: *test
++
+ coverage:
+ extends:
+ - .fdo.distribution-image@fedora
+@@ -479,6 +489,7 @@ coverage:
+ - test-fedora@aarch64
+ - test-fedora-rawhide@aarch64
+ - test-alpine@x86_64
++ - test-soup2@x86_64
+
+ coverity:
+ extends:
+--
+GitLab
+
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tracker/patches/disable-cli-test.patch
index 7b3f90302925..98db4cbf3fe9 100644
--- a/srcpkgs/tracker/patches/disable-cli-test.patch
+++ b/srcpkgs/tracker/patches/disable-cli-test.patch
@@ -1,11 +1,11 @@
fails to create database and then times out at creating a http server
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
-@@ -35,7 +35,6 @@ functional_tests = [
- 'collation',
- 'ontology-changes',
- 'ontology-rollback',
-- 'cli',
- 'portal',
- ]
+@@ -18,7 +18,6 @@ testconf.set('TEST_TAP_ENABLED', get_opt
+ subdir('config')
+ functional_tests = [
+- 'test_cli',
+ 'test_coalesce',
+ 'test_collation',
+ 'test_concurrent_query',
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index df004713e155..16f14211f4b5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,6 +1,6 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.4.2
+version=3.5.0
revision=1
build_style=meson
build_helper="gir"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Tracker"
changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=4e6df142a4f704878fca98ebb5a224750e5ea546aa2aaabaa726a73540bd1731
+checksum=13294275dbbbad9634b3a8390c08e6f12bebfe84f6ccafb72b27b0c23ba8da2f
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From 37a325407b2b63532a9af1ba5a9ab0363203e58e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:34:00 -0700
Subject: [PATCH 2/2] tracker-miners: update to 3.5.0.
---
srcpkgs/tracker-miners/patches/build.patch | 25 ----------------------
srcpkgs/tracker-miners/template | 4 ++--
2 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
deleted file mode 100644
index 9fd55b1d6324..000000000000
--- a/srcpkgs/tracker-miners/patches/build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8d709c3b55dc92621d5871fb429a02c78cc4b2d8 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 23:57:32 +0200
-Subject: [PATCH] fix build
-
----
- src/libtracker-miner/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/libtracker-miner/meson.build src/libtracker-miner/meson.build
-index a226623..9eacee3 100644
---- a/src/libtracker-miner/meson.build
-+++ b/src/libtracker-miner/meson.build
-@@ -40,7 +40,7 @@ endif
-
- libtracker_miner = library(
- 'tracker-miner-' + tracker_api_version,
-- miner_enums[0], miner_enums[1], miner_sources,
-+ miner_enums[0], miner_enums[1], tracker_miners_common_enum_header, miner_sources,
- c_args: tracker_c_args,
- install: true,
- install_dir: tracker_internal_libs_dir,
---
-2.28.0
-
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 3e7966c2b4a9..09af42dbc977 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.4.3
+version=3.5.0
revision=1
build_style=meson
build_helper=qemu
@@ -27,7 +27,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=8e4f3976472641b648d0f8f20debae1b1629ca5b560b8616e117d29d756fbeeb
+checksum=17966603dc432a98526b490586a48acd7f9f59935f7895dfc51729a46a6901a3
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] tracker: update to 3.5.0.
2023-03-24 0:59 [PR PATCH] tracker: update to 3.5.0 oreo639
2023-03-24 1:31 ` [PR PATCH] [Updated] " oreo639
@ 2023-03-24 1:49 ` oreo639
2023-03-24 19:47 ` [PR PATCH] [Merged]: " paper42
2 siblings, 0 replies; 4+ messages in thread
From: oreo639 @ 2023-03-24 1:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages tracker
https://github.com/void-linux/void-packages/pull/42967
tracker: update to 3.5.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tracker-42967.patch --]
[-- Type: text/x-diff, Size: 4542 bytes --]
From 549e803215dbb5e5eaf31a949c3705948774d296 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:33:41 -0700
Subject: [PATCH 1/2] tracker: update to 3.5.0.
---
srcpkgs/tracker/patches/disable-cli-test.patch | 14 +++++++-------
srcpkgs/tracker/template | 8 ++++++--
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tracker/patches/disable-cli-test.patch
index 7b3f90302925..98db4cbf3fe9 100644
--- a/srcpkgs/tracker/patches/disable-cli-test.patch
+++ b/srcpkgs/tracker/patches/disable-cli-test.patch
@@ -1,11 +1,11 @@
fails to create database and then times out at creating a http server
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
-@@ -35,7 +35,6 @@ functional_tests = [
- 'collation',
- 'ontology-changes',
- 'ontology-rollback',
-- 'cli',
- 'portal',
- ]
+@@ -18,7 +18,6 @@ testconf.set('TEST_TAP_ENABLED', get_opt
+ subdir('config')
+ functional_tests = [
+- 'test_cli',
+ 'test_coalesce',
+ 'test_collation',
+ 'test_concurrent_query',
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index df004713e155..9ff3673492bd 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,6 +1,6 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.4.2
+version=3.5.0
revision=1
build_style=meson
build_helper="gir"
@@ -17,13 +17,17 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Tracker"
changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=4e6df142a4f704878fca98ebb5a224750e5ea546aa2aaabaa726a73540bd1731
+checksum=13294275dbbbad9634b3a8390c08e6f12bebfe84f6ccafb72b27b0c23ba8da2f
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" dbus"
fi
+if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+ make_check=ci-skip # Test float comparison and time issues on 32-bit
+fi
+
post_patch() {
if [ "$CROSS_BUILD" ]; then
# Tell the build system that we have internal fts5 in sqlite3
From 1e72b5114f4e8acd4730ea6b8e8091a1c2d91fd1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:34:00 -0700
Subject: [PATCH 2/2] tracker-miners: update to 3.5.0.
---
srcpkgs/tracker-miners/patches/build.patch | 25 ----------------------
srcpkgs/tracker-miners/template | 4 ++--
2 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
deleted file mode 100644
index 9fd55b1d6324..000000000000
--- a/srcpkgs/tracker-miners/patches/build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8d709c3b55dc92621d5871fb429a02c78cc4b2d8 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 23:57:32 +0200
-Subject: [PATCH] fix build
-
----
- src/libtracker-miner/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/libtracker-miner/meson.build src/libtracker-miner/meson.build
-index a226623..9eacee3 100644
---- a/src/libtracker-miner/meson.build
-+++ b/src/libtracker-miner/meson.build
-@@ -40,7 +40,7 @@ endif
-
- libtracker_miner = library(
- 'tracker-miner-' + tracker_api_version,
-- miner_enums[0], miner_enums[1], miner_sources,
-+ miner_enums[0], miner_enums[1], tracker_miners_common_enum_header, miner_sources,
- c_args: tracker_c_args,
- install: true,
- install_dir: tracker_internal_libs_dir,
---
-2.28.0
-
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 3e7966c2b4a9..09af42dbc977 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.4.3
+version=3.5.0
revision=1
build_style=meson
build_helper=qemu
@@ -27,7 +27,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=8e4f3976472641b648d0f8f20debae1b1629ca5b560b8616e117d29d756fbeeb
+checksum=17966603dc432a98526b490586a48acd7f9f59935f7895dfc51729a46a6901a3
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: tracker: update to 3.5.0.
2023-03-24 0:59 [PR PATCH] tracker: update to 3.5.0 oreo639
2023-03-24 1:31 ` [PR PATCH] [Updated] " oreo639
2023-03-24 1:49 ` oreo639
@ 2023-03-24 19:47 ` paper42
2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2023-03-24 19:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1090 bytes --]
There's a merged pull request on the void-packages repository
tracker: update to 3.5.0.
https://github.com/void-linux/void-packages/pull/42967
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-24 19:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-24 0:59 [PR PATCH] tracker: update to 3.5.0 oreo639
2023-03-24 1:31 ` [PR PATCH] [Updated] " oreo639
2023-03-24 1:49 ` oreo639
2023-03-24 19:47 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).