* [PR PATCH] gjs: update to 1.76.0.
@ 2023-03-26 20:23 oreo639
2023-03-27 20:15 ` [PR PATCH] [Merged]: " paper42
0 siblings, 1 reply; 2+ messages in thread
From: oreo639 @ 2023-03-26 20:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gjs
https://github.com/void-linux/void-packages/pull/43034
gjs: update to 1.76.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/43034.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gjs-43034.patch --]
[-- Type: text/x-diff, Size: 3912 bytes --]
From 26e8ead0d0011252ff6e782ae963dd3dd82af0d2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:57:58 -0700
Subject: [PATCH] gjs: update to 1.76.0.
---
...44573672668e8bc8692afaaa7d8a73365660.patch | 49 +++++++++++++++++++
.../gjs/patches/ignore-encoding-test.patch | 8 +--
srcpkgs/gjs/template | 6 +--
3 files changed, 56 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
diff --git a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
new file mode 100644
index 000000000000..52743a99f6cf
--- /dev/null
+++ b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
@@ -0,0 +1,49 @@
+From 83683d093c157828cf7787e53a32c586ae4e85d3 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build | 4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 6db887d22..1e953ceb7 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+- # FIXME: find out why GTK4 tries to acquire a message bus
+- dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++ have_gtk4 = dependency('gtk4', required: false).found()
++
++ if have_gtk4
++ # FIXME: find out why GTK4 tries to acquire a message bus
++ dbus_tests += 'Gtk4'
++ endif
+ endif
+
+ bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 3ac372a16..5c7703935 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+
+ ### Tests and test setups ######################################################
+
+-if not get_option('skip_gtk_tests')
+- have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+
+ # Note: The test program in test/ needs to be ported
+--
+GitLab
+
diff --git a/srcpkgs/gjs/patches/ignore-encoding-test.patch b/srcpkgs/gjs/patches/ignore-encoding-test.patch
index e0f9390a204c..98c42ad10109 100644
--- a/srcpkgs/gjs/patches/ignore-encoding-test.patch
+++ b/srcpkgs/gjs/patches/ignore-encoding-test.patch
@@ -1,11 +1,11 @@
broken on musl
--- a/installed-tests/js/meson.build
--- b/installed-tests/js/meson.build
-@@ -243,7 +243,6 @@
- modules_tests = [
+@@ -242,7 +242,6 @@ modules_tests = [
'Console',
'ESModules',
+ 'AsyncMainloop',
- 'Encoding',
'GLibLogWriter',
- ]
- if build_cairo
+ 'Global',
+ 'Timers',
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 968f103d74b8..8e8698e3388a 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
# Template file for 'gjs'
pkgname=gjs
-version=1.74.1
+version=1.76.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -13,9 +13,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, LGPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gjs"
#changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz"
-checksum=f21f9cd3337a672a44c7e64bf9a8d8ad77c1b88b952b2b6184c7af9b1f3ef459
+checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d
make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: gjs: update to 1.76.0.
2023-03-26 20:23 [PR PATCH] gjs: update to 1.76.0 oreo639
@ 2023-03-27 20:15 ` paper42
0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2023-03-27 20:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]
There's a merged pull request on the void-packages repository
gjs: update to 1.76.0.
https://github.com/void-linux/void-packages/pull/43034
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-27 20:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-26 20:23 [PR PATCH] gjs: update to 1.76.0 oreo639
2023-03-27 20:15 ` [PR PATCH] [Merged]: " 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).