quassel-irssi: Update to newer version to fix compilation

This is the irssi-abi-8 branch that was not merged back to master but is
necessary for compilation. As it touches a submodule, I can't add a patch
for it. But I can backport all of the master commits.

Get rid of quasselc dependency as it's now a submodule.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2018-11-16 15:54:57 -08:00
parent f14c380333
commit 0d25d561f3
7 changed files with 131 additions and 18 deletions
@@ -1,5 +1,3 @@
diff --git a/core/Makefile b/core/Makefile
index 6133087..389855c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3,7 +3,7 @@ DESTDIR ?=
@@ -11,12 +9,12 @@ index 6133087..389855c 100644
IRSSI_LIB?=$(DESTDIR)/$(LIBDIR)/irssi
IRSSI_CFLAGS+=-I$(IRSSI_INCLUDE)/src/
IRSSI_CFLAGS+=-I$(IRSSI_INCLUDE)/src/core/
@@ -26,7 +26,7 @@ else
@@ -27,7 +27,7 @@ else
LDFLAGS += -lquasselc
endif
-CFLAGS=-std=gnu11 -Wall -Wextra -Werror -g -O2 $(IRSSI_CFLAGS) $(QUASSELC_FLAGS) -Wmissing-prototypes -Wmissing-declarations
+CFLAGS+=-std=gnu11 -Wall -Wextra -Werror -g $(IRSSI_CFLAGS) $(QUASSELC_FLAGS) -Wmissing-prototypes -Wmissing-declarations
TARGET=libquassel_core.so
CFLAGS += $(SSL_CFLAGS)
LDFLAGS+= $(SSL_LDLAGS)