cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to scite-4.0.3

Browse Source 
OK landry@
This commit is contained in:
bket 2018-02-24 10:55:25 +00:00
parent 3ba88b46b8
commit 108d48f339
5 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editors/scite/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.29 2018/01/19 17:11:35 jca Exp $
# $OpenBSD: Makefile,v 1.30 2018/02/24 10:55:25 bket Exp $
COMMENT= flexible and small GTK+ editor
VERSION= 4.0.2
VERSION= 4.0.3
DISTNAME= scite${VERSION:S/.//g}
PKGNAME= scite-${VERSION}
CATEGORIES= editors x11
@ -13,13 +13,14 @@ HOMEPAGE= http://www.scintilla.org/SciTE.html
PERMIT_PACKAGE_CDROM= may not sell
PERMIT_PACKAGE_FTP= Yes
WANTLIB += c cairo gdk-3 gdk_pixbuf-2.0 glib-2.0 gobject-2.0 gtk-3
WANTLIB += pango-1.0 pangocairo-1.0 pthread scintilla scintilla_lexers ${COMPILER_LIBCXX}
WANTLIB += ${COMPILER_LIBCXX} c cairo gdk-3 gdk_pixbuf-2.0 glib-2.0
WANTLIB += gobject-2.0 gtk-3 pango-1.0 pangocairo-1.0 scintilla
WANTLIB += scintilla_lexers
MASTER_SITES= http://www.scintilla.org/
EXTRACT_SUFX= .tgz
# c++11
# c++17
COMPILER= base-clang ports-clang ports-gcc
LIB_DEPENDS= x11/gtk+3 \

4
editors/scite/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (scite402.tgz) = H5u47Muu13wRDDDA5tuqwEs/YrdRqTAZKxM6e28PKfs=
SIZE (scite402.tgz) = 2424648
SHA256 (scite403.tgz) = crVJIMqL4cbsXg9Cnc/bCSgtkhl51keXMyff165Uq94=
SIZE (scite403.tgz) = 2433537

28
editors/scite/patches/patch-gtk_makefile
View File

@ -1,7 +1,4 @@
$OpenBSD
Drop `-pedantic'
/usr/local/include/gtk-3.0/gdk/gdktypes.h:318: error: comma at end of enumerator list
$OpenBSD: patch-gtk_makefile,v 1.11 2018/02/24 10:55:25 bket Exp $
Index: gtk/makefile
--- gtk/makefile.orig
@ -57,8 +54,7 @@ Index: gtk/makefile
ifdef CHECK_DEPRECATED
DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
endif
-CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
+CXXBASEFLAGS=-W -Wall -Dunix -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
ifdef DEBUG
-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
@ -84,7 +80,7 @@ Index: gtk/makefile
.c.o:
$(CC) $(INCLUDEDIRS) $(MISLEADING) -DLUA_USE_POSIX $(CXXTFLAGS) $(CFLAGS) -c $< -o $@
@@ -111,19 +104,16 @@ deps: deps.mak
@@ -111,9 +104,6 @@ deps: deps.mak
deps.mak:
$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >$@
@ -94,18 +90,12 @@ Index: gtk/makefile
# To almost make lua.vers (needs header and footer added) which is only needed after updating Lua:
# nm -g ../bin/SciTE | grep lua | awk '{print "\t\t" $3 ";"}' >lua2.vers
$(PROG): SciTEGTK.o GUIGTK.o Widget.o \
-FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \
-ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
-MatchMarker.o StringHelpers.o \
-PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
+ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \
+ ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
+ MatchMarker.o StringHelpers.o \
+ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
@@ -123,7 +113,7 @@ ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o Expor
MatchMarker.o StringHelpers.o \
PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
+ $(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) $(LDLIBS) -lm -lstdc++
+ $(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) $(LDLIBS) -lm -lstdc++
# Automatically generate header dependencies with "make deps"
include deps.mak
@ -129,7 +119,7 @@ Index: gtk/makefile
-
ifdef gnomeprefix
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications $(DESTDIR)$(pixmapdir)
$(INSTALL) -m 755 $(srcdir)/SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
$(INSTALL) -m 644 $(srcdir)/SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
- $(INSTALL) -m 644 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ $(INSTALL) -m 444 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
endif

4
editors/scite/patches/patch-src_SciTEGlobal_properties
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_SciTEGlobal_properties,v 1.7 2017/11/01 17:01:23 jeremy Exp $
$OpenBSD: patch-src_SciTEGlobal_properties,v 1.8 2018/02/24 10:55:25 bket Exp $
Index: src/SciTEGlobal.properties
--- src/SciTEGlobal.properties.orig
+++ src/SciTEGlobal.properties
@@ -284,7 +284,7 @@ if PLAT_WIN
@@ -285,7 +285,7 @@ if PLAT_WIN
command.scite.help="file://$(SciteDefaultHome)\SciTEDoc.html"
command.scite.help.subsystem=2
if PLAT_GTK

3
editors/scite/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2017/11/01 17:01:23 jeremy Exp $
@comment $OpenBSD: PLIST,v 1.10 2018/02/24 10:55:25 bket Exp $
@bin bin/SciTE
share/doc/scite/
share/doc/scite/CommandValues.html
@ -63,6 +63,7 @@ share/scite/lisp.properties
share/scite/lot.properties
share/scite/lout.properties
share/scite/lua.properties
share/scite/markdown.properties
share/scite/matlab.properties
share/scite/metapost.properties
share/scite/mmixal.properties