Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package scite for openSUSE:Factory checked in at 2021-07-29 21:32:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scite (Old) and /work/SRC/openSUSE:Factory/.scite.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scite" Thu Jul 29 21:32:03 2021 rev:31 rq:909173 version:5.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/scite/scite.changes 2021-07-20 15:39:06.721434597 +0200 +++ /work/SRC/openSUSE:Factory/.scite.new.1899/scite.changes 2021-07-29 21:33:11.384680500 +0200 @@ -1,0 +2,25 @@ +Thu Jul 29 08:53:16 UTC 2021 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 5.1.1: + * In DBCS encodings, treat valid DBCS lead byte followed by + invalid trail byte as single byte. Feature #1408. + * Searching was optimized for documents that contain mostly + ASCII text and is often 2-3 times faster. Feature #1381. + * Word searching behaves more consistently at start and end of + document. + * Add SCI_ALLOCATELINES to allocate indices to hold some number + of lines. This can decrease reallocation overhead when the + application can count or estimate the number of lines in huge + files. Feature #1370. + * Add SCI_AUTOCSETOPTIONS to allow choosing a non-resizeable + autocompletion list on Win32. Feature #1284. + +------------------------------------------------------------------- +Tue Jul 27 06:08:21 UTC 2021 - Atri Bhattacharya <badshah...@gmail.com> + +- Don't disable LTO for openSUSE >= 1550, now supported by + upstream. +- Add scite-use-system-scintilla.patch to allow building with + system scintilla and build with system scintilla. + +------------------------------------------------------------------- Old: ---- scite510.tgz New: ---- scite-use-system-scintilla.patch scite511.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scite.spec ++++++ --- /var/tmp/diff_new_pack.q4K2Xb/_old 2021-07-29 21:33:11.880679889 +0200 +++ /var/tmp/diff_new_pack.q4K2Xb/_new 2021-07-29 21:33:11.880679889 +0200 @@ -16,23 +16,21 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -#FIXME upstream fixing needed so lto can be re-enabled. -%if 0%{?suse_version} > 1500 -%define _lto_cflags %{nil} -%endif -%define tar_ver 510 +%define tar_ver 511 Name: scite -Version: 5.1.0 +Version: 5.1.1 Release: 0 Summary: Source Code Editor based on Scintilla License: MIT URL: https://www.scintilla.org/SciTE.html Source0: http://download.sourceforge.net/scintilla/%{name}%{tar_ver}.tgz -Source1: %{name}.changes +# PATCH-FEATURE-OPENSUSE scite-use-system-scintilla.patch badshah...@gmail.com -- Compile against system scintilla library +Patch0: scite-use-system-scintilla.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig +BuildRequires: libscintilla-devel >= %{version} BuildRequires: update-desktop-files BuildRequires: pkgconfig(gail-3.0) BuildRequires: pkgconfig(gdk-3.0) @@ -51,13 +49,12 @@ building and running programs. %prep -%setup -q -c +%autosetup -p1 -c %build export CXXFLAGS='%{optflags}' export CFLAGS='%{optflags}' %make_build GTK3=1 -C lexilla/src -%make_build GTK3=1 -C scintilla/gtk %make_build GTK3=1 -C scite/gtk %install @@ -80,7 +77,6 @@ %{_datadir}/applications/SciTE.desktop %dir %{_prefix}/lib/scite %{_prefix}/lib/scite/liblexilla.so -%{_prefix}/lib/scite/libscintilla.so %{_mandir}/man1/SciTE.1%{?ext_man} %changelog ++++++ scite-use-system-scintilla.patch ++++++ Index: scite-5.1.0/scite/gtk/makefile =================================================================== --- scite-5.1.0.orig/scite/gtk/makefile +++ scite-5.1.0/scite/gtk/makefile @@ -8,6 +8,7 @@ srcdir ?= . SCINTILLA_DIR ?= $(srcdir)/../../scintilla +SCINTILLA_INCLUDE_DIR ?= /usr/include/scintilla LEXILLA_DIR ?= $(srcdir)/../../lexilla .SUFFIXES: .cxx .o .h .a .c @@ -60,12 +61,12 @@ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION) LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION) -all: $(PROG) $(COMPONENT) $(LEXILLA) +all: $(PROG) $(LEXILLA) -vpath %.h $(srcdir) $(srcdir)/../src $(LEXILLA_DIR)/include $(SCINTILLA_DIR)/include +vpath %.h $(srcdir) $(srcdir)/../src $(LEXILLA_DIR)/include $(SCINTILLA_INCLUDE_DIR) vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../../lexilla/access $(SCINTILLA_DIR)/call -INCLUDES=-I $(LEXILLA_DIR)/include -I $(LEXILLA_DIR)/access -I $(SCINTILLA_DIR)/include -I $(srcdir)/../src +INCLUDES=-I $(LEXILLA_DIR)/include -I $(LEXILLA_DIR)/access -I $(SCINTILLA_INCLUDE_DIR) -I $(srcdir)/../src DEFINES += -DGTK DEFINES += -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" @@ -155,7 +156,7 @@ SRC_OBJS = \ Utf8_16.o $(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS) - $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS) + $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -lscintilla $(LDLIBS) # Automatically generate header dependencies with "make deps" include deps.mak @@ -168,7 +169,6 @@ install: $(INSTALL) -m 755 -d $(DESTDIR)$(libdir) $(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir) - $(INSTALL) -m 755 $(COMPONENT) $(DESTDIR)$(libdir) $(INSTALL) -m 755 $(LEXILLA) $(DESTDIR)$(libdir) for files in $(srcdir)/../src/*.properties $(srcdir)/../doc/*.html $(srcdir)/../doc/SciTEIco.png $(srcdir)/../doc/PrintHi.png $(srcdir)/../doc/SciTEIndicators.png; \ @@ -184,7 +184,6 @@ endif uninstall: rm -f $(DESTDIR)$(bindir)/SciTE - rm -f $(DESTDIR)$(libdir)/libscintilla.so rm -f $(DESTDIR)$(libdir)/liblexilla.so rm -rf $(DESTDIR)$(SYSCONF_PATH) ifdef gnomeprefix Index: scite-5.1.0/lexilla/src/makefile =================================================================== --- scite-5.1.0.orig/lexilla/src/makefile +++ scite-5.1.0/lexilla/src/makefile @@ -37,6 +37,7 @@ else BASE_FLAGS += -fvisibility=hidden endif +SCINTILLA_INCLUDE_DIR ?= /usr/include/scintilla LEXILLA=$(DIR_BIN)/$(SHARED_NAME).$(SHAREDEXTENSION) LIBLEXILLA=$(DIR_BIN)/liblexilla.a @@ -72,13 +73,13 @@ endif RANLIB ?= ranlib -vpath %.h ../src ../include ../../scintilla/include ../lexlib +vpath %.h ../src ../include $(SCINTILLA_INCLUDE_DIR) ../lexlib vpath %.cxx ../src ../lexlib ../lexers DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG) BASE_FLAGS += $(if $(DEBUG),-g,-Os) -INCLUDES = -I ../include -I ../../scintilla/include -I ../src -I ../lexlib +INCLUDES = -I ../include -I $(SCINTILLA_INCLUDE_DIR) -I ../src -I ../lexlib LDFLAGS += -shared BASE_FLAGS += $(WARNINGS) ++++++ scite510.tgz -> scite511.tgz ++++++ ++++ 6441 lines of diff (skipped)
