[packages/mcabber] - updated to 1.1.2 + build fixes

Wed Jul 2 20:32:15 CEST 2025

commit dd677978b695b444b0795bd8f457c0b16a87405a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jul 2 20:33:43 2025 +0200

    - updated to 1.1.2 + build fixes

 mcabber-format.patch        | 36 +++++++++++++++++++++++
 mcabber-uninitialized.patch | 11 +++++++
 mcabber.spec                | 71 +++++++++++++++++++++++++++++++++------------
 3 files changed, 100 insertions(+), 18 deletions(-)
---

diff --git a/mcabber.spec b/mcabber.spec
index fbd57c2..cc9fbe1 100644
--- a/mcabber.spec
+++ b/mcabber.spec
@@ -1,23 +1,31 @@
 Summary:	mcabber - small console Jabber client
 Summary(pl.UTF-8):	mcabber - mały konsolowy klient protokołu Jabber
 Name:		mcabber
-Version:	1.1.0
-Release:	2
-License:	GPL
+Version:	1.1.2
+Release:	1
+License:	GPL v2+
 Group:		Applications/Console
-Source0:	http://www.lilotux.net/~mikael/mcabber/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	4ff3626063285033c0a99b37827e0c11
-URL:		http://www.lilotux.net/~mikael/mcabber/
+Source0:	https://mcabber.com/files/%{name}-%{version}.tar.bz2
+# Source0-md5:	5c2f827e371fcfbf390c9eac66f9aaa5
+Patch0:		%{name}-uninitialized.patch
+Patch1:		%{name}-format.patch
+URL:		https://mcabber.com/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
-BuildRequires:	glib2-devel >= 2.0.0
-BuildRequires:	gpgme-devel
-BuildRequires:	libotr-devel
+BuildRequires:	enchant-devel
+BuildRequires:	glib2-devel >= 1:2.14.0
+BuildRequires:	gpgme-devel >= 1.0.0
+BuildRequires:	libidn-devel >= 0.0.0
+BuildRequires:	libotr-devel >= 4.0.0
 BuildRequires:	libtool
-BuildRequires:	loudmouth-devel >= 1.4.2
-BuildRequires:	ncurses-ext-devel
-BuildRequires:	openssl-devel
+BuildRequires:	loudmouth-devel >= 1.5.3
+BuildRequires:	ncurses-devel >= 5
+BuildRequires:	ncurses-ext-devel >= 5
 BuildRequires:	pkgconfig
+Requires:	glib2 >= 1:2.14.0
+Requires:	gpgme >= 1.0.0
+Requires:	libotr >= 4.0.0
+Requires:	loudmouth >= 1.5.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,17 +39,34 @@ możliwości mcabbera należą: obsługa SSL, logowanie historii,
 dopełnianie poleceń i wywoływanie zewnętrznych pleceń przy
 zdarzeniach.
 
+%package devel
+Summary:	Header files for mcabber modules development
+Summary(pl.UTF-8):	Pliki nagłówkowe do tworzenia modułów mcabbera
+Group:		Development/Libraries
+# doesn't require base
+Requires:	glib2-devel >= 1:2.14.0
+Requires:	loudmouth-devel >= 1.5.3
+Requires:	ncurses-devel >= 5
+Requires:	ncurses-ext-devel >= 5
+
+%description devel
+Header files for mcabber modules development.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe do tworzenia modułów mcabbera.
+
 %prep
 %setup -q
+%patch -P0 -p1
+%patch -P1 -p1
 
 %build
-%{__libtoolize} --automake
+%{__libtoolize}
 %{__aclocal} -I macros
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure \
-	--with-ssl
+%configure
 
 %{__make}
 
@@ -51,12 +76,22 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# plugins loaded via libgmodule
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/mcabber/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO mcabberrc.example
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
-%{_datadir}/%{name}
+%attr(755,root,root) %{_bindir}/mcabber
+%dir %{_libdir}/mcabber
+%attr(755,root,root) %{_libdir}/mcabber/lib*.so
+%{_datadir}/mcabber
+%{_mandir}/man1/mcabber.1*
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/mcabber
+%{_pkgconfigdir}/mcabber.pc
diff --git a/mcabber-format.patch b/mcabber-format.patch
new file mode 100644
index 0000000..e581896
--- /dev/null
+++ b/mcabber-format.patch
@@ -0,0 +1,36 @@
+--- mcabber-1.1.2/mcabber/screen.c.orig	2025-07-02 20:06:20.786279006 +0200
++++ mcabber-1.1.2/mcabber/screen.c	2025-07-02 20:24:19.187103474 +0200
+@@ -1278,12 +1278,12 @@ static void scr_update_window(winbuf_t *
+         tmp = pref[timelen];
+         pref[timelen] = '\0';
+         wbkgdset(win_entry->win, get_color(COLOR_TIMESTAMP));
+-        wprintw(win_entry->win, pref);
++        wprintw(win_entry->win, "%s", pref);
+         pref[timelen] = tmp;
+         wbkgdset(win_entry->win, get_color(color));
+-        wprintw(win_entry->win, pref+timelen);
++        wprintw(win_entry->win, "%s", pref+timelen);
+       } else
+-        wprintw(win_entry->win, pref);
++        wprintw(win_entry->win, "%s", pref);
+ 
+       // Make sure we are at the right position
+       wmove(win_entry->win, winy, prefixwidth-1);
+@@ -1362,7 +1362,7 @@ scr_update_window_skipline:
+         wmove(win_entry->win, winy, 0);
+         wbkgdset(win_entry->win, get_color(COLOR_READMARK));
+         g_snprintf(pref, prefixwidth, "             == ");
+-        wprintw(win_entry->win, pref);
++        wprintw(win_entry->win, "%s", pref);
+         w = scr_gettextwidth() / 3;
+         for (i=0; i<w; i++)
+           wprintw(win_entry->win, "== ");
+@@ -1782,7 +1782,7 @@ void scr_draw_main_window(unsigned int f
+ 
+   ver = mcabber_version();
+   message = g_strdup_printf("MCabber version %s.\n", ver);
+-  mvwprintw(chatWnd, 0, 0, message);
++  mvwprintw(chatWnd, 0, 0, "%s", message);
+   mvwprintw(chatWnd, 1, 0, "http://mcabber.com/");
+   g_free(ver);
+   g_free(message);
diff --git a/mcabber-uninitialized.patch b/mcabber-uninitialized.patch
new file mode 100644
index 0000000..3f9cc18
--- /dev/null
+++ b/mcabber-uninitialized.patch
@@ -0,0 +1,11 @@
+--- mcabber-1.1.2/mcabber/screen.c.orig	2020-09-19 16:21:13.000000000 +0200
++++ mcabber-1.1.2/mcabber/screen.c	2025-07-02 20:02:34.644170790 +0200
+@@ -4462,7 +4462,7 @@ static void bindcommand(keycode_t kcode)
+ static void scr_process_vi_arrow_key(int key)
+ {
+   const char *l;
+-  char mask[INPUTLINE_LENGTH+1];
++  char mask[INPUTLINE_LENGTH+1] = { 0 };
+   size_t cmd_len = strlen(mask);
+   size_t str_len = strlen(inputLine) - 1;
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mcabber.git/commitdiff/dd677978b695b444b0795bd8f457c0b16a87405a

