From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] New package: gnome-bluetooth1-3.34.5
Date: Tue, 05 Jul 2022 18:19:17 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37873@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1388 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome-bluetooth42
https://github.com/void-linux/void-packages/pull/37873
New package: gnome-bluetooth1-3.34.5
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
preparation for #36311, currently nothing in repositories uses gnome-bluetooth 42, but GNOME 42 which should be merged soon will
<!--
#### 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 add ci skip tag as described in
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/37873.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-bluetooth42-37873.patch --]
[-- Type: text/x-diff, Size: 15543 bytes --]
From 5b85b8b3ce201ec3837146ddaf7b4a567629f427 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:31:15 -0700
Subject: [PATCH 1/8] New package: gnome-bluetooth1-3.34.5
---
common/shlibs | 2 +-
srcpkgs/gnome-bluetooth1-devel | 1 +
.../gnome-bluetooth1/patches/meson-0.61.patch | 25 +++++++++++++
srcpkgs/gnome-bluetooth1/template | 35 +++++++++++++++++++
srcpkgs/gnome-bluetooth1/update | 2 ++
5 files changed, 64 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/gnome-bluetooth1-devel
create mode 100644 srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch
create mode 100644 srcpkgs/gnome-bluetooth1/template
create mode 100644 srcpkgs/gnome-bluetooth1/update
diff --git a/common/shlibs b/common/shlibs
index a5f385f719b9..be0b260a45d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -686,7 +686,7 @@ libatkmm-1.6.so.1 atkmm-2.22.1_1
libgtkmm-3.0.so.1 gtkmm-2.99.5_1
libgdkmm-3.0.so.1 gtkmm-2.99.5_1
libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
-libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
+libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libsasl2.so.3 libsasl-2.1.26_1
liblber-2.4.so.2 libldap-2.4.21_1
libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth1-devel b/srcpkgs/gnome-bluetooth1-devel
new file mode 120000
index 000000000000..61c3fca4c52b
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth1-devel
@@ -0,0 +1 @@
+gnome-bluetooth1
\ No newline at end of file
diff --git a/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c6962edd4f05
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch
@@ -0,0 +1,25 @@
+From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 7 Jan 2022 12:51:22 +0100
+Subject: [PATCH] build: Fix build for newer versions of meson
+
+sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
+---
+ sendto/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sendto/meson.build b/sendto/meson.build
+index 24a4e394..3e233a03 100644
+--- a/sendto/meson.build
++++ b/sendto/meson.build
+@@ -22,7 +22,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file (
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+--
+GitLab
+
diff --git a/srcpkgs/gnome-bluetooth1/template b/srcpkgs/gnome-bluetooth1/template
new file mode 100644
index 000000000000..e0c1faf729aa
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth1/template
@@ -0,0 +1,35 @@
+# Template file for 'gnome-bluetooth1'
+pkgname=gnome-bluetooth1
+version=3.34.5
+revision=1
+wrksrc="gnome-bluetooth-${version}"
+build_helper="gir"
+build_style=meson
+configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
+hostmakedepends="pkg-config gettext itstool $(vopt_if gir gobject-introspection) glib-devel"
+makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
+short_desc="GNOME Bluetooth Subsystem"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
+distfiles="${GNOME_SITE}/gnome-bluetooth/${version%.*}/gnome-bluetooth-${version}.tar.xz"
+checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+
+build_options="gir"
+build_options_default="gir"
+
+gnome-bluetooth1-devel_package() {
+ depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
diff --git a/srcpkgs/gnome-bluetooth1/update b/srcpkgs/gnome-bluetooth1/update
new file mode 100644
index 000000000000..6b527006d24d
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth1/update
@@ -0,0 +1,2 @@
+pkgname="gnome-bluetooth"
+pattern="\Q$pkgname\E-\K3\.[0-9.]*[0-9](?=)"
From a5af09d113071f86d3d2380dc3d0117ce08d823e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:46:28 -0700
Subject: [PATCH 2/8] gnome-bluetooth: update to 42.1
---
common/shlibs | 1 +
.../gnome-bluetooth/patches/meson-0.61.patch | 25 -------------------
srcpkgs/gnome-bluetooth/template | 12 ++++-----
3 files changed, 7 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
diff --git a/common/shlibs b/common/shlibs
index be0b260a45d9..acc0e007c6e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -687,6 +687,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
libgdkmm-3.0.so.1 gtkmm-2.99.5_1
libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
+libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
liblber-2.4.so.2 libldap-2.4.21_1
libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
deleted file mode 100644
index c6962edd4f05..000000000000
--- a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 7 Jan 2022 12:51:22 +0100
-Subject: [PATCH] build: Fix build for newer versions of meson
-
-sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
----
- sendto/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/sendto/meson.build b/sendto/meson.build
-index 24a4e394..3e233a03 100644
---- a/sendto/meson.build
-+++ b/sendto/meson.build
-@@ -22,7 +22,6 @@ desktop_in = configure_file(
- )
-
- i18n.merge_file (
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: desktop,
---
-GitLab
-
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index e6861631b08d..c764e5b760fa 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-bluetooth'
pkgname=gnome-bluetooth
-version=3.34.5
+version=42.1
revision=1
build_helper="gir"
build_style=meson
configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
-makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
- gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+hostmakedepends="pkg-config gettext itstool $(vopt_if gir gobject-introspection) glib-devel"
+makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel"
depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
checkdepends="python3-dbus"
short_desc="GNOME Bluetooth Subsystem"
@@ -15,13 +15,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+checksum=d9fe5d673f27a40a86a9e23d93cb99367e7b06df51872e8ac5ecc9938e55b5eb
build_options="gir"
build_options_default="gir"
gnome-bluetooth-devel_package() {
- depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}"
+ depends="glib-devel gtk4-devel ${sourcepkg}>=${version}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 6f9b909054fce4d169f4d14e8a129b9d291e1730 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 17:52:37 +0200
Subject: [PATCH 3/8] gnome-flashback: use gnome-bluetooth1
---
srcpkgs/gnome-flashback/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index fce623766e1c..8a8561df00b2 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-flashback'
pkgname=gnome-flashback
version=3.42.1
-revision=1
+revision=2
build_helper=gir
build_style=gnu-configure
configure_args="--with-compiz-session --enable-compile-warnings=minimum"
@@ -9,9 +9,9 @@ hostmakedepends="pkg-config gettext gettext-devel automake libtool glib-devel"
makedepends="pam-devel elogind-devel upower-devel ibus-devel polkit-devel
pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel libxkbfile-devel
libcompizconfig-devel libglib-devel pango-devel gtk+3-devel gdk-pixbuf-devel
- gdm-devel gnome-bluetooth-devel gnome-desktop-devel gnome-panel-devel
+ gdm-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-panel-devel
gsettings-desktop-schemas-devel libXxf86vm-devel"
-depends="gnome-bluetooth gnome-session gnome-settings-daemon
+depends="gnome-bluetooth1 gnome-session gnome-settings-daemon
gnome-panel gnome-themes-extra metacity"
short_desc="GNOME session with similar user experience to the GNOME 2.x series"
maintainer="shizonic <realtiaz@gmail.com>"
From ae3ff24be1b68b87d99fd30a5c72835c54bad724 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:15:58 +0200
Subject: [PATCH 4/8] budgie-control-center: use gnome-bluetooth1
---
srcpkgs/budgie-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index 15d7ee0dca87..416cbf8d584b 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,12 +1,12 @@
# Template file for 'budgie-control-center'
pkgname=budgie-control-center
version=1.0.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 libxml2"
makedepends="ModemManager-devel NetworkManager-devel accountsservice-devel
- colord-devel colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel
+ colord-devel colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel
gnome-online-accounts-devel gnome-settings-daemon-devel ibus-devel
libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel libnma-devel
polkit-devel pulseaudio-devel samba-devel upower-devel libxml2-devel
From 8ca59191b4f4df90adafca84f09a9899f13a92b8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:15:59 +0200
Subject: [PATCH 5/8] budgie-desktop: use gnome-bluetooth1
---
srcpkgs/budgie-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 02d90c307eaf..f7b5a2b03cd3 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
version=10.6.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
budgie-screensaver"
makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
- upower-devel gtk+3-devel polkit-devel gnome-bluetooth-devel gnome-menus-devel
+ upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
depends="gnome-session gnome-settings-daemon budgie-control-center elogind
gnome-themes-extra budgie-screensaver budgie-desktop-view"
From e5d1c64720ca4278e4a9f64f32812848597539ba Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:16:07 +0200
Subject: [PATCH 6/8] gnome-control-center: use gnome-bluetooth1
---
srcpkgs/gnome-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b0811396b6e1..92b9cb3d2f4a 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
version=41.4
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dcheese=$(vopt_if cheese true false)"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
- colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
+ colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
From 0d30cfa0e649059b40f1a7b5f30a36bf1cd676af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:16:09 +0200
Subject: [PATCH 7/8] gnome-core: use gnome-bluetooth1
---
srcpkgs/gnome-core/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index bdd854c47ac9..d7a7082b7a60 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=41.0
-revision=1
+revision=2
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="q66 <daniel@octaforge.org>"
@@ -26,7 +26,7 @@ depends="
glib-networking>=2.70.0
gmime3>=3.2.7
gnome-backgrounds>=41.0
- gnome-bluetooth>=3.34.5
+ gnome-bluetooth1>=3.34.5
gnome-color-manager>=3.36.0
gnome-control-center>=41.0
gnome-desktop>=41.0
From 3fdc4a777289168753b50d73d7f107451a2aaad7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:16:24 +0200
Subject: [PATCH 8/8] gnome-shell: use gnome-bluetooth1
---
srcpkgs/gnome-shell/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index ff60caafa4ec..77450cb127a8 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
version=41.5
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dsystemd=false -Dtests=false"
@@ -11,7 +11,7 @@ makedepends="gnome-control-center-devel at-spi2-atk-devel
evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel
- gnome-bluetooth-devel pipewire-devel gstreamer1-devel"
+ gnome-bluetooth1-devel pipewire-devel gstreamer1-devel"
depends="elogind gnome-control-center gsettings-desktop-schemas upower"
checkdepends="xvfb-run mesa-dri $depends"
short_desc="GNOME core user interface"
next reply other threads:[~2022-07-05 16:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-05 16:19 paper42 [this message]
2022-07-05 19:11 ` New package: gnome-bluetooth1-3.34.5, gnome-bluetooth: update to 42.1 oreo639
2022-07-05 19:12 ` oreo639
2022-07-05 19:12 ` oreo639
2022-07-05 19:13 ` oreo639
2022-07-06 7:43 ` oreo639
2022-07-06 7:44 ` oreo639
2022-07-06 10:02 ` [PR PATCH] [Updated] " paper42
2022-07-06 10:03 ` paper42
2022-07-06 11:08 ` [PR PATCH] [Updated] " paper42
2022-07-06 11:09 ` [PR PATCH] [Merged]: " paper42
2022-07-07 3:12 ` hsnfirdaus
2022-07-07 3:16 ` oreo639
2022-07-07 3:16 ` oreo639
2022-07-07 3:16 ` oreo639
2022-07-07 3:27 ` oreo639
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37873@inbox.vuxu.org \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).