From f804e104273920bd5caacfe061b08b5fc668c1d5 Mon Sep 17 00:00:00 2001 From: Michael J Mulligan Date: Fri, 26 Mar 2021 15:02:43 +0000 Subject: [PATCH 1/2] Add glib, pango, and pixbuf tags. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c57acba5..8a375f36 100644 --- a/Makefile +++ b/Makefile @@ -19,15 +19,15 @@ DEBIAN_PACKAGES = STRETCH BUSTER_NAME := buster BUSTER_IMAGE := golang:1.15-buster -BUSTER_GO_TAGS := gtk_3_24 +BUSTER_GO_TAGS := gtk_3_22,glib_2_58,pango_1_42,gdk_pixbuf_2_38 STRETCH_NAME := stretch -STRETCH_IMAGE := golang:1.9-stretch -STRETCH_GO_TAGS := gtk_3_22 +STRETCH_IMAGE := golang:1.15-stretch +STRETCH_GO_TAGS := gtk_3_22,glib_2_50,pango_1_40,gdk_pixbuf_2_36 JESSIE_NAME := jessie JESSIE_IMAGE := golang:1.8-jessie -JESSIE_GO_TAGS := gtk_3_14 +JESSIE_GO_TAGS := gtk_3_14,glib_2_42,pango_1_36,gdk_pixbuf_2_31 # Build information From cddd77621b901c0aff1b4042db88bf05780c0679 Mon Sep 17 00:00:00 2001 From: Michael J Mulligan Date: Mon, 29 Mar 2021 15:39:38 +0100 Subject: [PATCH 2/2] Drop JESSIE. Default BUSTER. --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8a375f36..64a35904 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ WORKDIR := $(shell pwd) BUILD_PATH := $(WORKDIR)/build DOCKER_IMAGE_BUILD = mcuadros/octoprint-tft-build -DEBIAN_PACKAGES = STRETCH +DEBIAN_PACKAGES = BUSTER BUSTER_NAME := buster BUSTER_IMAGE := golang:1.15-buster @@ -25,10 +25,6 @@ STRETCH_NAME := stretch STRETCH_IMAGE := golang:1.15-stretch STRETCH_GO_TAGS := gtk_3_22,glib_2_50,pango_1_40,gdk_pixbuf_2_36 -JESSIE_NAME := jessie -JESSIE_IMAGE := golang:1.8-jessie -JESSIE_GO_TAGS := gtk_3_14,glib_2_42,pango_1_36,gdk_pixbuf_2_31 - # Build information #GIT_COMMIT = $(shell git rev-parse HEAD | cut -c1-7)