Hello community, here is the log from the commit of package kdelibs3 for openSUSE:Factory checked in at 2012-05-07 22:46:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs3 (Old) and /work/SRC/openSUSE:Factory/.kdelibs3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs3", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs3/kdelibs3.changes 2012-04-23 09:14:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs3.new/kdelibs3.changes 2012-05-07 22:47:37.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Apr 29 18:45:34 UTC 2012 - [email protected] + +- fix a dcop header for gcc-4.7 so that other packages not to fail + when built against it + +------------------------------------------------------------------- +Wed Apr 25 18:33:34 UTC 2012 - [email protected] + +- Add kdelibs-automake-1.11.5.patch: make an exception for automake + 1.11.5, which is good enough (but matches automake*1.5*). + +------------------------------------------------------------------- New: ---- dcop-header-fix-gcc47.patch kdelibs-automake-1.11.5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.3eYqzR/_old 2012-05-07 22:47:40.000000000 +0200 +++ /var/tmp/diff_new_pack.3eYqzR/_new 2012-05-07 22:47:40.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kdelibs3 BuildRequires: OpenEXR-devel BuildRequires: arts-devel @@ -189,6 +190,8 @@ Patch220: kdelibs-fedora-3.5.x-CVE-2011-3365.patch Patch221: kdelibs-tarent-fix-webdav-utf8.diff Patch222: scalable-tray-icons.patch +Patch223: kdelibs-automake-1.11.5.patch +Patch224: dcop-header-fix-gcc47.patch %description This package contains kdelibs, one of the basic packages of the K @@ -385,6 +388,8 @@ %patch220 -p1 %patch221 -p1 %patch222 -p1 +%patch223 -p1 +%patch224 -p1 tar xfvj %SOURCE12 # ++++++ dcop-header-fix-gcc47.patch ++++++ diff -wruN kdelibs-3.5.10.orig/dcop/dcoptypes.h kdelibs-3.5.10/dcop/dcoptypes.h --- kdelibs-3.5.10.orig/dcop/dcoptypes.h 2005-09-10 12:27:23.000000000 +0400 +++ kdelibs-3.5.10/dcop/dcoptypes.h 2012-04-29 21:44:52.823786005 +0400 @@ -22,6 +22,9 @@ #ifndef DCOPTYPES_H #define DCOPTYPES_H +// generic template fallback for unknown types +template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; } + #include <dcopref.h> // standard c/c++ types @@ -70,9 +73,6 @@ // And some KDE types class KURL; inline const char* dcopTypeName( const KURL& ) { return "KURL"; } -// generic template fallback for unknown types -template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; } - // type initialization for standard c/c++ types inline void dcopTypeInit(bool& b){b=false;} inline void dcopTypeInit(char& c){c=0;} ++++++ kdelibs-automake-1.11.5.patch ++++++ Index: kdelibs-3.5.10/admin/cvs.sh =================================================================== --- kdelibs-3.5.10.orig/admin/cvs.sh +++ kdelibs-3.5.10/admin/cvs.sh @@ -63,6 +63,10 @@ esac AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1` required_automake_version="1.6.1 or newer" case $AUTOMAKE_STRING in + automake*1.11.5* ) + echo "*** $AUTOMAKE_STRING found." + UNSERMAKE=no + ;; automake*1.5d* | automake*1.5* | automake*1.5-* ) echo "*** YOU'RE USING $AUTOMAKE_STRING." echo "*** KDE requires automake $required_automake_version" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
