Drop `-pedantic' for the time being; it will break when we upgrade to the

new gtk+3.
This commit is contained in:
ajacoutot 2015-09-24 04:33:06 +00:00
parent f2b9129fa6
commit 11c72cea00

View File

@ -1,6 +1,10 @@
$OpenBSD: patch-gtk_makefile,v 1.10 2015/01/17 05:06:12 jeremy Exp $
$OpenBSD: patch-gtk_makefile,v 1.11 2015/09/24 04:33:06 ajacoutot Exp $
Drop `-pedantic'
/usr/local/include/gtk-3.0/gdk/gdktypes.h:318: error: comma at end of enumerator list
--- gtk/makefile.orig Thu Nov 27 21:47:24 2014
+++ gtk/makefile Mon Dec 22 23:52:04 2014
+++ gtk/makefile Thu Sep 24 06:30:19 2015
@@ -6,15 +6,8 @@
# Builds for GTK+ 2 and no longer supports GTK+ 1.
# Also works with ming32-make on Windows.
@ -19,7 +23,7 @@ $OpenBSD: patch-gtk_makefile,v 1.10 2015/01/17 05:06:12 jeremy Exp $
RANLIB = touch
ifdef GTK3
@@ -36,17 +29,20 @@
@@ -36,17 +29,20 @@ DEL = del /q
COMPLIB=..\bin\scintilla.a
else
DEL = rm -f
@ -39,11 +43,11 @@ $OpenBSD: patch-gtk_makefile,v 1.10 2015/01/17 05:06:12 jeremy Exp $
DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
endif
-CXXBASEFLAGS=-Wall -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
+CXXBASEFLAGS=-Wall -pedantic -DGTK -DSCI_LEXER -Dunix $(INCLUDEDIRS) $(DEPRECATED)
+CXXBASEFLAGS=-Wall -DGTK -DSCI_LEXER -Dunix $(INCLUDEDIRS) $(DEPRECATED)
ifdef NOTHREADS
THREADFLAGS=-DG_THREADS_IMPL_NONE
@@ -65,24 +61,48 @@
@@ -65,24 +61,48 @@ else
CTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
endif
else
@ -95,7 +99,7 @@ $OpenBSD: patch-gtk_makefile,v 1.10 2015/01/17 05:06:12 jeremy Exp $
clean:
$(DEL) *.o $(COMPLIB) *.plist
@@ -92,15 +112,26 @@
@@ -92,15 +112,26 @@ analyze:
deps:
$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak