Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Ayatana indicators
@ 2022-01-20 15:34 tibequadorian
  2022-01-21 14:55 ` [RFC] " ericonr
                   ` (12 more replies)
  0 siblings, 13 replies; 14+ messages in thread
From: tibequadorian @ 2022-01-20 15:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tibequadorian/void-packages ayatana-indicators
https://github.com/void-linux/void-packages/pull/35135

Ayatana indicators
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

`libappindicator` hasn't seen a release since 2012 (almost 10 years!)
Debian has removed it in buster and switched to [libayatana-appindicator](https://ayatanaindicators.github.io/).
This PR is intended to prepare void linux for it. Let me know what you think...

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/35135.patch is attached

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

From df8ad2c170e29b8cc28bddf0c34b6ba162858dfb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:37:25 +0100
Subject: [PATCH 1/3] New package: ayatana-ido-0.9.0

---
 common/shlibs                |  1 +
 srcpkgs/ayatana-ido-devel    |  1 +
 srcpkgs/ayatana-ido/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/ayatana-ido-devel
 create mode 100644 srcpkgs/ayatana-ido/template

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..c008858e9469 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4098,3 +4098,4 @@ libkmailconfirmbeforedeleting.so.5 kdepim-addons-21.08.3_1
 libkaddressbookprivate.so.5 kaddressbook-21.08.3_1
 libcodec2.so.1.0 codec2-1.0.1_1
 libx86emu.so.3 libx86emu-3.4_1
+libayatana-ido3-0.4.so.0 ayatana-ido-0.9.0_1
diff --git a/srcpkgs/ayatana-ido-devel b/srcpkgs/ayatana-ido-devel
new file mode 120000
index 000000000000..2e1aa73a149c
--- /dev/null
+++ b/srcpkgs/ayatana-ido-devel
@@ -0,0 +1 @@
+ayatana-ido
\ No newline at end of file
diff --git a/srcpkgs/ayatana-ido/template b/srcpkgs/ayatana-ido/template
new file mode 100644
index 000000000000..cf14fea35aba
--- /dev/null
+++ b/srcpkgs/ayatana-ido/template
@@ -0,0 +1,26 @@
+# Template file for 'ayatana-ido'
+pkgname=ayatana-ido
+version=0.9.0
+revision=1
+build_helper="gir"
+build_style=cmake
+hostmakedepends="pkg-config gobject-introspection vala"
+makedepends="gtk+3-devel glib-devel"
+short_desc="Ayatana Indicator Display Objects"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/${pkgname}/archive/${version}.tar.gz"
+checksum=e09b182a67ea65e188a689a2ff792c9a3830740f1aec6679bbd6021235402b4b
+
+ayatana-ido-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
+	}
+}

From 3aa37b7a2417507538c4a9fc484c9c07abee50c9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:38:40 +0100
Subject: [PATCH 2/3] New package: libayatana-indicator-0.9.0

---
 common/shlibs                         |  1 +
 srcpkgs/libayatana-indicator-devel    |  1 +
 srcpkgs/libayatana-indicator/template | 23 +++++++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 120000 srcpkgs/libayatana-indicator-devel
 create mode 100644 srcpkgs/libayatana-indicator/template

diff --git a/common/shlibs b/common/shlibs
index c008858e9469..78465d5620c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4099,3 +4099,4 @@ libkaddressbookprivate.so.5 kaddressbook-21.08.3_1
 libcodec2.so.1.0 codec2-1.0.1_1
 libx86emu.so.3 libx86emu-3.4_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.0_1
+libayatana-indicator3.so.7 libayatana-indicator-0.9.0_1
diff --git a/srcpkgs/libayatana-indicator-devel b/srcpkgs/libayatana-indicator-devel
new file mode 120000
index 000000000000..fdfe7dbb5d64
--- /dev/null
+++ b/srcpkgs/libayatana-indicator-devel
@@ -0,0 +1 @@
+libayatana-indicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-indicator/template b/srcpkgs/libayatana-indicator/template
new file mode 100644
index 000000000000..64063481858d
--- /dev/null
+++ b/srcpkgs/libayatana-indicator/template
@@ -0,0 +1,23 @@
+# Template file for 'libayatana-indicator'
+pkgname=libayatana-indicator
+version=0.9.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gtk+3-devel ayatana-ido-devel"
+short_desc="Ayatana Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/${pkgname}/archive/${version}.tar.gz"
+checksum=b72c31e64f2a6a7d8f8a35a725d02416cfae7c35e0d42f5664792f7d22d465a4
+
+libayatana-indicator-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 2d4e020212216083751898e714cd58e96feffe6d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 17 Jan 2022 16:44:14 +0100
Subject: [PATCH 3/3] New package: libayatana-appindicator-0.5.90

---
 common/shlibs                                 |  1 +
 srcpkgs/libayatana-appindicator-devel         |  1 +
 .../0001-Fix-build-with-musl-libc.patch       | 27 ++++++++++++++++
 srcpkgs/libayatana-appindicator/template      | 32 +++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 120000 srcpkgs/libayatana-appindicator-devel
 create mode 100644 srcpkgs/libayatana-appindicator/patches/0001-Fix-build-with-musl-libc.patch
 create mode 100644 srcpkgs/libayatana-appindicator/template

diff --git a/common/shlibs b/common/shlibs
index 78465d5620c9..73f33485bf19 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4100,3 +4100,4 @@ libcodec2.so.1.0 codec2-1.0.1_1
 libx86emu.so.3 libx86emu-3.4_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.0_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.0_1
+libayatana-appindicator3.so.1 libayatana-appindicator-0.5.90_1
diff --git a/srcpkgs/libayatana-appindicator-devel b/srcpkgs/libayatana-appindicator-devel
new file mode 120000
index 000000000000..a2ff93abbc17
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator-devel
@@ -0,0 +1 @@
+libayatana-appindicator
\ No newline at end of file
diff --git a/srcpkgs/libayatana-appindicator/patches/0001-Fix-build-with-musl-libc.patch b/srcpkgs/libayatana-appindicator/patches/0001-Fix-build-with-musl-libc.patch
new file mode 100644
index 000000000000..cc3d59650d34
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/patches/0001-Fix-build-with-musl-libc.patch
@@ -0,0 +1,27 @@
+From 89415c01b730e3a1f6f66402b5c439fb04bda201 Mon Sep 17 00:00:00 2001
+From: Luca Weiss <luca@z3ntu.xyz>
+Date: Tue, 7 Dec 2021 22:22:53 +0100
+Subject: [PATCH] Fix build with musl libc
+
+canonicalize_file_name() is a GNU extension not supported by musl libc.
+Use realpath() from POSIX instead.
+---
+ src/app-indicator.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/app-indicator.c b/src/app-indicator.c
+index a0e1553..cb0086f 100644
+--- a/src/app-indicator.c
++++ b/src/app-indicator.c
+@@ -2081,7 +2081,7 @@ append_snap_prefix (const gchar *path)
+ 	g_autofree gchar *canon_path = NULL;
+ 
+ 	if (snap != NULL && path != NULL) {
+-		canon_path = canonicalize_file_name(path);
++		canon_path = realpath(path, NULL);
+ 
+ 		if (g_str_has_prefix (canon_path, "/tmp/")) {
+ 			g_warning ("Using '/tmp' paths in SNAP environment will lead to unreadable resources");
+-- 
+2.34.1
+
diff --git a/srcpkgs/libayatana-appindicator/template b/srcpkgs/libayatana-appindicator/template
new file mode 100644
index 000000000000..3a807f987592
--- /dev/null
+++ b/srcpkgs/libayatana-appindicator/template
@@ -0,0 +1,32 @@
+# Template file for 'libayatana-appindicator'
+pkgname=libayatana-appindicator
+version=0.5.90
+revision=1
+build_helper="gir"
+build_style=cmake
+configure_args="-DENABLE_BINDINGS_MONO=OFF -DENABLE_BINDINGS_VALA=$(vopt_if vala ON OFF)"
+hostmakedepends="pkg-config gobject-introspection $(vopt_if vala vala)"
+makedepends="glib-devel gtk+3-devel libdbusmenu-gtk3-devel libayatana-indicator-devel"
+short_desc="Ayatana Application Indicators Shared Library"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="LGPL-3.0-or-later"
+homepage="https://ayatanaindicators.github.io/"
+distfiles="https://github.com/AyatanaIndicators/${pkgname}/archive/${version}.tar.gz"
+checksum=15319ca7fda90c6bd85311bbe83eefe1e322de32df2c7f5174b0d5a7537c27b4
+
+build_options="vala"
+build_options_default="vala"
+
+libayatana-appindicator-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
+	}
+}

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2022-11-25 15:52 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-20 15:34 [PR PATCH] Ayatana indicators tibequadorian
2022-01-21 14:55 ` [RFC] " ericonr
2022-01-21 22:18 ` tibequadorian
2022-01-21 22:31 ` tibequadorian
2022-01-28 22:31 ` [PR PATCH] [Updated] " tibequadorian
2022-01-28 22:57 ` tibequadorian
2022-02-15 21:03 ` [PR PATCH] [Closed]: " tibequadorian
2022-02-18  3:48 ` ericonr
2022-02-18  3:49 ` ericonr
2022-02-18  9:17 ` tibequadorian
2022-03-05 20:17 ` tibequadorian
2022-10-21  0:42 ` paper42
2022-11-25  0:51 ` tibequadorian
2022-11-25 15:52 ` paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).