Hello community, here is the log from the commit of package scintilla for openSUSE:Factory checked in at 2016-07-14 09:50:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scintilla (Old) and /work/SRC/openSUSE:Factory/.scintilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scintilla" Changes: -------- --- /work/SRC/openSUSE:Factory/scintilla/scintilla.changes 2016-04-22 16:24:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scintilla.new/scintilla.changes 2016-07-14 09:50:16.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Jul 12 17:06:20 UTC 2016 - [email protected] + +- Version update to 3.6.6: + * Various small bugfixes +- Remove support for older distros that are marked as dead +- Update shared patch to set properly cflags: + * scintilla-shared.patch + +------------------------------------------------------------------- Old: ---- scintilla364.tgz New: ---- scintilla366.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scintilla.spec ++++++ --- /var/tmp/diff_new_pack.mmsfqA/_old 2016-07-14 09:50:18.000000000 +0200 +++ /var/tmp/diff_new_pack.mmsfqA/_new 2016-07-14 09:50:18.000000000 +0200 @@ -16,10 +16,11 @@ # -%define tar_ver 364 +%define tar_ver 366 %define so_ver 3.0 +%define libname libscintilla3 Name: scintilla -Version: 3.6.4 +Version: 3.6.6 Release: 0 Summary: A free source code editing component License: MIT @@ -27,18 +28,13 @@ Url: http://www.scintilla.org Source: http://sourceforge.net/projects/scintilla/files/scintilla/%{version}/%{name}%{tar_ver}.tgz Patch0: %{name}-shared.patch +BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: glib2-devel BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1310 -BuildRequires: gtk3-devel -%else -BuildRequires: gtk2-devel -%endif -%if 0%{?suse_version} -BuildRequires: fdupes -%endif %description Scintilla is a free source code editing component. It comes with @@ -54,11 +50,11 @@ editors, allowing the use of proportional fonts, bold and italics, multiple foreground and background colours and multiple fonts. -%package -n libscintilla3 +%package -n %{libname} Summary: A free source code editing component Group: Development/Libraries/C and C++ -%description -n libscintilla3 +%description -n %{libname} Scintilla is a free source code editing component. It comes with complete source code and a license that permits use in any free project or commercial product. @@ -75,7 +71,10 @@ %package -n libscintilla-devel Summary: A free source code editing component Group: Development/Libraries/C and C++ -Requires: libscintilla3 = %{version} +Requires: %{libname} = %{version} +Requires: pkgconfig +Requires: pkgconfig(glib-2.0) +Requires: pkgconfig(gtk+-3.0) %description -n libscintilla-devel Scintilla is a free source code editing component. It comes with @@ -93,17 +92,11 @@ %prep %setup -q -n %{name} -rm -f gtk/makefile.orig %patch0 -find . -name 'CVS' -type d -exec rm -rf \{\} \; 2> /dev/null || : %build cd gtk -%if 0%{?suse_version} >= 1310 -make GTK3=1 %{?_smp_mflags} LIBDIR=%{_libdir} -I%{_includedir}/glib-2.0 VERSION=`echo %{so_ver} | sed 's|\.0*|:|'` -%else -make %{?_smp_mflags} LIBDIR=%{_libdir} -I%{_includedir}/glib-2.0 VERSION=`echo %{so_ver} | sed 's|\.0*|:|'` -%endif +make CFLAGS="%{optflags}" GTK3=1 %{?_smp_mflags} LIBDIR=%{_libdir} -I%{_includedir}/glib-2.0 VERSION=`echo %{so_ver} | sed 's|\.0*|:|'` %install mkdir -p %{buildroot}%{_includedir}/%{name}/src @@ -112,32 +105,26 @@ cp src/*.h %{buildroot}%{_includedir}/%{name}/src mkdir -p lib libtool --mode=install install bin/libscintilla.la `pwd`/lib -install lib/*.so* %{buildroot}%{_libdir} +install -m755 lib/*.so.3 %{buildroot}%{_libdir} +ln -s libscintilla.so.3 %{buildroot}%{_libdir}/libscintilla.so mkdir -p %{buildroot}/%{_defaultdocdir} mv doc %{buildroot}/%{_defaultdocdir}/%{name} cp License.txt %{buildroot}/%{_defaultdocdir}/%{name} rmdir %{buildroot}%{_includedir}/%{name}/src || : -%if 0%{?suse_version} %fdupes -s %{buildroot}/%{_defaultdocdir}/%{name} -%endif -find %{buildroot} -%post -n libscintilla3 -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig -%postun -n libscintilla3 -p /sbin/ldconfig - -%files -n libscintilla3 +%files -n %{libname} %defattr(-,root,root) -%{_libdir}/*.so.* -%dir %{_defaultdocdir}/%{name} -%{_defaultdocdir}/%{name}/License.txt +%{_libdir}/libscintilla.so.3 %files -n libscintilla-devel %defattr(-,root,root) -%{_libdir}/*.so +%{_libdir}/libscintilla.so %dir %{_defaultdocdir}/%{name} %{_defaultdocdir}/%{name}/* -%exclude %{_defaultdocdir}/%{name}/License.txt %dir %{_includedir}/%{name} %{_includedir}/%{name}/* ++++++ scintilla-shared.patch ++++++ --- /var/tmp/diff_new_pack.mmsfqA/_old 2016-07-14 09:50:18.000000000 +0200 +++ /var/tmp/diff_new_pack.mmsfqA/_new 2016-07-14 09:50:18.000000000 +0200 @@ -11,8 +11,15 @@ endif vpath %.h ../src ../include ../lexlib -@@ -77,7 +77,7 @@ endif - CFLAGS:=$(CTFLAGS) +@@ -71,19 +71,18 @@ else + CTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) + endif + else +-CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) ++CTFLAGS=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS) + endif + +-CFLAGS:=$(CTFLAGS) CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS) -CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) @@ -20,13 +27,29 @@ MARSHALLER=scintilla-marshal.o .cxx.o: -@@ -105,8 +105,7 @@ $(COMPLIB): Accessor.o CharacterSet.o Le + $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $< + .c.o: +- $(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $< ++ $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $< + + GLIB_GENMARSHAL = glib-genmarshal + GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal +@@ -104,7 +103,7 @@ analyze: + clang --analyze $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx + + deps: +- $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak ++ $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak + + $(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \ + CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o CaseConvert.o CaseFolder.o \ +@@ -113,8 +112,7 @@ $(COMPLIB): Accessor.o CharacterSet.o Le KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \ RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ $(MARSHALLER) $(LEXOBJS) - $(AR) rc $@ $^ - $(RANLIB) $@ -+ libtool --mode=link gcc -g -O3 -o $@ $^ -rpath $(LIBDIR) $(CONFIGLDFLAGS) -version-info $(VERSION) ++ libtool --mode=link gcc $(CONFIGFLAGS) -o $@ $^ -rpath $(LIBDIR) $(CONFIGLDFLAGS) -version-info $(VERSION) # Automatically generate header dependencies with "make deps" include deps.mak ++++++ scintilla364.tgz -> scintilla366.tgz ++++++ ++++ 5794 lines of diff (skipped)
