[packages/kde4-kdelibs] - rel 2; set no-debug flags for 'PLD' release type; BR openmotif-devel -> motif-devel

arekm arekm at pld-linux.org
Sun Nov 3 18:26:15 CET 2013


commit 87e5bc8a68eaad8c186deaab5d39182310e25111
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Nov 3 18:26:10 2013 +0100

    - rel 2; set no-debug flags for 'PLD' release type; BR openmotif-devel -> motif-devel

 kde4-kdelibs-pld-flags.patch | 30 ++++++++++++++++++++++++++++++
 kde4-kdelibs.spec            |  6 ++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/kde4-kdelibs.spec b/kde4-kdelibs.spec
index 1c9ee43..d0f4eed 100644
--- a/kde4-kdelibs.spec
+++ b/kde4-kdelibs.spec
@@ -17,7 +17,7 @@ Summary(ru.UTF-8):	K Desktop Environment - Библиотеки
 Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
 Name:		kde4-kdelibs
 Version:	4.11.3
-Release:	1
+Release:	2
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
@@ -30,6 +30,7 @@ Patch2:		%{name}-findlzmafix.patch
 Patch3:		%{name}-aboutPLD.patch
 Patch4:		%{name}-devicemanager_remove.patch
 Patch5:		kde4-kdelibs-sync.patch
+Patch6:		kde4-kdelibs-pld-flags.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.2.2
 BuildRequires:	Qt3Support-devel >= %{qtver}
@@ -84,7 +85,7 @@ BuildRequires:	libxslt-devel >= 1.0.7
 BuildRequires:	lua50-devel
 BuildRequires:	media-player-info
 BuildRequires:	mdns-bonjour-devel
-BuildRequires:	openmotif-devel
+BuildRequires:	motif-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pcre-devel >= 3.5
 BuildRequires:	phonon-devel >= %{phononver}
@@ -242,6 +243,7 @@ KDE.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %if "%{pld_release}" == "ti"
 sed -i -e 's#PLDLINUX_VERSION#PLD/Titanium#g' kio/kio/kprotocolmanager.cpp
diff --git a/kde4-kdelibs-pld-flags.patch b/kde4-kdelibs-pld-flags.patch
new file mode 100644
index 0000000..04394c1
--- /dev/null
+++ b/kde4-kdelibs-pld-flags.patch
@@ -0,0 +1,30 @@
+--- kdelibs-4.11.3/cmake/modules/FindKDE4Internal.cmake~	2013-11-01 16:45:56.000000000 +0100
++++ kdelibs-4.11.3/cmake/modules/FindKDE4Internal.cmake	2013-11-03 18:21:09.957104460 +0100
+@@ -1195,11 +1195,13 @@
+    # Select flags.
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG -DQT_NO_DEBUG")
++   set(CMAKE_CXX_FLAGS_PLD           "-DNDEBUG -DQT_NO_DEBUG") 
+    set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+    set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
+    set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG -DQT_NO_DEBUG")
++   set(CMAKE_C_FLAGS_PLD              "-DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+    set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
+    set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+@@ -1327,11 +1329,13 @@
+    # Select flags.
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG -DQT_NO_DEBUG")
++   set(CMAKE_CXX_FLAGS_PLD            "-DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-inline")
+    set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
+    set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG -DQT_NO_DEBUG")
++   set(CMAKE_C_FLAGS_PLD              "-DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-inline")
+    set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
+    set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdelibs.git/commitdiff/87e5bc8a68eaad8c186deaab5d39182310e25111



More information about the pld-cvs-commit mailing list