[PR PATCH] dropbox, nautilus-python, seahorse-nautilus: remove package

[PR PATCH] dropbox, nautilus-python, seahorse-nautilus: remove package

[paper42]

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

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

https://github.com/paper42/void-packages nautilus-43-remove-pkgs
https://github.com/void-linux/void-packages/pull/41121

dropbox, nautilus-python, seahorse-nautilus: remove package
These packages don't work with nautilus 43, this is split from the GNOME 43 PR (#39513) because removing these packages will break shlib checks in xbps if the are not also removed from binary repositories. First, this PR should be merged, then the packages removed from binary repositories and then the GNOME 43 PR should be merged.

#### 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/41121.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nautilus-43-remove-pkgs-41121.patch --]
[-- Type: text/x-diff, Size: 12009 bytes --]

From 830698a32ab653887742af9c80f75a70cbf0ad4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:31:06 +0100
Subject: [PATCH 1/3] dropbox: remove package

doesn't work with nautilus 43
---
 srcpkgs/dropbox/template          | 25 -------------------------
 srcpkgs/dropbox/update            |  1 -
 srcpkgs/nautilus-dropbox          |  1 -
 srcpkgs/removed-packages/template |  2 ++
 4 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/dropbox/template
 delete mode 100644 srcpkgs/dropbox/update
 delete mode 120000 srcpkgs/nautilus-dropbox

diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template
deleted file mode 100644
index 7b73816c3c5c..000000000000
--- a/srcpkgs/dropbox/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'dropbox'
-pkgname=dropbox
-version=2020.03.04
-revision=2
-_fullname="nautilus-dropbox"
-build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config python3-gobject python3-docutils gdk-pixbuf-devel"
-makedepends="nautilus-devel python3-devel python3-gobject-devel"
-depends="libxslt python3-gobject python3-gpg gdk-pixbuf"
-short_desc="Dropbox file sharing"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.dropbox.com"
-distfiles="https://linux.dropbox.com/packages/${_fullname}-${version}.tar.bz2"
-checksum=f3704103e8c646ec48cd9daf9af2183c6b492c59edf93d8768c14861cb404cca
-
-nautilus-dropbox_package() {
-	short_desc="Dropbox nautilus plugin"
-	depends="dropbox>=${version}_${revision}"
-	pkg_install() {
-		vmove /usr/lib/nautilus
-		vmove /usr/share/nautilus-dropbox
-	}
-}
diff --git a/srcpkgs/dropbox/update b/srcpkgs/dropbox/update
deleted file mode 100644
index db5a2a8292c3..000000000000
--- a/srcpkgs/dropbox/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=nautilus-dropbox
diff --git a/srcpkgs/nautilus-dropbox b/srcpkgs/nautilus-dropbox
deleted file mode 120000
index 650a4c835dc4..000000000000
--- a/srcpkgs/nautilus-dropbox
+++ /dev/null
@@ -1 +0,0 @@
-dropbox
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df3fdc331c84..643f738cc91c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -79,6 +79,7 @@ replaces="
  dnote-cli<=0.6.2_1
  docker2aci<=0.17.2_4
  dreampie<=1.2.1_3
+ dropbox<=2020.03.04_2
  dtkcore-devel<=2.1.1_2
  dtkcore<=2.1.1_2
  dtkwidget-devel<=2.1.1_2
@@ -311,6 +312,7 @@ replaces="
  mozjs68<=68.11.0_1
  mp3gain<=1.6.2_2
  mutagen<=1.43.0_3
+ nautilus-dropbox<=2020.03.04_2
  nautilus-sendto<=3.8.6_2
  ncdns<=0.0.2_12
  newt-python<=0.52.21_5

From 6b8636196ad844017ada956ed8dba59932247390 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:42:49 +0100
Subject: [PATCH 2/3] nautilus-python: remove package

doesn't work with nautilus 43
---
 srcpkgs/nautilus-python/template  | 25 -------------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 srcpkgs/nautilus-python/template

diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template
deleted file mode 100644
index b65f4808f4f1..000000000000
--- a/srcpkgs/nautilus-python/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'nautilus-python'
-pkgname=nautilus-python
-version=1.2.3
-revision=6
-build_style=gnu-configure
-configure_args="$(vopt_enable gtk_doc gtk-doc) PYTHON=python3
- PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${py3_inc}
- PYTHON_LIBS=-lpython${py3_ver}"
-hostmakedepends="automake libtool pkg-config which python3
- $(vopt_if gtk_doc gtk-doc)"
-makedepends="python3-devel python3-gobject-devel nautilus-devel"
-depends="nautilus python3-gobject"
-short_desc="Python bindings for the Nautilus extension framework"
-maintainer="Nafis <mnabid.25@outlook.com>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Projects/NautilusPython"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=073ce0297282259937ab473d189b97a04f42b97197c9292fc3bde9d135282098
-
-CFLAGS="-fcommon"
-
-build_options="gtk_doc"
-if [ ! "$CROSS_BUILD" ]; then
-	build_options_default="gtk_doc"
-fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 643f738cc91c..fca98aa5341a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
  mp3gain<=1.6.2_2
  mutagen<=1.43.0_3
  nautilus-dropbox<=2020.03.04_2
+ nautilus-python<=1.2.3_6
  nautilus-sendto<=3.8.6_2
  ncdns<=0.0.2_12
  newt-python<=0.52.21_5

From c1116dfb789daca08c9845cdcdb17581c54e4ffc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:45:29 +0100
Subject: [PATCH 3/3] seahorse-nautilus: remove package

doesn't work with nautilus 43
---
 srcpkgs/removed-packages/template             |  3 +-
 .../patches/fix-desktop-files.patch           | 56 -------------------
 .../seahorse-nautilus/patches/locale.patch    | 12 ----
 .../seahorse-nautilus/patches/new-gnupg.patch | 13 -----
 .../patches/remove-unused-gnome-keyring.patch | 18 ------
 srcpkgs/seahorse-nautilus/template            | 22 --------
 6 files changed, 2 insertions(+), 122 deletions(-)
 delete mode 100644 srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
 delete mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch
 delete mode 100644 srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
 delete mode 100644 srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
 delete mode 100644 srcpkgs/seahorse-nautilus/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fca98aa5341a..f16c6c438477 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.20221205
-revision=1
+revision=2
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -475,6 +475,7 @@ replaces="
  rkt-stage1-fly<=1.30.0_3
  rkt<=1.30.0_3
  scantailor<=0.9.12.1_2
+ seahorse-nautilus<=3.10.1_6
  seahorse-sharing<=3.8.0_4
  searchfile<=0.0.0.20180623_2
  seriespl<=2.3.5_2
diff --git a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch b/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
deleted file mode 100644
index 89c2313aa986..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Sun, 8 Jan 2017 23:27:27 +1100
-Subject: Fix desktop files to use valid field code with Exec key.
-
-Description: Fix desktop files to use valid field code with Exec key.
-Author: Carlos Maddela <e7appew@gmail.com>
-Origin: vendor
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=790254
-Last-Update: 2017-11-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- tool/seahorse-pgp-encrypted.desktop.in.in | 2 +-
- tool/seahorse-pgp-keys.desktop.in.in      | 2 +-
- tool/seahorse-pgp-signature.desktop.in.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tool/seahorse-pgp-encrypted.desktop.in.in b/tool/seahorse-pgp-encrypted.desktop.in.in
-index 2d631e8..0897aa0 100644
---- a/tool/seahorse-pgp-encrypted.desktop.in.in
-+++ b/tool/seahorse-pgp-encrypted.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Decrypt File
- MimeType=application/pgp-encrypted;
--Exec=seahorse-tool --decrypt
-+Exec=seahorse-tool --decrypt %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-keys.desktop.in.in b/tool/seahorse-pgp-keys.desktop.in.in
-index 36cb153..5b4bd73 100644
---- a/tool/seahorse-pgp-keys.desktop.in.in
-+++ b/tool/seahorse-pgp-keys.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Import Key
- MimeType=application/pgp-keys;
--Exec=seahorse-tool --import
-+Exec=seahorse-tool --import %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-signature.desktop.in.in b/tool/seahorse-pgp-signature.desktop.in.in
-index 00b9562..77820f7 100644
---- a/tool/seahorse-pgp-signature.desktop.in.in
-+++ b/tool/seahorse-pgp-signature.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Verify Signature
- MimeType=application/pgp-signature;
--Exec=seahorse-tool --verify
-+Exec=seahorse-tool --verify %U
- Type=Application
- Terminal=false
- NoDisplay=true
diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch
deleted file mode 100644
index 06867e0432e0..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/locale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -41,6 +41,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
- 
- GLIB_GSETTINGS
- AM_GLIB_GNU_GETTEXT
-+DATADIRNAME=share
- 
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gio-2.0)
- 
diff --git a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
deleted file mode 100644
index 01d944a3cac9..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -58,7 +58,7 @@ AC_ARG_ENABLE(gpg-check,
- 	DO_CHECK=$enableval, DO_CHECK=yes)
- 
- if test	"$DO_CHECK" = "yes"; then
--	accepted_versions="1.2 1.4 2.0"
-+	accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
- 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- 	ok="no"
- 	if test "$GNUPG" != "no"; then
diff --git a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch b/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
deleted file mode 100644
index befc0d669eca..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -148,13 +148,6 @@ fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
- 
- # -----------------------------------------------------------------------------
--# Keyring
--
--PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
--
--# -----------------------------------------------------------------------------
- # DBus
- 
- DBUS_GLIB_REQUIRED=0.35
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
deleted file mode 100644
index d80a1258aeae..000000000000
--- a/srcpkgs/seahorse-nautilus/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'seahorse-nautilus'
-pkgname=seahorse-nautilus
-version=3.10.1
-revision=6
-build_style=gnu-configure
-configure_args="--disable-schemas-compile"
-hostmakedepends="automake libtool pkg-config intltool gpgme-devel gnupg
- glib-devel gettext-devel-tools"
-makedepends="gtk+3-devel nautilus-devel libnotify-devel
- gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel"
-depends="gnupg desktop-file-utils"
-short_desc="Nautilus plugin for OpenPGP file encryption/decryption"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org/projects/seahorse/"
-distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz"
-checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a
-lib32disabled=yes
-
-pre_configure() {
-	autoreconf -fi
-}

Re: dropbox, nautilus-python, seahorse-nautilus: remove package

[coreyberla]

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

New comment by coreyberla on void-packages repository

https://github.com/void-linux/void-packages/pull/41121#issuecomment-1353711175

Comment:
https://github.com/dropbox/nautilus-dropbox/commit/5587be23bec68281e5d6de2b302dbd2a79ea47aa Nautilus Dropbox supports gnome 43

Re: dropbox, nautilus-python, seahorse-nautilus: remove package

[coreyberla]

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

New comment by coreyberla on void-packages repository

https://github.com/void-linux/void-packages/pull/41121#issuecomment-1353712089

Comment:
https://gitlab.gnome.org/GNOME/nautilus-python/-/tags/4.0 so does Nautilus Python 

Re: dropbox, nautilus-python, seahorse-nautilus: remove package

[JamiKettunen]

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

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/41121#issuecomment-1354062358

Comment:
> [dropbox/nautilus-dropbox@5587be2](https://github.com/dropbox/nautilus-dropbox/commit/5587be23bec68281e5d6de2b302dbd2a79ea47aa) Nautilus Dropbox supports gnome 43

@coreyberla technically true, not tagged though; in that case `seahorse-nautilus` also supports GNOME 43 https://gitlab.gnome.org/GNOME/seahorse-nautilus/-/commit/d4b51676fee6e4d2580506629847cdd88e8ffdbb

Re: dropbox, nautilus-python, seahorse-nautilus: remove package

[coreyberla]

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

New comment by coreyberla on void-packages repository

https://github.com/void-linux/void-packages/pull/41121#issuecomment-1354073906

Comment:
> technically true, not tagged though

I think that's just an oversight. They made a release off the newly pushed commits.

https://www.dropbox.com/download?dl=packages/fedora/nautilus-dropbox-2022.12.05-1.fedora.x86_64.rpm

Re: dropbox, nautilus-python, seahorse-nautilus: remove package

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41121#issuecomment-1354518045

Comment:
oops, I will fix that later

Re: dropbox, nautilus-python, seahorse-nautilus: remove package

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41121#issuecomment-1368541582

Comment:
fixed as part of https://github.com/void-linux/void-packages/pull/39513

Re: [PR PATCH] [Closed]: dropbox, nautilus-python, seahorse-nautilus: remove package

[paper42]

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

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

dropbox, nautilus-python, seahorse-nautilus: remove package
https://github.com/void-linux/void-packages/pull/41121

Description:
These packages don't work with nautilus 43, this is split from the GNOME 43 PR (#39513) because removing these packages will break shlib checks in xbps if the are not also removed from binary repositories. First, this PR should be merged, then the packages removed from binary repositories and then the GNOME 43 PR should be merged.

#### 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
-->