From 4f0b35c14710cbc19c9fa98e4dbd1904a9acbbc4 Mon Sep 17 00:00:00 2001
From: sam#gemmi-win10 <sam@china.gz>
Date: Sun, 15 Oct 2023 04:49:43 +0800
Subject: [PATCH] compile2: try tiger 1.13.1

---
 deb12/src/Dockerfile.compile2 | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/deb12/src/Dockerfile.compile2 b/deb12/src/Dockerfile.compile2
index 2f97da8..2800066 100644
--- a/deb12/src/Dockerfile.compile2
+++ b/deb12/src/Dockerfile.compile2
@@ -98,7 +98,7 @@ FROM stage-base as stage-tiger
 ARG COMPILE_TIGER="yes"
 
 # ins: dev, dep and sources
-# TODO: 版本不一定对得上..v1.12.0; 手动ct-compileImg: 未执行本步;
+# TODO: 版本不一定对得上..v1.13.1; 手动ct-compileImg: 未执行本步;
 # RUN apt update; \
 #   # 129 MB
 #   apt build-dep -y tigervnc 
@@ -121,16 +121,16 @@ WORKDIR /src/arm
 RUN mkdir -p /usr/local/tigervnc; \
   \
   mkdir -p /build; \
-  tar -zxf tigervnc-1.12.0.tar.gz -C /build/; \
-  tar -jxf xorg-server-1.20.7.tar.bz2 --strip-components=1 -C /build/tigervnc-1.12.0/unix/xserver/; \
-  \cp -a tigervnc-1.12.0-configuration_fixes-1.patch /build/; \
+  tar -zxf tigervnc-1.13.1.tar.gz -C /build/; \
+  tar -jxf xorg-server-1.21.7.tar.bz2 --strip-components=1 -C /build/tigervnc-1.13.1/unix/xserver/; \
+  # \cp -a tigervnc-1.13.1-configuration_fixes-1.patch /build/; \
   \
-  ls /build/tigervnc-1.12.0/unix/xserver/
+  ls /build/tigervnc-1.13.1/unix/xserver/
 
-# apply patch: tigervnc-1.12.0; xserver120
-WORKDIR /build/tigervnc-1.12.0 
+# apply patch: tigervnc-1.13.1; xserver120
+WORKDIR /build/tigervnc-1.13.1 
 # RUN \
-#   patch -Np1 -i ../tigervnc-1.12.0-configuration_fixes-1.patch; \
+#   patch -Np1 -i ../tigervnc-1.13.1-configuration_fixes-1.patch; \
 #   cd unix/xserver && patch -Np1 -i ../xserver120.patch;
 
 #make vncpasswd, vncconfig, vncviewver, ...
@@ -146,20 +146,20 @@ WORKDIR /build/tigervnc-1.12.0
 #   build the normal parts of TigerVNC first.
 #   Xvnc-build-err: No rule to make target '../../../../common/network/libnetwork.la', needed by 'Xvnc'.  Stop.
 RUN test "yes" != "$COMPILE_TIGER" && exit 0 || echo doMake; \
-  patch -Np1 -i ../tigervnc-1.12.0-configuration_fixes-1.patch; \
+  patch -Np1 -i ../tigervnc-1.13.1-configuration_fixes-1.patch; \
   cd unix/xserver && patch -Np1 -i ../xserver120.patch; \
   \
-  cd /build/tigervnc-1.12.0; \
+  cd /build/tigervnc-1.13.1; \
   # https://github.com/glfw/glfw/issues/1957
   # export CMAKE_LIBRARY_ARCHITECTURE=x86_64-unknown-linux-gnu; \
   # export CMAKE_LIBRARY_ARCHITECTURE=x86_64-linux-gnu; \
   cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release -DINSTALL_SYSTEMD_UNITS=OFF -Wno-dev . ; \
-  cat /build/tigervnc-1.12.0/CMakeFiles/CMakeError.log; \
+  cat /build/tigervnc-1.13.1/CMakeFiles/CMakeError.log; \
   make;
 
 # make XServer [plat x3: 构建耗时 52min]
-WORKDIR /build/tigervnc-1.12.0/unix/xserver
+WORKDIR /build/tigervnc-1.13.1/unix/xserver
 # --disable-static
 # --enable-xvfb > --disable-xvfb #不生成xvfb
 # --enable-glx ##libgl1? 24M (drop-all-enabled: 还是有依赖)
@@ -190,15 +190,15 @@ RUN test "yes" != "$COMPILE_TIGER" && exit 0 || echo doMake; \
       --without-dtrace ; \
       # try1: CFLAGS="-static" LDFLAGS="-static"
       make; \
-      find /build/tigervnc-1.12.0/ |egrep Xvnc; \
-      find /build/tigervnc-1.12.0/ |egrep "libos|librfb|librdr|libnetwork|libunixcommon"; \
+      find /build/tigervnc-1.13.1/ |egrep Xvnc; \
+      find /build/tigervnc-1.13.1/ |egrep "libos|librfb|librdr|libnetwork|libunixcommon"; \
       \
       make install; \
       find /usr/local/tigervnc; \
     echo "finished!";
 # vncpasswd
 # alter_try: https://github.com/KarpelesLab/vncpasswd #golang实现
-# RUN cp /build/tigervnc-1.12.0/unix/vncpasswd/vncpasswd /usr/local/tigervnc/bin/
+# RUN cp /build/tigervnc-1.13.1/unix/vncpasswd/vncpasswd /usr/local/tigervnc/bin/
 
 # https://github.com/TigerVNC/tigervnc/issues/800
 # LD_PRELOAD=/lib/aarch64-linux-gnu/libgcc_s.so.1 vncserver :2 -localhost no