[packages/kde4-kmplayer] - more cmake fixes - fix files listed twice - rel 3

baggins baggins at pld-linux.org
Sat Oct 5 21:45:33 CEST 2019


commit 9f745e69e0d06e2466652a5514fd0f3f0e97d6d6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Oct 5 21:44:22 2019 +0200

    - more cmake fixes
    - fix files listed twice
    - rel 3

 cmake.patch        | 11 +++++++++++
 kde4-kmplayer.spec |  3 +--
 2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/kde4-kmplayer.spec b/kde4-kmplayer.spec
index bbc9f62..1927816 100644
--- a/kde4-kmplayer.spec
+++ b/kde4-kmplayer.spec
@@ -5,7 +5,7 @@ Summary:	A KDE MPlayer/Xine/ffmpeg/ffserver/VDR frontend
 Summary(pl.UTF-8):	Frontend dla programów MPlayer/Xine/ffmpeg/ffserver/VDR pod KDE
 Name:		kde4-kmplayer
 Version:	0.11.3d
-Release:	2
+Release:	3
 License:	GPL
 Group:		X11/Applications/Multimedia
 Source0:	http://kmplayer.kde.org/pkgs/%{origname}-%{version}.tar.bz2
@@ -74,4 +74,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/services/kmplayer_part.desktop
 %{_desktopdir}/kde4/kmplayer.desktop
 %{_iconsdir}/hicolor/*/apps/kmplayer.*
-%{_kdedocdir}/en/kmplayer
diff --git a/cmake.patch b/cmake.patch
index 8232031..1672133 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -16,3 +16,14 @@
  
  add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
  add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+--- kmplayer-0.11.3d/src/CMakeLists.txt~	2012-06-10 14:35:46.000000000 +0200
++++ kmplayer-0.11.3d/src/CMakeLists.txt	2019-10-05 21:34:56.679770896 +0200
+@@ -13,7 +13,7 @@
+     MESSAGE("have cairo cflags:${optionalCFlags} ldflags:${optionalLinkFlags}")
+ endif (KMPLAYER_WITH_CAIRO)
+ 
+-add_definitions(-DQT3_SUPPORT -DKDE3_SUPPORT -DKMPLAYER_VERSION_STRING=\\"${KMPLAYER_VERSION_STRING}\\")
++add_definitions(-DQT3_SUPPORT -DKDE3_SUPPORT -DKMPLAYER_VERSION_STRING=\"${KMPLAYER_VERSION_STRING}\")
+ 
+ ADD_DEFINITIONS(${CAIROCFlags})
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kmplayer.git/commitdiff/9f745e69e0d06e2466652a5514fd0f3f0e97d6d6



More information about the pld-cvs-commit mailing list