kee

commit 511c8deabff1d8db15bfd3eb433dda1e11782c1e
parent 25b99ae4188cf7105fcb5818408cd3cceb7aba51
Author: lash <dev@holbrook.no>
Date:   Wed, 17 Apr 2024 18:51:22 +0100

Eliminate varint

Diffstat:
M
README.md
 | 
1
-
M
src/Makefile
 | 
3
++-
M
src/gtk/Makefile
 | 
3
++-
M
src/gtk/kee-entry.c
 | 
1
-
M
src/gtk/tests/Makefile
 | 
3
++-
M
src/tests/Makefile
 | 
3
++-

6 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
@@ -33,7 +33,6 @@ The code expects objects from these source trees to be available somehow:
 |project | upstream source | version | tar.gz sha256 |
 |---|---|---|---|
 | liblash | [https://holbrook.no/src/liblash](https://holbrook.no/src/liblash) `(193dd4032e8088ada2dc9dcedab8d7486e9305f5)` | `0.1.0` | `333cdf49bb7e9f44b37e5bc9f594a01e4b3b8ecb3fcd3d9ffec3ea6dcdeaec7b` |
-| varint.c | [https://github.com/tidwall/varint.c](https://github.com/tidwall/varint.c) `(7e1f7067eaf6ee114d865c99a8f5f01c813f3a61)` | `0.1.0` | `e33f83a8cd965827554c134bcb607990c04c0097cd57e49ae8c343c6d311826f` |
 | libcmime | [https://github.com/spmfilter/libcmime.git](https://github.com/spmfilter/libcmime.git) `(dd21eb096d162656e30243f60fc4bc35ad39ae6e)` | `0.2.2` | `18a8d46ebec575a79212acc2dc6af7fd7bdeba3a9b85a70677ed0b7785c5c04e` |
 | gst-plugins-rs | [https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs](https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs) `(a84bbc66f30573b62871db163c48afef75adf6ec)` | `1.22.10 (gstreamer)` | `691d5d52f59ec6322a2f6ddc1039ef47c9ac5e6328e2df1ef920629b46c659df` |
 
diff --git a/src/Makefile b/src/Makefile
@@ -2,7 +2,8 @@ OBJS := $(patsubst %.c,%.o,$(filter-out main.c,$(wildcard *.c)))
 INCLUDES := `pkg-config --cflags libgcrypt lmdb libxdg-basedir`
 #CFLAGS +=  $(INCLUDES) -g3 -Wall -Iaux/varint
 CFLAGS +=  $(INCLUDES) -Wall
-LIBS := `pkg-config --libs libgcrypt zlib lmdb libxdg-basedir` -lb64 -lvarint -llash
+#LIBS := `pkg-config --libs libgcrypt zlib lmdb libxdg-basedir` -lb64 -lvarint -llash
+LIBS := `pkg-config --libs libgcrypt zlib lmdb libxdg-basedir` -lb64 -llash
 LDFLAGS += $(LIBS)
 
 #all: aux resource $(OBJS)
diff --git a/src/gtk/Makefile b/src/gtk/Makefile
@@ -4,7 +4,8 @@ INCLUDES :=  -I.. -I../aux/include
 #CFLAGS +=  `pkg-config --cflags gtk4  gstreamer-1.0 libcmime` $(INCLUDES) -g3 -Wall
 CFLAGS +=  `pkg-config --cflags gtk4  gstreamer-1.0  libtasn1` $(INCLUDES) -g3 -Wall
 #LIBS := `pkg-config --libs gtk4 zlib lmdb libgcrypt libxdg-basedir  gstreamer-1.0 libcmime` -lb64
-LIBS := `pkg-config --libs gtk4 zlib lmdb libgcrypt libxdg-basedir gstreamer-1.0 libtasn1` -lb64 -lcmime -lvarint -llash
+#LIBS := `pkg-config --libs gtk4 zlib lmdb libgcrypt libxdg-basedir gstreamer-1.0 libtasn1` -lb64 -lcmime -lvarint -llash
+LIBS := `pkg-config --libs gtk4 zlib lmdb libgcrypt libxdg-basedir gstreamer-1.0 libtasn1` -lb64 -lcmime -llash
 LDFLAGS += $(LIBS) 
 
 all: resource $(OBJS)
diff --git a/src/gtk/kee-entry.c b/src/gtk/kee-entry.c
@@ -7,7 +7,6 @@
 #include <libtasn1.h>
 
 #include "cmime.h"
-#include "varint.h"
 
 #include "kee-entry.h"
 #include "db.h"
diff --git a/src/gtk/tests/Makefile b/src/gtk/tests/Makefile
@@ -4,7 +4,8 @@ OBJS := $(patsubst %.c,%.o,$(wildcard *.c))
 LINKOBJS := $(wildcard ../../*.o) $(wildcard ../*.o)
 INCLUDES :=  -I../.. -I..
 CFLAGS +=  `pkg-config --cflags gtk4  gstreamer-1.0` $(INCLUDES) -Wall
-LIBS := `pkg-config --libs gtk4 zlib lmdb libgcrypt libxdg-basedir  gstreamer-1.0` -lb64 -lvarint -lcmime -llash
+#LIBS := `pkg-config --libs gtk4 zlib lmdb libgcrypt libxdg-basedir  gstreamer-1.0` -lb64 -lvarint -lcmime -llash
+LIBS := `pkg-config --libs gtk4 zlib lmdb libgcrypt libxdg-basedir  gstreamer-1.0` -lb64 -lcmime -llash
 LDFLAGS += $(LIBS) 
 
 all: $(OBJS)
diff --git a/src/tests/Makefile b/src/tests/Makefile
@@ -4,7 +4,8 @@ OBJS := $(patsubst %.c,%.o,$(wildcard *.c))
 LINKOBJS := $(wildcard ../*.o)
 INCLUDES :=  -I..
 CFLAGS +=  `pkg-config --cflags gtk4  gstreamer-1.0` $(INCLUDES) -Wall
-LIBS := `pkg-config --libs gtk4 zlib lmdb libgcrypt libxdg-basedir  gstreamer-1.0` -lb64 -lvarint -llash
+#LIBS := `pkg-config --libs gtk4 zlib lmdb libgcrypt libxdg-basedir  gstreamer-1.0` -lb64 -lvarint -llash
+LIBS := `pkg-config --libs gtk4 zlib lmdb libgcrypt libxdg-basedir  gstreamer-1.0` -lb64 -llash
 LDFLAGS += $(LIBS) 
 
 all: obj_debug $(OBJS)