Put-testGtk4.js-in-dbus-suite.patch

@@ -1,97 +0,0 @@
-From 2079e0ed79df6549a02310b1d8f183f983d2caa9 Mon Sep 17 00:00:00 2001
-From: Philip Chimento <philip.chimento@gmail.com>
-Date: Sun, 19 Feb 2023 22:45:49 -0800
-Subject: [PATCH] CI: Put testGtk4.js in 'dbus' suite
-
-This is a temporary fix for GTK 4 trying to acquire a message bus on
-startup, until we figure out what magic environment variable will
-prevent that.
----
- installed-tests/js/meson.build | 59 ++++++++++++++++++++--------------
- 1 file changed, 34 insertions(+), 25 deletions(-)
-
-diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
-index f1bf57027..7e8f4acb4 100644
---- a/installed-tests/js/meson.build
-+++ b/installed-tests/js/meson.build
-@@ -154,10 +154,6 @@ if not get_option('skip_gtk_tests')
-         'GObjectDestructionAccess',
-         'LegacyGtk',
-     ]
--
--    if have_gtk4
--        jasmine_tests += 'Gtk4'
--    endif
- endif
- 
- installed_js_tests_dir = installed_tests_execdir / 'js'
-@@ -202,31 +198,40 @@ if get_option('installed_tests')
-     install_subdir('modules', install_dir: installed_js_tests_dir)
- endif
- 
--# testGDBus.js is separate, because it can be skipped, and during build should
--# be run using dbus-run-session
-+# testGDBus.js and testGtk4.js are separate, because they can be skipped, and
-+# during build should be run using dbus-run-session
- 
--if not get_option('skip_dbus_tests')
--    test_file = files('testGDBus.js')
--    bus_config = files('../../test/test-bus.conf')
--    test('GDBus', dbus_run_session,
--        args: ['--config-file', bus_config, '--', minijasmine, test_file],
--        env: tests_environment, protocol: 'tap', suite: 'dbus')
-+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'
- endif
- 
--gdbus_test_description_subst = {
--    'name': 'testGDBus.js',
--    'installed_tests_execdir': installed_tests_execdir,
--}
--gdbus_test_description = configure_file(
--    configuration: gdbus_test_description_subst,
--    input: '../minijasmine.test.in', output: 'testGDBus.test',
--    install: get_option('installed_tests'),
--    install_dir: installed_tests_metadir)
-+bus_config = files('../../test/test-bus.conf')
-+foreach test : dbus_tests
-+    test_file = files('test@0@.js'.format(test))
- 
--if get_option('installed_tests')
--    install_data('matchers.js', 'testGDBus.js',
--        install_dir: installed_js_tests_dir)
--endif
-+    if not get_option('skip_dbus_tests')
-+        test(test, dbus_run_session,
-+            args: ['--config-file', bus_config, '--', minijasmine, test_file],
-+            env: tests_environment, protocol: 'tap', suite: 'dbus')
-+    endif
-+
-+    dbus_test_description_subst = {
-+        'name': 'test@0@.js'.format(test),
-+        'installed_tests_execdir': installed_tests_execdir,
-+    }
-+    dbus_test_description = configure_file(
-+        configuration: dbus_test_description_subst,
-+        input: '../minijasmine.test.in',
-+        output: 'test@0@.test'.format(test),
-+        install: get_option('installed_tests'),
-+        install_dir: installed_tests_metadir)
-+
-+    if get_option('installed_tests')
-+        install_data(test_file, install_dir: installed_js_tests_dir)
-+    endif
-+endforeach
- 
- # tests using ES modules are also separate because they need an extra
- # minijasmine flag
-@@ -265,3 +270,7 @@ foreach test : modules_tests
-         install_data(test_file, install_dir: installed_js_tests_dir)
-     endif
- endforeach
-+
-+if get_option('installed_tests')
-+    install_data('matchers.js', install_dir: installed_js_tests_dir)
-+endif

disable_tests-error.patch

@@ -1,26 +0,0 @@
-diff -up gjs-1.75.1/installed-tests/js/testCairo.js.BAK gjs-1.75.1/installed-tests/js/testCairo.js
---- gjs-1.75.1/installed-tests/js/testCairo.js.BAK	2023-02-13 18:33:38.473451126 +0800
-+++ gjs-1.75.1/installed-tests/js/testCairo.js	2023-02-13 18:34:43.197447329 +0800
-@@ -114,14 +114,14 @@ describe('Cairo', function () {
-                 xAdvance: 0,
-                 yAdvance: 0,
-             });
--            expect(cr.textExtents('trailing spaces   ')).toEqual({
--                xBearing: 0,
--                yBearing: -8,
--                width: jasmine.any(Number),
--                height: jasmine.any(Number),
--                xAdvance: jasmine.any(Number),
--                yAdvance: 0,
--            });
-+            //expect(cr.textExtents('trailing spaces   ')).toEqual({
-+            //    xBearing: 0,
-+            //    yBearing: -8,
-+            //    width: jasmine.any(Number),
-+            //    height: jasmine.any(Number),
-+            //    xAdvance: jasmine.any(Number),
-+            //    yAdvance: 0,
-+            //});
-         });
- 
-         it('can call various, otherwise untested, methods without crashing', function () {

gjs.spec

@@ -1,43 +1,16 @@
-%global glib2_version 2.66.0
-%global gobject_introspection_version 1.66.0
-%global mozjs102_version 102.5.0
-
 Name:          gjs
-Version:       1.75.1
+Version:       1.65.4
-Release:       2
+Release:       1
 Summary:       using GNOME libraries from Javascript
 License:       MIT and (MPLv1.1 or GPLv2+ or LGPLv2+)
-URL:           https://wiki.gnome.org/Projects/Gjs
+URL:           https://wiki.gnome.org/Attic/Gjs
-Source0:       https://download.gnome.org/sources/%{name}/1.75/%{name}-%{version}.tar.xz
+Source0:       https://download.gnome.org/sources/gjs/1.65/gjs-%{version}.tar.xz
-Patch0:        disable_tests-error.patch
-#https://github.com/GNOME/gjs/commit/2079e0ed
-Patch1:        Put-testGtk4.js-in-dbus-suite.patch
 
-BuildRequires:  gcc-c++
+BuildRequires: cairo-gobject-devel chrpath gobject-introspection-devel >= 1.61.2 meson cmake sysprof-devel
-BuildRequires:  meson
+BuildRequires: glib2-devel >= 2.58.0 gtk3-devel >= 3.20 mozjs68-devel >= 68.11.0
-BuildRequires:  gettext
+BuildRequires: readline-devel dbus-glib-devel gcc-c++ gettext pkgconfig dbus-daemon
-BuildRequires:  readline-devel
-BuildRequires:  pkgconfig(cairo-gobject)
-BuildRequires:  pkgconfig(gio-2.0) >= %{glib2_version}
-BuildRequires:  pkgconfig(gobject-introspection-1.0) >= %{gobject_introspection_version}
-BuildRequires:  pkgconfig(gtk4)
-BuildRequires:  pkgconfig(mozjs-102) >= %{mozjs102_version}
-BuildRequires:  pkgconfig(sysprof-capture-4)
-BuildRequires:  dbus-daemon
-# For GTK+ 3 tests
-BuildRequires:  gtk3
-# For dbus tests
-BuildRequires:  dbus-glib-devel
-# xvfb for test suite
-BuildRequires:  xorg-x11-server-Xvfb
 
-Requires: glib2%{?_isa} >= %{glib2_version}
+Requires:      glib2 >= 2.58.0 gobject-introspection >= 1.61.2 gtk3 >= 3.20 mozjs68 >= 68.11.0
-Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version}
-Requires: mozjs102%{?_isa} >= %{mozjs102_version}
-
-
-# Filter provides for private libraries
-#%%global __provides_exclude_from ^%{_libdir}/gjs/
 
 %description
 Gjs is a Javascript binding for GNOME. It's mainly based on Spidermonkey javascript
@@ -45,7 +18,8 @@ engine and the GObject introspection framework.
 
 %package devel
 Summary:   Development files for gjs
-Requires:     %{name}%{?_isa} = %{version}-%{release}
+Requires:  %{name} = %{version}-%{release}
+
 Provides:  %{name}-tests = %{version}-%{release}
 Obsoletes: %{name}-tests < %{version}-%{release}
 
@@ -62,9 +36,6 @@ Development files for gjs.
 %install
 %meson_install
 
-%check
-%{shrink:xvfb-run -s "-screen 0 1600x1200x24" %meson_test --timeout-multiplier=5}
-
 %files
 %defattr(-,root,root)
 %doc NEWS README.md
@@ -86,21 +57,6 @@ Development files for gjs.
 %{_datadir}/glib-2.0/schemas/org.gnome.GjsTest.gschema.xml
 
 %changelog
-* Wed Feb 21 2024 liyanan <liyanan61@h-partners.com> - 1.75.1-2
-- Put testGtk4.js in dbus suite
-
-* Mon Jan 2 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 1.75.1-1
-- Upgrade to 1.75.1
-
-* Wed Apr 06 2022 wangkai <wangkai385@huawei.com> - 1.71.1-1
-- Update to 1.71.1
-
-* Mon May 31 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 1.66.2-1
-- Upgrade to 1.66.2
-
-* Fri Nov 13 2020 chengguipeng <chengguipeng1@huawei.com> - 1.66.1-1
-- update to 1.66.1
-
 * Fri Oct 9 2020 jinzhimin <jinzhimin2@huawei.com> - 1.65.4-1
 - update to 1.65.4