Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
02db257d
Commit
02db257d
authored
3 years ago
by
Sören Tempel
Browse files
Options
Downloads
Patches
Plain Diff
community/drawterm: upgrade to 0_hg20210414
parent
37e0bc48
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
community/drawterm/APKBUILD
+6
-8
6 additions, 8 deletions
community/drawterm/APKBUILD
community/drawterm/gcc-10.patch
+0
-47
0 additions, 47 deletions
community/drawterm/gcc-10.patch
community/drawterm/respect-env.patch
+13
-7
13 additions, 7 deletions
community/drawterm/respect-env.patch
with
19 additions
and
62 deletions
community/drawterm/APKBUILD
+
6
−
8
View file @
02db257d
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname
=
drawterm
pkgver
=
0_hg202
0
04
2
1
pkgrel
=
1
pkgver
=
0_hg202
1
041
4
pkgrel
=
0
pkgdesc
=
"Connect to Plan 9 CPU servers from other operating systems"
url
=
"http://drawterm.9front.org/"
arch
=
"all !armhf !armv7 !s390x !mips !mips64"
...
...
@@ -11,11 +11,10 @@ options="!check" # upstream does not have a test suite
makedepends
=
"linux-headers libx11-dev libxt-dev"
subpackages
=
"
$pkgname
-dbg"
source
=
"https://dev.alpinelinux.org/archive/drawterm/drawterm-
$pkgver
.tar.gz
respect-env.patch
gcc-10.patch"
respect-env.patch"
_srcurl
=
"https://code.9front.org/hg/
$pkgname
"
_srcrev
=
"
62a48ddc800d
"
_srcrev
=
"
80a4267e62de
"
prepare
()
{
default_prepare
...
...
@@ -51,6 +50,5 @@ package() {
"
$pkgdir
"
/usr/share/licenses/
$pkgname
/LICENSE
}
sha512sums
=
"4fe571e9b4eee2965eef5bfa319767632ece6c8629b7068e6fbfee0bff8be5e6437be07c502042b2b2162e52f810f96cfd2014c84387764acb2306785e04b1a5 drawterm-0_hg20200421.tar.gz
be42c27a550b49f13fa26cdd698fb4d8387d989141cae1a3671deceb82b9286c9f73772ec9731698c7ecef69949381f9eda8af1dc1d9957fa373752e52f809bb respect-env.patch
54868240dc6cbc6c2502de2ebd71446aa97dccdff5fe76fb5a6141c7c71e3c556461b089c3786b1640a428bb090934d815f54c8601ccaa5ee566a201d621b299 gcc-10.patch"
sha512sums
=
"97e0299497316e4d9799bd4e0ad6dec29e638559d13bb7f1dee3c30003201fa52d4ef704aff7baec611993262d0c96517ae1095092dac86aa66d7661f4d56f02 drawterm-0_hg20210414.tar.gz
abbef7eb9291f2a5479fe9a77ba5e1924b53797ae7a2505e46c502242d594ab6d7b77a0f97bb50ce2e58742fac01269c75887e9ebd835d2ed2afd68dccb8f44a respect-env.patch"
This diff is collapsed.
Click to expand it.
community/drawterm/gcc-10.patch
deleted
100644 → 0
+
0
−
47
View file @
37e0bc48
# HG changeset patch
# User Ori Bernstein <ori@eigenstate.org>'
# Date 1588022377 25200
# Node ID 8fd96772eb02c2f55d895d4a125a3826f4b344ab
# Parent 4911d154d158ff29091b5cc2e752838dc3258991
fix drawterm compiles using gcc 10
-fno-common became the default, and and kmesg was relying
on common symbols being merged.
diff -r 4911d154d158 -r 8fd96772eb02 kern/dat.h
--- a/kern/dat.h Thu Apr 23 12:52:37 2020 -0700
+++ b/kern/dat.h Mon Apr 27 14:19:37 2020 -0700
@@ -32,6 +32,7 @@
typedef struct RWlock RWlock;
typedef struct Waitq Waitq;
typedef struct Walkqid Walkqid;
+typedef struct Kmesg Kmesg;
typedef int Devgen(Chan*, char*, Dirtab*, int, int, Dir*);
#include "fcall.h"
@@ -477,8 +478,10 @@
* Log console output so it can be retrieved via /dev/kmesg.
* This is good for catching boot-time messages after the fact.
*/
-struct {
+struct Kmesg {
Lock lk;
uint n;
char buf[16384];
-} kmesg;
+};
+
+extern Kmesg kmesg;
diff -r 4911d154d158 -r 8fd96772eb02 kern/devcons.c
--- a/kern/devcons.c Thu Apr 23 12:52:37 2020 -0700
+++ b/kern/devcons.c Mon Apr 27 14:19:37 2020 -0700
@@ -13,6 +13,7 @@
void (*screenputs)(char*, int) = 0;
+Kmesg kmesg; /* console messages */
Queue* kbdq; /* unprocessed console input */
Queue* lineq; /* processed console input */
Queue* kprintoq; /* console output, for /dev/kprint */
This diff is collapsed.
Click to expand it.
community/drawterm/respect-env.patch
+
13
−
7
View file @
02db257d
diff -upr drawterm-20170119.orig/Make.unix drawterm-20170119/Make.unix
--- drawterm-20170119.orig/Make.unix 2017-01-23 22:41:27.402630694 +0100
+++ drawterm-20170119/Make.unix 2017-01-23 22:41:43.879309573 +0100
@@ -5,12 +5,15 @@
AR=ar
Make sure common environment variables (CC, CFLAGS, LDFLAGS, …) are not
overwritten. Also allow configuring the X11 library and include
directory separately.
diff -upr drawterm-0_hg20210414.orig/Make.unix drawterm-0_hg20210414/Make.unix
--- drawterm-0_hg20210414.orig/Make.unix 2021-04-20 18:51:54.514645075 +0200
+++ drawterm-0_hg20210414/Make.unix 2021-04-20 18:56:30.207396107 +0200
@@ -5,13 +5,16 @@
AR=ar
AS=as
RANLIB=ranlib
X11=/usr/X11R6
...
...
@@ -15,8 +19,10 @@ diff -upr drawterm-20170119.orig/Make.unix drawterm-20170119/Make.unix
O=o
OS=posix
GUI=x11
-LDADD=-L$(X11)/lib64 -L$(X11)/lib -lX11 -ggdb
+LDADD=-L$(X11LIB) -lX11 -ggdb
LDFLAGS=$(PTHREAD)
-LDADD=-L$(X11)/lib64 -L$(X11)/lib -lX11 -ggdb -lm
-LDFLAGS=$(PTHREAD)
+LDADD=-L$(X11LIB) -lX11 -ggdb -lm
+LDFLAGS+=$(PTHREAD)
TARG=drawterm
# AUDIO=none
AUDIO=unix
This diff is collapsed.
Click to expand it.
Sören Tempel
@nmeum
mentioned in merge request
!20656 (closed)
·
3 years ago
mentioned in merge request
!20656 (closed)
mentioned in merge request !20656
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment