* [PR PATCH] s/libgnome-keyring/libsecret/
@ 2024-03-28 2:27 sgn
2024-03-29 0:31 ` [PR PATCH] [Updated] s/libgnome-keyring/libsecret/ sgn
2024-03-29 1:42 ` [PR PATCH] [Merged]: s/libgnome-keyring/libsecret/ sgn
0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2024-03-28 2:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages gnome-keyring-mass-remove
https://github.com/void-linux/void-packages/pull/49573
s/libgnome-keyring/libsecret/
<!-- 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/49573.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-keyring-mass-remove-49573.patch --]
[-- Type: text/x-diff, Size: 12959 bytes --]
From c9f1d99f586d867f786ac9b77a44bf794aad2dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:49 +0700
Subject: [PATCH 1/7] libgda: no longer needs libgnome-keyring
Because of libsecret
---
srcpkgs/libgda/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index b284245abf12e5..f22960309a32c2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -9,7 +9,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
makedepends="gtk+3-devel libxml2-devel libxslt-devel
openssl-devel libgcrypt-devel sqlite-devel db-devel
- libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
+ libsecret-devel gtksourceview-devel graphviz-devel
json-glib-devel readline-devel libmariadbclient-devel"
depends="sqlite"
checkdepends="xvfb-run"
From 0e37d279cc42b3d2c04bc7d5fd16b3bdf5cbc0f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:49 +0700
Subject: [PATCH 2/7] libpurple-steam: update to 1.7.2.
---
.../patches/fix-makefile.patch | 48 -------------------
srcpkgs/libpurple-steam/template | 15 +++---
2 files changed, 7 insertions(+), 56 deletions(-)
delete mode 100644 srcpkgs/libpurple-steam/patches/fix-makefile.patch
diff --git a/srcpkgs/libpurple-steam/patches/fix-makefile.patch b/srcpkgs/libpurple-steam/patches/fix-makefile.patch
deleted file mode 100644
index 96f473bcfbc916..00000000000000
--- a/srcpkgs/libpurple-steam/patches/fix-makefile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git steam-mobile/Makefile steam-mobile/Makefile
-index 853f107..5d5c0be 100644
---- a/steam-mobile/Makefile
-+++ b/steam-mobile/Makefile
-@@ -1,17 +1,35 @@
-+CC ?= gcc
-+CFLAGS = -Wall -I. -fPIC -pipe
-+PKG_CONFIG ?= pkg-config
-
--COMPILER = gcc
-+DIR_PERM = 0755
-+FILE_PERM = 0644
-
--LIBPURPLE_CFLAGS += $(shell pkg-config --cflags glib-2.0 json-glib-1.0 purple nss gnome-keyring-1)
--LIBPURPLE_LIBS += $(shell pkg-config --libs glib-2.0 json-glib-1.0 purple nss)
-+LIBPURPLE_CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 json-glib-1.0 purple nss gnome-keyring-1)
-+LIBPURPLE_LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 json-glib-1.0 purple nss)
-+PLUGIN_DIR_PURPLE = $(shell $(PKG_CONFIG) --variable=plugindir purple)
-+DATA_ROOT_DIR_PURPLE = $(shell $(PKG_CONFIG) --variable=datarootdir purple)
-+
-+
-+PRPL_NAME = libsteam.so
-
- STEAM_SOURCES = \
- steam_connection.c \
- libsteam.c
-
- .PHONY: all clean install
--all: libsteam.so
-+all: $(PRPL_NAME)
-+install:
-+ mkdir -m $(DIR_PERM) -p $(DESTDIR)$(PLUGIN_DIR_PURPLE)
-+ install -m $(FILE_PERM) $(PRPL_NAME) $(DESTDIR)$(PLUGIN_DIR_PURPLE)/$(PRPL_NAME)
-+ mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16
-+ install -m $(FILE_PERM) steam16.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16/steam.png
-+ mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22
-+ install -m $(FILE_PERM) steam22.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/steam.png
-+ mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48
-+ install -m $(FILE_PERM) steam48.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/steam.png
- clean:
-- rm -f libsteam.so
-+ rm -f $(PRPL_NAME)
-
--libsteam.so: ${STEAM_SOURCES}
-- ${COMPILER} -Wall -I. -g -O2 -fPIC -pipe ${STEAM_SOURCES} -o $@ ${LIBPURPLE_CFLAGS} ${LIBPURPLE_LIBS} -shared
-+libsteam.so: $(STEAM_SOURCES)
-+ $(CC) $(CFLAGS) $(STEAM_SOURCES) -o $@ $(LIBPURPLE_CFLAGS) $(LIBPURPLE_LIBS) -shared
-
diff --git a/srcpkgs/libpurple-steam/template b/srcpkgs/libpurple-steam/template
index 22f319c50b39dd..c3766383956aef 100644
--- a/srcpkgs/libpurple-steam/template
+++ b/srcpkgs/libpurple-steam/template
@@ -1,17 +1,16 @@
# Template file for 'libpurple-steam'
pkgname="libpurple-steam"
-version="1.6.1"
-revision=2
+version=1.7.2
+revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
-makedepends="libpurple-devel json-glib-devel libglib-devel nss-devel libgnome-keyring-devel"
-short_desc="A Steam plugin for libpurple - uses the Steam Mobile API"
+makedepends="libpurple-devel json-glib-devel libglib-devel nss-devel
+ libsecret-devel"
+short_desc="Steam plugin for libpurple - uses the Steam Mobile API"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/EionRobb/pidgin-opensteamworks"
distfiles="https://github.com/EionRobb/pidgin-opensteamworks/archive/${version}.tar.gz"
-checksum=6a63248ed67f85185d32760246a22fea58e49af2d8a604abaa2cb3a3b5368a01
+checksum=5dbb2e5b57e1a6f76df1b301fec0df8559008722f6a8d537006120052a87e53d
build_wrksrc="steam-mobile"
-
-CFLAGS="-fPIC -I."
From 0eede7603f55cf773264cb03ac07b4bcf782bb94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:50 +0700
Subject: [PATCH 3/7] remmina: gnome-keyring replaced with libsecret
---
srcpkgs/remmina/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 7dc8212b08ec99..50acabeaca061e 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -7,7 +7,7 @@ configure_args="-DCMAKE_USE_PTHREADS_INIT=ON -DWITH_KF5WALLET=on"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info qt5-host-tools qt5-qmake"
makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
gobject-introspection gstreamermm-devel json-glib-devel kwallet-devel
- libgcrypt-devel libgnome-keyring-devel liblz4-devel libsasl-devel
+ libgcrypt-devel liblz4-devel libsasl-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
From b17a09ceae351e955505fa44a9c11abe9f0d1161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:50 +0700
Subject: [PATCH 4/7] retroshare: switch to libsecret
---
srcpkgs/retroshare/patches/gcc-12.patch | 16 ++++++++++++----
srcpkgs/retroshare/template | 4 ++--
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/retroshare/patches/gcc-12.patch b/srcpkgs/retroshare/patches/gcc-12.patch
index 06a95bb03ac3fd..f16748fe6d98a7 100644
--- a/srcpkgs/retroshare/patches/gcc-12.patch
+++ b/srcpkgs/retroshare/patches/gcc-12.patch
@@ -1,7 +1,5 @@
-Index: RetroShare-0.6.6/libretroshare/src/util/rsdir.cc
-===================================================================
---- RetroShare-0.6.6.orig/libretroshare/src/util/rsdir.cc
-+++ RetroShare-0.6.6/libretroshare/src/util/rsdir.cc
+--- a/libretroshare/src/util/rsdir.cc
++++ b/libretroshare/src/util/rsdir.cc
@@ -47,6 +47,7 @@
#include <fstream>
@@ -10,3 +8,13 @@ Index: RetroShare-0.6.6/libretroshare/src/util/rsdir.cc
#if defined(WIN32) || defined(__CYGWIN__)
#include "util/rsstring.h"
+--- a/retroshare-gui/src/gui/statistics/Histogram.h
++++ b/retroshare-gui/src/gui/statistics/Histogram.h
+@@ -18,6 +18,7 @@
+ * *
+ *******************************************************************************/
+
++#include <cstdint>
+ #include <vector>
+ #include <iostream>
+
diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index bb17569277a7f3..35a2732c77f634 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,13 +1,13 @@
# Template file for 'retroshare'
pkgname=retroshare
version=0.6.6
-revision=3
+revision=4
build_style=qmake
#XXX broadcast feature requires an ancient udp-discovery-cpp which either needs
# to be fetched+patched (FTBFS) here or packaged :/
configure_args="RS_UPNP_LIB=miniupnpc CONFIG+=no_rs_broadcast_discovery"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="ffmpeg-devel libgnome-keyring-devel libmicrohttpd-devel
+makedepends="ffmpeg-devel libsecret-devel libmicrohttpd-devel
libopencv-devel libssh-devel miniupnpc-devel libXScrnSaver-devel libxslt-devel
pulseaudio-devel qt5-multimedia-devel qt5-tools-devel qt5-x11extras-devel
speex-devel sqlcipher-devel sqlite-devel rapidjson"
From c352538aa6a7cb116c2c0e249c4932ed3d77143b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:50 +0700
Subject: [PATCH 5/7] subversion: gnome-keyring replaced by libsecret
---
srcpkgs/subversion-kwallet-auth/template | 2 +-
srcpkgs/subversion/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
index 319de334752e91..65ca1f9265dbc6 100644
--- a/srcpkgs/subversion-kwallet-auth/template
+++ b/srcpkgs/subversion-kwallet-auth/template
@@ -12,7 +12,7 @@ configure_args="--disable-javahl --disable-static --config-cache
--with-utf8proc=internal"
hostmakedepends="automake libtool pkg-config perl python3
apache-devel gettext swig"
-makedepends="apache-devel gdbm-devel libgnome-keyring-devel serf-devel
+makedepends="apache-devel gdbm-devel serf-devel
libsecret-devel liblz4-devel python3-devel sqlite-devel py3c
kdelibs4support-devel file-devel perl"
short_desc="KDE kwallet authentication support in subversion"
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 793ebf88400915..7ed76f10e002d6 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -11,7 +11,7 @@ configure_args="--disable-javahl --disable-static --config-cache
--with-utf8proc=internal"
hostmakedepends="automake libtool pkg-config perl python3
apache-devel gettext swig"
-makedepends="apache-devel gdbm-devel libgnome-keyring-devel serf-devel
+makedepends="apache-devel gdbm-devel serf-devel
libsecret-devel liblz4-devel python3-devel sqlite-devel py3c
file-devel perl"
depends="ca-certificates"
From 92663914f19fd13d7ecad03281b7ac5b64a49f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:50 +0700
Subject: [PATCH 6/7] telepathy-mission-control: no gnome-keyring from 2013
---
srcpkgs/telepathy-mission-control/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/telepathy-mission-control/template b/srcpkgs/telepathy-mission-control/template
index 5851b8c4dc463e..502e03868b5aed 100644
--- a/srcpkgs/telepathy-mission-control/template
+++ b/srcpkgs/telepathy-mission-control/template
@@ -5,9 +5,9 @@ reverts="5:5.16.4_1 5:5.16.1_2 5:5.16.1_1 5:5.16.0_2 5:5.16.0_1 5:5.15.1_1
version=5.16.6
revision=1
build_style=gnu-configure
-configure_args="--disable-static --enable-gnome-keyring --disable-schemas-compile"
+configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="pkg-config python3 intltool libxslt glib-devel"
-makedepends="libglib-devel telepathy-glib-devel NetworkManager-devel libgnome-keyring-devel"
+makedepends="libglib-devel telepathy-glib-devel NetworkManager-devel"
depends="telepathy-glib>=0.22"
short_desc="Account manager and channel dispatcher for the Telepathy framework"
maintainer="Orphaned <orphan@voidlinux.org>"
From d870f97ffb1806da7bc7f1c98802a448a59018b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:50 +0700
Subject: [PATCH 7/7] cinnamon: no longer uses libgnome-keyring
---
srcpkgs/cinnamon/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index c64c953fe824e0..d4184be444372c 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -9,8 +9,7 @@ hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel xapps-devel
- libgnome-keyring-devel NetworkManager-devel libcroco-devel
- cinnamon-desktop-devel"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] s/libgnome-keyring/libsecret/
2024-03-28 2:27 [PR PATCH] s/libgnome-keyring/libsecret/ sgn
@ 2024-03-29 0:31 ` sgn
2024-03-29 1:42 ` [PR PATCH] [Merged]: s/libgnome-keyring/libsecret/ sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2024-03-29 0:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages gnome-keyring-mass-remove
https://github.com/void-linux/void-packages/pull/49573
s/libgnome-keyring/libsecret/
<!-- 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/49573.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-keyring-mass-remove-49573.patch --]
[-- Type: text/x-diff, Size: 11227 bytes --]
From c9f1d99f586d867f786ac9b77a44bf794aad2dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:49 +0700
Subject: [PATCH 1/6] libgda: no longer needs libgnome-keyring
Because of libsecret
---
srcpkgs/libgda/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index b284245abf12e5..f22960309a32c2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -9,7 +9,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
makedepends="gtk+3-devel libxml2-devel libxslt-devel
openssl-devel libgcrypt-devel sqlite-devel db-devel
- libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
+ libsecret-devel gtksourceview-devel graphviz-devel
json-glib-devel readline-devel libmariadbclient-devel"
depends="sqlite"
checkdepends="xvfb-run"
From 3b7e12248af93e420144765dd372fe9ee2db7fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:49 +0700
Subject: [PATCH 2/6] libpurple-steam: update to 1.7.2.
---
.../patches/fix-makefile.patch | 48 -------------------
srcpkgs/libpurple-steam/template | 17 ++++---
2 files changed, 8 insertions(+), 57 deletions(-)
delete mode 100644 srcpkgs/libpurple-steam/patches/fix-makefile.patch
diff --git a/srcpkgs/libpurple-steam/patches/fix-makefile.patch b/srcpkgs/libpurple-steam/patches/fix-makefile.patch
deleted file mode 100644
index 96f473bcfbc916..00000000000000
--- a/srcpkgs/libpurple-steam/patches/fix-makefile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git steam-mobile/Makefile steam-mobile/Makefile
-index 853f107..5d5c0be 100644
---- a/steam-mobile/Makefile
-+++ b/steam-mobile/Makefile
-@@ -1,17 +1,35 @@
-+CC ?= gcc
-+CFLAGS = -Wall -I. -fPIC -pipe
-+PKG_CONFIG ?= pkg-config
-
--COMPILER = gcc
-+DIR_PERM = 0755
-+FILE_PERM = 0644
-
--LIBPURPLE_CFLAGS += $(shell pkg-config --cflags glib-2.0 json-glib-1.0 purple nss gnome-keyring-1)
--LIBPURPLE_LIBS += $(shell pkg-config --libs glib-2.0 json-glib-1.0 purple nss)
-+LIBPURPLE_CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 json-glib-1.0 purple nss gnome-keyring-1)
-+LIBPURPLE_LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 json-glib-1.0 purple nss)
-+PLUGIN_DIR_PURPLE = $(shell $(PKG_CONFIG) --variable=plugindir purple)
-+DATA_ROOT_DIR_PURPLE = $(shell $(PKG_CONFIG) --variable=datarootdir purple)
-+
-+
-+PRPL_NAME = libsteam.so
-
- STEAM_SOURCES = \
- steam_connection.c \
- libsteam.c
-
- .PHONY: all clean install
--all: libsteam.so
-+all: $(PRPL_NAME)
-+install:
-+ mkdir -m $(DIR_PERM) -p $(DESTDIR)$(PLUGIN_DIR_PURPLE)
-+ install -m $(FILE_PERM) $(PRPL_NAME) $(DESTDIR)$(PLUGIN_DIR_PURPLE)/$(PRPL_NAME)
-+ mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16
-+ install -m $(FILE_PERM) steam16.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16/steam.png
-+ mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22
-+ install -m $(FILE_PERM) steam22.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/steam.png
-+ mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48
-+ install -m $(FILE_PERM) steam48.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/steam.png
- clean:
-- rm -f libsteam.so
-+ rm -f $(PRPL_NAME)
-
--libsteam.so: ${STEAM_SOURCES}
-- ${COMPILER} -Wall -I. -g -O2 -fPIC -pipe ${STEAM_SOURCES} -o $@ ${LIBPURPLE_CFLAGS} ${LIBPURPLE_LIBS} -shared
-+libsteam.so: $(STEAM_SOURCES)
-+ $(CC) $(CFLAGS) $(STEAM_SOURCES) -o $@ $(LIBPURPLE_CFLAGS) $(LIBPURPLE_LIBS) -shared
-
diff --git a/srcpkgs/libpurple-steam/template b/srcpkgs/libpurple-steam/template
index 22f319c50b39dd..fb400cd7df5132 100644
--- a/srcpkgs/libpurple-steam/template
+++ b/srcpkgs/libpurple-steam/template
@@ -1,17 +1,16 @@
# Template file for 'libpurple-steam'
-pkgname="libpurple-steam"
-version="1.6.1"
-revision=2
+pkgname=libpurple-steam
+version=1.7.2
+revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
-makedepends="libpurple-devel json-glib-devel libglib-devel nss-devel libgnome-keyring-devel"
-short_desc="A Steam plugin for libpurple - uses the Steam Mobile API"
+makedepends="libpurple-devel json-glib-devel libglib-devel nss-devel
+ libsecret-devel"
+short_desc="Steam plugin for libpurple - uses the Steam Mobile API"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/EionRobb/pidgin-opensteamworks"
distfiles="https://github.com/EionRobb/pidgin-opensteamworks/archive/${version}.tar.gz"
-checksum=6a63248ed67f85185d32760246a22fea58e49af2d8a604abaa2cb3a3b5368a01
+checksum=5dbb2e5b57e1a6f76df1b301fec0df8559008722f6a8d537006120052a87e53d
build_wrksrc="steam-mobile"
-
-CFLAGS="-fPIC -I."
From ba39b2523273a66f35d4d31d525f6e84a994dd34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:50 +0700
Subject: [PATCH 3/6] remmina: gnome-keyring replaced with libsecret
---
srcpkgs/remmina/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 7dc8212b08ec99..50acabeaca061e 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -7,7 +7,7 @@ configure_args="-DCMAKE_USE_PTHREADS_INIT=ON -DWITH_KF5WALLET=on"
hostmakedepends="glib-devel intltool pkg-config shared-mime-info qt5-host-tools qt5-qmake"
makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
gobject-introspection gstreamermm-devel json-glib-devel kwallet-devel
- libgcrypt-devel libgnome-keyring-devel liblz4-devel libsasl-devel
+ libgcrypt-devel liblz4-devel libsasl-devel
libsecret-devel libsodium-devel libsoup3-devel libssh-devel libva-devel
libvncserver-devel libxkbfile-devel opus-devel phodav-devel
spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
From 4e46bd916156a727ee3cf47a7fc2cffeb6e358a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:50 +0700
Subject: [PATCH 4/6] retroshare: switch to libsecret
---
srcpkgs/retroshare/patches/gcc-12.patch | 16 ++++++++++++----
srcpkgs/retroshare/template | 4 ++--
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/retroshare/patches/gcc-12.patch b/srcpkgs/retroshare/patches/gcc-12.patch
index 06a95bb03ac3fd..f16748fe6d98a7 100644
--- a/srcpkgs/retroshare/patches/gcc-12.patch
+++ b/srcpkgs/retroshare/patches/gcc-12.patch
@@ -1,7 +1,5 @@
-Index: RetroShare-0.6.6/libretroshare/src/util/rsdir.cc
-===================================================================
---- RetroShare-0.6.6.orig/libretroshare/src/util/rsdir.cc
-+++ RetroShare-0.6.6/libretroshare/src/util/rsdir.cc
+--- a/libretroshare/src/util/rsdir.cc
++++ b/libretroshare/src/util/rsdir.cc
@@ -47,6 +47,7 @@
#include <fstream>
@@ -10,3 +8,13 @@ Index: RetroShare-0.6.6/libretroshare/src/util/rsdir.cc
#if defined(WIN32) || defined(__CYGWIN__)
#include "util/rsstring.h"
+--- a/retroshare-gui/src/gui/statistics/Histogram.h
++++ b/retroshare-gui/src/gui/statistics/Histogram.h
+@@ -18,6 +18,7 @@
+ * *
+ *******************************************************************************/
+
++#include <cstdint>
+ #include <vector>
+ #include <iostream>
+
diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index bb17569277a7f3..35a2732c77f634 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,13 +1,13 @@
# Template file for 'retroshare'
pkgname=retroshare
version=0.6.6
-revision=3
+revision=4
build_style=qmake
#XXX broadcast feature requires an ancient udp-discovery-cpp which either needs
# to be fetched+patched (FTBFS) here or packaged :/
configure_args="RS_UPNP_LIB=miniupnpc CONFIG+=no_rs_broadcast_discovery"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="ffmpeg-devel libgnome-keyring-devel libmicrohttpd-devel
+makedepends="ffmpeg-devel libsecret-devel libmicrohttpd-devel
libopencv-devel libssh-devel miniupnpc-devel libXScrnSaver-devel libxslt-devel
pulseaudio-devel qt5-multimedia-devel qt5-tools-devel qt5-x11extras-devel
speex-devel sqlcipher-devel sqlite-devel rapidjson"
From 29985103e532b72f4c10134759800b0e5b90b7a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:50 +0700
Subject: [PATCH 5/6] telepathy-mission-control: no gnome-keyring from 2013
---
srcpkgs/telepathy-mission-control/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/telepathy-mission-control/template b/srcpkgs/telepathy-mission-control/template
index 5851b8c4dc463e..502e03868b5aed 100644
--- a/srcpkgs/telepathy-mission-control/template
+++ b/srcpkgs/telepathy-mission-control/template
@@ -5,9 +5,9 @@ reverts="5:5.16.4_1 5:5.16.1_2 5:5.16.1_1 5:5.16.0_2 5:5.16.0_1 5:5.15.1_1
version=5.16.6
revision=1
build_style=gnu-configure
-configure_args="--disable-static --enable-gnome-keyring --disable-schemas-compile"
+configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="pkg-config python3 intltool libxslt glib-devel"
-makedepends="libglib-devel telepathy-glib-devel NetworkManager-devel libgnome-keyring-devel"
+makedepends="libglib-devel telepathy-glib-devel NetworkManager-devel"
depends="telepathy-glib>=0.22"
short_desc="Account manager and channel dispatcher for the Telepathy framework"
maintainer="Orphaned <orphan@voidlinux.org>"
From 3df7dcd2cb14a579ca8c7c480168fe99647791fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 28 Mar 2024 09:24:50 +0700
Subject: [PATCH 6/6] cinnamon: no longer uses libgnome-keyring
---
srcpkgs/cinnamon/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index c64c953fe824e0..d4184be444372c 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -9,8 +9,7 @@ hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel xapps-devel
- libgnome-keyring-devel NetworkManager-devel libcroco-devel
- cinnamon-desktop-devel"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: s/libgnome-keyring/libsecret/
2024-03-28 2:27 [PR PATCH] s/libgnome-keyring/libsecret/ sgn
2024-03-29 0:31 ` [PR PATCH] [Updated] s/libgnome-keyring/libsecret/ sgn
@ 2024-03-29 1:42 ` sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2024-03-29 1:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1094 bytes --]
There's a merged pull request on the void-packages repository
s/libgnome-keyring/libsecret/
https://github.com/void-linux/void-packages/pull/49573
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] 3+ messages in thread
end of thread, other threads:[~2024-03-29 1:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-28 2:27 [PR PATCH] s/libgnome-keyring/libsecret/ sgn
2024-03-29 0:31 ` [PR PATCH] [Updated] s/libgnome-keyring/libsecret/ sgn
2024-03-29 1:42 ` [PR PATCH] [Merged]: s/libgnome-keyring/libsecret/ sgn
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).