[kmplayer] kmplayer-0.11.3a

[Orcan Ogetbil]

commit 4b0acdda3e8fbe19a83da00b2b65e0e170fe738c
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Mon Dec 26 01:59:02 2011 -0500

    kmplayer-0.11.3a

 .gitignore                              |    1 +
 kmplayer-0.11.2c-desktop_validate.patch |   57 -------------------------------
 kmplayer-buildfix-glib.patch            |   39 +++++++++++++++++++++
 kmplayer-desktop_validate.patch         |   45 ++++++++++++++++++++++++
 kmplayer-fix-perms.patch                |   12 ++++++
 kmplayer-include-doc-po.patch           |   15 ++++++++
 kmplayer.spec                           |   30 ++++++++++------
 sources                                 |    2 +-
 8 files changed, 131 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 255b6a6..ca553ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 kmplayer-0.11.2b.tar.bz2
 /kmplayer-0.11.2c.tar.bz2
+/kmplayer-0.11.3a.tar.bz2
diff --git a/kmplayer-buildfix-glib.patch b/kmplayer-buildfix-glib.patch
new file mode 100644
index 0000000..f5e54fe
--- /dev/null
+++ b/kmplayer-buildfix-glib.patch
@@ -0,0 +1,39 @@
+diff -rupN kmplayer-0.11.3a.old/CMakeLists.txt kmplayer-0.11.3a/CMakeLists.txt
+--- kmplayer-0.11.3a.old/CMakeLists.txt	2011-10-22 09:37:10.000000000 -0400
++++ kmplayer-0.11.3a/CMakeLists.txt	2011-12-26 01:56:13.133176874 -0500
+@@ -34,6 +34,7 @@ if(NOT WIN32)
+ 
+   if (KMPLAYER_BUILT_WITH_NPP)
+     PKGCONFIG(dbus-glib-1 GLibDBusIncDir GLibDBusLinkDir GLibDBusLinkFlags GLibDBusCflags)
++    PKGCONFIG(gmodule-2.0 GModuleIncDir GModuleLinkDir GModuleLinkFlags GModuleCflags)
+ 
+     if (GLibDBusCflags)
+       set(KMPLAYER_WITH_GDBUS 1)
+diff -rupN kmplayer-0.11.3a.old/src/CMakeLists.txt kmplayer-0.11.3a/src/CMakeLists.txt
+--- kmplayer-0.11.3a.old/src/CMakeLists.txt	2011-10-22 09:37:10.000000000 -0400
++++ kmplayer-0.11.3a/src/CMakeLists.txt	2011-12-26 01:51:56.216361130 -0500
+@@ -137,10 +137,10 @@ if (KMPLAYER_WITH_NPP)
+     add_executable(knpplayer ${knpplayer_SRCS})
+ 
+     SET_TARGET_PROPERTIES(knpplayer PROPERTIES COMPILE_FLAGS
+-        "${GLibDBusCflags} ${GTKCflags} ${GThreadCflags}"
++        "${GLibDBusCflags} ${GTKCflags} ${GThreadCflags} ${GModuleCflags}"
+     )
+ 
+-    target_link_libraries(knpplayer ${GLibDBusLinkFlags} ${GTKLinkFlags} ${GThreadLinkFlags}
++    target_link_libraries(knpplayer ${GLibDBusLinkFlags} ${GTKLinkFlags} ${GThreadLinkFlags} ${GModuleLinkFlags}
+         ${X11_X11_LIB} )
+ 
+     install(TARGETS knpplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
+diff -rupN kmplayer-0.11.3a.old/src/npplayer.cpp kmplayer-0.11.3a/src/npplayer.cpp
+--- kmplayer-0.11.3a.old/src/npplayer.cpp	2011-10-22 09:37:10.000000000 -0400
++++ kmplayer-0.11.3a/src/npplayer.cpp	2011-12-26 01:47:23.739606443 -0500
+@@ -32,7 +32,7 @@ extern "C" {
+ #include <fcntl.h>
+ 
+ #include <glib/gprintf.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ 
diff --git a/kmplayer-desktop_validate.patch b/kmplayer-desktop_validate.patch
new file mode 100644
index 0000000..85291ee
--- /dev/null
+++ b/kmplayer-desktop_validate.patch
@@ -0,0 +1,45 @@
+diff -rupN kmplayer-0.11.3.old/src/kmplayer.desktop kmplayer-0.11.3/src/kmplayer.desktop
+--- kmplayer-0.11.3.old/src/kmplayer.desktop	2011-10-11 13:36:18.000000000 -0400
++++ kmplayer-0.11.3/src/kmplayer.desktop	2011-10-19 00:09:47.000000000 -0400
+@@ -46,7 +46,6 @@ Comment[sv]=KDE-gränssnitt för Mplayer
+ Comment[th]=ระบบติดต่อผู้ใช้ของ MPlayer บน KDE 
+ Comment[tr]=MPlayer için KDE arayüzü
+ Comment[uk]=KDE-інтерфейс для MPlayer
+-Comment[x-test]=xxKDE interface for MPlayerxx
+ Comment[zh_CN]=MPlayer 的 KDE 界面
+ Comment[zh_TW]=MPlayer 的 KDE 介面
+ Terminal=false
+@@ -97,7 +96,6 @@ Name[th]=KMPlayer
+ Name[tr]=KMPlayer
+ Name[ug]=KMPlayer
+ Name[uk]=KMPlayer
+-Name[x-test]=xxKMPlayerxx
+ Name[zh_CN]=KMPlayer
+ Name[zh_TW]=KMPlayer
+ MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/flv;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/webm;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-flv;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;x-scheme-handler/mms;x-scheme-handler/pnm;x-scheme-handler/rtspt;x-scheme-handler/rtspu;
+@@ -150,6 +148,5 @@ GenericName[th]=โปรแกรมเ
+ GenericName[tr]=Medya Oynatıcı
+ GenericName[ug]=ۋاسىتە قويغۇچ
+ GenericName[uk]=Програвач
+-GenericName[x-test]=xxMedia Playerxx
+ GenericName[zh_CN]=媒体播放器
+ GenericName[zh_TW]=媒體播放器
+diff -rupN kmplayer-0.11.3.old/src/kmplayer_part.desktop kmplayer-0.11.3/src/kmplayer_part.desktop
+--- kmplayer-0.11.3.old/src/kmplayer_part.desktop	2011-10-11 13:36:18.000000000 -0400
++++ kmplayer-0.11.3/src/kmplayer_part.desktop	2011-10-19 00:11:56.000000000 -0400
+@@ -43,7 +43,6 @@ Name[sv]=Inbäddad Mplayer för KDE
+ Name[th]=ตัวเล่นสื่อ MPlayer แบบฝังตัวได้สำหรับ KDE
+ Name[tr]=KDE için gömülü MPlayer
+ Name[uk]=Вбудований MPlayer для KDE
+-Name[x-test]=xxEmbedded MPlayer for KDExx
+ Name[zh_CN]=KDE 嵌入式 MPlayer
+ Name[zh_TW]=KDE 嵌入式 MPlayer
+ Comment=Video player plugin (QuickTime, XMovie, Windows Media and RealPlayer compatible)
+@@ -88,7 +87,6 @@ Comment[sv]=Insticksprogram för videosp
+ Comment[th]=ส่วนเสริมตัวเล่นวิดีโอ (ใช้ด้วยกันได้กับ QuickTime, XMovie, Windows Media และ RealPlayer)
+ Comment[tr]=Video oynatıcı eklentisi (QuickTime, XMovie, Windows Media ve RealPlayer uyumlu)
+ Comment[uk]=Додаток відтворення відео (QuickTime, XMovie, Windows Media і сумісних з RealPlayer)
+-Comment[x-test]=xxVideo player plugin (QuickTime, XMovie, Windows Media and RealPlayer compatible)xx
+ Comment[zh_CN]=视频播放器插件(兼容 QuickTime、XMovie、Windows Media 和 RealPlayer)
+ Comment[zh_TW]=影像播放器外掛程式（與 QuickTime，XMovie，Windows Media 與 RealPlayer 相容）
+ X-KDE-Library=libkmplayerpart
diff --git a/kmplayer-fix-perms.patch b/kmplayer-fix-perms.patch
new file mode 100644
index 0000000..661ad8e
--- /dev/null
+++ b/kmplayer-fix-perms.patch
@@ -0,0 +1,12 @@
+diff -rupN kmplayer-0.11.3a.old/src/CMakeLists.txt kmplayer-0.11.3a/src/CMakeLists.txt
+--- kmplayer-0.11.3a.old/src/CMakeLists.txt	2011-10-22 09:37:10.000000000 -0400
++++ kmplayer-0.11.3a/src/CMakeLists.txt	2011-12-26 01:28:10.382692579 -0500
+@@ -124,7 +124,7 @@ install(TARGETS kdeinit_kmplayer  ${INST
+ 
+ install(TARGETS kmplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-install(PROGRAMS kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
++install(FILES kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ 
+ #qt4_add_dbus_interface(kmplayer_SRCS org.kde.Konqueror.Main.xml kmplayer_interface)
+ 
diff --git a/kmplayer-include-doc-po.patch b/kmplayer-include-doc-po.patch
new file mode 100644
index 0000000..705c368
--- /dev/null
+++ b/kmplayer-include-doc-po.patch
@@ -0,0 +1,15 @@
+diff -rupN kmplayer-0.11.3a.old/CMakeLists.txt kmplayer-0.11.3a/CMakeLists.txt
+--- kmplayer-0.11.3a.old/CMakeLists.txt	2011-10-22 09:37:10.000000000 -0400
++++ kmplayer-0.11.3a/CMakeLists.txt	2011-12-26 01:08:43.905104322 -0500
+@@ -63,8 +63,8 @@ configure_file (config-kmplayer.h.cmake
+ 
+ add_subdirectory(src)
+ add_subdirectory(icons)
+-#add_subdirectory(doc)
++add_subdirectory(doc)
+ add_subdirectory(data)
+ 
+-#include(MacroOptionalAddSubdirectory)
+-#macro_optional_add_subdirectory(po)
++include(MacroOptionalAddSubdirectory)
++macro_optional_add_subdirectory(po)
diff --git a/kmplayer.spec b/kmplayer.spec
index 97efb71..a996bad 100644
--- a/kmplayer.spec
+++ b/kmplayer.spec
@@ -1,7 +1,7 @@
 Name:    kmplayer
 Summary: A simple front-end for MPlayer/FFMpeg/Phonon
-Version: 0.11.2c
-Release: 6%{?dist}
+Version: 0.11.3a
+Release: 1%{?dist}
 Group:   Applications/Multimedia
 # The documentation is GFDL.
 # The files under src/moz-sdk are MPLv1.1 or GPLv2+ or LGPLv2+
@@ -18,13 +18,22 @@ URL:     http://kmplayer.kde.org/
 Source0: http://kmplayer.kde.org/pkgs/kmplayer-%{version}%{?beta}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+# reinclude docs and translations
+Patch0: kmplayer-include-doc-po.patch
+# fix desktop file permission
+Patch1: kmplayer-fix-perms.patch
+# build fix against more recent glib2
+Patch2: kmplayer-buildfix-glib.patch
+
 # default to using phonon (instead of mplayer)
 # Put this into kde-settings instead? -- Rex
 Patch4: kmplayer-0.11.0a-kmplayerrc_phonon_default.patch
 
 ## upstream patches
 # http://websvn.kde.org/?view=revision&revision=1225583
-Patch100: kmplayer-0.11.2c-desktop_validate.patch
+# except the test lines are re-introduced
+Patch100: kmplayer-desktop_validate.patch
 
 BuildRequires: cairo-devel
 BuildRequires: dbus-devel 
@@ -35,7 +44,6 @@ BuildRequires: gettext
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 BuildRequires: kdelibs4-devel
-BuildRequires: pango-devel
 BuildRequires: phonon-devel
 
 %description
@@ -48,6 +56,9 @@ on a movie file, the movie is played inside Konqueror.
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 
+%patch0 -p1 -b .docpo
+%patch1 -p1 -b .perms
+%patch2 -p1 -b .glib2
 %patch4 -p1 -b .kmplayerrc_phonon_default
 %patch100 -p1 -b .desktop_validate
 
@@ -65,7 +76,6 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
@@ -75,14 +85,8 @@ make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %check
-# validate patch50
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kmplayer.desktop
 
-
-%clean
-rm -rf %{buildroot}
-
-
 %post
 touch --no-create %{_kde4_iconsdir}hicolor &>/dev/null || :
 
@@ -99,7 +103,6 @@ update-desktop-database -q &> /dev/null || :
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING* README TODO
 %{_kde4_bindir}/kmplayer
 %{_kde4_bindir}/knpplayer
@@ -115,6 +118,9 @@ update-desktop-database -q &> /dev/null || :
 
 
 %changelog
+* Sun Dec 25 2011 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.3a-1
+- kmplayer-0.11.3a
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.11.2c-6
 - Rebuild for new libpng
 
diff --git a/sources b/sources
index 76bc3c6..47c4d12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7a1363dfaad0c7b563ecbd58f301e704  kmplayer-0.11.2c.tar.bz2
+5d37eaea3bfbf8040e4ed303b878c43d  kmplayer-0.11.3a.tar.bz2