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

feat: add netcat for remote development support #77

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
56 changes: 53 additions & 3 deletions dev.zed.Zed.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# dev.zed.Zed.yaml
app-id: dev.zed.Zed
runtime: org.freedesktop.Sdk
runtime-version: '24.08'
runtime-version: "24.08"
sdk: org.freedesktop.Sdk
command: zed-wrapper
separate-locales: false
Expand Down Expand Up @@ -41,8 +41,8 @@ modules:
- /share/info
- /share/man
- /share/pkgconfig
- '*.a'
- '*.la'
- "*.a"
- "*.la"
config-opts:
- -Dgtk_doc=false
- -Dintrospection=false
Expand All @@ -51,6 +51,56 @@ modules:
sha256: bad10f3c553a0e1854649ab59c5b2434da22ca1a54ae6138f1f53961567e1ab7
url: https://download.gnome.org/sources/gcr/3.41/gcr-3.41.2.tar.xz

- name: libmd
buildsystem: autotools
sources:
- type: archive
url: https://libbsd.freedesktop.org/releases/libmd-1.1.0.tar.xz
sha256: 1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332
x-checker-data:
type: anitya
project-id: 15525
stable-only: true
url-template: https://libbsd.freedesktop.org/releases/libmd-$version.tar.xz
cleanup:
- /lib/pkgconfig
- /share/man

- name: libbsd
buildsystem: autotools
sources:
- type: archive
url: https://libbsd.freedesktop.org/releases/libbsd-0.12.2.tar.xz
sha256: b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014
x-checker-data:
type: anitya
project-id: 1567
stable-only: true
url-template: https://libbsd.freedesktop.org/releases/libbsd-$version.tar.xz
cleanup:
- /lib/pkgconfig
- /share/man
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None of these packages are part of the freedesktop SDK?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK neither libbsd nor libmd is in the SDK, they are also compiled in other Flatpaks that need them such as com.valvesoftware.Steam.


- name: netcat
buildsystem: simple
build-commands:
- |
while read patch; do
echo "Applying $patch..."
patch -Np1 -i "debian/patches/$patch"
done < debian/patches/series
- make CFLAGS="$CFLAGS -I/usr/include/libbsd" LDFLAGS="$LDFLAGS -lbsd"
- install -Dm0755 nc /app/bin/nc
sources:
- type: archive
url: https://salsa.debian.org/debian/netcat-openbsd/-/archive/debian/1.228-1/netcat-openbsd-debian-1.228-1.tar.gz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the upstream tarball is not used here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The upstream tarball is for BSD only and doesn't work on Linux without patches, this Debian package bundles those patches, is tracked by Anitya, and is also used by both Arch Linux and Alpine Linux.

sha256: a1eb2593335123efc6e9c12a7e73c72cbf0b665739130fc383322f36757f37cc
x-checker-data:
type: anitya
project-id: 21535
stable-only: true
url-template: https://salsa.debian.org/debian/netcat-openbsd/-/archive/debian/$version-1/netcat-openbsd-debian-$version-1.tar.gz

- name: zed
buildsystem: simple
build-commands:
Expand Down