Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-lablgtk2 for openSUSE:Factory checked in at 2021-04-29 01:37:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-lablgtk2 (Old) and /work/SRC/openSUSE:Factory/.ocaml-lablgtk2.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-lablgtk2" Thu Apr 29 01:37:33 2021 rev:20 rq:887305 version:2.18.11 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-lablgtk2/ocaml-lablgtk2.changes 2020-06-17 14:56:33.986260881 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-lablgtk2.new.12324/ocaml-lablgtk2.changes 2021-04-29 01:38:22.706576571 +0200 @@ -2 +2,11 @@ -Wed Jun 17 06:06:06 UTC 2020 - [email protected] +Fri Apr 9 09:09:09 UTC 2021 - [email protected] + +- Update to version 2.18.11 + Remove obsolete ocaml-lablgtk2.ml_table_extension_events.patch +- add build conditionals for gl,glade,gnomecanvas,gtksourceview2, + gtkspell and rsvg, enable only the latter be default +- Remove ocaml_native_compiler conditional + build native target unconditionally + +------------------------------------------------------------------- +Wed Jun 17 06:06:06 UTC 2020 - [email protected] Old: ---- ocaml-lablgtk2-2.18.10.tar.xz ocaml-lablgtk2.ml_table_extension_events.patch New: ---- ocaml-lablgtk2-2.18.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-lablgtk2.spec ++++++ --- /var/tmp/diff_new_pack.CqwXOB/_old 2021-04-29 01:38:23.114577149 +0200 +++ /var/tmp/diff_new_pack.CqwXOB/_new 2021-04-29 01:38:23.118577154 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-lablgtk2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,37 +15,54 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - -Version: 2.18.10 -Release: 0 -%{?ocaml_preserve_bytecode} +%bcond_with ocaml_lablgtk2_gl +%bcond_with ocaml_lablgtk2_glade +%bcond_with ocaml_lablgtk2_gnomecanvas +%bcond_with ocaml_lablgtk2_gtksourceview2 +%bcond_with ocaml_lablgtk2_gtkspell +%bcond_without ocaml_lablgtk2_rsvg # handle built-in ocaml helper from rpm-build, and helper from ocaml-rpm-macros %global __suseocaml_requires_opts -i GtkSourceView2_types %global __ocaml_requires_opts -i GtkSourceView2_types + Name: ocaml-lablgtk2 +Version: 2.18.11 +Release: 0 +%{?ocaml_preserve_bytecode} +Summary: An Objective Caml Interface to gtk2+ +License: LGPL-2.1-only +Group: Development/Languages/OCaml +BuildRoot: %_tmppath/%name-%version-build +URL: https://opam.ocaml.org/packages/lablgtk Source0: %{name}-%{version}.tar.xz -Patch0: ocaml-lablgtk2.ml_table_extension_events.patch -BuildRequires: gtk2-devel -BuildRequires: gtksourceview2-devel -BuildRequires: gtkspell-devel -BuildRequires: libglade2-devel -BuildRequires: libgnomecanvas-devel -BuildRequires: librsvg-devel BuildRequires: ocaml -BuildRequires: ocaml-findlib -BuildRequires: ocaml-lablgl-devel -BuildRequires: ocaml-rpm-macros >= 20200514 -BuildRequires: xorg-x11 -BuildRequires: zlib-devel -Requires: ocaml +BuildRequires: ocaml-rpm-macros >= 20210409 +BuildRequires: ocamlfind(findlib) +%if %{with ocaml_lablgtk2_gl} +BuildRequires: ocamlfind(lablgl) +%endif +BuildRequires: pkg-config +BuildRequires: pkgconfig(gtk+-2.0) +%if %{with ocaml_lablgtk2_gtksourceview2} +BuildRequires: pkgconfig(gtksourceview-2.0) +%endif +%if %{with ocaml_lablgtk2_gtkspell} +BuildRequires: pkgconfig(gtkspell-2.0) +%endif +%if %{with ocaml_lablgtk2_glade} +BuildRequires: pkgconfig(libglade-2.0) +%endif +%if %{with ocaml_lablgtk2_gnomecanvas} +BuildRequires: pkgconfig(libgnomecanvas-2.0) +%endif +%if %{with ocaml_lablgtk2_rsvg} +BuildRequires: pkgconfig(librsvg-2.0) +%endif + Provides: lablgtk2 = %{version} Obsoletes: lablgtk2 < %{version} Provides: ocaml-lablgtk = %{version} Obsoletes: ocaml-lablgtk < %{version} -Url: https://github.com/garrigue/lablgtk -Summary: An Objective Caml Interface to gtk2+ -License: LGPL-2.1-only -Group: Development/Languages/OCaml %description LablGTK2 uses the rich type system of Objective Caml 3 to provide a @@ -63,9 +80,6 @@ Obsoletes: ocaml-lablgtk-devel < %{version} Provides: lablgtk2:/usr/lib/ocaml/lablgtk2/glib.cmi Requires: %{name} = %{version} -Requires: gtk2-devel -Requires: gtksourceview2-devel -Requires: libgnomecanvas-devel %description devel LablGTK2 uses the rich type system of Objective Caml 3 to provide a @@ -74,37 +88,58 @@ level, which allows for interactive use of the library. %prep -%autosetup -p1 +%setup -q %build -find -name ".cvsignore" -print -delete -# fix README file executable permissions chmod a-x README -export CFLAGS="$RPM_OPT_FLAGS" -make configure -%configure --with-gnomecanvas +%configure \ + --without-gl \ + --without-glade \ + --without-gnomecanvas \ + --without-gnomeui \ + --without-gtksourceview \ + --without-gtksourceview2 \ + --without-gtkspell \ + --without-panel \ + --without-quartz \ + --without-rsvg \ + \ +%if %{with ocaml_lablgtk2_gl} + --with-gl \ +%endif +%if %{with ocaml_lablgtk2_glade} + --with-glade \ +%endif +%if %{with ocaml_lablgtk2_gnomecanvas} + --with-gnomecanvas \ +%endif +%if %{with ocaml_lablgtk2_gtksourceview2} + --with-gtksourceview2 \ +%endif +%if %{with ocaml_lablgtk2_gtkspell} + --with-gtkspell \ +%endif +%if %{with ocaml_lablgtk2_rsvg} + --with-rsvg \ +%endif + %{nil} make world -%if 0%{?ocaml_native_compiler} make opt -pushd src -make lablgtk.cmxa -make lablrsvg.cmxa -make gtkInit.cmx -popd -%endif %install -%makeinstall +%make_install # Remove ld.conf (part of main OCaml dist). -rm $RPM_BUILD_ROOT%{ocaml_standard_library}/ld.conf +rm -fv %{buildroot}%{ocaml_standard_library}/ld.conf # %ocaml_create_file_list %files -f %{name}.files -%doc CHANGES README +%defattr(-,root,root,-) +%doc README %{_bindir}/* %files devel -f %{name}.files.devel +%defattr(-,root,root,-) %{ocaml_standard_library}/*/propcc %{ocaml_standard_library}/*/varcc ++++++ _service ++++++ --- /var/tmp/diff_new_pack.CqwXOB/_old 2021-04-29 01:38:23.150577200 +0200 +++ /var/tmp/diff_new_pack.CqwXOB/_new 2021-04-29 01:38:23.150577200 +0200 @@ -1,15 +1,17 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">https://github.com/garrigue/lablgtk.git</param> + <param name="exclude">.cvsignore</param> + <param name="exclude">applications</param> + <param name="exclude">doc</param> + <param name="exclude">examples</param> + <param name="filename">ocaml-lablgtk2</param> + <param name="revision">156973670a9c00b10f7f97201bbca054e6f3b66b</param> <param name="scm">git</param> + <param name="submodules">disable</param> + <param name="url">https://github.com/garrigue/lablgtk.git</param> <param name="versionformat">@PARENT_TAG@</param> - <!-- 2.18.10 --> - <param name="revision">d66addf4e9dc5ed489e85529475645996afa68a8</param> - <param name="filename">ocaml-lablgtk2</param> -<param name="exclude">.cvsignore</param> -<param name="exclude">applications</param> -<param name="exclude">doc</param> -<param name="exclude">examples</param> + <param name="versionrewrite-pattern">[v]?([^\+]+)(.*)</param> + <param name="versionrewrite-replacement">\1</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ ocaml-lablgtk2-2.18.10.tar.xz -> ocaml-lablgtk2-2.18.11.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.10/CHANGES new/ocaml-lablgtk2-2.18.11/CHANGES --- old/ocaml-lablgtk2-2.18.10/CHANGES 2020-01-23 15:38:11.000000000 +0100 +++ new/ocaml-lablgtk2-2.18.11/CHANGES 2020-06-19 17:37:39.000000000 +0200 @@ -1,11 +1,15 @@ LablGTK changes log +In Lablgtk-2.18.11: + +2020.06.19 [Jerry James] + * Fix the build with -fno-common, the default for GCC 10 + In Lablgtk-2.18.10: 2020.01.23 [Jacques] * headers changed again in ocaml 4.10.0beta2 * fix C compilation warnings - * fix SourceMarkAttributes.new_attribute In Lablgtk-2.18.9: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.10/src/ml_gdk.c new/ocaml-lablgtk2-2.18.11/src/ml_gdk.c --- old/ocaml-lablgtk2-2.18.10/src/ml_gdk.c 2020-01-23 15:38:11.000000000 +0100 +++ new/ocaml-lablgtk2-2.18.11/src/ml_gdk.c 2020-06-19 17:37:39.000000000 +0200 @@ -55,6 +55,8 @@ #define GDK_WINDOW_TYPE_HINT_DOCK GDK_WINDOW_TYPE_HINT_NORMAL #endif +CAMLexport lookup_info *ml_table_extension_events; + CAMLprim void ml_raise_gdk (const char *errmsg) { static const value * exn = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.10/src/ml_gdk.h new/ocaml-lablgtk2-2.18.11/src/ml_gdk.h --- old/ocaml-lablgtk2-2.18.10/src/ml_gdk.h 2020-01-23 15:38:11.000000000 +0100 +++ new/ocaml-lablgtk2-2.18.11/src/ml_gdk.h 2020-06-19 17:37:39.000000000 +0200 @@ -102,7 +102,7 @@ CAMLexport int OptFlags_GdkModifier_val (value); CAMLexport int Flags_GdkModifier_val (value); CAMLexport int Flags_Event_mask_val (value); -CAMLexport lookup_info *ml_table_extension_events; +CAMLextern lookup_info *ml_table_extension_events; #define Extension_events_val(key) ml_lookup_to_c(ml_table_extension_events,key) #define GdkDragContext_val(val) check_cast(GDK_DRAG_CONTEXT,val)
