From 20ce40f773fc94dff977999874ddb1eebae945db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 4 May 2021 21:24:00 +0200 Subject: [PATCH] Rediff patches. --- irssi-dcc-send-limit.patch | 30 +++--- irssi-dynamic.patch | 200 ++++++++++++++++++------------------- irssi-gcc4.patch | 16 +-- irssi-home_etc.patch | 21 ++-- irssi-libs-nopoison.patch | 11 +- 5 files changed, 140 insertions(+), 138 deletions(-) diff --git a/irssi-dcc-send-limit.patch b/irssi-dcc-send-limit.patch index cde39a1..68535bb 100644 --- a/irssi-dcc-send-limit.patch +++ b/irssi-dcc-send-limit.patch @@ -1,9 +1,9 @@ -diff -ur irssi-0.8.4.orig/src/irc/dcc/dcc-rec.h irssi-0.8.4/src/irc/dcc/dcc-rec.h ---- irssi-0.8.4.orig/src/irc/dcc/dcc-rec.h Mon Feb 19 04:40:06 2001 -+++ irssi-0.8.4/src/irc/dcc/dcc-rec.h Thu Mar 14 02:20:25 2002 -@@ -20,6 +20,12 @@ - time_t starttime; /* transfer start time */ - uoff_t transfd; /* bytes transferred */ +diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/dcc/dcc-rec.h irssi-1.2.2/src/irc/dcc/dcc-rec.h +--- irssi-1.2.2.org/src/irc/dcc/dcc-rec.h 2019-08-29 15:48:43.000000000 +0200 ++++ irssi-1.2.2/src/irc/dcc/dcc-rec.h 2021-05-04 21:22:16.382408355 +0200 +@@ -22,6 +22,12 @@ uoff_t transfd; /* bytes transferred */ + + int pasv_id; /* DCC Id for passive DCCs. <0 means a passive DCC, >=0 means a standard DCC */ +int timeout_tag; + @@ -14,10 +14,10 @@ diff -ur irssi-0.8.4.orig/src/irc/dcc/dcc-rec.h irssi-0.8.4/src/irc/dcc/dcc-rec. unsigned int destroyed:1; /* We're about to destroy this DCC recond */ GHashTable *module_data; -diff -ur irssi-0.8.4.orig/src/irc/dcc/dcc-send.c irssi-0.8.4/src/irc/dcc/dcc-send.c ---- irssi-0.8.4.orig/src/irc/dcc/dcc-send.c Sun Jan 20 04:10:27 2002 -+++ irssi-0.8.4/src/irc/dcc/dcc-send.c Thu Mar 14 02:21:22 2002 -@@ -217,17 +217,87 @@ +diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/dcc/dcc-send.c irssi-1.2.2/src/irc/dcc/dcc-send.c +--- irssi-1.2.2.org/src/irc/dcc/dcc-send.c 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/irc/dcc/dcc-send.c 2021-05-04 21:22:16.382408355 +0200 +@@ -250,17 +250,87 @@ static void sig_dcc_destroyed(SEND_DCC_R { if (!IS_DCC_SEND(dcc)) return; @@ -106,7 +106,7 @@ diff -ur irssi-0.8.4.orig/src/irc/dcc/dcc-send.c irssi-0.8.4/src/irc/dcc/dcc-sen ret = read(dcc->fhandle, buffer, sizeof(buffer)); if (ret <= 0) { -@@ -282,6 +352,7 @@ +@@ -316,6 +386,7 @@ static void dcc_send_connected(SEND_DCC_ GIOChannel *handle; IPADDR addr; int port; @@ -114,7 +114,7 @@ diff -ur irssi-0.8.4.orig/src/irc/dcc/dcc-send.c irssi-0.8.4/src/irc/dcc/dcc-sen /* accept connection */ handle = net_accept(dcc->handle, &addr, &port); -@@ -296,6 +366,13 @@ +@@ -330,6 +401,13 @@ static void dcc_send_connected(SEND_DCC_ g_source_remove(dcc->tagconn); dcc->tagconn = -1; @@ -128,7 +128,7 @@ diff -ur irssi-0.8.4.orig/src/irc/dcc/dcc-send.c irssi-0.8.4/src/irc/dcc/dcc-sen dcc->starttime = time(NULL); dcc->handle = handle; memcpy(&dcc->addr, &addr, sizeof(IPADDR)); -@@ -429,6 +429,7 @@ +@@ -434,6 +512,7 @@ static int dcc_send_one_file(int queue, dcc->size = st.st_size; dcc->fhandle = hfile; dcc->queue = queue; @@ -136,11 +136,11 @@ diff -ur irssi-0.8.4.orig/src/irc/dcc/dcc-send.c irssi-0.8.4/src/irc/dcc/dcc-sen dcc->file_quoted = strchr(fname, ' ') != NULL; if (!passive) { dcc->tagconn = g_input_add(handle, G_INPUT_READ, -@@ -412,6 +490,7 @@ +@@ -473,6 +552,7 @@ void dcc_send_init(void) dcc_register_type("SEND"); settings_add_str("dcc", "dcc_upload_path", "~"); settings_add_bool("dcc", "dcc_send_replace_space_with_underscore", FALSE); + settings_add_int("dcc", "dcc_send_top_speed", 0); signal_add("dcc destroyed", (SIGNAL_FUNC) sig_dcc_destroyed); + signal_add("dcc reply send pasv", (SIGNAL_FUNC) dcc_send_connect); command_bind("dcc send", NULL, (SIGNAL_FUNC) cmd_dcc_send); - command_set_options("dcc send", "append flush prepend rmhead rmtail"); diff --git a/irssi-dynamic.patch b/irssi-dynamic.patch index 288ffd6..300e8bd 100644 --- a/irssi-dynamic.patch +++ b/irssi-dynamic.patch @@ -1,7 +1,7 @@ -diff -ur irssi-0.8.10-rc5-o/configure.ac irssi-0.8.10-rc5/configure.ac ---- irssi-0.8.10-rc5-o/configure.ac 2004-09-15 06:15:05.000000000 -0600 -+++ irssi-0.8.10-rc5/configure.ac 2005-05-29 01:32:38.000000000 -0600 -@@ -236,6 +236,10 @@ +diff -urNp -x '*.orig' irssi-1.2.2.org/configure.ac irssi-1.2.2/configure.ac +--- irssi-1.2.2.org/configure.ac 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/configure.ac 2021-05-04 21:23:17.308905879 +0200 +@@ -212,6 +212,10 @@ case "$host_os" in ;; esac @@ -10,9 +10,9 @@ diff -ur irssi-0.8.10-rc5-o/configure.ac irssi-0.8.10-rc5/configure.ac +]) + - AC_CHECK_FUNCS(mkfifo fcntl nl_langinfo) + AC_SEARCH_LIBS([socket], [network socket]) -@@ -508,20 +508,20 @@ +@@ -472,20 +476,20 @@ if test "$want_perl" != "no"; then dnl * building with static perl support dnl * all PERL_LDFLAGS linking is done in fe-text PERL_LINK_FLAGS="$PERL_LDFLAGS" @@ -39,7 +39,7 @@ diff -ur irssi-0.8.10-rc5-o/configure.ac irssi-0.8.10-rc5/configure.ac perl_static_lib= perl_static_fe_lib= fi -@@ -591,7 +591,7 @@ +@@ -641,7 +645,7 @@ dnl ************************************ AC_SUBST(CHAT_MODULES) AC_SUBST(irc_MODULES) @@ -48,7 +48,7 @@ diff -ur irssi-0.8.10-rc5-o/configure.ac irssi-0.8.10-rc5/configure.ac FE_COMMON_LIBS="" CHAT_LIBS="" -@@ -842,16 +846,16 @@ +@@ -650,16 +654,16 @@ for c in $CHAT_MODULES; do module_deinits="" fe_module_inits="" fe_module_deinits="" @@ -69,7 +69,7 @@ diff -ur irssi-0.8.10-rc5-o/configure.ac irssi-0.8.10-rc5/configure.ac fe_module_inits="$fe_module_inits fe_${c}_${s}_init();" fe_module_deinits="fe_${c}_${s}_deinit(); $fe_module_deinits" fi -@@ -879,7 +883,7 @@ +@@ -689,7 +693,7 @@ for c in $CHAT_MODULES; do fi done @@ -78,37 +78,37 @@ diff -ur irssi-0.8.10-rc5-o/configure.ac irssi-0.8.10-rc5/configure.ac dnl ** common libraries needed by frontends COMMON_NOUI_LIBS="$CHAT_LIBS $CORE_LIBS" -diff -ur irssi-0.8.10-rc5-o/src/core/Makefile.am irssi-0.8.10-rc5/src/core/Makefile.am ---- irssi-0.8.10-rc5-o/src/core/Makefile.am 2004-08-19 18:10:01.000000000 -0600 -+++ irssi-0.8.10-rc5/src/core/Makefile.am 2005-05-29 01:32:38.000000000 -0600 +diff -urNp -x '*.orig' irssi-1.2.2.org/src/core/Makefile.am irssi-1.2.2/src/core/Makefile.am +--- irssi-1.2.2.org/src/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/core/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,6 @@ -noinst_LIBRARIES = libcore.a +libirssi_core_LTLIBRARIES = libirssi_core.la + +libirssi_coredir = $(libdir) - INCLUDES = \ + AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -@@ -7,7 +9,7 @@ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DMODULEDIR=\""$(libdir)/irssi/modules"\" +@@ -13,7 +15,7 @@ else + regex_impl=iregex-regexh.c + endif -libcore_a_SOURCES = \ +libirssi_core_la_SOURCES = \ args.c \ channels.c \ channels-setup.c \ -diff -ur irssi-0.8.10-rc5-o/src/fe-common/core/Makefile.am irssi-0.8.10-rc5/src/fe-common/core/Makefile.am ---- irssi-0.8.10-rc5-o/src/fe-common/core/Makefile.am 2004-09-15 06:15:05.000000000 -0600 -+++ irssi-0.8.10-rc5/src/fe-common/core/Makefile.am 2005-05-29 01:32:38.000000000 -0600 +diff -urNp -x '*.orig' irssi-1.2.2.org/src/fe-common/core/Makefile.am irssi-1.2.2/src/fe-common/core/Makefile.am +--- irssi-1.2.2.org/src/fe-common/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/fe-common/core/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libfe_common_core.a +libirssife_common_core_LTLIBRARIES = libirssife_common_core.la +libirssife_common_coredir = $(libdir) - INCLUDES = \ + AM_CPPFLAGS = \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ -@@ -6,7 +7,7 @@ +@@ -6,7 +7,7 @@ AM_CPPFLAGS = \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DTHEMESDIR=\""$(datadir)/irssi/themes"\" @@ -117,28 +117,9 @@ diff -ur irssi-0.8.10-rc5-o/src/fe-common/core/Makefile.am irssi-0.8.10-rc5/src/ chat-completion.c \ command-history.c \ completion.c \ -diff -ur irssi-0.8.10-rc5-o/src/fe-common/irc/dcc/Makefile.am irssi-0.8.10-rc5/src/fe-common/irc/dcc/Makefile.am ---- irssi-0.8.10-rc5-o/src/fe-common/irc/dcc/Makefile.am 2004-05-10 14:45:03.000000000 -0600 -+++ irssi-0.8.10-rc5/src/fe-common/irc/dcc/Makefile.am 2005-05-29 01:32:38.000000000 -0600 -@@ -1,4 +1,5 @@ --noinst_LIBRARIES = libfe_irc_dcc.a -+libirssife_irc_dcc_LTLIBRARIES = libirssife_irc_dcc.la -+libirssife_irc_dccdir = $(libdir) - - INCLUDES = \ - -I$(top_srcdir)/src \ -@@ -10,7 +11,7 @@ - -DHELPDIR=\""$(datadir)/irssi/help"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" - --libfe_irc_dcc_a_SOURCES = \ -+libirssife_irc_dcc_la_SOURCES = \ - fe-dcc.c \ - fe-dcc-chat.c \ - fe-dcc-chat-messages.c \ -diff -ur irssi-0.8.10-rc5-o/src/fe-common/irc/Makefile.am irssi-0.8.10-rc5/src/fe-common/irc/Makefile.am ---- irssi-0.8.10-rc5-o/src/fe-common/irc/Makefile.am 2004-07-11 09:45:03.000000000 -0600 -+++ irssi-0.8.10-rc5/src/fe-common/irc/Makefile.am 2005-05-29 01:32:38.000000000 -0600 +diff -urNp -x '*.orig' irssi-1.2.2.org/src/fe-common/irc/Makefile.am irssi-1.2.2/src/fe-common/irc/Makefile.am +--- irssi-1.2.2.org/src/fe-common/irc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/fe-common/irc/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,6 +1,7 @@ SUBDIRS = dcc notifylist @@ -146,9 +127,9 @@ diff -ur irssi-0.8.10-rc5-o/src/fe-common/irc/Makefile.am irssi-0.8.10-rc5/src/f +libirssife_common_irc_LTLIBRARIES = libirssife_common_irc.la +libirssife_common_ircdir = $(libdir) - INCLUDES = \ + AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -@@ -29,7 +30,7 @@ +@@ -31,7 +32,7 @@ real_sources = \ irc-completion.c \ module-formats.c @@ -157,17 +138,36 @@ diff -ur irssi-0.8.10-rc5-o/src/fe-common/irc/Makefile.am irssi-0.8.10-rc5/src/f $(real_sources) \ irc-modules.c -diff -ur irssi-0.8.10-rc5-o/src/fe-common/irc/notifylist/Makefile.am irssi-0.8.10-rc5/src/fe-common/irc/notifylist/Makefile.am ---- irssi-0.8.10-rc5-o/src/fe-common/irc/notifylist/Makefile.am 2004-05-10 14:45:03.000000000 -0600 -+++ irssi-0.8.10-rc5/src/fe-common/irc/notifylist/Makefile.am 2005-05-29 01:32:38.000000000 -0600 +diff -urNp -x '*.orig' irssi-1.2.2.org/src/fe-common/irc/dcc/Makefile.am irssi-1.2.2/src/fe-common/irc/dcc/Makefile.am +--- irssi-1.2.2.org/src/fe-common/irc/dcc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/fe-common/irc/dcc/Makefile.am 2021-05-04 21:23:17.308905879 +0200 +@@ -1,4 +1,5 @@ +-noinst_LIBRARIES = libfe_irc_dcc.a ++libirssife_irc_dcc_LTLIBRARIES = libirssife_irc_dcc.la ++libirssife_irc_dccdir = $(libdir) + + AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ +@@ -10,7 +11,7 @@ AM_CPPFLAGS = \ + -DHELPDIR=\""$(datadir)/irssi/help"\" \ + -DSYSCONFDIR=\""$(sysconfdir)"\" + +-libfe_irc_dcc_a_SOURCES = \ ++libirssife_irc_dcc_la_SOURCES = \ + fe-dcc.c \ + fe-dcc-chat.c \ + fe-dcc-chat-messages.c \ +diff -urNp -x '*.orig' irssi-1.2.2.org/src/fe-common/irc/notifylist/Makefile.am irssi-1.2.2/src/fe-common/irc/notifylist/Makefile.am +--- irssi-1.2.2.org/src/fe-common/irc/notifylist/Makefile.am 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/fe-common/irc/notifylist/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libfe_irc_notifylist.a +libirssife_irc_notifylist_LTLIBRARIES = libirssife_irc_notifylist.la +libirssife_irc_notifylistdir = $(libdir) - INCLUDES = \ + AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -@@ -9,7 +10,7 @@ +@@ -9,7 +10,7 @@ AM_CPPFLAGS = \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" @@ -176,17 +176,33 @@ diff -ur irssi-0.8.10-rc5-o/src/fe-common/irc/notifylist/Makefile.am irssi-0.8.1 fe-notifylist.c \ module-formats.c -diff -ur irssi-0.8.10-rc5-o/src/irc/core/Makefile.am irssi-0.8.10-rc5/src/irc/core/Makefile.am ---- irssi-0.8.10-rc5-o/src/irc/core/Makefile.am 2004-05-10 14:45:04.000000000 -0600 -+++ irssi-0.8.10-rc5/src/irc/core/Makefile.am 2005-05-29 01:32:38.000000000 -0600 +diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/Makefile.am irssi-1.2.2/src/irc/Makefile.am +--- irssi-1.2.2.org/src/irc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/irc/Makefile.am 2021-05-04 21:23:17.308905879 +0200 +@@ -4,9 +4,10 @@ endif + + SUBDIRS = core dcc flood notifylist $(PROXY) + +-noinst_LIBRARIES = libirc.a ++libirssi_irc_LTLIBRARIES = libirssi_irc.la ++libirssi_ircdir = $(libdir) + +-libirc_a_SOURCES = irc.c ++libirssi_irc_la_SOURCES = irc.c + + DISTFILES = $(DIST_COMMON) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/core/Makefile.am irssi-1.2.2/src/irc/core/Makefile.am +--- irssi-1.2.2.org/src/irc/core/Makefile.am 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/irc/core/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libirc_core.a +libirssi_irc_core_LTLIBRARIES = libirssi_irc_core.la +libirssi_irc_coredir = $(libdir) - INCLUDES = \ + AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -@@ -6,7 +7,7 @@ +@@ -6,7 +7,7 @@ AM_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ $(GLIB_CFLAGS) @@ -195,17 +211,17 @@ diff -ur irssi-0.8.10-rc5-o/src/irc/core/Makefile.am irssi-0.8.10-rc5/src/irc/co bans.c \ ctcp.c \ channels-query.c \ -diff -ur irssi-0.8.10-rc5-o/src/irc/dcc/Makefile.am irssi-0.8.10-rc5/src/irc/dcc/Makefile.am ---- irssi-0.8.10-rc5-o/src/irc/dcc/Makefile.am 2004-05-10 14:45:04.000000000 -0600 -+++ irssi-0.8.10-rc5/src/irc/dcc/Makefile.am 2005-05-29 01:32:38.000000000 -0600 +diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/dcc/Makefile.am irssi-1.2.2/src/irc/dcc/Makefile.am +--- irssi-1.2.2.org/src/irc/dcc/Makefile.am 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/irc/dcc/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libirc_dcc.a +libirssi_irc_dcc_LTLIBRARIES = libirssi_irc_dcc.la +libirssi_irc_dccdir = $(libdir) - INCLUDES = \ + AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -@@ -6,7 +7,7 @@ +@@ -6,7 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/irc/core/ \ $(GLIB_CFLAGS) @@ -214,17 +230,17 @@ diff -ur irssi-0.8.10-rc5-o/src/irc/dcc/Makefile.am irssi-0.8.10-rc5/src/irc/dcc dcc.c \ dcc-chat.c \ dcc-get.c \ -diff -ur irssi-0.8.10-rc5-o/src/irc/flood/Makefile.am irssi-0.8.10-rc5/src/irc/flood/Makefile.am ---- irssi-0.8.10-rc5-o/src/irc/flood/Makefile.am 2004-05-10 14:45:04.000000000 -0600 -+++ irssi-0.8.10-rc5/src/irc/flood/Makefile.am 2005-05-29 01:32:38.000000000 -0600 +diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/flood/Makefile.am irssi-1.2.2/src/irc/flood/Makefile.am +--- irssi-1.2.2.org/src/irc/flood/Makefile.am 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/irc/flood/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libirc_flood.a +libirssi_irc_flood_LTLIBRARIES = libirssi_irc_flood.la +libirssi_irc_flooddir = $(libdir) - INCLUDES = \ + AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -@@ -6,7 +7,7 @@ +@@ -6,7 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/irc/core/ \ $(GLIB_CFLAGS) @@ -233,33 +249,17 @@ diff -ur irssi-0.8.10-rc5-o/src/irc/flood/Makefile.am irssi-0.8.10-rc5/src/irc/f autoignore.c \ flood.c -diff -ur irssi-0.8.10-rc5-o/src/irc/Makefile.am irssi-0.8.10-rc5/src/irc/Makefile.am ---- irssi-0.8.10-rc5-o/src/irc/Makefile.am 2002-03-15 14:07:19.000000000 -0700 -+++ irssi-0.8.10-rc5/src/irc/Makefile.am 2005-05-29 01:32:38.000000000 -0600 -@@ -4,9 +4,10 @@ - - SUBDIRS = core dcc flood notifylist $(PROXY) - --noinst_LIBRARIES = libirc.a -+libirssi_irc_LTLIBRARIES = libirssi_irc.la -+libirssi_ircdir = $(libdir) - --libirc_a_SOURCES = irc.c -+libirssi_irc_la_SOURCES = irc.c - - DISTFILES = $(DIST_COMMON) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -diff -ur irssi-0.8.10-rc5-o/src/irc/notifylist/Makefile.am irssi-0.8.10-rc5/src/irc/notifylist/Makefile.am ---- irssi-0.8.10-rc5-o/src/irc/notifylist/Makefile.am 2004-05-10 14:45:04.000000000 -0600 -+++ irssi-0.8.10-rc5/src/irc/notifylist/Makefile.am 2005-05-29 01:32:38.000000000 -0600 +diff -urNp -x '*.orig' irssi-1.2.2.org/src/irc/notifylist/Makefile.am irssi-1.2.2/src/irc/notifylist/Makefile.am +--- irssi-1.2.2.org/src/irc/notifylist/Makefile.am 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/irc/notifylist/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,4 +1,5 @@ -noinst_LIBRARIES = libirc_notifylist.a +libirssi_irc_notifylist_LTLIBRARIES = libirssi_irc_notifylist.la +libirssi_irc_notifylistdir = $(libdir) - INCLUDES = \ + AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -@@ -6,7 +7,7 @@ +@@ -6,7 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/irc/core/ \ $(GLIB_CFLAGS) @@ -268,9 +268,9 @@ diff -ur irssi-0.8.10-rc5-o/src/irc/notifylist/Makefile.am irssi-0.8.10-rc5/src/ notifylist.c \ notify-commands.c \ notify-ison.c \ -diff -ur irssi-0.8.10-rc5-o/src/lib-config/Makefile.am irssi-0.8.10-rc5/src/lib-config/Makefile.am ---- irssi-0.8.10-rc5-o/src/lib-config/Makefile.am 2004-05-10 14:45:04.000000000 -0600 -+++ irssi-0.8.10-rc5/src/lib-config/Makefile.am 2005-05-29 01:32:38.000000000 -0600 +diff -urNp -x '*.orig' irssi-1.2.2.org/src/lib-config/Makefile.am irssi-1.2.2/src/lib-config/Makefile.am +--- irssi-1.2.2.org/src/lib-config/Makefile.am 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/lib-config/Makefile.am 2021-05-04 21:23:17.308905879 +0200 @@ -1,10 +1,11 @@ -noinst_LIBRARIES = libirssi_config.a +libirssi_config_LTLIBRARIES = libirssi_config.la @@ -285,9 +285,10 @@ diff -ur irssi-0.8.10-rc5-o/src/lib-config/Makefile.am irssi-0.8.10-rc5/src/lib- get.c \ set.c \ parse.c \ ---- irssi-0.8.10/src/perl/Makefile.am~ 2005-12-11 17:10:06.000000000 +0200 -+++ irssi-0.8.10/src/perl/Makefile.am 2005-12-11 17:12:01.000000000 +0200 -@@ -7,11 +7,11 @@ +diff -urNp -x '*.orig' irssi-1.2.2.org/src/perl/Makefile.am irssi-1.2.2/src/perl/Makefile.am +--- irssi-1.2.2.org/src/perl/Makefile.am 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/perl/Makefile.am 2021-05-04 21:23:17.308905879 +0200 +@@ -5,11 +5,11 @@ perl_dirs = common irc ui textui module_LTLIBRARIES = $(perl_module_lib) $(perl_module_fe_lib) noinst_LTLIBRARIES = $(perl_static_lib) $(perl_static_fe_lib) EXTRA_LTLIBRARIES = \ @@ -301,14 +302,11 @@ diff -ur irssi-0.8.10-rc5-o/src/lib-config/Makefile.am irssi-0.8.10-rc5/src/lib- +libirssi_perl_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir) +libirssife_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir) - perl-core.c: perl-signals-list.h irssi-core.pl.h - -diff -ur irssi-0.8.10-rc5-o/src/perl/Makefile.am irssi-0.8.10-rc5/src/perl/Makefile.am ---- irssi-0.8.10-rc5-o/src/perl/Makefile.am 2003-11-16 11:30:02.000000000 -0700 -+++ irssi-0.8.10-rc5/src/perl/Makefile.am 2005-05-29 01:33:18.000000000 -0600 -@@ -55,16 +55,16 @@ - rm -f .libs/DynaLoader.a - $(LN_S) $(DYNALOADER_A) .libs/DynaLoader.a + perl-core.lo: irssi-core.pl.h + perl-signals.lo: perl-signals-list.h +@@ -43,16 +43,16 @@ noinst_HEADERS = \ + perl-signals.h \ + perl-sources.h -libperl_core_la_SOURCES = \ +libirssi_perl_core_la_SOURCES = \ @@ -327,7 +325,7 @@ diff -ur irssi-0.8.10-rc5-o/src/perl/Makefile.am irssi-0.8.10-rc5/src/perl/Makef $(perl_fe_sources) perl-signals-list.h: $(top_srcdir)/docs/signals.txt $(srcdir)/get-signals.pl -@@ -165,4 +165,4 @@ +@@ -162,4 +162,4 @@ distclean-generic: cd ..; \ done diff --git a/irssi-gcc4.patch b/irssi-gcc4.patch index ab1e3da..6b2ecc5 100644 --- a/irssi-gcc4.patch +++ b/irssi-gcc4.patch @@ -1,8 +1,9 @@ ---- irssi-0.8.11/src/core/misc.h 2007-04-25 20:13:56.000000000 +0200 -+++ irssi-0.8.11/src/core/misc.h-new 2007-06-07 01:41:35.677176190 +0200 -@@ -1,6 +1,10 @@ - #ifndef __MISC_H - #define __MISC_H +diff -urNp -x '*.orig' irssi-1.2.2.org/src/core/misc.h irssi-1.2.2/src/core/misc.h +--- irssi-1.2.2.org/src/core/misc.h 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/core/misc.h 2021-05-04 21:22:59.014622440 +0200 +@@ -4,6 +4,10 @@ + int g_input_add_poll(int fd, int priority, int condition, + GInputFunction function, void *data); +#ifdef HAVE_CONFIG_H +#include "irssi-config.h" @@ -11,8 +12,9 @@ /* `str' should be type char[MAX_INT_STRLEN] */ #define ltoa(str, num) \ g_snprintf(str, sizeof(str), "%d", num) ---- irssi-0.8.11/src/perl/module.h 2007-04-25 20:13:56.000000000 +0200 -+++ irssi-0.8.11/src/perl/module.h-new 2007-06-07 01:42:22.832959937 +0200 +diff -urNp -x '*.orig' irssi-1.2.2.org/src/perl/module.h irssi-1.2.2/src/perl/module.h +--- irssi-1.2.2.org/src/perl/module.h 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/perl/module.h 2021-05-04 21:22:59.017955947 +0200 @@ -1,5 +1,9 @@ #include "common.h" diff --git a/irssi-home_etc.patch b/irssi-home_etc.patch index 990e6a4..08d6b94 100644 --- a/irssi-home_etc.patch +++ b/irssi-home_etc.patch @@ -1,7 +1,8 @@ ---- irssi-0.8.6.orig/src/core/core.c 2002-10-19 20:00:06.000000000 +0200 -+++ irssi-0.8.6/src/core/core.c 2003-11-09 12:46:25.000000000 +0100 -@@ -193,7 +193,9 @@ - args_register(options); +diff -urNp -x '*.orig' irssi-1.2.2.org/src/core/core.c irssi-1.2.2/src/core/core.c +--- irssi-1.2.2.org/src/core/core.c 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/core/core.c 2021-05-04 21:22:39.960299530 +0200 +@@ -193,7 +193,9 @@ void core_preinit(const char *path) + int len; if (irssi_dir == NULL) { - home = g_get_home_dir(); @@ -10,10 +11,11 @@ + home = g_get_home_dir(); if (home == NULL) home = "."; - ---- irssi-0.8.11/src/core/log-away.c.orig 2007-04-25 20:13:56.000000000 +0200 -+++ irssi-0.8.11/src/core/log-away.c 2007-06-07 01:31:08.951362144 +0200 -@@ -105,7 +105,12 @@ + +diff -urNp -x '*.orig' irssi-1.2.2.org/src/core/log-away.c irssi-1.2.2/src/core/log-away.c +--- irssi-1.2.2.org/src/core/log-away.c 2019-08-29 15:48:46.000000000 +0200 ++++ irssi-1.2.2/src/core/log-away.c 2021-05-04 21:22:39.960299530 +0200 +@@ -112,7 +112,12 @@ void log_away_init(void) away_msgs = 0; awaylog_file = g_strconcat(get_irssi_dir(), "/away.log", NULL); @@ -26,5 +28,4 @@ + settings_add_str("log", "awaylog_file", awaylog_file); g_free(awaylog_file); settings_add_level("log", "awaylog_level", "msgs hilight"); - - + diff --git a/irssi-libs-nopoison.patch b/irssi-libs-nopoison.patch index 13fabac..094d594 100644 --- a/irssi-libs-nopoison.patch +++ b/irssi-libs-nopoison.patch @@ -1,11 +1,12 @@ ---- irssi-0.8.12/configure.ac~ 2008-11-16 19:24:07.000000000 +0200 -+++ irssi-0.8.12/configure.ac 2008-11-16 19:26:14.401917429 +0200 -@@ -511,7 +511,7 @@ +diff -urNp -x '*.orig' irssi-1.2.2.org/configure.ac irssi-1.2.2/configure.ac +--- irssi-1.2.2.org/configure.ac 2021-05-04 21:23:37.126601768 +0200 ++++ irssi-1.2.2/configure.ac 2021-05-04 21:23:37.263275533 +0200 +@@ -431,7 +431,7 @@ if test "$want_perl" != "no"; then AC_MSG_RESULT([not found, building without Perl]) want_perl=no else - PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts 2>/dev/null` + PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts 2>/dev/null | sed -e 's/-Wl,--as-needed//'` - dnl * Perl 5.004 and older use perl_xxx variables while - dnl * later use PL_perl_xxx variables .. + dnl * remove all database stuffs + dnl * nsl is already in ldflags -- 2.43.0