packages: kdelibs/kdelibs-lib_loader.patch, kdelibs/kdelibs.spec, kdelibs/k...

glen glen at pld-linux.org
Wed Oct 5 12:06:13 CEST 2011 

Author: glen                         Date: Wed Oct  5 10:06:13 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- release 25 (boost upgrade rebuild)

---- Files affected:
packages/kdelibs:
   kdelibs-lib_loader.patch (1.4 -> 1.5) , kdelibs.spec (1.603 -> 1.604) , kdelibs-gcc4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kdelibs/kdelibs-lib_loader.patch
diff -u packages/kdelibs/kdelibs-lib_loader.patch:1.4 packages/kdelibs/kdelibs-lib_loader.patch:1.5
--- packages/kdelibs/kdelibs-lib_loader.patch:1.4	Mon Feb 18 15:49:47 2008
+++ packages/kdelibs/kdelibs-lib_loader.patch	Wed Oct  5 12:06:07 2011
@@ -14,7 +14,7 @@
 +CXXFLAGS += -fexceptions
  libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
  libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
-+libkdecore_la_LIBADD += -lboost_filesystem -lboost_regex
++libkdecore_la_LIBADD += -lboost_filesystem -lboost_system -lboost_regex
  libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
  libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
  	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
@@ -31,11 +31,12 @@
      static QString findLibrary( const char * name, const KInstance * instance = KGlobal::instance() );
 --- kdelibs-3.5.5/kdecore/klibloader.cpp.orig	2006-01-19 17:06:18.000000000 +0000
 +++ kdelibs-3.5.5/kdecore/klibloader.cpp	2007-01-05 00:08:39.215039750 +0000
-@@ -331,43 +331,59 @@
+@@ -331,43 +331,60 @@
      d = 0L;
  }
  
 -static inline QCString makeLibName( const char* name )
++#define BOOST_FILESYSTEM_VERSION 2
 +#include <boost/filesystem/exception.hpp>
 +#include <boost/filesystem/operations.hpp>
 +#include <boost/filesystem/path.hpp>

================================================================
Index: packages/kdelibs/kdelibs.spec
diff -u packages/kdelibs/kdelibs.spec:1.603 packages/kdelibs/kdelibs.spec:1.604
--- packages/kdelibs/kdelibs.spec:1.603	Fri Jul 29 13:46:07 2011
+++ packages/kdelibs/kdelibs.spec	Wed Oct  5 12:06:07 2011
@@ -13,18 +13,18 @@
 %define		_state		stable
 %define		artsver		13:1.5.10
 
-Summary:	K Desktop Environment - libraries
-Summary(es.UTF-8):	K Desktop Environment - bibliotecas
-Summary(ko.UTF-8):	KDE - 라이브러리
-Summary(pl.UTF-8):	K Desktop Environment - biblioteki
-Summary(pt_BR.UTF-8):	Bibliotecas de fundação do KDE
-Summary(ru.UTF-8):	K Desktop Environment - Библиотеки
-Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
+Summary:	K Desktop Environment 3 libraries
+Summary(es.UTF-8):	K Desktop Environment 3 - bibliotecas
+Summary(ko.UTF-8):	KDE 3 - 라이브러리
+Summary(pl.UTF-8):	Biblioteki K Desktop Environment 3
+Summary(pt_BR.UTF-8):	Bibliotecas de fundação do KDE 3
+Summary(ru.UTF-8):	K Desktop Environment 3 - Библиотеки
+Summary(uk.UTF-8):	K Desktop Environment 3 - Бібліотеки
 Name:		kdelibs
 Version:	3.5.10
-Release:	24
+Release:	25
 Epoch:		9
-License:	LGPL
+License:	LGPL v2
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	43cd55ed15f63b5738d620ef9f9fd568
@@ -57,6 +57,7 @@
 Patch17:	kdelibs-3.5.10-LDFLAG_fix-1.patch
 # http://www.thel.ro/kde3-fedora/SOURCES/kdelibs-3.5.10-ossl-1.x.patch
 Patch18:	kdelibs-3.5.10-ossl-1.x.patch
+Patch19:	kdelibs-gcc4.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.4.0.a
 BuildRequires:	acl-devel
@@ -187,7 +188,7 @@
 
 %description
 This package includes libraries that are central to the development
-and execution of a KDE program, misc HTML documentation and theme
+and execution of a KDE 3 programs, misc HTML documentation and theme
 modules.
 
 Included in this package are among others:
@@ -197,11 +198,12 @@
 - kwallet - KDE password manager.
 
 %description -l es.UTF-8
-Bibliotecas para KDE.
+Bibliotecas para KDE 3.
 
 %description -l pl.UTF-8
 Ten pakiet zawiera biblioteki potrzebne do rozwijania i uruchamiania
-aplikacji KDE, różną dokumentację oraz moduły z motywami wyglądu KDE.
+aplikacji KDE 3, różną dokumentację oraz moduły z motywami wyglądu
+KDE.
 
 Pakiet ten zawiera między innymi:
 - kdecore - podstawową bibliotekę KDE,
@@ -210,11 +212,11 @@
 - kwallet - system zarządzania hasłami w KDE.
 
 %description -l pt_BR.UTF-8
-Bibliotecas de fundação do KDE requeridas por todo e qualquer
+Bibliotecas de fundação do KDE 3 requeridas por todo e qualquer
 aplicativo KDE.
 
 %description -l ru.UTF-8
-Библиотеки для K Desktop Environment.
+Библиотеки для K Desktop Environment 3.
 
 Включены библиотеки KDE:
 - jscript (javascript),
@@ -225,7 +227,7 @@
 - kspell (проверка орфографии),
 
 %description -l uk.UTF-8
-Бібліотеки для K Desktop Environment.
+Бібліотеки для K Desktop Environment 3.
 
 Включені такі бібліотеки KDE:
 - jscript (javascript),
@@ -236,11 +238,11 @@
 - kspell (перевірка орфографії),
 
 %package devel
-Summary:	kdelibs - header files and development documentation
-Summary(pl.UTF-8):	kdelibs - pliki nagłówkowe i dokumentacja do kdelibs
-Summary(pt_BR.UTF-8):	Arquivos de inclusão e documentação para compilar aplicativos KDE
-Summary(ru.UTF-8):	Хедеры и документация для компилляции программ KDE
-Summary(uk.UTF-8):	Хедери та документація для компіляції програм KDE
+Summary:	kdelibs 3 - header files and development documentation
+Summary(pl.UTF-8):	kdelibs 3 - pliki nagłówkowe i dokumentacja do kdelibs
+Summary(pt_BR.UTF-8):	Arquivos de inclusão e documentação para compilar aplicativos KDE 3
+Summary(ru.UTF-8):	Хедеры и документация для компилляции программ KDE 3
+Summary(uk.UTF-8):	Хедери та документація для компіляції програм KDE 3
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	acl-devel
@@ -372,6 +374,7 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 mv -f configure{,.dist}
 
@@ -457,13 +460,13 @@
 	fi
 
 	# packaged by hicolor-icon-theme
-	rm $RPM_BUILD_ROOT%{_iconsdir}/hicolor/index.theme
+	%{__rm} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/index.theme
 
 	# remove *.la for dynamic plugins. kde lib loader handles .so now.
-	rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+	%{__rm} $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
 	# keep $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kdewidget.la for kdebase and others.
-	rm $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/styles/*.la
-	rm $RPM_BUILD_ROOT%{_libdir}/libkdeinit_*.la
+	%{__rm} $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/styles/*.la
+	%{__rm} $RPM_BUILD_ROOT%{_libdir}/libkdeinit_*.la
 
 	# remove unwanted boost deps from .la
 	sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kdewidgets.la
@@ -1011,6 +1014,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.604  2011/10/05 10:06:07  glen
+- release 25 (boost upgrade rebuild)
+
 Revision 1.603  2011/07/29 11:46:07  glen
 - release 24
 

================================================================
Index: packages/kdelibs/kdelibs-gcc4.patch
diff -u /dev/null packages/kdelibs/kdelibs-gcc4.patch:1.1
--- /dev/null	Wed Oct  5 12:06:13 2011
+++ packages/kdelibs/kdelibs-gcc4.patch	Wed Oct  5 12:06:07 2011
@@ -0,0 +1,10 @@
+--- kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cups-util.c~	2007-10-08 11:52:10.000000000 +0200
++++ kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cups-util.c	2011-08-03 12:48:35.120781904 +0200
+@@ -1,6 +1,7 @@
+ #include <cups/ipp.h>
+ #include <cups/http.h>
+ #include <cups/cups.h>
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdelibs/kdelibs-lib_loader.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdelibs/kdelibs.spec?r1=1.603&r2=1.604&f=u

More information about the pld-cvs-commit mailing list