46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
--- vncterm/Makefile.alt 2020-07-15 09:08:24.000000000 +0000
|
|
+++ vncterm/Makefile 2020-09-04 09:32:58.598217300 +0000
|
|
@@ -1,6 +1,3 @@
|
|
-include /usr/share/dpkg/pkg-info.mk
|
|
-include /usr/share/dpkg/architecture.mk
|
|
-
|
|
PACKAGE=vncterm
|
|
GITVERSION:=$(shell cat .git/refs/heads/master)
|
|
|
|
@@ -19,7 +16,7 @@ VNC_LIBS := -lnsl -lpthread -lz -ljpeg -
|
|
all: vncterm
|
|
|
|
font.data: genfont2
|
|
- ./genfont2 -o font.data.tmp -i /usr/share/unifont/unifont.hex
|
|
+ ./genfont2 -o font.data.tmp -i unifont.hex
|
|
mv font.data.tmp font.data
|
|
|
|
genfont2: genfont2.c
|
|
@@ -31,14 +28,11 @@ ${VNCLIB}: ${VNCSRC}
|
|
rm -rf ${VNCDIR}
|
|
tar xf ${VNCSRC}
|
|
ln -s ../vncpatches ${VNCDIR}/patches
|
|
- cd ${VNCDIR}; quilt push -a
|
|
+ cd ${VNCDIR}; patch -p1 < patches/tls-auth-pluging.patch
|
|
cd ${VNCDIR}; cmake -D WITH_GNUTLS=OFF -D WITH_OPENSSL=OFF -D WITH_WEBSOCKETS=OFF -D WITH_SYSTEMD=OFF -D WITH_TIGHTVNC_FILETRANSFER=OFF -D WITH_GCRYPT=OFF -D WITH_LZO=OFF -D BUILD_SHARED_LIBS=OFF .; cmake --build .
|
|
|
|
-vncterm: vncterm.c wchardata.c $(VNCLIB)
|
|
- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(VNC_LIBS)
|
|
-
|
|
-wchardata.c:
|
|
- cp /usr/share/unifont/$@ $@
|
|
+vncterm: vncterm.c ${VNCLIB} vncterm.1 font.data
|
|
+ gcc -O2 -g -o $@ vncterm.c wchardata.c -Wall -Wno-deprecated-declarations -D_GNU_SOURCE -I ${VNCDIR} ${VNCLIB} -lpthread -lz -ljpeg -lutil -lgnutls -lpng
|
|
|
|
.PHONY: install
|
|
install: vncterm vncterm.1 font.data
|
|
@@ -57,7 +51,7 @@ dinstall: ${DEB}
|
|
|
|
vncterm.1: vncterm.pod
|
|
rm -f $@
|
|
- pod2man -n $< -s 1 -r ${DEB_VERSION_UPSTREAM} <$< >$@
|
|
+ pod2man -n $< -s 1 -r ${VNCVER} <$< >$@
|
|
|
|
.PHONY: deb
|
|
deb: $(DEB)
|