packages: kde4-kdelibs/kde4-kdelibs-aboutPLD.patch, kde4-kdelibs/kde4-kdeli...

arekm arekm at pld-linux.org
Wed Jan 18 22:47:48 CET 2012 

Author: arekm                        Date: Wed Jan 18 21:47:48 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 4.8.0

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs-aboutPLD.patch (1.27 -> 1.28) , kde4-kdelibs.spec (1.262 -> 1.263) 

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch
diff -u packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.27 packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.28
--- packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.27	Sat Dec  3 11:11:25 2011
+++ packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch	Wed Jan 18 22:47:42 2012
@@ -1,14 +1,15 @@
 diff -Nru kdelibs-4.5.5/CMakeLists.txt kdelibs-4.5.5.new//CMakeLists.txt
 --- kdelibs-4.5.5/CMakeLists.txt	2011-01-04 14:45:04.000000000 +0100
 +++ kdelibs-4.5.5.new//CMakeLists.txt	2011-01-05 17:43:47.775500003 +0100
-@@ -14,6 +14,7 @@
- set (KDE_VERSION_RELEASE 5)
- set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
- set (KDE_VERSION_STRING "${KDE_VERSION} (4.7.4)")
-+exec_program ("/bin/cat" ARGS "/etc/pld-release" OUTPUT_VARIABLE PLD_VERSION_STRING)
- 
- set (KDE_DISTRIBUTION_TEXT "compiled sources" CACHE STRING "Indicate the distribution in bug reports" )
+@@ -22,6 +22,8 @@
+ endif (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+ set (KDE_DEFAULT_HOME ".kde${_KDE_DEFAULT_HOME_POSTFIX}" CACHE STRING "The default KDE home directory" )
  
++exec_program ("/bin/cat" ARGS "/etc/pld-release" OUTPUT_VARIABLE PLD_VERSION_STRING)
++
+ # this must be before FindKDE4Internal in order to preset the result of the visibility test, so that it will be skipped
+ option(KHTML_BUILD_TESTREGRESSION "Build KHTML's testregression. Note: this disables hidden visibility")
+ # Disable visibility if testregression is built, because the symbols are needed then
 diff -Nru kdelibs-4.5.5/CreateKDELibsDependenciesFile.cmake kdelibs-4.5.5.new//CreateKDELibsDependenciesFile.cmake
 --- kdelibs-4.5.5/CreateKDELibsDependenciesFile.cmake	2010-02-20 12:32:37.000000000 +0100
 +++ kdelibs-4.5.5.new//CreateKDELibsDependenciesFile.cmake	2011-01-05 17:43:47.698500004 +0100
@@ -230,12 +231,13 @@
  
      const KAboutData *mAboutData;
  };
-@@ -127,6 +131,7 @@
-     actions->addAction(KStandardAction::SwitchApplicationLanguage, this, SLOT(switchApplicationLanguage()));
-     actions->addAction(KStandardAction::AboutApp, this, SLOT(aboutApplication()));
-     actions->addAction(KStandardAction::AboutKDE, this, SLOT(aboutKDE()));
-+    actions->addAction(KStandardAction::AboutPLD, this, SLOT(aboutPLD()));
-   }
+@@ -140,6 +140,8 @@
+             actions->addAction(d->mAboutAppAction->objectName(), d->mAboutAppAction);
+         if (d->mAboutKDEAction)
+             actions->addAction(d->mAboutKDEAction->objectName(), d->mAboutKDEAction);
++        if (d->mAboutPLDAction)
++            actions->addAction(d->mAboutPLDAction->objectName(), d->mAboutPLDAction);
+     }
  }
  
 @@ -198,6 +203,11 @@

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs.spec
diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.262 packages/kde4-kdelibs/kde4-kdelibs.spec:1.263
--- packages/kde4-kdelibs/kde4-kdelibs.spec:1.262	Tue Dec 27 01:38:58 2011
+++ packages/kde4-kdelibs/kde4-kdelibs.spec	Wed Jan 18 22:47:42 2012
@@ -4,9 +4,9 @@
 #
 %define		_state		stable
 %define		orgname		kdelibs
-%define		qtver		4.7.4
-%define		sopranover	2.5.63
-%define		phononver	4.5.0
+%define		qtver		4.8.0
+%define		sopranover	2.7.0
+%define		phononver	4.5.1
 %define		atticaver	0.2.0
 
 Summary:	K Desktop Environment - libraries
@@ -17,12 +17,12 @@
 Summary(ru.UTF-8):	K Desktop Environment - Библиотеки
 Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
 Name:		kde4-kdelibs
-Version:	4.7.4
-Release:	3
+Version:	4.8.0
+Release:	1
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	46baa210a6f5a0d6af4b7602a4b00994
+# Source0-md5:	c19858c68f9a209ae521d7fb3c34747b
 Source1:	%{name}-pld_box.png
 Patch100:	%{name}-branch.diff
 Patch0:		%{name}-branding.patch
@@ -413,8 +413,6 @@
 %lang(en) %{_kdedocdir}/en/common
 %lang(en) %{_kdedocdir}/en/kioslave
 
-%attr(755,root,root) %{_libdir}/libkactivities.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkactivities.so.?
 %attr(755,root,root) %ghost %{_libdir}/libkcmutils.so.?
 %attr(755,root,root) %{_libdir}/libkcmutils.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkemoticons.so.?
@@ -522,7 +520,6 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kconfig_compiler
-%attr(755,root,root) %{_libdir}/libkactivities.so
 %attr(755,root,root) %{_libdir}/libkde3support.so
 %attr(755,root,root) %{_libdir}/libkdeclarative.so
 %attr(755,root,root) %{_libdir}/libkdecore.so
@@ -727,6 +724,7 @@
 %{_includedir}/KDE/KDateValidator
 %{_includedir}/KDE/KDateWidget
 %{_includedir}/KDE/KDebug
+%{_includedir}/KDE/KDescendantsProxyModel
 %{_includedir}/KDE/KDesktopFile
 %{_includedir}/KDE/KDialog
 %{_includedir}/KDE/KDialogButtonBox
@@ -1121,6 +1119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.263  2012/01/18 21:47:42  arekm
+- up to 4.8.0
+
 Revision 1.262  2011/12/27 00:38:58  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.262&r2=1.263&f=u

More information about the pld-cvs-commit mailing list