Hello community, here is the log from the commit of package scintilla for openSUSE:Factory checked in at 2011-11-28 12:57:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scintilla (Old) and /work/SRC/openSUSE:Factory/.scintilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scintilla", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/scintilla/scintilla.changes 2011-09-23 12:45:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scintilla.new/scintilla.changes 2011-11-28 12:57:29.000000000 +0100 @@ -1,0 +2,80 @@ +Sun Nov 27 06:56:48 UTC 2011 - [email protected] + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Mon Oct 17 20:33:30 CEST 2011 - [email protected] + +- updated to the version 2.29 + +------------------------------------------------------------------- +Wed Nov 11 17:30:56 CET 2009 - [email protected] + +- making sure that no include can be included twice + +------------------------------------------------------------------- +Tue Nov 10 22:26:20 CET 2009 - [email protected] + +- commenting out fdupes on non-SuSE distro + +------------------------------------------------------------------- +Fri Oct 30 19:29:42 CET 2009 - [email protected] + +- packaging even src headers (MySQL Workbench need them) + +------------------------------------------------------------------- +Fri Oct 30 10:17:02 CET 2009 - [email protected] + +- moving headers to the scintilla directory + +------------------------------------------------------------------- +Sun Oct 25 10:27:53 CET 2009 - [email protected] + +- updated to version 2.01 + - 2.01 changes + - Fix to positioning rectangular paste when viewing line ends. + - Don't insert new lines and indentation for line ends at end of + rectangular paste. + - When not in additional selection typing mode, cutting a + rectangular selection removes all of the selected text. + - Rectangular selections are copied to the clipboard in document + order, not in the order of selection. + - SCI_SETCURRENTPOS and SCI_SETANCHOR work in rectangular mode. + - On GTK+, drag and drop to a later position in the document now + drops at the position. + - Fix bug where missing property did not use default value. + - 2.0 changes + - Multiple pieces of text can be selected simultaneously by holding + control whil dragging the mouse. Typing, backspace and delete may + affect all selections together. + - Virtual space allows selecting beyond the last character on a line. + - SciTE on GTK+ path bar is now optional and defaults to off. + - MagikSF lexer recognises numbers correctly. + - Folding of Python comments and blank lines improved. Bug #210240. + - Bug fixed where background colour of last character in document + leaked past that character. + - Crash fixed when adding marker beyond last line in document. + Bug #2830307. + - Resource leak fixed in SciTE for Windows when printing fails. + Bug #2816524. + - Bug fixed on Windows where the system caret was destroyed during + destruction when another window was using the system caret. + Bug #2830223. + - Bug fixed where indentation guides were drawn over text when the + indentation used a style with a different space width to the + default style. + - SciTE bug fixed where box comment added a bare line feed rather + than the chosen line end. Bug #2818104. + - Reverted fix that led to wrapping whole document when displaying + the first line of the document. + - Export to LaTeX in SciTE fixed to work in more cases and not use + as much space. Bug #1286548. + - Bug fixed where EN_CHANGE notification was sent when performing a + paste operation in a read-only document. Bug #2825485. + - Refactored code so that Scintilla exposes less of its internal + implementation and uses the C++ standard library for some basic + collections. Projects that linked to Scintilla's SString or PropSet + classes should copy this code from a previous version of Scintilla + or from SciTE. + +------------------------------------------------------------------- Old: ---- scintilla179.tar.bz2 New: ---- scintilla229.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scintilla.spec ++++++ --- /var/tmp/diff_new_pack.7zkLCn/_old 2011-11-28 12:57:31.000000000 +0100 +++ /var/tmp/diff_new_pack.7zkLCn/_new 2011-11-28 12:57:31.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package scintilla (Version 1.79) +# spec file for package scintilla # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,15 +20,18 @@ Name: scintilla Summary: A free source code editing component -Version: 1.79 +Version: 2.29 Release: 1 Group: Development/Libraries/C and C++ License: Other uncritical OpenSource License Url: http://www.scintilla.org -Source: %{name}179.tar.bz2 -Patch: %{name}-shared.patch +Source: %{name}229.tar.bz2 +Patch0: %{name}-shared.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: fdupes gcc-c++ gtk2-devel +BuildRequires: gcc-c++ gtk2-devel libtool +%if 0%{?suse_version} +BuildRequires: fdupes +%endif %description Scintilla is a free source code editing component. It comes with @@ -46,12 +49,12 @@ -%package -n libscintilla1 +%package -n libscintilla2 License: Other uncritical OpenSource License Summary: A free source code editing component Group: Development/Libraries/C and C++ -%description -n libscintilla1 +%description -n libscintilla2 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. @@ -70,7 +73,7 @@ %package -n libscintilla-devel License: Other uncritical OpenSource License Group: Development/Libraries/C and C++ -Requires: libscintilla1 = %{version} +Requires: libscintilla2 = %{version} Summary: A free source code editing component %description -n libscintilla-devel @@ -91,34 +94,42 @@ %prep %setup -n %{name} -%patch -p1 +%patch0 +find . -name 'CVS' -type d -exec rm -rf \{\} \; 2> /dev/null || : %build cd gtk -make %{?jobs:-j%jobs} LIBDIR=%{_libdir} VERSION=`echo %{version} | sed 's|\.|:|'` +make %{?jobs:-j%jobs} LIBDIR=%{_libdir} VERSION=`echo %{version} | sed 's|\.0*|:|'` %install -mkdir -p %{buildroot}%{_includedir} +mkdir -p %{buildroot}%{_includedir}/%{name}/src mkdir -p %{buildroot}%{_libdir} -cp include/* %{buildroot}%{_includedir} +cp include/* %{buildroot}%{_includedir}/%{name} +cp src/*.h %{buildroot}%{_includedir}/%{name}/src mkdir -p lib libtool --mode=install install bin/*.la `pwd`/lib install lib/*.so* %{buildroot}%{_libdir} -rm -f %{buildroot}%{_libdir}/libscintilla.so.1 -ln -sf libscintilla.so.1.0.`echo %{version} | sed 's|.*\.||'` %{buildroot}%{_libdir}/libscintilla.so.1 +rm -f %{buildroot}%{_libdir}/libscintilla.so.2 +rm -f %{buildroot}%{_libdir}/libscintilla.so +ln -sf libscintilla.so.2.0.`echo %{version} | sed 's|.*\.0*||'` %{buildroot}%{_libdir}/libscintilla.so.2 +ln -sf libscintilla.so.2.0.`echo %{version} | sed 's|.*\.0*||'` %{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} %clean rm -rf %{buildroot} -%post -n libscintilla1 -p /sbin/ldconfig +%post -n libscintilla2 -p /sbin/ldconfig -%postun -n libscintilla1 -p /sbin/ldconfig +%postun -n libscintilla2 -p /sbin/ldconfig -%files -n libscintilla1 +%files -n libscintilla2 %defattr(-,root,root) %{_libdir}/*.so.* %dir %{_defaultdocdir}/%{name} @@ -130,6 +141,7 @@ %dir %{_defaultdocdir}/%{name} %{_defaultdocdir}/%{name}/* %exclude %{_defaultdocdir}/%{name}/License.txt -%{_includedir}/* +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/* %changelog ++++++ scintilla-shared.patch ++++++ --- /var/tmp/diff_new_pack.7zkLCn/_old 2011-11-28 12:57:31.000000000 +0100 +++ /var/tmp/diff_new_pack.7zkLCn/_new 2011-11-28 12:57:31.000000000 +0100 @@ -1,33 +1,37 @@ -diff -Naru scintilla-bak/gtk/makefile scintilla/gtk/makefile ---- scintilla-bak/gtk/makefile 2008-12-19 17:43:38.000000000 +0100 -+++ scintilla/gtk/makefile 2008-12-19 18:20:03.000000000 +0100 -@@ -17,13 +17,13 @@ - RANLIB = ranlib - endif - +Index: gtk/makefile +=================================================================== +--- gtk/makefile.orig ++++ gtk/makefile +@@ -36,7 +36,7 @@ DEL = del /q + COMPLIB=..\bin\scintilla.a + else + DEL = rm -f -COMPLIB=../bin/scintilla.a +COMPLIB=../bin/libscintilla.la + endif - vpath %.h ../src ../include - vpath %.cxx ../src - - INCLUDEDIRS=-I ../include -I ../src --CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -Os -DGTK -DSCI_LEXER $(INCLUDEDIRS) -+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -O3 -fPIC -DPIC -DGTK -DSCI_LEXER $(INCLUDEDIRS) + vpath %.h ../src ../include ../lexlib +@@ -46,7 +46,7 @@ INCLUDEDIRS=-I ../include -I ../src -I . + ifdef CHECK_DEPRECATED + DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT + endif +-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED) ++CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -fPIC -DPIC -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED) ifdef NOTHREADS THREADFLAGS=-DG_THREADS_IMPL_NONE -@@ -41,6 +41,7 @@ - # pkg-config which is an OK indication that GTK2 is available - ifdef GTK2 - CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0) -+CONFIGLDFLAGS=$(shell pkg-config --libs gtk+-2.0) +@@ -62,7 +62,7 @@ endif + + CFLAGS:=$(CXXFLAGS) + +-CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) ++CONFIGFLAGS:=$(shell pkg-config --cflags --libs $(GTKVERSION)) MARSHALLER=scintilla-marshal.o - else - ifdef GTK1 -@@ -89,8 +90,7 @@ + + .cxx.o: +@@ -86,8 +86,7 @@ $(COMPLIB): Accessor.o CharacterSet.o Le KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ - RESearch.o RunStyles.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ + RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ $(MARSHALLER) $(LEXOBJS) - $(AR) rc $@ $^ - $(RANLIB) $@ ++++++ scintilla179.tar.bz2 -> scintilla229.tar.bz2 ++++++ ++++ 120605 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
