From 8f542b9868f22590d72248ecdbc0ddfde9268d080d1acf1e3130f85923c3647c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 15 Nov 2011 14:41:38 +0000 Subject: [PATCH 1/3] Accepting request 91583 from home:dimstar:GNOME:Next Update to 1.31.0 OBS-URL: https://build.opensuse.org/request/show/91583 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gjs?expand=0&rev=55 --- gjs-1.30.0.tar.bz2 | 3 --- gjs-1.31.0.tar.bz2 | 3 +++ gjs.changes | 9 +++++++++ gjs.spec | 5 +++-- 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 gjs-1.30.0.tar.bz2 create mode 100644 gjs-1.31.0.tar.bz2 diff --git a/gjs-1.30.0.tar.bz2 b/gjs-1.30.0.tar.bz2 deleted file mode 100644 index 70481c6..0000000 --- a/gjs-1.30.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c0dc1fc883b3c46cbc514bcfb577ec01eac45c934c6d07a06cdb12a2b2931ef -size 545836 diff --git a/gjs-1.31.0.tar.bz2 b/gjs-1.31.0.tar.bz2 new file mode 100644 index 0000000..0dc0148 --- /dev/null +++ b/gjs-1.31.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbf1f2bcbf5315a42e9f2b67bda8eedb7046c743f373713505bf769789e40939 +size 545185 diff --git a/gjs.changes b/gjs.changes index 67d284b..02d2d89 100644 --- a/gjs.changes +++ b/gjs.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Oct 28 07:55:21 UTC 2011 - dimstar@opensuse.org + +- Update to version 1.31.0: + + Fix memory leaks + + Don't use deprecated g_thread_init() and gvalue calls. + + Fix compiler warnings. +- Add pkgconfig(glib-2.0) BuildRequires. + ------------------------------------------------------------------- Tue Sep 27 19:25:01 UTC 2011 - vuntz@opensuse.org diff --git a/gjs.spec b/gjs.spec index 066ba9b..07db172 100644 --- a/gjs.spec +++ b/gjs.spec @@ -22,14 +22,14 @@ %define xulrunner_ver 20 Name: gjs -Version: 1.30.0 +Version: 1.31.0 Release: 1 # FIXME: find out if tapsets should really be in devel package or in main package License: MIT License (or similar) Summary: JavaScript bindings based on gobject-introspection and Mozilla Group: Development/Libraries/GNOME Url: http://live.gnome.org/Gjs -Source: http://download.gnome.org/sources/gjs/1.30/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gjs/1.31/%{name}-%{version}.tar.bz2 BuildRequires: gcc-c++ %if %{build_with_xulrunner} BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel @@ -39,6 +39,7 @@ BuildRequires: readline-devel BuildRequires: systemtap-sdt-devel BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(glib-2.0) >= 2.31.0 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.29.16 %if ! %{build_with_xulrunner} BuildRequires: pkgconfig(mozjs185) From 2f146bd0ed60f50de8eae4520522dbf161162a5a20bb7c596928e0b6a1df9095 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 05:05:24 +0000 Subject: [PATCH 2/3] Accepting request 97406 from home:vuntz:branches:GNOME:Factory Update to 1.31.6 OBS-URL: https://build.opensuse.org/request/show/97406 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gjs?expand=0&rev=56 --- gjs-1.31.0.tar.bz2 | 3 --- gjs-1.31.6.tar.xz | 3 +++ gjs.changes | 21 +++++++++++++++++++++ gjs.spec | 33 ++++++--------------------------- 4 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 gjs-1.31.0.tar.bz2 create mode 100644 gjs-1.31.6.tar.xz diff --git a/gjs-1.31.0.tar.bz2 b/gjs-1.31.0.tar.bz2 deleted file mode 100644 index 0dc0148..0000000 --- a/gjs-1.31.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbf1f2bcbf5315a42e9f2b67bda8eedb7046c743f373713505bf769789e40939 -size 545185 diff --git a/gjs-1.31.6.tar.xz b/gjs-1.31.6.tar.xz new file mode 100644 index 0000000..d8d8c4a --- /dev/null +++ b/gjs-1.31.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4a3628c651675f98dc2f2121cdf113611cc1f8ba0c326b3c7c8063240ba61b4 +size 454072 diff --git a/gjs.changes b/gjs.changes index 02d2d89..253f145 100644 --- a/gjs.changes +++ b/gjs.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue Dec 20 20:34:37 UTC 2011 - vuntz@opensuse.org + +- Update to version 1.31.6: + + Require mozjs185. + + Add a common way to grab a GType for an object + + Some work to improve support for ParamSpec. + + lang: + - Add new "Class" framework adapted from MooTools + - Improve prototype property descriptors + - Introduce abstract classes + - Fix for reentrant calls + + console: Fix ARGV when using -c to specify program + + Several overrides improvements. + + Various other code changes. +- Remove %build_with_xulrunner define: only building against + mozjs185 is supported now. +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. + ------------------------------------------------------------------- Fri Oct 28 07:55:21 UTC 2011 - dimstar@opensuse.org diff --git a/gjs.spec b/gjs.spec index 07db172..8c0a52a 100644 --- a/gjs.spec +++ b/gjs.spec @@ -15,35 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# Set to 1 to build with xulrunner, else we build with js -%define build_with_xulrunner 0 - -%define xulrunner_ver 20 - Name: gjs -Version: 1.31.0 -Release: 1 +Version: 1.31.6 +Release: 0 # FIXME: find out if tapsets should really be in devel package or in main package -License: MIT License (or similar) Summary: JavaScript bindings based on gobject-introspection and Mozilla +License: MIT Group: Development/Libraries/GNOME Url: http://live.gnome.org/Gjs -Source: http://download.gnome.org/sources/gjs/1.31/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gjs/1.31/%{name}-%{version}.tar.xz BuildRequires: gcc-c++ -%if %{build_with_xulrunner} -BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel -%endif BuildRequires: python BuildRequires: readline-devel BuildRequires: systemtap-sdt-devel +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) >= 2.31.0 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.29.16 -%if ! %{build_with_xulrunner} BuildRequires: pkgconfig(mozjs185) -%endif Requires: libgjs0 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,14 +43,7 @@ This module contains JavaScript bindings based on gobject-introspection and the Mozilla SpiderMonkey JavaScript engine. %package -n libgjs0 -License: MIT License (or similar) Summary: JavaScript bindings based on gobject-introspection and Mozilla -Group: Development/Libraries/GNOME -%if %{build_with_xulrunner} -# Explicitly requires the xulrunner version we need, instead of hoping we'll -# get the right one with the libmozjs.so Requires. -Requires: mozilla-xulrunner%{xulrunner_ver} -%endif Provides: libgjs-0 = %{version} Obsoletes: libgjs-0 < %{version} @@ -68,13 +52,8 @@ This module contains JavaScript bindings based on gobject-introspection and the Mozilla SpiderMonkey JavaScript engine. %package -n libgjs-devel -License: MIT License (or similar) Summary: JavaScript bindings based on gobject-introspection and Mozilla -Group: Development/Libraries/GNOME Requires: libgjs0 = %{version} -%if %{build_with_xulrunner} -Requires: mozilla-xulrunner%{xulrunner_ver}-devel -%endif # Just a helper provides Provides: gjs-devel = %{version} From 0f341cd6985327478686186ace5e5a5b4c70f439358f3118d84ad3d0f71eb538 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 24 Dec 2011 14:24:50 +0000 Subject: [PATCH 3/3] Accepting request 98101 from home:vuntz:branches:GNOME:Factory Split typelib out to fix build OBS-URL: https://build.opensuse.org/request/show/98101 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gjs?expand=0&rev=57 --- gjs.changes | 6 ++++++ gjs.spec | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/gjs.changes b/gjs.changes index 253f145..dfdedcc 100644 --- a/gjs.changes +++ b/gjs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 24 14:09:35 UTC 2011 - vuntz@opensuse.org + +- Split typelib file into typelib-1_0-GjsDBus-1_0 subpackage. +- Add typelib-1_0-GjsDBus-1_0 Requires to devel subpackage. + ------------------------------------------------------------------- Tue Dec 20 20:34:37 UTC 2011 - vuntz@opensuse.org diff --git a/gjs.spec b/gjs.spec index 8c0a52a..e698706 100644 --- a/gjs.spec +++ b/gjs.spec @@ -44,6 +44,7 @@ Mozilla SpiderMonkey JavaScript engine. %package -n libgjs0 Summary: JavaScript bindings based on gobject-introspection and Mozilla +Group: Development/Libraries/GNOME Provides: libgjs-0 = %{version} Obsoletes: libgjs-0 < %{version} @@ -51,9 +52,19 @@ Obsoletes: libgjs-0 < %{version} This module contains JavaScript bindings based on gobject-introspection and the Mozilla SpiderMonkey JavaScript engine. +%package -n typelib-1_0-GjsDBus-1_0 +Summary: GJS DBus utility library -- Introspection bindings +Group: Development/Libraries/GNOME + +%description -n typelib-1_0-GjsDBus-1_0 +This module contains JavaScript bindings based on gobject-introspection and the +Mozilla SpiderMonkey JavaScript engine. + %package -n libgjs-devel Summary: JavaScript bindings based on gobject-introspection and Mozilla +Group: Development/Libraries/GNOME Requires: libgjs0 = %{version} +Requires: typelib-1_0-GjsDBus-1_0 # Just a helper provides Provides: gjs-devel = %{version} @@ -94,9 +105,12 @@ rm -rf %{buildroot} %{_datadir}/gjs-1.0/ %{_libdir}/*.so.* %dir %{_libdir}/gjs -%{_libdir}/gjs/GjsDBus-1.0.typelib %{_libdir}/gjs-1.0/ +%files -n typelib-1_0-GjsDBus-1_0 +%defattr(-,root,root) +%{_libdir}/gjs/GjsDBus-1.0.typelib + %files -n libgjs-devel %defattr(-,root,root) %{_includedir}/*