Accepting request 853281 from home:andythe_great:branches:X11:Cinnamon:Factory

- Update to version 4.8.0.
  * Rebase on GJS 1.66 and Mozjs78.
  * deprecation.cpp: Add additional info to ByteArray deprecation 
    warning, and link to the xlet versioning tutorial page.
- Add cjs-tests package.
- Switch to meson.
- Build with mozjs68.

OBS-URL: https://build.opensuse.org/request/show/853281
OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/cjs?expand=0&rev=47

cjs.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sat Dec  5 15:01:03 UTC 2020 - andy great <andythe_great@pm.me>
+
+- Update to version 4.8.0.
+  * Rebase on GJS 1.66 and Mozjs78.
+  * deprecation.cpp: Add additional info to ByteArray deprecation 
+    warning, and link to the xlet versioning tutorial page.
+- Add cjs-tests package.
+- Switch to meson.
+
+-------------------------------------------------------------------
+Mon Sep 28 19:13:50 UTC 2020 - andy great <andythe_great@pm.me>
+
+- Build with mozjs68. 
+
 -------------------------------------------------------------------
 Sun Sep 27 13:55:38 UTC 2020 - andy great <andythe_great@pm.me>
 

cjs.spec

@@ -20,21 +20,20 @@
 %define sover   0
 %define typelib typelib-1_0-CjsPrivate-1_0
 Name:           cjs
-Version:        4.6.0
+Version:        4.8.0
 Release:        0
 Summary:        JavaScript module used by Cinnamon
 License:        MIT AND (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later)
 Group:          System/GUI/Other
 URL:            https://github.com/linuxmint/cjs
 Source:         https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-BuildRequires:  autoconf
-BuildRequires:  autoconf-archive
-BuildRequires:  automake
 BuildRequires:  dbus-1
+BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
+BuildRequires:  meson
 BuildRequires:  pkgconfig
-BuildRequires:  python
+BuildRequires:  sysprof-devel
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo-gobject)
 BuildRequires:  pkgconfig(dbus-glib-1)
@@ -42,7 +41,9 @@ BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.14.0
 BuildRequires:  pkgconfig(libffi)
-BuildRequires:  pkgconfig(mozjs-52)
+BuildRequires:  pkgconfig(mozjs-78)
+BuildRequires:  pkgconfig(readline)
+BuildRequires:  pkgconfig(sysprof-capture-4)
 
 %description
 JavaScript bindings based on GObject Introspection for the
@@ -82,28 +83,29 @@ Cinnamon Desktop.
 
 This package contains development files for cjs.
 
+%package tests
+Summary:        Tests for the cjs package
+Group:          System/GUI/Other
+Requires:       %{name}%{?_isa} = %{?epoch}:%{version}-%{release}
+
+%description tests
+The cjs-tests package contains tests that can be used to verify
+the functionality of the installed cjs package.
+
 %prep
 %setup -q
-# we didn't enable code-coverage tests, so "@CODE_COVERAGE_RULES@" never get filled
-sed -i '$d' Makefile-test.am
 
 %build
-NOCONFIGURE=1 ./autogen.sh
-%configure \
-%if 0%{?suse_version} < 1500
-  --without-dbus-tests \
-%endif
-  --disable-static
-
-export CFLAGS+='%{optflags}'
-make %{?_smp_mflags} V=1
+%meson --libexecdir=%{_libdir}/%{name}/
+%meson_build
 
 %install
-%make_install
+%meson_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
-%post -n %{soname}%{sover} -p /sbin/ldconfig
+%fdupes -s %{buildroot}%{_libdir}/%{name}/installed-tests/
 
+%post -n %{soname}%{sover} -p /sbin/ldconfig
 %postun -n %{soname}%{sover} -p /sbin/ldconfig
 
 %files
@@ -115,13 +117,19 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/libcjs.so.%{sover}*
 
 %files -n %{typelib}
-%dir %{_libdir}/cjs/
-%dir %{_libdir}/cjs/girepository-1.0/
-%{_libdir}/cjs/girepository-1.0/CjsPrivate-1.0.typelib
+%dir %{_libdir}/%{name}/
+%dir %{_libdir}/%{name}/girepository-1.0/
+%{_libdir}/%{name}/girepository-1.0/CjsPrivate-1.0.typelib
 
 %files devel
 %{_includedir}/%{name}-1.0/
 %{_libdir}/%{soname}.so
 %{_libdir}/pkgconfig/%{name}*.pc
+%{_datadir}/cjs-1.0/
+
+%files tests
+%{_libdir}/%{name}/installed-tests/
+%{_datadir}/installed-tests/
+%{_datadir}/glib-2.0/schemas/org.cinnamon.CjsTest.gschema.xml
 
 %changelog

cjs-4.6.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:47f8abb867881594766fec1398d1b9117012826c5e72ecafb3153a0c8226bf81
-size 463060

cjs-4.8.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f07defa6b21efcc4332ba46f286ed303a05af8805d47a9ff4bfa40cdf45b40b
+size 599974