From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- dev-ml/lablgtk/Manifest | 3 +- dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch | 97 +++++++++++++++++++++++ dev-ml/lablgtk/lablgtk-2.18.10.ebuild | 8 +- 3 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch (limited to 'dev-ml/lablgtk') diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest index b0a58bfff746..999bb389c3ea 100644 --- a/dev-ml/lablgtk/Manifest +++ b/dev-ml/lablgtk/Manifest @@ -1,7 +1,8 @@ +AUX lablgtk-2.18.10-cflags.patch 2852 BLAKE2B 9460dc7e50572f006eca3858b485d99b39fd8b29648bde3559f04b431cf0363725a9e3ed324db20fe0177cf1afff58c3436432c2fbb2de219b390d2bd830b494 SHA512 7f731a8ecd8e10de8519e91f346f73d479a31fee22a9c16ba60109e055655d54a66183a1f4a072702597a65c005fb3d17819672edd8d12396e41bb41c9231250 DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7c5fc16abd485c508f8de3ab587173b0b5c798cdbe851254b48754929c1f0063cfc9e3c5e0663b7cdebc380ec0e8a SHA512 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024 DIST lablgtk-2.18.8.tar.gz 855263 BLAKE2B 92aeadcfac666756e50ea573c7a2119cc13eab5c2f2e033fcdf92d5c33d597d64bf2e860ff181d958b4d8e9a3d4002b3eaabbd1da7580444fee91dafaba26289 SHA512 1510b8886dd55b82fbc96f333d84779f51a4794d13b0934569d13b1975ded9ec684855b9856f636fb302fd8ff2f118d0d5f3ffb2b8086d22cdad442e963868ae -EBUILD lablgtk-2.18.10.ebuild 1884 BLAKE2B e64363193707f30dc7c85c68a80aa83700a4033a1ca08c3f51e5deb685e67523ab0507cf6a9e0c10e31522783f856bcb34e7ac5feac33c222e3893ff629cd4e1 SHA512 ee518a55a66c7876464034435516192af8c91e338fbdec2dbd0575c1eb2fe68f0cbde4fcc23f8814a430296f4e59f474b275b50c4c033a92f8d19725f85c4fbc +EBUILD lablgtk-2.18.10.ebuild 1968 BLAKE2B 3b337ec377bf85ca60cb18197b5d702f3942056e45dd3ed5d8ea4b6dda727b4418fb5e6a759235955b8b31f86aab39cbac72705a9366a428bec1c281d4e9e50c SHA512 fcc1dd98df79f3416e0641a3a4f8cda052172822802fd41461dc6701c1e83f6a6b56ef289676c6fe41df2eb99667cf462ab10ba04cb1be3e761f064ae54c1c23 EBUILD lablgtk-2.18.5.ebuild 2327 BLAKE2B debd856df94beb8f43f803b38f3a07c9b30e2636152be3af9e39defb3a78551c08e748e2096c4014ee22046a7cb121650271caee10ed6db7119bb140b5db7300 SHA512 e2b0225484f28971d02c02dde960095a60a0ef2db2b25263ad678a3f7a33473bdeafd96e100d671a11da5fe331d0c69f092fc23d64ffcf07e0d1d2ddfe60b268 EBUILD lablgtk-2.18.8-r1.ebuild 1717 BLAKE2B 0f951f152a005cbe10ba78e829215087f3d32f27fcddba88af0ab943f23e30d053f3fbd364900f689aacce7896800a31731c87489109b6612b1eacb8fe802036 SHA512 db05d897d25054b497a16a531e7d13fb19de2e5f74aa3faf162cfc2d960e61b106511bec89a332586cc96633a1a92820bf9c03da91edbe0b7073424335177c32 MISC metadata.xml 463 BLAKE2B 79b09024eeae81c18bf584e6341773512c569e348cea23294fd1354bbc6f5ac4da24ffa2a00cf89c44fe7b3af4b8214d6c53f2b36e7c2aca0fedbe2a7d944c97 SHA512 c4dc8d0ea137fa1d8694702fec3dc42eec83967f061c72097b77032ccfe8e6f47450d7a7486647acdf0387ac3d2cf8c028b772d71943d402bec5a7bd976a0ce1 diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch new file mode 100644 index 000000000000..9cbc94a8a036 --- /dev/null +++ b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch @@ -0,0 +1,97 @@ +--- a/src/Makefile 2020-05-14 22:01:09.565870733 +0200 ++++ b/src/Makefile 2020-05-14 22:06:49.081621996 +0200 +@@ -18,6 +18,7 @@ + + include $(CONFIG) + #GTKCFLAGS += -Werror -Wno-error=deprecated-declarations ++CFLAGS= + + TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \ + $(THINITOBJS) build.ml +@@ -45,14 +46,13 @@ + + ifdef DEBUG + COMPILER += -warn-error A-52 +-CFLAGS = -g $(GTKCFLAGS) ++OCAMLCFLAGS = $(GTKCFLAGS) + CUSTOM = -custom + #MLLINK += -cclib -lcamlrund + MLBYTEFLAGS = -g -dtypes + else +-CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) ++OCAMLCFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) + ifneq ($(TOOLCHAIN),msvc) +-CFLAGS += -O + endif + endif + +@@ -65,9 +65,9 @@ + THLINK = unix.cma threads.cma + + ifdef USE_CC +-CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(CFLAGS) ++CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(OCAMLCFLAGS) $(CFLAGS) + else +-CCOMPILER = $(CAMLC) -c -ccopt '$(CFLAGS)' -verbose ++CCOMPILER = $(CAMLC) -c -ccopt '$(OCAMLCFLAGS) $(CFLAGS)' -verbose + endif + + ifdef USE_GL +@@ -123,7 +123,7 @@ + CLIBS += liblablrsvg$(XA) + RSVGMLOBJS = rsvg.cmo + RSVGCOBJS = ml_rsvg$(XO) +-$(RSVGCOBJS) : CFLAGS+=$(HAVE_SVGZ) ++$(RSVGCOBJS) : OCAMLCFLAGS+=$(HAVE_SVGZ) + endif + + ifdef USE_GTKSPELL +@@ -140,7 +140,7 @@ + opt:: lablgtksourceview.cmxs + endif + +-ml_gtksourceview.o: CFLAGS=$(GTKSOURCEVIEWCFLAGS) ++ml_gtksourceview.o: OCAMLCFLAGS=$(GTKSOURCEVIEWCFLAGS) + GTKSOURCEVIEWMLOBJS = gtkSourceView.cmo gSourceView.cmo + GTKSOURCEVIEWCOBJS = ml_gtksourceview$(XO) + ml_gtksourceview.c: pango_tags.h +@@ -179,7 +179,7 @@ + endif + + ifdef USE_GTKQUARTZ +-CFLAGS += -DHAS_GTKQUARTZ ++OCAMLCFLAGS += -DHAS_GTKQUARTZ + endif + # Rules + .SUFFIXES: .ml .mli .cmo .cmi .cmx .cmxs .cmxa .c $(XO) .d$(XO) .var .h .opt .def .ml4 +@@ -188,7 +188,7 @@ + .cpp$(XO): + $(CCOMPILER) $< + .c.d$(XO): +- $(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(CFLAGS)' $< ++ $(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(OCAMLCFLAGS) $(CFLAGS)' $< + .ml.cmo: + $(COMPILER) $(PRINCIPAL) $< + .mli.cmi: +--- a/src/ml_gdk.h 2020-05-14 22:19:59.045394874 +0200 ++++ b/src/ml_gdk.h 2020-05-14 22:20:06.694277819 +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; ++extern 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) +--- a/src/ml_gdk.c 2020-05-14 22:21:39.244861128 +0200 ++++ b/src/ml_gdk.c 2020-05-14 22:21:57.571580518 +0200 +@@ -55,6 +55,8 @@ + #define GDK_WINDOW_TYPE_HINT_DOCK GDK_WINDOW_TYPE_HINT_NORMAL + #endif + ++lookup_info *ml_table_extension_events; ++ + CAMLprim void ml_raise_gdk (const char *errmsg) + { + static const value * exn = NULL; diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild index ad3698d27a55..780d515a5e01 100644 --- a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild +++ b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild @@ -26,6 +26,10 @@ BDEPEND="dev-ml/findlib DOCS=( CHANGES README CHANGES.API ) +PATCHES=( + "${FILESDIR}"/${P}-cflags.patch +) + src_configure() { local myeconfargs=( $(use_enable debug) @@ -46,9 +50,9 @@ src_configure() { src_compile() { # parallel build crashes - emake -j1 all + emake -j1 all CFLAGS="${CFLAGS}" if use ocamlopt; then - emake -j1 opt + emake -j1 opt CFLAGS="${CFLAGS}" fi } -- cgit v1.2.3