Hello community, here is the log from the commit of package haxe for openSUSE:Factory checked in at 2019-10-24 23:10:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haxe (Old) and /work/SRC/openSUSE:Factory/.haxe.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haxe" Thu Oct 24 23:10:03 2019 rev:10 rq:742471 version:3.4.7 Changes: -------- --- /work/SRC/openSUSE:Factory/haxe/haxe.changes 2018-02-23 15:31:54.877934268 +0100 +++ /work/SRC/openSUSE:Factory/.haxe.new.2990/haxe.changes 2019-10-24 23:10:13.756596872 +0200 @@ -1,0 +2,9 @@ +Wed Oct 23 11:12:13 UTC 2019 - o...@aepfle.de + +- build with camlp5, use --unsafe-strings + add 527acc3ce0bb881aafe14d7919447075774519f7.patch + add 9bc4999af40324af5e48ed0e3087a4b76f84d9b8.patch + add ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9.tar.gz + remove ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490.tar.gz + +------------------------------------------------------------------- Old: ---- ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490.tar.gz New: ---- 527acc3ce0bb881aafe14d7919447075774519f7.patch 9bc4999af40324af5e48ed0e3087a4b76f84d9b8.patch ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haxe.spec ++++++ --- /var/tmp/diff_new_pack.dajcWc/_old 2019-10-24 23:10:15.136598483 +0200 +++ /var/tmp/diff_new_pack.dajcWc/_new 2019-10-24 23:10:15.136598483 +0200 @@ -16,7 +16,7 @@ # -%global commit_ocamllibs ab5be31c6dd1fcd761c2ba16c5d767bcf6792490 +%global commit_ocamllibs 2502c82e45d2cfca6dfe6ecb558f56104d0c43f9 %global commit_haxelib a494d8be523e26fcf875e2c33915808dc221e17a Name: haxe @@ -32,12 +32,14 @@ Source0: https://github.com/HaxeFoundation/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: https://github.com/HaxeFoundation/ocamllibs/archive/%{commit_ocamllibs}.tar.gz#/ocamllibs-%{commit_ocamllibs}.tar.gz Source2: https://github.com/HaxeFoundation/haxelib/archive/%{commit_haxelib}.tar.gz#/haxelib-%{commit_haxelib}.tar.gz +Patch0: 527acc3ce0bb881aafe14d7919447075774519f7.patch +Patch1: 9bc4999af40324af5e48ed0e3087a4b76f84d9b8.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: help2man BuildRequires: neko-devel >= 2.2.0 BuildRequires: neko >= 2.2.0 BuildRequires: ocaml >= 4.02.3 -BuildRequires: ocaml-camlp4-devel +BuildRequires: ocaml-camlp5-devel BuildRequires: pkgconfig(zlib) BuildRequires: pcre-devel-static BuildRequires: cmake @@ -51,11 +53,12 @@ C++, PHP, C#, Java, Python, Lua, and Neko VM binary files. %prep -%setup -q +%autosetup -p1 + +%build pushd libs && tar -xf %{SOURCE1} --strip-components=1 && popd pushd extra/haxelib_src && tar -xf %{SOURCE2} --strip-components=1 && popd -%build # note that the Makefile does not support parallel building # Haxe 3.4.* is not safe-string compatible. ++++++ 527acc3ce0bb881aafe14d7919447075774519f7.patch ++++++ >From 527acc3ce0bb881aafe14d7919447075774519f7 Mon Sep 17 00:00:00 2001 From: Simon Krajewski <si...@haxe.org> Date: Wed, 12 Dec 2018 21:42:21 +0100 Subject: [PATCH] add -unsafe-string and update libs submodule --- Makefile | 2 +- libs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b846a06976..27ea839c04 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ LFLAGS= STATICLINK?=0 CFLAGS= -bin-annot -ALL_CFLAGS= $(CFLAGS) -g -w -3 -I libs/extlib -I libs/extc -I libs/neko -I libs/javalib -I libs/ziplib -I libs/swflib -I libs/xml-light -I libs/ttflib -I libs/ilib -I libs/objsize -I libs/pcre \ +ALL_CFLAGS= $(CFLAGS) -unsafe-string -g -w -3 -I libs/extlib -I libs/extc -I libs/neko -I libs/javalib -I libs/ziplib -I libs/swflib -I libs/xml-light -I libs/ttflib -I libs/ilib -I libs/objsize -I libs/pcre \ -I src -I src/context -I src/generators -I src/macro -I src/optimization -I src/syntax -I src/typing -I src/display LIBS=unix str libs/extlib/extLib libs/xml-light/xml-light libs/swflib/swflib \ ++++++ 9bc4999af40324af5e48ed0e3087a4b76f84d9b8.patch ++++++ >From 9bc4999af40324af5e48ed0e3087a4b76f84d9b8 Mon Sep 17 00:00:00 2001 From: Andy Li <a...@onthewings.net> Date: Fri, 26 Jul 2019 16:39:39 +0800 Subject: [PATCH] use camlp5 instead of camlp4 (#8547) --- Makefile | 2 +- Makefile.win | 2 +- opam | 2 +- tests/Brewfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 27ea839c04..1b691c714d 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ endif CC_CMD = $(COMPILER) $(ALL_CFLAGS) -c $< -CC_PARSER_CMD = $(COMPILER) -pp camlp4o $(ALL_CFLAGS) -c src/syntax/parser.ml +CC_PARSER_CMD = $(COMPILER) -pp camlp5o $(ALL_CFLAGS) -c src/syntax/parser.ml RELDIR=../../.. ++++++ ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490.tar.gz -> ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490/extc/Makefile new/ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9/extc/Makefile --- old/ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490/extc/Makefile 2017-12-12 03:01:55.000000000 +0100 +++ new/ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9/extc/Makefile 2018-12-12 21:39:57.000000000 +0100 @@ -14,21 +14,21 @@ $(OCAMLC) -a -o extc.cma $(LIBS) extc.ml process.ml extc.cmxa: extc.ml process.ml extc_stubs.o process_stubs.o - $(OCAMLOPT) -a -o extc.cmxa $(LIBS) extc.ml process.ml + $(OCAMLOPT) -unsafe-string -a -o extc.cmxa $(LIBS) extc.ml process.ml extc_stubs.o: extc_stubs.c $(OCAMLC) $(ALL_CFLAGS) extc_stubs.c process_stubs.o: process_stubs.c $(OCAMLC) $(ALL_CFLAGS) process_stubs.c - + clean: rm -f extc.cma extc.cmi extc.cmx extc.cmxa extc.o extc.obj extc.lib extc_stubs.obj extc_stubs.o process.cmx process.obj process.cmi process.o process_stubs.obj process_stubs.o rm -f extc.a libextc.a libextc.lib extc.cmo process.cmo test: native ocamlopt -o test.exe -I ../extLib extLib.cmxa zlib/zlib.lib extc_stubs.obj process_stubs.obj extc.cmxa test.ml - + .PHONY: all bytecode native clean Makefile: ; $(SRC): ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490/extlib/Makefile new/ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9/extlib/Makefile --- old/ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490/extlib/Makefile 2017-12-12 03:01:55.000000000 +0100 +++ new/ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9/extlib/Makefile 2018-12-12 21:39:57.000000000 +0100 @@ -23,7 +23,7 @@ $(OCAMLC) -a -o extLib.cma $(SRC) extLib.cmxa: $(SRC) - $(OCAMLOPT) -g -a -o extLib.cmxa $(SRC) + $(OCAMLOPT) -unsafe-string -g -a -o extLib.cmxa $(SRC) doc: $(OCAMLC) -c $(MODULES:=.mli) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490/pcre/Makefile new/ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9/pcre/Makefile --- old/ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490/pcre/Makefile 2017-12-12 03:01:55.000000000 +0100 +++ new/ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9/pcre/Makefile 2018-12-12 21:39:57.000000000 +0100 @@ -13,7 +13,7 @@ $(OCAMLC) -a -o pcre.cma $(LIBS) pcre.ml pcre.cmxa: pcre.ml pcre_stubs.o - $(OCAMLOPT) -a -o pcre.cmxa $(LIBS) pcre.ml + $(OCAMLOPT) -unsafe-string -a -o pcre.cmxa $(LIBS) pcre.ml pcre_stubs.o: pcre_stubs.c $(OCAMLC) $(ALL_CFLAGS) pcre_stubs.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490/swflib/Makefile new/ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9/swflib/Makefile --- old/ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490/swflib/Makefile 2017-12-12 03:01:55.000000000 +0100 +++ new/ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9/swflib/Makefile 2018-12-12 21:39:57.000000000 +0100 @@ -4,7 +4,7 @@ OCAMLC=ocamlc .SUFFIXES : .ml .mli .cmo .cmi .cmx .mll .mly -ALL_CFLAGS= $(CFLAGS) -I ../extlib -I ../extc -g +ALL_CFLAGS= $(CFLAGS) -unsafe-string -I ../extlib -I ../extc -g LIBS= SRC=actionScript.ml as3hl.mli as3.mli png.ml swflib.sln swf.ml swfPic.ml as3code.ml as3hlparse.ml as3parse.ml png.mli swfParser.ml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490/ziplib/Makefile new/ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9/ziplib/Makefile --- old/ocamllibs-ab5be31c6dd1fcd761c2ba16c5d767bcf6792490/ziplib/Makefile 2017-12-12 03:01:55.000000000 +0100 +++ new/ocamllibs-2502c82e45d2cfca6dfe6ecb558f56104d0c43f9/ziplib/Makefile 2018-12-12 21:39:57.000000000 +0100 @@ -6,7 +6,7 @@ native: zip.cmxa zip.cmxa: $(SRC) - $(OCAMLOPT) -g -I ../extlib -I ../extc -a -o zip.cmxa $(SRC) + $(OCAMLOPT) -unsafe-string -g -I ../extlib -I ../extc -a -o zip.cmxa $(SRC) bytecode: zip.cma zip.cma: $(SRC)
