Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package profanity for openSUSE:Factory checked in at 2023-08-28 17:15:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/profanity (Old) and /work/SRC/openSUSE:Factory/.profanity.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "profanity" Mon Aug 28 17:15:35 2023 rev:33 rq:1106132 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/profanity/profanity.changes 2023-08-03 17:28:12.459191300 +0200 +++ /work/SRC/openSUSE:Factory/.profanity.new.1766/profanity.changes 2023-08-28 17:15:38.529570657 +0200 @@ -1,0 +2,11 @@ +Sun Aug 27 09:49:01 UTC 2023 - Michael Vetter <[email protected]> + +- Add three bugfix patches: + * Correctly display OX carbons: + profanity-0.14.0-ox-carbons.patch + * Fix typos: + profanity-0.14.0-typos.patch + * Stop spamming log when X is not running: + profanity-0.14.0-xscreensaver.patch + +------------------------------------------------------------------- New: ---- profanity-0.14.0-ox-carbons.patch profanity-0.14.0-typos.patch profanity-0.14.0-xscreensaver.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ profanity.spec ++++++ --- /var/tmp/diff_new_pack.B1sYuc/_old 2023-08-28 17:15:40.189630270 +0200 +++ /var/tmp/diff_new_pack.B1sYuc/_new 2023-08-28 17:15:40.197630557 +0200 @@ -25,6 +25,10 @@ URL: https://profanity-im.github.io Source: https://github.com/profanity-im/profanity/releases/download/%{version}/profanity-%{version}.tar.gz Source1: profanity-rpmlintrc +# all 3 patches taken from upstream repo +Patch0: profanity-0.14.0-ox-carbons.patch +Patch1: profanity-0.14.0-typos.patch +Patch2: profanity-0.14.0-xscreensaver.patch BuildRequires: glib2-devel >= 2.62 BuildRequires: gtk2-devel BuildRequires: libcurl-devel @@ -81,6 +85,9 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 sed -i -e "s/python-config/python3-config/g" configure %build ++++++ profanity-0.14.0-ox-carbons.patch ++++++ >From 122434a276e21017ba294bda25164e27fd7cd731 Mon Sep 17 00:00:00 2001 From: Michael Vetter <[email protected]> Date: Thu, 24 Aug 2023 09:31:50 +0200 Subject: [PATCH] ox: correctly recognize ox encrypted carbons and dont display them as legacy pgp encrypted messages. This was forgotten in 2c94ee5a8. Fix https://github.com/profanity-im/profanity/issues/1875 --- src/event/server_events.c | 2 ++ src/ui/chatwin.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/event/server_events.c b/src/event/server_events.c index 81ce3927c..66ee65a96 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -471,6 +471,8 @@ sv_ev_outgoing_carbon(ProfMessage* message) if (message->enc == PROF_MSG_ENC_OMEMO) { chatwin_outgoing_carbon(chatwin, message); + } else if (message->enc == PROF_MSG_ENC_OX) { + chatwin_outgoing_carbon(chatwin, message); } else if (message->encrypted) { #ifdef HAVE_LIBGPGME message->plain = p_gpg_decrypt(message->encrypted); diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c index d462f08aa..c1ecd7054 100644 --- a/src/ui/chatwin.c +++ b/src/ui/chatwin.c @@ -467,6 +467,8 @@ chatwin_outgoing_carbon(ProfChatWin* chatwin, ProfMessage* message) enc_char = prefs_get_pgp_char(); } else if (message->enc == PROF_MSG_ENC_OMEMO) { enc_char = prefs_get_omemo_char(); + } else if (message->enc == PROF_MSG_ENC_OX) { + enc_char = prefs_get_ox_char(); } else { enc_char = strdup("-"); } ++++++ profanity-0.14.0-typos.patch ++++++ >From 2cf1269b6892ef12650c6474efec72d6d978a2fc Mon Sep 17 00:00:00 2001 From: Michael Vetter <[email protected]> Date: Thu, 3 Aug 2023 08:26:23 +0200 Subject: [PATCH] Typo fixes --- CHANGELOG | 10 +++++----- RELEASE_GUIDE.md | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) Index: profanity-0.14.0/CHANGELOG =================================================================== --- profanity-0.14.0.orig/CHANGELOG +++ profanity-0.14.0/CHANGELOG @@ -1,7 +1,7 @@ 0.14.0 (2023-08-03) =================== -13 people contributed to this release: Daniel Santos, @DebXWoody, @H3rnand3zzz, @ike08, @MarcoPolo-PasTonMolo, @mdosch, @pasis, @paulfertser, @shahab-vahedi, @sjaeckel, @techmetx11, @thexhr and jubalh. +13 people contributed to this release: Daniel Santos, @DebXWoody, @H3rnand3zzz, @ike08, @MarcoPolo-PasTonMolo, @mdosch, @pasis, @paulfertser, @shahab-vahedi, @sjaeckel, @techmetx11, @thexhr and @jubalh. Thanks a lot to our sponsors: @mdosch, @LeSpocky, @jamesponddotco and one anonymous sponsor. If you want to support us too: https://profanity-im.github.io/donate.html @@ -9,13 +9,13 @@ If you want to support us too: https://p This release depends on libstrophe >= 0.12.3. This is not done for feature reasons, but because several issues were fixed inside libstrophe. Changes: -- Introduce new `/privacy command (#1836, #1870) +- Introduce new `/privacy` command (#1836, #1870) `/os` -> `/privacy os` `/privacy logging` - Fix crash when using NetBSD curses implementation (#1769) - Fix OMEMO autodetection in autotools (#1865) - Add ability to completely turn logs off (#1857) -- Extend /pgp command to make key exchange procedure easier (#1850) +- Extend `/pgp` command to make key exchange procedure easier (#1850) Used by PSI and Pidgin as well. - Add ability to download and install plugins directly (#1842) `/plugins install` @@ -41,7 +41,7 @@ Changes: - Improve OMEMO QR code (#1796) - Improve OMEMO help (#1838) - Fix duplicate download IDs (#1794) -- Add macro for possible NULL prints and use it on known sports (#1786) +- Add macro for possible NULL prints (#1786) - Prevent setting invalid combination of libstrophe flags - Fix libstrophe timer-callback usage - Fix memory leaks (#1780, #1814, #1837) @@ -53,7 +53,7 @@ Changes: - Improve MAM support (#1724, #1791, #1868) - Add vCard support (XEP-0054) (#1757) - Fix autocompletion for lastactivity -- Improve /msg and /win autocompletion: autocomplete roster nickname and actual barejid +- Improve `/msg` and `/win` autocompletion: autocomplete roster nickname and actual barejid - UI improvements (#1800, #1773, #1821) 0.13.1 (2022-10-12) Index: profanity-0.14.0/docs/profanity.1 =================================================================== --- profanity-0.14.0.orig/docs/profanity.1 +++ profanity-0.14.0/docs/profanity.1 @@ -169,7 +169,7 @@ or to the mailing list at: .br .SH LICENSE Copyright (C) 2012 \- 2019 James Booth <[email protected]>. -Copyright (C) 2019 \- 2023 Michael Vetter <[email protected]>. +Copyright (C) 2019 \- 2023 Michael Vetter <[email protected]>. License GPLv3+: GNU GPL version 3 or later <https://www.gnu.org/licenses/gpl.html> This is free software; you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. ++++++ profanity-0.14.0-xscreensaver.patch ++++++ >From 2ed6211cc3a93e8605c008ad944ad24ec6910838 Mon Sep 17 00:00:00 2001 From: Martin Dosch <[email protected]> Date: Fri, 11 Aug 2023 13:04:08 +0200 Subject: [PATCH] Don't use xscreensaver on wayland. Fixes #1874. --- src/ui/core.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) Index: profanity-0.14.0/src/ui/core.c =================================================================== --- profanity-0.14.0.orig/src/ui/core.c +++ profanity-0.14.0/src/ui/core.c @@ -107,7 +107,11 @@ ui_init(void) notifier_initialise(); cons_about(); #ifdef HAVE_LIBXSS - display = XOpenDisplay(0); + char* x11_display = getenv("DISPLAY"); + char* wayland_display = getenv("WAYLAND_DISPLAY"); + if (x11_display && !wayland_display) { + display = XOpenDisplay(0); + } #endif ui_idle_time = g_timer_new(); inp_size = 0; @@ -150,15 +154,17 @@ ui_get_idle_time(void) { // if compiled with libxss, get the x sessions idle time #ifdef HAVE_LIBXSS - XScreenSaverInfo* info = XScreenSaverAllocInfo(); - if (info && display) { - XScreenSaverQueryInfo(display, DefaultRootWindow(display), info); - unsigned long result = info->idle; - XFree(info); - return result; - } - if (info) { - XFree(info); + if (display) { + XScreenSaverInfo* info = XScreenSaverAllocInfo(); + if (info && display) { + XScreenSaverQueryInfo(display, DefaultRootWindow(display), info); + unsigned long result = info->idle; + XFree(info); + return result; + } + if (info) { + XFree(info); + } } // if no libxss or xss idle time failed, use profanity idle time #endif
