diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /x11-plugins/lurch/files | |
parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) |
gentoo resync : 14.12.2020
Diffstat (limited to 'x11-plugins/lurch/files')
-rw-r--r-- | x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch | 91 | ||||
-rw-r--r-- | x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch | 92 |
2 files changed, 183 insertions, 0 deletions
diff --git a/x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch b/x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch new file mode 100644 index 000000000000..261c3ac57c5b --- /dev/null +++ b/x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch @@ -0,0 +1,91 @@ +From d5c2d8902ec268a1e6f8a9f5bd6fabde1e8ddf6a Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Thu, 3 Dec 2020 23:59:00 +0100 +Subject: [PATCH] axc: Use system's libsignal-protocol-c shared library + +--- + Makefile | 26 ++++++++++---------------- + 1 file changed, 10 insertions(+), 16 deletions(-) + +diff --git a/lib/axc/Makefile b/lib/axc/Makefile +index 601e4fb..d08dd85 100644 +--- a/lib/axc/Makefile ++++ b/lib/axc/Makefile +@@ -14,6 +14,9 @@ GLIB_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs glib-2.0) + SQLITE3_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags sqlite3) + SQLITE3_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs sqlite3) + ++LIBSIGNAL_PROTOCOL_C_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c) ++LIBSIGNAL_PROTOCOL_C_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs libsignal-protocol-c) ++ + LIBGCRYPT_CONFIG ?= libgcrypt-config + LIBGCRYPT_LDFLAGS ?= $(shell $(LIBGCRYPT_CONFIG) --libs) + +@@ -24,26 +27,24 @@ TDIR = test + TFN = test_all + CDIR = coverage + +-AX_DIR=./lib/libsignal-protocol-c +-AX_BDIR=$(AX_DIR)/build/src +-AX_PATH=$(AX_BDIR)/libsignal-protocol-c.a +- + PKGCFG_C=$(GLIB_CFLAGS) \ + $(SQLITE3_CFLAGS) \ ++ $(LIBSIGNAL_PROTOCOL_C_CFLAGS) \ + $(LIBGCRYPT_CFLAGS) + + PKGCFG_L=$(GLIB_LDFLAGS) \ + $(SQLITE3_LDFLAGS) \ ++ $(LIBSIGNAL_PROTOCOL_C_LDFLAGS) \ + $(LIBGCRYPT_LDFLAGS) + +-HEADERS=-I$(AX_DIR)/src ++HEADERS= + CFLAGS += $(HEADERS) $(PKGCFG_C) -std=c11 -g -Wall -Wextra -Wpedantic \ + -Wstrict-overflow -fno-strict-aliasing -funsigned-char \ + -fno-builtin-memset + CPPFLAGS += -D_XOPEN_SOURCE=700 -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE + TESTFLAGS=$(HEADERS) $(PKGCFG_C) -g -O0 --coverage + PICFLAGS=-fPIC $(CFLAGS) +-LDFLAGS += -pthread -ldl $(PKGCFG_L) $(AX_PATH) -lm ++LDFLAGS += -pthread -ldl $(PKGCFG_L) -lm + LDFLAGS_T= -lcmocka $(LDFLAGS) + + all: $(BDIR)/libaxc.a +@@ -51,7 +52,7 @@ all: $(BDIR)/libaxc.a + $(BDIR): + $(MKDIR_P) $@ + +-client: $(SDIR)/message_client.c $(BDIR)/axc_store.o $(BDIR)/axc_crypto.o $(BDIR)/axc.o $(AX_PATH) ++client: $(SDIR)/message_client.c $(BDIR)/axc_store.o $(BDIR)/axc_crypto.o $(BDIR)/axc.o + $(MKDIR_P) $@ + $(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@/$@.o $(LDFLAGS) + +@@ -73,15 +74,8 @@ $(BDIR)/libaxc.a: $(BDIR)/axc.o $(BDIR)/axc_crypto.o $(BDIR)/axc_store.o + $(BDIR)/libaxc-nt.a: $(BDIR)/axc-nt.o $(BDIR)/axc_crypto.o $(BDIR)/axc_store.o + $(AR) rcs $@ $^ + +-$(AX_PATH): +- cd $(AX_DIR) && \ +- $(MKDIR_P) build && \ +- cd build && \ +- $(CMAKE) $(CMAKE_FLAGS) .. && \ +- $(MAKE) +- + .PHONY: test +-test: $(AX_PATH) test_store test_client ++test: test_store test_client + + .PHONY: test_store + test_store: $(SDIR)/axc_store.c $(SDIR)/axc_crypto.c $(TDIR)/test_store.c +@@ -109,6 +103,6 @@ clean: + + .PHONY: clean-all + clean-all: clean +- rm -rf client $(BDIR) $(CDIR) $(AX_DIR)/build ++ rm -rf client $(BDIR) $(CDIR) + + +-- +2.27.0 + diff --git a/x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch b/x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch new file mode 100644 index 000000000000..4b3de986154d --- /dev/null +++ b/x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch @@ -0,0 +1,92 @@ +From 72f286f389236fe99cb10fdeda3ee9b474de645d Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Fri, 4 Dec 2020 00:10:17 +0100 +Subject: [PATCH] lurch: Use system's libsignal-protocol-c shared library + +--- + Makefile | 37 ++++++++++++++++++++++++------------- + 1 file changed, 24 insertions(+), 13 deletions(-) + +diff --git a/Makefile b/Makefile +index 32bc9c9..937401d 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,16 +28,21 @@ LIBPURPLE_LDFLAGS=$(shell $(PKG_CONFIG) --cflags purple) \ + XML2_CFLAGS ?= $(shell $(XML2_CONFIG) --cflags) + XML2_LDFLAGS ?= $(shell $(XML2_CONFIG) --libs) + ++LIBSIGNAL_PROTOCOL_C_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c) ++LIBSIGNAL_PROTOCOL_C_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs libsignal-protocol-c) ++ + LIBGCRYPT_LDFLAGS ?= $(shell $(LIBGCRYPT_CONFIG) --libs) + + PKGCFG_C=$(GLIB_CFLAGS) \ + $(LIBPURPLE_CFLAGS) \ ++ $(LIBSIGNAL_PROTOCOL_C_CFLAGS) \ + $(XML2_CFLAGS) + + + PKGCFG_L=$(shell $(PKG_CONFIG) --libs sqlite3 mxml) \ + $(GLIB_LDFLAGS) \ + $(LIBPURPLE_LDFLAGS) \ ++ $(LIBSIGNAL_PROTOCOL_C_LDFLAGS) \ + $(XML2_LDFLAGS) \ + $(LIBGCRYPT_LDFLAGS) + +@@ -51,7 +56,7 @@ else + endif + endif + +-HEADERS=-I$(HDIR)/jabber -I$(LOMEMO_SRC) -I$(AXC_SRC) -I$(AX_DIR)/src ++HEADERS=-I$(HDIR)/jabber -I$(LOMEMO_SRC) -I$(AXC_SRC) + CFLAGS += -std=c11 -Wall -g -Wstrict-overflow $(PKGCFG_C) $(HEADERS) + PLUGIN_CPPFLAGS=-DPURPLE_PLUGINS + # -D_BSD_SOURCE can be removed once nobody uses glibc <= 2.18 any more +@@ -79,26 +84,32 @@ AXC_SRC=$(AXC_DIR)/src + AXC_BUILD=$(AXC_DIR)/build + AXC_PATH=$(AXC_BUILD)/libaxc-nt.a + +-AX_DIR=$(AXC_DIR)/lib/libsignal-protocol-c +-AX_PATH=$(AX_DIR)/build/src/libsignal-protocol-c.a +- +-VENDOR_LIBS=$(LOMEMO_PATH) $(AXC_PATH) $(AX_PATH) ++VENDOR_LIBS=$(LOMEMO_PATH) $(AXC_PATH) + + + ### make rules + # +-all: $(BDIR)/lurch.so ++all: $(BDIR)/lurch.so $(BDIR)/linkdummy ++ ++ ++$(BDIR)/linkdummy.c: ++ echo 'int main() { return 0; }' > $@ ++ ++$(BDIR)/liblinklurch.so: $(BDIR)/lurch.so | $(BDIR) ++ ln -f $^ $@ ++ ++$(BDIR)/linkdummy: $(BDIR)/linkdummy.o $(BDIR)/liblinklurch.so ++ $(CC) \ ++ $(shell $(PKG_CONFIG) --libs purple) \ ++ -L$(BDIR) -llinklurch \ ++ $^ \ ++ -o $@ \ ++ $(LDFLAGS) ++ + + $(BDIR): + $(MKDIR_P) build + +-$(AX_PATH): +- cd $(AX_DIR)/ && \ +- $(MKDIR_P) build && \ +- cd build && \ +- $(CMAKE) $(CMAKE_FLAGS) .. \ +- && $(MAKE) +- + $(AXC_PATH): + $(MAKE) -C "$(AXC_DIR)" build/libaxc-nt.a + +-- +2.27.0 + |