[PR PATCH] Sbctl

[PR PATCH] Sbctl

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1565 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages sbctl
https://github.com/void-linux/void-packages/pull/29391

Sbctl
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29391.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sbctl-29391.patch --]
[-- Type: text/x-diff, Size: 6796 bytes --]

From 0c32821443a30a49cd158078825fe9a5e1c820aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 10 Mar 2021 00:42:54 -0300
Subject: [PATCH 1/2] empathy

---
 .../{INSTALL.msg => files/README.voidlinux}   |  2 -
 srcpkgs/empathy/patches/enchant-2.patch       | 79 +++++++++++++++++++
 srcpkgs/empathy/template                      | 13 ++-
 3 files changed, 89 insertions(+), 5 deletions(-)
 rename srcpkgs/empathy/{INSTALL.msg => files/README.voidlinux} (76%)
 create mode 100644 srcpkgs/empathy/patches/enchant-2.patch

diff --git a/srcpkgs/empathy/INSTALL.msg b/srcpkgs/empathy/files/README.voidlinux
similarity index 76%
rename from srcpkgs/empathy/INSTALL.msg
rename to srcpkgs/empathy/files/README.voidlinux
index de8e50ea3da..090705a4075 100644
--- a/srcpkgs/empathy/INSTALL.msg
+++ b/srcpkgs/empathy/files/README.voidlinux
@@ -1,8 +1,6 @@
 Some optional packages must be installed for additional functionality:
 
-	- telepathy-butterfly for MSN support
 	- telepathy-gabble for XMPP/jabber support
 	- telepathy-haze for libpurple support
 	- telepathy-idle for IRC support
-	- telepathy-rakia for SIP support
 	- telepathy-salut for link-local XMPP support
diff --git a/srcpkgs/empathy/patches/enchant-2.patch b/srcpkgs/empathy/patches/enchant-2.patch
new file mode 100644
index 00000000000..c2b3a50c038
--- /dev/null
+++ b/srcpkgs/empathy/patches/enchant-2.patch
@@ -0,0 +1,79 @@
+Source: https://gitlab.gnome.org/GNOME/empathy/-/merge_requests/3
+Upstream: no, because upstream is completely abandoned
+
+From f42c415154c797a1b3fbddde60ad8fedb2eda988 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon@bigon.be>
+Date: Tue, 7 Jan 2020 11:09:26 +0100
+Subject: [PATCH 1/2] libempathy-gtk: Stop using deprecated enchant function
+
+Replace enchant_dict_add_to_pwl() by enchant_dict_add() and bump minimal
+version accordingly
+---
+ configure.ac                   | 2 +-
+ libempathy-gtk/empathy-spell.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7aeb6b31c..4bf2d4d0c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,7 +72,7 @@ WEBKIT_REQUIRED=2.10.0
+ GOA_REQUIRED=3.5.1
+ 
+ # Optional deps
+-ENCHANT_REQUIRED=1.2.0
++ENCHANT_REQUIRED=1.4.0
+ GEOCLUE_REQUIRED=2.1.0
+ GEOCODE_GLIB_REQUIRED=0.99.1
+ ISO_CODES_REQUIRED=0.35
+diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c
+index 27f27f902..bb0159fd8 100644
+--- a/libempathy-gtk/empathy-spell.c
++++ b/libempathy-gtk/empathy-spell.c
+@@ -424,7 +424,7 @@ empathy_spell_add_to_dictionary (const gchar *code,
+ 	if (lang == NULL)
+ 		return;
+ 
+-	enchant_dict_add_to_pwl (lang->speller, word, strlen (word));
++	enchant_dict_add (lang->speller, word, strlen (word));
+ }
+ 
+ #else /* not HAVE_ENCHANT */
+-- 
+GitLab
+
+
+From 6c12a411274acf86e494b36704abb8e18b56642e Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon@bigon.be>
+Date: Tue, 7 Jan 2020 11:38:13 +0100
+Subject: [PATCH 2/2] configure.ac: Switch to enchant-2
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4bf2d4d0c..14f83c852 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,7 +72,7 @@ WEBKIT_REQUIRED=2.10.0
+ GOA_REQUIRED=3.5.1
+ 
+ # Optional deps
+-ENCHANT_REQUIRED=1.4.0
++ENCHANT_REQUIRED=2.1.1
+ GEOCLUE_REQUIRED=2.1.0
+ GEOCODE_GLIB_REQUIRED=0.99.1
+ ISO_CODES_REQUIRED=0.35
+@@ -307,7 +307,7 @@ AC_ARG_ENABLE(spell,
+ if test "x$enable_spell" != "xno"; then
+    PKG_CHECK_MODULES(ENCHANT,
+    [
+-      enchant >= $ENCHANT_REQUIRED,
++      enchant-2 >= $ENCHANT_REQUIRED,
+       iso-codes >= $ISO_CODES_REQUIRED
+    ], have_enchant="yes", have_enchant="no")
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template
index 4e01bad39a3..5504b684668 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -1,21 +1,22 @@
 # Template file for 'empathy'
 pkgname=empathy
 version=3.12.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="
  --enable-gst-1.0=yes --enable-gudev=yes --enable-spell=yes
  --disable-schemas-compile --disable-static --enable-goa=no
  --enable-ubuntu-online-accounts=no --enable-geocode=yes
  --enable-location=yes --enable-nautilus-sendto=no --enable-map=yes"
-hostmakedepends="pkg-config intltool itstool glib-devel libxslt geoclue2"
+hostmakedepends="pkg-config intltool itstool glib-devel libxslt geoclue2
+ autoconf automake libtool gettext-devel"
 makedepends="
  libcanberra-devel clutter-gst-devel clutter-gtk-devel
  telepathy-glib-devel telepathy-logger-devel libnotify-devel
  telepathy-farstream-devel telepathy-mission-control-devel
  evolution-data-server-devel geocode-glib-devel folks-devel
  webkit2gtk-devel libgudev-devel pulseaudio-devel cheese-devel
- enchant-devel NetworkManager-devel libchamplain-devel
+ enchant2-devel NetworkManager-devel libchamplain-devel
  gnutls-devel gsettings-desktop-schemas-devel geoclue2-devel iso-codes"
 depends="gsettings-desktop-schemas>=3.12 iso-codes"
 short_desc="GNOME instant messaging client using the Telepathy framework"
@@ -24,8 +25,14 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://live.gnome.org/Empathy"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3
+patch_args=-Np1
 disable_parallel_build=yes
 
 pre_configure() {
 	CFLAGS+=" -I$wrksrc/telepathy-account-widgets"
+	autoreconf -fi
+}
+
+post_install() {
+	vdoc $FILESDIR/README.voidlinux
 }

From 45d925e20ad8772710ba6a40ee4b256a7c736054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 11 Mar 2021 02:40:26 -0300
Subject: [PATCH 2/2] New package: sbctl-0.1.

---
 srcpkgs/sbctl/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/sbctl/template

diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
new file mode 100644
index 00000000000..48b1e7d9a1a
--- /dev/null
+++ b/srcpkgs/sbctl/template
@@ -0,0 +1,24 @@
+# Template file for 'sbctl'
+pkgname=sbctl
+version=0.1
+revision=1
+archs="x86_64* i686* aarch64* arm*"
+build_style=go
+go_import_path="github.com/foxboron/sbctl"
+hostmakedepends="asciidoc"
+depends="sbsigntool"
+short_desc="Secure Boot key manager"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="MIT"
+homepage="https://github.com/Foxboron/sbctl"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=ba460e362ec0aa47c934052c235e05e36e0d81f36e5e7b94992b04f7d8406563
+
+do_build() {
+	make
+}
+
+do_install() {
+	make install PREFIX=/usr DESTDIR=$DESTDIR
+	# TODO: install completions, sbctl tries to run lsblk when generating them
+}

Re: [PR PATCH] [Updated] Sbctl

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1570 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages sbctl
https://github.com/void-linux/void-packages/pull/29391

Sbctl
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29391.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sbctl-29391.patch --]
[-- Type: text/x-diff, Size: 1183 bytes --]

From 86b72404360bd6927dbfa48a5523930930b39b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 11 Mar 2021 02:40:26 -0300
Subject: [PATCH] New package: sbctl-0.1.

---
 srcpkgs/sbctl/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/sbctl/template

diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
new file mode 100644
index 00000000000..48b1e7d9a1a
--- /dev/null
+++ b/srcpkgs/sbctl/template
@@ -0,0 +1,24 @@
+# Template file for 'sbctl'
+pkgname=sbctl
+version=0.1
+revision=1
+archs="x86_64* i686* aarch64* arm*"
+build_style=go
+go_import_path="github.com/foxboron/sbctl"
+hostmakedepends="asciidoc"
+depends="sbsigntool"
+short_desc="Secure Boot key manager"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="MIT"
+homepage="https://github.com/Foxboron/sbctl"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=ba460e362ec0aa47c934052c235e05e36e0d81f36e5e7b94992b04f7d8406563
+
+do_build() {
+	make
+}
+
+do_install() {
+	make install PREFIX=/usr DESTDIR=$DESTDIR
+	# TODO: install completions, sbctl tries to run lsblk when generating them
+}

Re: [PR PATCH] [Updated] New package sbctl 0.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1586 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages sbctl
https://github.com/void-linux/void-packages/pull/29391

New package sbctl 0.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29391.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sbctl-29391.patch --]
[-- Type: text/x-diff, Size: 1147 bytes --]

From 21f3a730216e1621e974172affa8bc520cb70ead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 11 Mar 2021 02:40:26 -0300
Subject: [PATCH] New package: sbctl-0.1.

---
 srcpkgs/sbctl/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/sbctl/template

diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
new file mode 100644
index 000000000000..7f6b7e79bc55
--- /dev/null
+++ b/srcpkgs/sbctl/template
@@ -0,0 +1,23 @@
+# Template file for 'sbctl'
+pkgname=sbctl
+version=0.1
+revision=1
+build_style=go
+go_import_path="github.com/foxboron/sbctl"
+hostmakedepends="asciidoc"
+depends="sbsigntool"
+short_desc="Secure Boot key manager"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="MIT"
+homepage="https://github.com/Foxboron/sbctl"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=ba460e362ec0aa47c934052c235e05e36e0d81f36e5e7b94992b04f7d8406563
+
+do_build() {
+	make
+}
+
+do_install() {
+	make install PREFIX=/usr DESTDIR=$DESTDIR
+	# TODO: install completions, sbctl tries to run lsblk when generating them
+}

Re: [PR PATCH] [Merged]: New package sbctl 0.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1432 bytes --]

There's a merged pull request on the void-packages repository

New package sbctl 0.1
https://github.com/void-linux/void-packages/pull/29391

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->