radiotray-ng: 0.2.9 -> 0.2.10.1; adopt as maintainer (#476505)
This commit is contained in:
@@ -1,25 +0,0 @@
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index 58ab5c2..4f56a25 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -1,5 +1,7 @@
|
||||
include(GoogleTest)
|
||||
|
||||
+set(CMAKE_CXX_STANDARD 17)
|
||||
+
|
||||
function(add_gmock_test target)
|
||||
add_executable(${target} ${ARGN})
|
||||
target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread)
|
||||
diff --git a/tests/bookmarks_test.cpp b/tests/bookmarks_test.cpp
|
||||
index 2d72356..97f898a 100644
|
||||
--- a/tests/bookmarks_test.cpp
|
||||
+++ b/tests/bookmarks_test.cpp
|
||||
@@ -215,7 +215,7 @@ TEST(Bookmarks, test_that_stations_are_added_and_removed_from_a_group_and_moved)
|
||||
ASSERT_FALSE(bm[0].stations[0].notifications);
|
||||
|
||||
// vector only throws when using at()
|
||||
- EXPECT_THROW(bm[0].stations.at(100), std::out_of_range);
|
||||
+ EXPECT_THROW(static_cast<void>(bm[0].stations.at(100)), std::out_of_range);
|
||||
EXPECT_THROW(bm[1], std::out_of_range);
|
||||
}
|
||||
|
||||
+9
-9
@@ -18,7 +18,7 @@
|
||||
libappindicator-gtk3,
|
||||
libnotify,
|
||||
libxdg_basedir,
|
||||
wxGTK,
|
||||
wxGTK32,
|
||||
# GStreamer
|
||||
glib-networking,
|
||||
gst_all_1,
|
||||
@@ -48,15 +48,15 @@ let
|
||||
lxml
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "radiotray-ng";
|
||||
version = "0.2.9";
|
||||
version = "0.2.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ebruck";
|
||||
repo = "radiotray-ng";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rRD/IfVnOxowr2mO2BB2hcHK5ByZSmTbcgYdULogYUs=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GYSacYKS0az5sqPqZhnuTZOT9NSzW+P9o5r5p0RhTtI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
libnotify
|
||||
libxdg_basedir
|
||||
lsb-release
|
||||
wxGTK
|
||||
wxGTK32
|
||||
# for https gstreamer / libsoup
|
||||
glib-networking
|
||||
]
|
||||
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}"
|
||||
(lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck)
|
||||
];
|
||||
|
||||
# 'wxFont::wxFont(int, int, int, int, bool, const wxString&, wxFontEncoding)' is deprecated
|
||||
@@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Internet radio player for linux";
|
||||
homepage = "https://github.com/ebruck/radiotray-ng";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ ];
|
||||
maintainers = [ lib.maintainers.somasis ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index 58ab5c2..4f56a25 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -1,5 +1,7 @@
|
||||
include(GoogleTest)
|
||||
|
||||
+set(CMAKE_CXX_STANDARD 17)
|
||||
+
|
||||
function(add_gmock_test target)
|
||||
add_executable(${target} ${ARGN})
|
||||
target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread)
|
||||
@@ -11683,10 +11683,6 @@ with pkgs;
|
||||
fltk = fltk13;
|
||||
};
|
||||
|
||||
radiotray-ng = callPackage ../applications/audio/radiotray-ng {
|
||||
wxGTK = wxGTK32;
|
||||
};
|
||||
|
||||
rawtherapee = callPackage ../applications/graphics/rawtherapee {
|
||||
fftw = fftwSinglePrec;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user