* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgtk/files/
@ 2022-12-23 20:12 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2022-12-23 20:12 UTC (permalink / raw
To: gentoo-commits
commit: edea85dc1531fae355514ac3130d05fe58805284
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 20:11:50 2022 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 20:12:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edea85dc
dev-ml/lablgtk: remove warn-error
Closes: https://bugs.gentoo.org/887393
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch
index 9cbc94a8a036..ca82491113b6 100644
--- a/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch
+++ b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch
@@ -8,10 +8,11 @@
TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \
$(THINITOBJS) build.ml
-@@ -45,14 +46,13 @@
+@@ -44,15 +45,13 @@
+ endif
ifdef DEBUG
- COMPILER += -warn-error A-52
+-COMPILER += -warn-error A-52
-CFLAGS = -g $(GTKCFLAGS)
+OCAMLCFLAGS = $(GTKCFLAGS)
CUSTOM = -custom
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgtk/files/
@ 2023-03-10 20:27 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2023-03-10 20:27 UTC (permalink / raw
To: gentoo-commits
commit: e7f2b2fc1a58b8d1642ae55471cbb22a231d2efc
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 20:26:12 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 20:26:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f2b2fc
dev-ml/lablgtk: fix Makefile
Closes: https://bugs.gentoo.org/888607
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch b/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch
index a77455afa8ef..eccbf30a3ea8 100644
--- a/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch
+++ b/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch
@@ -1,5 +1,14 @@
--- a/src/Makefile 2022-12-23 21:39:09.743150707 +0100
+++ b/src/Makefile 2022-12-23 21:39:40.219667855 +0100
+@@ -23,7 +23,7 @@
+ TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \
+ $(THINITOBJS) build.ml
+
+-all: dist byte
++all: dist byte sourceView2Enums.ml
+ world: dist byte $(CAMLBEST)
+ install: findlib-install
+ uninstall: findlib-uninstall
@@ -617,7 +617,7 @@
gtk_tags.h gdk_tags.h ml_gtktext.h sourceView_tags.h wrappers.h
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgtk/files/
@ 2024-11-22 18:55 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2024-11-22 18:55 UTC (permalink / raw
To: gentoo-commits
commit: 215b08612b55bd4a51ada231af3976850e5c72fd
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Nov 20 16:55:14 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 18:55:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=215b0861
dev-ml/lablgtk: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/39385
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch | 98 ----------------------
.../lablgtk/files/lablgtk-2.18.12-Makefile.patch | 20 -----
dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch | 76 -----------------
dev-ml/lablgtk/files/lablgtk-2.18.12-depend.patch | 11 ---
4 files changed, 205 deletions(-)
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch
deleted file mode 100644
index ca82491113b6..000000000000
--- a/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- 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
-@@ -44,15 +45,13 @@
- endif
-
- 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/files/lablgtk-2.18.12-Makefile.patch b/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch
deleted file mode 100644
index eccbf30a3ea8..000000000000
--- a/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/Makefile 2022-12-23 21:39:09.743150707 +0100
-+++ b/src/Makefile 2022-12-23 21:39:40.219667855 +0100
-@@ -23,7 +23,7 @@
- TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \
- $(THINITOBJS) build.ml
-
--all: dist byte
-+all: dist byte sourceView2Enums.ml
- world: dist byte $(CAMLBEST)
- install: findlib-install
- uninstall: findlib-uninstall
-@@ -617,7 +617,7 @@
- gtk_tags.h gdk_tags.h ml_gtktext.h sourceView_tags.h wrappers.h
-
- $(GTKSOURCEVIEW2COBJS): ml_glib.h ml_gdk.h ml_gtk.h ml_gobject.h ml_gdkpixbuf.h ml_pango.h \
-- gtk_tags.h gdk_tags.h ml_gtktext.h sourceView2_tags.h wrappers.h
-+ gtk_tags.h gdk_tags.h ml_gtktext.h pango_tags.h sourceView2_tags.h wrappers.h
-
- ml_glib$(XO): glib_tags.h ml_glib.h wrappers.h
- ml_gobject$(XO): gobject_tags.h ml_gvaluecaml.h wrappers.h
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch b/dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch
deleted file mode 100644
index aeef5c319a6d..000000000000
--- a/dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -ur lablgtk-2.18.12.orig/src/Makefile lablgtk-2.18.12/src/Makefile
---- lablgtk-2.18.12.orig/src/Makefile 2021-12-25 02:23:31.000000000 +0100
-+++ lablgtk-2.18.12/src/Makefile 2022-03-04 08:12:28.151812474 +0100
-@@ -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-6
--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:
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.12-depend.patch b/dev-ml/lablgtk/files/lablgtk-2.18.12-depend.patch
deleted file mode 100644
index f707865ab293..000000000000
--- a/dev-ml/lablgtk/files/lablgtk-2.18.12-depend.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/.depend 2023-01-22 20:48:06.026147545 +0100
-+++ b/src/.depend 2023-01-22 20:49:11.170105871 +0100
-@@ -438,6 +438,8 @@
- ogtkBrokenProps.cmx : gtkSignal.cmx gtkBrokenProps.cmx gobject.cmx gData.cmx
- ogtkAssistantProps.cmo : gtkSignal.cmi gtkAssistantProps.cmo gobject.cmi
- ogtkAssistantProps.cmx : gtkSignal.cmx gtkAssistantProps.cmx gobject.cmx
-+gtkThInit.cmo : gtkThread.cmi
-+gtkThInit.cmx : gtkThread.cmx
- gtkThread.cmo : gtkSignal.cmi gtkMain.cmo glib.cmi gtkThread.cmi
- gtkThread.cmx : gtkSignal.cmx gtkMain.cmx glib.cmx gtkThread.cmi
- gtkThTop.cmo : gtkThread.cmi
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-22 18:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-10 20:27 [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgtk/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2024-11-22 18:55 Alfredo Tupone
2022-12-23 20:12 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox