Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

kmplayer: 0.11.3d -> 0.12.0b

Unknown 20b48cbd a7159d3c

+50 -16
+26 -15
pkgs/applications/video/kmplayer/default.nix
··· 1 - { stdenv, fetchurl 2 - , automoc4, cmake, gettext, makeWrapper, perl, pkgconfig 3 - , kdelibs4, cairo, dbus_glib, mplayer 4 }: 5 6 - stdenv.mkDerivation { 7 - name = "kmplayer-0.11.3d"; 8 9 src = fetchurl { 10 - #url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2; 11 - url = "mirror://gentoo/distfiles/kmplayer-0.11.3d.tar.bz2"; 12 - sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; 13 }; 14 15 - buildInputs = [ kdelibs4 cairo dbus_glib ]; 16 17 - nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ]; 18 19 postInstall = '' 20 wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin 21 ''; 22 23 - meta = { 24 description = "MPlayer front-end for KDE"; 25 - license = "GPL"; 26 - homepage = http://kmplayer.kde.org; 27 - broken = true; # Also unavailable on this mirror 28 - maintainers = [ stdenv.lib.maintainers.sander ]; 29 }; 30 }
··· 1 + { 2 + mkDerivation, lib, fetchurl, 3 + extra-cmake-modules, makeWrapper, 4 + qtsvg, qtx11extras, ki18n, kdelibs4support, kio, kmediaplayer, kwidgetsaddons, 5 + phonon, cairo, mplayer 6 }: 7 8 + mkDerivation rec { 9 + majorMinorVersion = "0.12"; 10 + patchVersion = "0b"; 11 + version = "${majorMinorVersion}.${patchVersion}"; 12 + name = "kmplayer-${version}"; 13 14 src = fetchurl { 15 + url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2"; 16 + sha256 = "0wzdxym4fc83wvqyhcwid65yv59a2wvp1lq303cn124mpnlwx62y"; 17 }; 18 19 + patches = [ 20 + ./kmplayer_part-plugin_metadata.patch # Qt 5.9 doesn't like an empty string for the optional "FILE" argument of "Q_PLUGIN_METADATA" 21 + ./no-docs.patch # Don't build docs due to errors (kdelibs4support propagates kdoctools) 22 + ]; 23 24 + nativeBuildInputs = [ extra-cmake-modules makeWrapper ]; 25 + 26 + buildInputs = [ 27 + qtsvg qtx11extras ki18n kdelibs4support kio kmediaplayer kwidgetsaddons 28 + phonon cairo 29 + ]; 30 31 postInstall = '' 32 wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin 33 ''; 34 35 + meta = with lib; { 36 description = "MPlayer front-end for KDE"; 37 + license = with licenses; [ gpl2 lgpl2 fdl12 ]; 38 + homepage = https://kmplayer.kde.org/; 39 + maintainers = with maintainers; [ sander zraexy ]; 40 }; 41 }
+11
pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch
···
··· 1 + --- a/src/kmplayer_part.h 2 + +++ b/src/kmplayer_part.h 3 + @@ -36,7 +36,7 @@ 4 + 5 + class KMPlayerFactory : public KPluginFactory { 6 + Q_OBJECT 7 + - Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "") 8 + + Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory") 9 + Q_INTERFACES(KPluginFactory) 10 + public: 11 + KMPlayerFactory();
+12
pkgs/applications/video/kmplayer/no-docs.patch
···
··· 1 + --- a/CMakeLists.txt 2 + +++ b/CMakeLists.txt 3 + @@ -79,9 +79,6 @@ 4 + 5 + add_subdirectory(src) 6 + add_subdirectory(icons) 7 + -if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc" AND KF5DocTools_VERSION) 8 + - add_subdirectory(doc) 9 + -endif(KF5DocTools_VERSION) 10 + add_subdirectory(data) 11 + 12 + if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+1 -1
pkgs/top-level/all-packages.nix
··· 15240 15241 kiwix = callPackage ../applications/misc/kiwix { }; 15242 15243 - kmplayer = kde4.callPackage ../applications/video/kmplayer { }; 15244 15245 kodestudio = callPackage ../applications/editors/kodestudio { }; 15246
··· 15240 15241 kiwix = callPackage ../applications/misc/kiwix { }; 15242 15243 + kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; 15244 15245 kodestudio = callPackage ../applications/editors/kodestudio { }; 15246