Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make it compile with Docker on Debian Buster #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
# We cache go get gtk, to speed up builds.
#RUN go get -tags ${GO_TAGS} -v github.com/gotk3/gotk3/gtk/...

ADD . ${GOPATH}/src/github.com/mcuadros/OctoPrint-TFT/
ADD . ${GOPATH}/src/github.com/darksid3r/OctoPrint-TFT/
#RUN go get -tags ${GO_TAGS} -v ./...

WORKDIR ${GOPATH}/src/github.com/mcuadros/OctoPrint-TFT/
WORKDIR ${GOPATH}/src/github.com/darksid3r/OctoPrint-TFT/
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ GOTEST = $(GOCMD) test -v
# Environment
WORKDIR := $(shell pwd)
BUILD_PATH := $(WORKDIR)/build
DOCKER_IMAGE_BUILD = mcuadros/octoprint-tft-build
DOCKER_IMAGE_BUILD = darksid3r/octoprint-tft-build

DEBIAN_PACKAGES = BUSTER
BUSTER_NAME := buster
BUSTER_IMAGE := golang:1.11
BUSTER_GO_TAGS := gtk_3_22

DEBIAN_PACKAGES = JESSIE STRETCH
STRETCH_NAME := stretch
STRETCH_IMAGE := golang:1.9-stretch
STRETCH_GO_TAGS := gtk_3_22
Expand All @@ -24,7 +28,6 @@ JESSIE_NAME := jessie
JESSIE_IMAGE := golang:1.8-jessie
JESSIE_GO_TAGS := gtk_3_14


# Build information
GIT_COMMIT = $(shell git rev-parse HEAD | cut -c1-7)
DEV_PREFIX := 0.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OctoPrint-TFT [![GitHub release](https://img.shields.io/github/release/mcuadros/OctoPrint-TFT.svg)](https://github.com/mcuadros/OctoPrint-TFT/releases) [![license](https://img.shields.io/github/license/mcuadros/OctoPrint-TFT.svg)]()
OctoPrint-TFT [![GitHub release](https://img.shields.io/github/release/darksid3r/OctoPrint-TFT.svg)](https://github.com/darksid3r/OctoPrint-TFT/releases) [![license](https://img.shields.io/github/license/darksid3r/OctoPrint-TFT.svg)]()
=============

_OctoPrint-TFT_, a touch interface for TFT touch modules based on GTK+3.
Expand Down
4 changes: 2 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Build-Depends: debhelper (>= 9),
libcairo2-dev (>= 1.14.0),
libgtk-3-dev (>= 3.14)
Standards-Version: 4.1.1
Homepage: https://github.com/mcuadros/OctoPrint-TFT
Homepage: https://github.com/darksid3r/OctoPrint-TFT
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-go/packages/octoprint-tft.git
Vcs-Git: https://anonscm.debian.org/git/pkg-go/packages/octoprint-tft.git
XS-Go-Import-Path: github.com/mcuadros/OctoPrint-TFT
XS-Go-Import-Path: github.com/darksid3r/OctoPrint-TFT
Testsuite: autopkgtest-pkg-go

Package: octoprint-tft
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/make -f

export DH_VERBOSE := 1
export DH_GOPKG := github.com/mcuadros/OctoPrint-TFT
export DH_GOPKG := github.com/darksid3r/OctoPrint-TFT
export DH_GOLANG_INSTALL_ALL := 1
export DH_GOLANG_EXCLUDES := vendor

Expand Down
2 changes: 1 addition & 1 deletion debian/watch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=3
opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/octoprint-tft-\$1\.tar\.gz/,\
uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/\$1~\$2\$3/ \
https://github.com/mcuadros/OctoPrint-TFT/tags .*/v?(\d\S*)\.tar\.gz
https://github.com/darksid3r/OctoPrint-TFT/tags .*/v?(\d\S*)\.tar\.gz
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
"strings"

"github.com/mcuadros/OctoPrint-TFT/ui"
"github.com/darksid3r/OctoPrint-TFT/ui"

"github.com/gotk3/gotk3/gtk"
"gopkg.in/yaml.v1"
Expand Down