[PR PATCH] gnome-photos: remove an old patch

[PR PATCH] gnome-photos: remove an old patch

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1633 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gnome-photos-fix-segfault
https://github.com/void-linux/void-packages/pull/31619

gnome-photos: remove an old patch
fixes a segfault

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/31619.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-photos-fix-segfault-31619.patch --]
[-- Type: text/x-diff, Size: 2118 bytes --]

From 8be426d298058a59c479d21bd92fa565a09564a2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 22 Jun 2021 22:18:06 +0200
Subject: [PATCH] gnome-photos: remove an old patch

fixes a segfault
---
 .../gnome-photos/patches/fix-double-declaration.diff  | 11 -----------
 srcpkgs/gnome-photos/template                         |  3 ++-
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 srcpkgs/gnome-photos/patches/fix-double-declaration.diff

diff --git a/srcpkgs/gnome-photos/patches/fix-double-declaration.diff b/srcpkgs/gnome-photos/patches/fix-double-declaration.diff
deleted file mode 100644
index d11d0e0fdebf..000000000000
--- a/srcpkgs/gnome-photos/patches/fix-double-declaration.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/photos-base-manager.h	2021-04-20 13:16:07.042348375 +0200
-+++ b/src/photos-base-manager.h	2021-04-20 13:16:16.974347953 +0200
-@@ -78,8 +78,6 @@ guint               photos_base_manager_
- 
- GObject            *photos_base_manager_get_previous_object      (PhotosBaseManager *self, GObject *object);
- 
--PhotosSparqlTemplate *photos_base_manager_get_sparql_template    (PhotosBaseManager *self, gint flags);
--
- const gchar        *photos_base_manager_get_title                (PhotosBaseManager *self);
- 
- gchar              *photos_base_manager_get_where                (PhotosBaseManager *self, gint flags);
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index fee19723ed89..db7c9a01d95a 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-photos'
 pkgname=gnome-photos
 version=40.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Ddogtail=false"
@@ -17,6 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Photos"
 distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
 checksum=e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af
+make_check=no # python3-dogtail not packaged
 
 build_options="gir"
 build_options_default="gir"

Re: gnome-photos: remove an old patch

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1696 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31619#issuecomment-866308109

Comment:
```
[162/207] Compiling C object src/gnome-photos.p/photos-query-builder.c.o
../src/photos-query-builder.c: In function 'photos_query_builder_query':
../src/photos-query-builder.c:153:21: warning: implicit declaration of function 'photos_base_manager_get_sparql_template'; did you mean 'photos_base_manager_get_all_filter'? [-Wimplicit-function-declaration]
  153 |   sparql_template = photos_base_manager_get_sparql_template (state->srch_typ_mngr, flags);
      |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                     photos_base_manager_get_all_filter
../src/photos-query-builder.c:153:21: warning: nested extern declaration of 'photos_base_manager_get_sparql_template' [-Wnested-externs]
../src/photos-query-builder.c:153:19: warning: assignment to 'PhotosSparqlTemplate *' {aka 'struct _PhotosSparqlTemplate *'} from 'int' makes pointer from integer without a cast [-Wint-conversion]
  153 |   sparql_template = photos_base_manager_get_sparql_template (state->srch_typ_mngr, flags);
      |                   ^
../src/photos-query-builder.c: In function 'photos_query_builder_count_query':
../src/photos-query-builder.c:284:19: warning: assignment to 'PhotosSparqlTemplate *' {aka 'struct _PhotosSparqlTemplate *'} from 'int' makes pointer from integer without a cast [-Wint-conversion]
  284 |   sparql_template = photos_base_manager_get_sparql_template (state->srch_typ_mngr, flags);
      |                   ^
```

Why warnings matter (I have a PR to make this specific warning an error as well).

Re: [PR PATCH] [Merged]: gnome-photos: remove an old patch

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]

There's a merged pull request on the void-packages repository

gnome-photos: remove an old patch
https://github.com/void-linux/void-packages/pull/31619

Description:
fixes a segfault

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->