Attachment 218956 Details for Bug 250512 – Patch (Revision 2)

[patch] Patch (Revision 2)

libgcr-full.diff (text/plain), 14.12 KB, created by Neel Chauhan on 2020-10-21 19:31:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neel Chauhan

Created: 2020-10-21 19:31:45 UTC

Size: 14.12 KB

patch

obsolete

>Index: devel/libgdata/Makefile
>===================================================================
>--- devel/libgdata/Makefile	(revision 552847)
>+++ devel/libgdata/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	libgdata
> PORTVERSION=	0.17.13
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	GNOME
> 
>@@ -18,7 +19,7 @@
> 		libjson-glib-1.0.so:devel/json-glib \
> 		libp11-kit.so:security/p11-kit \
> 		libgoa-1.0.so:net/gnome-online-accounts \
>-		libgcr-3.so:security/gcr \
>+		libgcr-base-3.so:security/gcr \
> 		liboauth.so:net/liboauth
> 
> USES=		gettext gnome localbase meson pkgconfig tar:xz
>Index: mail/evolution/Makefile
>===================================================================
>--- mail/evolution/Makefile	(revision 552847)
>+++ mail/evolution/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	evolution
> PORTVERSION=	3.38.0
>+PORTREVISION=	1
> CATEGORIES=	mail gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome
>@@ -20,7 +21,7 @@
> 		iso-codes>=0:misc/iso-codes \
> 		highlight:textproc/highlight
> LIB_DEPENDS=	libnss3.so:security/nss \
>-		libgcr-3.so:security/gcr \
>+		libgcr-base-3.so:security/gcr \
> 		libgtkspell3-3.so:textproc/gtkspell3 \
> 		libgnome-autoar-gtk-0.so:archivers/gnome-autoar \
> 		libsoup-2.4.so:devel/libsoup \
>Index: mail/geary/Makefile
>===================================================================
>--- mail/geary/Makefile	(revision 552847)
>+++ mail/geary/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	geary
> PORTVERSION=	3.32.2
>+PORTREVISION=	1
> CATEGORIES=	mail gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome
>@@ -24,7 +25,7 @@
> 		libcanberra.so:audio/libcanberra \
> 		libnotify.so:devel/libnotify \
> 		libgee-0.8.so:devel/libgee \
>-		libgcr-3.so:security/gcr \
>+		libgcr-base-3.so:security/gcr \
> 		libsecret-1.so:security/libsecret \
> 		libenchant-2.so:textproc/enchant2 \
> 		libfolks.so:net-im/folks
>Index: net-im/ekiga/Makefile
>===================================================================
>--- net-im/ekiga/Makefile	(revision 552847)
>+++ net-im/ekiga/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> 
> PORTNAME=	ekiga
> PORTVERSION=	4.0.1
>-PORTREVISION=	29
>+PORTREVISION=	30
> CATEGORIES=	net-im
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>@@ -122,7 +122,7 @@
> 
> .if ${PORT_OPTIONS:MEVOLUTION}
> USE_GNOME+=	evolutiondataserver3
>-LIB_DEPENDS+=	libgcr-3.so:security/gcr
>+LIB_DEPENDS+=	libgcr-base-3.so:security/gcr
> CONFIGURE_ARGS+=--enable-eds
> PLIST_SUB+=	EVOLUTION=""
> WITH_PLUGINS=	1
>Index: net-im/folks/Makefile
>===================================================================
>--- net-im/folks/Makefile	(revision 552847)
>+++ net-im/folks/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	folks
> PORTVERSION=	0.14.0
>+PORTREVISION=	1
> CATEGORIES=	net-im
> MASTER_SITES=	GNOME
> 
>@@ -14,7 +15,7 @@
> 
> BUILD_DEPENDS=	vapigen:lang/vala
> LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
>-		libgcr-3.so:security/gcr \
>+		libgcr-base-3.so:security/gcr \
> 		libzeitgeist-2.0.so:sysutils/zeitgeist \
> 		libtelepathy-glib.so:net-im/telepathy-glib \
> 		libnspr4.so:devel/nspr \
>Index: security/gcr/Makefile
>===================================================================
>--- security/gcr/Makefile	(revision 552847)
>+++ security/gcr/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gcr
>-PORTVERSION=	3.28.0
>-PORTREVISION=	1
>+PORTVERSION=	3.38.0
> CATEGORIES=	security gnome
> MASTER_SITES=	GNOME
> 
>@@ -11,6 +10,7 @@
> COMMENT=	Library for bits of crypto UI and parsing
> 
> BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc \
>+		gpg2:security/gnupg \
> 		vapigen:lang/vala
> LIB_DEPENDS=	libdbus-1.so:devel/dbus \
> 		libgpg-error.so:security/libgpg-error \
>@@ -21,11 +21,10 @@
> PORTSCOUT=	limitw:1,even
> 
> USE_GNOME=	cairo gtk30 intlhack introspection:build
>-USES=		desktop-file-utils gettext gmake gnome libtool pathfix \
>-		pkgconfig shared-mime-info tar:xz
>-GNU_CONFIGURE=	yes
>+USES=		desktop-file-utils gettext gmake gnome libtool meson pathfix \
>+		pkgconfig python:3.6+ shared-mime-info tar:xz
> USE_LDCONFIG=	yes
>-CONFIGURE_ARGS=	--disable-valgrind
>+BINARY_ALIAS=	python3=${PYTHON_VERSION}
> INSTALLS_ICONS=	yes
> INSTALL_TARGET=	install-strip
> 
>Index: security/gcr/distinfo
>===================================================================
>--- security/gcr/distinfo	(revision 552847)
>+++ security/gcr/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1525382004
>-SHA256 (gcr-3.28.0.tar.xz) = 15e175d1da7ec486d59749ba34906241c442898118ce224a7b70bf2e849faf0b
>-SIZE (gcr-3.28.0.tar.xz) = 1329044
>+TIMESTAMP = 1603225294
>+SHA256 (gcr-3.38.0.tar.xz) = a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1
>+SIZE (gcr-3.38.0.tar.xz) = 1029784
>Index: security/gcr/pkg-plist
>===================================================================
>--- security/gcr/pkg-plist	(revision 552847)
>+++ security/gcr/pkg-plist	(working copy)
>@@ -65,9 +65,6 @@
> lib/libgck-1.so
> lib/libgck-1.so.0
> lib/libgck-1.so.0.0.0
>-lib/libgcr-3.so
>-lib/libgcr-3.so.1
>-lib/libgcr-3.so.1.0.0
> lib/libgcr-base-3.so
> lib/libgcr-base-3.so.1
> lib/libgcr-base-3.so.1.0.0
>@@ -98,7 +95,6 @@
> share/gtk-doc/html/gck/GckSlot.html
> share/gtk-doc/html/gck/annotation-glossary.html
> share/gtk-doc/html/gck/gck-Errors.html
>-share/gtk-doc/html/gck/gck-GckAttribute.html
> share/gtk-doc/html/gck/gck-GckModule-lists.html
> share/gtk-doc/html/gck/gck-Library-Utilities.html
> share/gtk-doc/html/gck/gck-Miscellaneous-Functions.html
>@@ -115,65 +111,66 @@
> share/gtk-doc/html/gck/style.css
> share/gtk-doc/html/gck/up-insensitive.png
> share/gtk-doc/html/gck/up.png
>-share/gtk-doc/html/gcr-3/GcrCertificate.html
>-share/gtk-doc/html/gcr-3/GcrCertificateChain.html
>-share/gtk-doc/html/gcr-3/GcrCertificateWidget.html
>-share/gtk-doc/html/gcr-3/GcrCollection.html
>-share/gtk-doc/html/gcr-3/GcrCollectionModel.html
>-share/gtk-doc/html/gcr-3/GcrComboSelector.html
>-share/gtk-doc/html/gcr-3/GcrComparable.html
>-share/gtk-doc/html/gcr-3/GcrImportButton.html
>-share/gtk-doc/html/gcr-3/GcrImporter.html
>-share/gtk-doc/html/gcr-3/GcrKeyWidget.html
>-share/gtk-doc/html/gcr-3/GcrListSelector.html
>-share/gtk-doc/html/gcr-3/GcrParser.html
>-share/gtk-doc/html/gcr-3/GcrPkcs11Certificate.html
>-share/gtk-doc/html/gcr-3/GcrPrompt.html
>-share/gtk-doc/html/gcr-3/GcrPromptDialog.html
>-share/gtk-doc/html/gcr-3/GcrRenderer.html
>-share/gtk-doc/html/gcr-3/GcrSecretExchange.html
>-share/gtk-doc/html/gcr-3/GcrSecureEntryBuffer.html
>-share/gtk-doc/html/gcr-3/GcrSimpleCertificate.html
>-share/gtk-doc/html/gcr-3/GcrSimpleCollection.html
>-share/gtk-doc/html/gcr-3/GcrSystemPrompt.html
>-share/gtk-doc/html/gcr-3/GcrSystemPrompter.html
>-share/gtk-doc/html/gcr-3/GcrTreeSelector.html
>-share/gtk-doc/html/gcr-3/GcrViewer.html
>-share/gtk-doc/html/gcr-3/GcrViewerWidget.html
>-share/gtk-doc/html/gcr-3/annotation-glossary.html
>-share/gtk-doc/html/gcr-3/certificate-widget.png
>-share/gtk-doc/html/gcr-3/certificates.html
>-share/gtk-doc/html/gcr-3/ch01.html
>-share/gtk-doc/html/gcr-3/collections.html
>-share/gtk-doc/html/gcr-3/combo-selector.png
>-share/gtk-doc/html/gcr-3/gcr-3.devhelp2
>-share/gtk-doc/html/gcr-3/gcr-GcrCertificateRequest.html
>-share/gtk-doc/html/gcr-3/gcr-GcrColumn.html
>-share/gtk-doc/html/gcr-3/gcr-GcrImportInteraction.html
>-share/gtk-doc/html/gcr-3/gcr-GcrSshAskpass.html
>-share/gtk-doc/html/gcr-3/gcr-Key-Fingerprints.html
>-share/gtk-doc/html/gcr-3/gcr-Library-PKCS#11.html
>-share/gtk-doc/html/gcr-3/gcr-Library-Utilities.html
>-share/gtk-doc/html/gcr-3/gcr-Non-pageable-Memory.html
>-share/gtk-doc/html/gcr-3/gcr-Trust-Storage-and-Lookups.html
>-share/gtk-doc/html/gcr-3/home.png
>-share/gtk-doc/html/gcr-3/import-button.png
>-share/gtk-doc/html/gcr-3/index.html
>-share/gtk-doc/html/gcr-3/key-widget.png
>-share/gtk-doc/html/gcr-3/left-insensitive.png
>-share/gtk-doc/html/gcr-3/left.png
>-share/gtk-doc/html/gcr-3/list-selector.png
>-share/gtk-doc/html/gcr-3/misc.html
>-share/gtk-doc/html/gcr-3/prompts.html
>-share/gtk-doc/html/gcr-3/right-insensitive.png
>-share/gtk-doc/html/gcr-3/right.png
>-share/gtk-doc/html/gcr-3/storage.html
>-share/gtk-doc/html/gcr-3/style.css
>-share/gtk-doc/html/gcr-3/tree-selector.png
>-share/gtk-doc/html/gcr-3/up-insensitive.png
>-share/gtk-doc/html/gcr-3/up.png
>-share/gtk-doc/html/gcr-3/viewer-widget.png
>-share/gtk-doc/html/gcr-3/widgets.html
>+share/gtk-doc/html/gck/GckAttribute.html
>+share/gtk-doc/html/gcr/GcrCertificate.html
>+share/gtk-doc/html/gcr/GcrCertificateChain.html
>+share/gtk-doc/html/gcr/GcrCertificateRequest.html
>+share/gtk-doc/html/gcr/GcrCertificateWidget.html
>+share/gtk-doc/html/gcr/GcrCollection.html
>+share/gtk-doc/html/gcr/GcrKeyWidget.html
>+share/gtk-doc/html/gcr/GcrListSelector.html
>+share/gtk-doc/html/gcr/GcrParser.html
>+share/gtk-doc/html/gcr/GcrPkcs11Certificate.html
>+share/gtk-doc/html/gcr/GcrPrompt.html
>+share/gtk-doc/html/gcr/GcrPromptDialog.html
>+share/gtk-doc/html/gcr/GcrRenderer.html
>+share/gtk-doc/html/gcr/GcrSecretExchange.html
>+share/gtk-doc/html/gcr/GcrSecureEntryBuffer.html
>+share/gtk-doc/html/gcr/GcrSimpleCertificate.html
>+share/gtk-doc/html/gcr/GcrSimpleCollection.html
>+share/gtk-doc/html/gcr/GcrSshAskpass.html
>+share/gtk-doc/html/gcr/GcrSystemPrompt.html
>+share/gtk-doc/html/gcr/GcrSystemPrompter.html
>+share/gtk-doc/html/gcr/GcrTreeSelector.html
>+share/gtk-doc/html/gcr/GcrViewer.html
>+share/gtk-doc/html/gcr/GcrViewerWidget.html
>+share/gtk-doc/html/gcr/GcrCollectionModel.html
>+share/gtk-doc/html/gcr/GcrComboSelector.html
>+share/gtk-doc/html/gcr/GcrComparable.html
>+share/gtk-doc/html/gcr/GcrImportButton.html
>+share/gtk-doc/html/gcr/GcrImportInteraction.html
>+share/gtk-doc/html/gcr/GcrImporter.html
>+share/gtk-doc/html/gcr/gcr-Library-PKCS#11.html
>+share/gtk-doc/html/gcr/gcr-Library-Utilities.html
>+share/gtk-doc/html/gcr/gcr-Non-pageable-Memory.html
>+share/gtk-doc/html/gcr/gcr-Trust-Storage-and-Lookups.html
>+share/gtk-doc/html/gcr/annotation-glossary.html
>+share/gtk-doc/html/gcr/certificate-widget.png
>+share/gtk-doc/html/gcr/certificates.html
>+share/gtk-doc/html/gcr/ch01.html
>+share/gtk-doc/html/gcr/collections.html
>+share/gtk-doc/html/gcr/combo-selector.png
>+share/gtk-doc/html/gcr/gcr-GcrColumn.html
>+share/gtk-doc/html/gcr/gcr-Key-Fingerprints.html
>+share/gtk-doc/html/gcr/gcr.devhelp2
>+share/gtk-doc/html/gcr/home.png
>+share/gtk-doc/html/gcr/import-button.png
>+share/gtk-doc/html/gcr/index.html
>+share/gtk-doc/html/gcr/key-widget.png
>+share/gtk-doc/html/gcr/left-insensitive.png
>+share/gtk-doc/html/gcr/left.png
>+share/gtk-doc/html/gcr/list-selector.png
>+share/gtk-doc/html/gcr/misc.html
>+share/gtk-doc/html/gcr/prompts.html
>+share/gtk-doc/html/gcr/right-insensitive.png
>+share/gtk-doc/html/gcr/right.png
>+share/gtk-doc/html/gcr/storage.html
>+share/gtk-doc/html/gcr/style.css
>+share/gtk-doc/html/gcr/tree-selector.png
>+share/gtk-doc/html/gcr/up-insensitive.png
>+share/gtk-doc/html/gcr/up.png
>+share/gtk-doc/html/gcr/viewer-widget.png
>+share/gtk-doc/html/gcr/widgets.html
> share/icons/hicolor/16x16/apps/gcr-gnupg.png
> share/icons/hicolor/16x16/apps/gcr-key-pair.png
> share/icons/hicolor/16x16/apps/gcr-key.png
>@@ -215,6 +212,7 @@
> share/locale/bs/LC_MESSAGES/gcr.mo
> share/locale/ca/LC_MESSAGES/gcr.mo
> share/locale/ca@valencia/LC_MESSAGES/gcr.mo
>+share/locale/ckb/LC_MESSAGES/gcr.mo
> share/locale/cs/LC_MESSAGES/gcr.mo
> share/locale/cy/LC_MESSAGES/gcr.mo
> share/locale/da/LC_MESSAGES/gcr.mo
>Index: security/gnome-keyring/Makefile
>===================================================================
>--- security/gnome-keyring/Makefile	(revision 552847)
>+++ security/gnome-keyring/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	gnome-keyring
> PORTVERSION=	3.36.0
>+PORTREVISION=	1
> CATEGORIES=	security gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome
>@@ -18,7 +19,7 @@
> 		gcr>=3.5.3:security/gcr
> LIB_DEPENDS=	libdbus-1.so:devel/dbus \
> 		libgpg-error.so:security/libgpg-error \
>-		libgcr-3.so:security/gcr \
>+		libgcr-base-3.so:security/gcr \
> 		libtasn1.so:security/libtasn1 \
> 		libp11-kit.so:security/p11-kit \
> 		libgcrypt.so:security/libgcrypt
>Index: security/seahorse/Makefile
>===================================================================
>--- security/seahorse/Makefile	(revision 552847)
>+++ security/seahorse/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	seahorse
> PORTVERSION=	3.36.2
>+PORTREVISION=	1
> CATEGORIES=	security gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome
>@@ -17,7 +18,7 @@
> 		valac:lang/vala \
> 		itstool:textproc/itstool
> LIB_DEPENDS=	libgpgme.so:security/gpgme \
>-		libgcr-3.so:security/gcr \
>+		libgcr-base-3.so:security/gcr \
> 		libsecret-1.so:security/libsecret \
> 		libsoup-2.4.so:devel/libsoup \
> 		libpwquality.so:security/libpwquality \
>Index: www/epiphany/Makefile
>===================================================================
>--- www/epiphany/Makefile	(revision 552847)
>+++ www/epiphany/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	epiphany
> PORTVERSION=	3.38.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome
>@@ -19,7 +19,7 @@
> 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
> LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
> 		libsoup-2.4.so:devel/libsoup \
>-		libgcr-3.so:security/gcr \
>+		libgcr-base-3.so:security/gcr \
> 		libstartup-notification-1.so:x11/startup-notification \
> 		libnss3.so:security/nss \
> 		libjson-glib-1.0.so:devel/json-glib \
>Index: www/midori/Makefile
>===================================================================
>--- www/midori/Makefile	(revision 552847)
>+++ www/midori/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	midori
> PORTVERSION=	9.0
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www xfce
> 
> MAINTAINER=	xfce@FreeBSD.org
>@@ -19,7 +19,7 @@
> 		libjson-glib-1.0.so:devel/json-glib \
> 		libsoup-2.4.so:devel/libsoup \
> 		libp11-kit.so:security/p11-kit \
>-		libgcr-3.so:security/gcr \
>+		libgcr-base-3.so:security/gcr \
> 		libpeas-1.0.so:devel/libpeas \
> 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
> RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
>Index: x11-fm/sushi/Makefile
>===================================================================
>--- x11-fm/sushi/Makefile	(revision 552847)
>+++ x11-fm/sushi/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	sushi
> PORTVERSION=	3.34.0
>+PORTREVISION=	1
> CATEGORIES=	x11-fm gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome
>@@ -13,7 +14,7 @@
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libgcr-3.so:security/gcr \
>+LIB_DEPENDS=	libgcr-base-3.so:security/gcr \
> 		libgjs.so:lang/gjs \
> 		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
> 		libclutter-gst-3.0.so:multimedia/clutter-gst3 \

Actions: View | Diff

Attachments on bug 250512: 218953 | 218954 | 218955 | 218956