From 6abef67bb487ad81774c6cf5f2c255f8e138a32b Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:37:31 +0800 Subject: [PATCH] gnome_mplayer: remove --- .../video/gnome-mplayer/default.nix | 39 --------- .../video/gnome-mplayer/fix-paths.patch | 87 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 pkgs/applications/video/gnome-mplayer/default.nix delete mode 100644 pkgs/applications/video/gnome-mplayer/fix-paths.patch diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix deleted file mode 100644 index 3d6b281ef07b..000000000000 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{lib, stdenv, substituteAll, fetchFromGitHub, pkg-config, gettext, glib, gtk3, gmtk, dbus, dbus-glib -, libnotify, libpulseaudio, mplayer, wrapGAppsHook3 }: - -stdenv.mkDerivation rec { - pname = "gnome-mplayer"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "kdekorte"; - repo = "gnome-mplayer"; - rev = "v${version}"; - sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; - }; - - nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; - buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - mencoder = "${mplayer}/bin/mencoder"; - mplayer = "${mplayer}/bin/mplayer"; - }) - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: mpris-interface.o:src/playlist.h:32: multiple definition of - # `plclose'; gui.o:src/playlist.h:32: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - meta = with lib; { - description = "Gnome MPlayer, a simple GUI for MPlayer"; - mainProgram = "gnome-mplayer"; - homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/video/gnome-mplayer/fix-paths.patch b/pkgs/applications/video/gnome-mplayer/fix-paths.patch deleted file mode 100644 index ede4991c4662..000000000000 --- a/pkgs/applications/video/gnome-mplayer/fix-paths.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/src/gui.c -+++ b/src/gui.c -@@ -7470,7 +7470,7 @@ - filename = g_strdup_printf("%s/00000001.jpg", dirname); - g_free(basepath); - // run mplayer and try to get the first frame and convert it to a jpeg -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - av[ac++] = g_strdup_printf("-vo"); - av[ac++] = g_strdup_printf("jpeg:outdir=%s", dirname); - av[ac++] = g_strdup_printf("-ao"); ---- a/src/property_page_common.c -+++ b/src/property_page_common.c -@@ -80,7 +80,7 @@ - MetaData *ret; - ret = g_new0(MetaData, 1); - -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - av[ac++] = g_strdup_printf("-vo"); - av[ac++] = g_strdup_printf("null"); - av[ac++] = g_strdup_printf("-ao"); ---- a/src/support.c -+++ b/src/support.c -@@ -566,7 +566,7 @@ - } else { - playlist = FALSE; - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -728,7 +728,7 @@ - playlist = FALSE; - // run mplayer and try to get the first frame and convert it to a jpeg - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -825,7 +825,7 @@ - playlist = FALSE; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1251,7 +1251,7 @@ - gm_log(verbose, G_LOG_LEVEL_INFO, "getting file metadata for %s", name); - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1532,7 +1532,7 @@ - return 0; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1597,7 +1597,7 @@ - - if (control_id == 0) { - ac = 0; -- av[ac++] = g_strdup_printf("mencoder"); -+ av[ac++] = g_strdup_printf("@mencoder@"); - av[ac++] = g_strdup_printf("-ovc"); - av[ac++] = g_strdup_printf("copy"); - av[ac++] = g_strdup_printf("-oac"); -@@ -2830,7 +2830,7 @@ - gboolean ret = TRUE; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a323daad49ac..a62f97668656 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -567,6 +567,7 @@ mapAliases ({ gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 + gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14 gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 gnome-resources = resources; # added 2023-12-10 gnome_user_docs = throw "'gnome_user_docs' has been renamed to/replaced by 'gnome-user-docs'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77e8d00a7e34..0836ec8f476a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30316,8 +30316,6 @@ with pkgs; gnaural = callPackage ../applications/audio/gnaural { }; - gnome_mplayer = callPackage ../applications/video/gnome-mplayer { }; - gnumeric = callPackage ../applications/office/gnumeric { }; gnunet = callPackage ../applications/networking/p2p/gnunet { };