Hello community, here is the log from the commit of package scintilla for openSUSE:Factory checked in at 2015-03-25 10:00:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-03-29 07:48:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scintilla.new/scintilla.changes 2015-03-25 10:00:36.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Mar 23 00:07:55 UTC 2015 - [email protected] + +- Update to version 3.5.4 + * No changelog available +- Build with gtk3 support for openSUSE > 13.1 +- Bump so version to 3 +- Add glib2-devel require; new upstream dependency +- Update scintilla-shared.patch +- Remove redundant %clean section +- Enable parallel building with %{?_smp_mflags} + +------------------------------------------------------------------- Old: ---- scintilla229.tar.bz2 New: ---- scintilla354.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scintilla.spec ++++++ --- /var/tmp/diff_new_pack.ofcCIp/_old 2015-03-25 10:00:37.000000000 +0100 +++ /var/tmp/diff_new_pack.ofcCIp/_new 2015-03-25 10:00:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package scintilla # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -15,20 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - +%define tar_ver 354 +%define so_ver 3.0 Name: scintilla Summary: A free source code editing component -Version: 2.29 +Version: 3.5.4 Release: 1 Group: Development/Libraries/C and C++ License: MIT Url: http://www.scintilla.org -Source: %{name}229.tar.bz2 +Source: http://sourceforge.net/projects/scintilla/files/scintilla/%{version}/%{name}%{tar_ver}.tgz Patch0: %{name}-shared.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ gtk2-devel libtool +BuildRequires: gcc-c++ +BuildRequires: glib2-devel +%if 0%{?suse_version} >= 1310 +BuildRequires: gtk3-devel +%else +BuildRequires: gtk2-devel +%endif +BuildRequires: libtool %if 0%{?suse_version} BuildRequires: fdupes %endif @@ -47,14 +54,12 @@ editors, allowing the use of proportional fonts, bold and italics, multiple foreground and background colours and multiple fonts. - - -%package -n libscintilla2 +%package -n libscintilla3 License: MIT Summary: A free source code editing component Group: Development/Libraries/C and C++ -%description -n libscintilla2 +%description -n libscintilla3 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. @@ -68,12 +73,10 @@ editors, allowing the use of proportional fonts, bold and italics, multiple foreground and background colours and multiple fonts. - - %package -n libscintilla-devel License: MIT Group: Development/Libraries/C and C++ -Requires: libscintilla2 = %{version} +Requires: libscintilla3 = %{version} Summary: A free source code editing component %description -n libscintilla-devel @@ -90,16 +93,19 @@ editors, allowing the use of proportional fonts, bold and italics, multiple foreground and background colours and multiple fonts. - - %prep %setup -n %{name} +rm -f gtk/makefile.orig %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|\.0*|:|'` +%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 %install mkdir -p %{buildroot}%{_includedir}/%{name}/src @@ -107,12 +113,8 @@ cp include/* %{buildroot}%{_includedir}/%{name} cp src/*.h %{buildroot}%{_includedir}/%{name}/src mkdir -p lib -libtool --mode=install install bin/*.la `pwd`/lib +libtool --mode=install install bin/libscintilla.la `pwd`/lib install lib/*.so* %{buildroot}%{_libdir} -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} @@ -122,14 +124,11 @@ %endif find %{buildroot} -%clean -rm -rf %{buildroot} - -%post -n libscintilla2 -p /sbin/ldconfig +%post -n libscintilla3 -p /sbin/ldconfig -%postun -n libscintilla2 -p /sbin/ldconfig +%postun -n libscintilla3 -p /sbin/ldconfig -%files -n libscintilla2 +%files -n libscintilla3 %defattr(-,root,root) %{_libdir}/*.so.* %dir %{_defaultdocdir}/%{name} ++++++ scintilla-shared.patch ++++++ --- /var/tmp/diff_new_pack.ofcCIp/_old 2015-03-25 10:00:37.000000000 +0100 +++ /var/tmp/diff_new_pack.ofcCIp/_new 2015-03-25 10:00:37.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- gtk/makefile.orig +++ gtk/makefile -@@ -36,7 +36,7 @@ DEL = del /q +@@ -36,7 +36,7 @@ COMPLIB=..\bin\scintilla.a else DEL = rm -f @@ -11,26 +11,26 @@ endif vpath %.h ../src ../include ../lexlib -@@ -46,7 +46,7 @@ INCLUDEDIRS=-I ../include -I ../src -I . +@@ -46,7 +46,7 @@ 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) +-CXXBASEFLAGS=-Wall -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED) ++CXXBASEFLAGS=-Wall -pedantic -fPIC -DPIC -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED) ifdef NOTHREADS THREADFLAGS=-DG_THREADS_IMPL_NONE -@@ -62,7 +62,7 @@ endif - - CFLAGS:=$(CXXFLAGS) +@@ -71,7 +71,7 @@ + CFLAGS:=$(CTFLAGS) + CXXTFLAGS:=--std=c++0x $(CTFLAGS) $(REFLAGS) -CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) +CONFIGFLAGS:=$(shell pkg-config --cflags --libs $(GTKVERSION)) MARSHALLER=scintilla-marshal.o .cxx.o: -@@ -86,8 +86,7 @@ $(COMPLIB): Accessor.o CharacterSet.o Le - KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ +@@ -99,8 +99,7 @@ + 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 $@ $^ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
