From patchwork Sun Mar 2 01:44:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 39478 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6AA4427BBEA; Sun, 2 Mar 2025 01:45:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 23D6627BBE2 for ; Sun, 2 Mar 2025 01:45:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1toYOB-0002b0-A0; Sat, 01 Mar 2025 20:45:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1toYO7-0002Uh-LJ for guix-patches@gnu.org; Sat, 01 Mar 2025 20:45:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1toYO7-0003OU-50 for guix-patches@gnu.org; Sat, 01 Mar 2025 20:45:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=AeBz2qoNfW5ZS+p1eeBF0gpvgR5NmijypdmYvkIezz8=; b=dgPaEVrpI2BbK38U6tC9He49lNMn7sFW60O0taAZ3CJoN/vLiHd5Z643b2YD6YU+CtU2rJduHeKT9pxtuQHd72m4C8xpMv1d0L2IICT/O6L5PjNFFyJAb5/bclhQl46Ztq0YYmEIWaXv6eTBNyl/zjI1zDadtttTXdPpXZHakHpg2lyBZ9YZfy+w1CzFTpWZ7T2lhB0leXlHLqlPCZ4/djW18BdFrwooC2itAG2JbVUyJzByvdTfi2Lau9EJuRGYyMLjxmX8ITd9sFLuFAV2vdArd85kS14NnMRMlFZeDk+NOSiNuer/P8psFWexg1Jf9xmCu8PCyfbiIoN7iGtlNw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1toYO6-0008H7-TG for guix-patches@gnu.org; Sat, 01 Mar 2025 20:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76670] [PATCH] gnu: Remove gnash. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Mar 2025 01:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76670@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174087987431593 (code B ref -1); Sun, 02 Mar 2025 01:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Mar 2025 01:44:34 +0000 Received: from localhost ([127.0.0.1]:47844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1toYNc-0008D7-25 for submit@debbugs.gnu.org; Sat, 01 Mar 2025 20:44:33 -0500 Received: from lists.gnu.org ([2001:470:142::17]:35868) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1toYNZ-0008CF-GP for submit@debbugs.gnu.org; Sat, 01 Mar 2025 20:44:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1toYNS-0000mh-9L for guix-patches@gnu.org; Sat, 01 Mar 2025 20:44:22 -0500 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1toYNP-0003HQ-MA for guix-patches@gnu.org; Sat, 01 Mar 2025 20:44:21 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 7C61A240027 for ; Sun, 2 Mar 2025 02:44:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1740879856; bh=Bm5THM/qHOIiN2PH94a7AVPZpzGDN8nh4XwIbi16kr8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=A0m/htb2wCygrILxljeBCShvKEA/ewbUW9lSfhP7Nrg5gKRUrg5SH6rozz2KuRluA goBTSMzY5Apllg25U5aCuEPvvFYx5lRpqUZegjHOM+k5rMI1YBE6nqJZtcYP6FOyxT Q95G5usB6S+wxNQyBIgaQ6slx3cp8jFs5V24jKxQEZ4wKeJ1oHNbFAHTHsi+PCUQ55 ZlgCI2bngKogMQGQYMe2kVEqGrSpkHbZ7VaZTS96urTCwlwJVBKUHaky+ePdzCmdJA pjLQpoCdP+KkvHtwxy1uweY3aJqFiGh4dQ5uBIWX/0D+0qqfWzstDG+f1inftHPNPn g1x48dIcOzyqQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Z54Vl4Hxrz6twj; Sun, 2 Mar 2025 02:44:15 +0100 (CET) From: Vinicius Monego Date: Sun, 2 Mar 2025 01:44:10 +0000 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=monego@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Gnash is unmaintained since 2019, does not compile with recent versions of Boost, does not compile with C++17 and above and requires an older version of GCC and deprecated dependencies. It will be a problem to support it in the long term. Furthermore, it can be replaced by Lightspark (a modern and active alternative) in the majority of cases. * gnu/packages/animation.scm (gnash): Delete variable. * gnu/packages/patches/gnash-fix-giflib-version.patch: Delete patch. * gnu/local.mk (dist_patch_DATA): Remove it. Change-Id: I5d65ee7808ab80fbc9b79940c5403a18cc07d96d --- "Fixes" https://issues.guix.gnu.org/62645 gnu/local.mk | 1 - gnu/packages/animation.scm | 83 ------------------- .../patches/gnash-fix-giflib-version.patch | 17 ---- 3 files changed, 101 deletions(-) delete mode 100644 gnu/packages/patches/gnash-fix-giflib-version.patch base-commit: e7b87dcde25b5ef278441d6ea42a7f662fe6d53f diff --git a/gnu/local.mk b/gnu/local.mk index 09b29da79f..34ff404b8c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1492,7 +1492,6 @@ dist_patch_DATA = \ %D%/packages/patches/gmobile-make-it-installable.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ - %D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnome-2048-fix-positional-argument.patch \ %D%/packages/patches/gnome-control-center-firmware-security.patch \ %D%/packages/patches/gnome-control-center-libexecdir.patch \ diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 5dbc208f5c..b06aa26b48 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -204,89 +204,6 @@ (define-public synfigstudio contains the graphical user interface for synfig.") (license license:gpl3+))) -;; This package provides a standalone (no browser plugin) version of Gnash. -(define-public gnash - ;; The last tagged release of Gnash was in 2013. - (let ((commit "583ccbc1275c7701dc4843ec12142ff86bb305b4") - (revision "0")) - (package - (name "gnash") - (version (git-version "0.8.11" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/gnash.git/") - (commit commit))) - (file-name (git-file-name name version)) - (patches (search-patches "gnash-fix-giflib-version.patch")) - (sha256 - (base32 "0fh0bljn0i6ypyh6l99afi855p7ki7lm869nq1qj6k8hrrwhmfry")))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags - (list "--disable-static" - ;; Plugins are based on XULRunner and NPAPI only. Disable. - "--disable-plugins" - "--enable-gui=gtk" - "--enable-media=ffmpeg" - (string-append "--with-boost-incl=" - (assoc-ref %build-inputs "boost") "/include") - (string-append "--with-boost-lib=" - (assoc-ref %build-inputs "boost") "/lib") - (string-append "--with-ffmpeg-incl=" - (assoc-ref %build-inputs "ffmpeg") - "/include/libavcodec") - (string-append "--with-speex-incl=" - (assoc-ref %build-inputs "speex") "/include") - (string-append "--with-jemalloc-incl=" - (assoc-ref %build-inputs "jemalloc") - "/include/jemalloc") - (string-append "--with-speex-lib=" - (assoc-ref %build-inputs "speex") "/lib") - (string-append "--with-jpeg-incl=" - (assoc-ref %build-inputs "libjpeg") "/include") - (string-append "--with-zlib-incl=" - (assoc-ref %build-inputs "zlib") "/include") - (string-append "--with-png-incl=" - (assoc-ref %build-inputs "libpng") - "/include")))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("dejagnu" ,dejagnu) ;for tests - ("gettext" ,gettext-minimal) - ("libtool" ,libtool) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) - (inputs - `(("agg" ,agg) - ("at-spi2-core" ,at-spi2-core) - ("boost" ,boost) - ("curl" ,curl) - ("ffmpeg" ,ffmpeg-2.8) - ("freeglut" ,freeglut) - ("gconf" ,gconf) - ("giflib" ,giflib) - ("glib" ,glib) - ("gtk+" ,gtk+-2) - ("gtkglext" ,gtkglext) - ("jemalloc" ,jemalloc) - ("libjpeg" ,libjpeg-turbo) - ("libltdl" ,libltdl) - ("libpng" ,libpng) - ("pangox-compat" ,pangox-compat) - ("sdl" ,sdl) - ("speex" ,speex))) - (synopsis "Flash movie player") - (description - "Gnash is a Flash movie player. It supports SWF version v7 and some -of v8 and v9. It is possible to configure Gnash to use several different -audio or video backends, ensuring good performance.") - (home-page "https://www.gnu.org/software/gnash/") - (license license:gpl3+)))) - ;; This package provides a standalone (no browser plugin) version of ;; Lightspark. (define-public lightspark diff --git a/gnu/packages/patches/gnash-fix-giflib-version.patch b/gnu/packages/patches/gnash-fix-giflib-version.patch deleted file mode 100644 index 44816d2a14..0000000000 --- a/gnu/packages/patches/gnash-fix-giflib-version.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Change GIFLIB_MINOR to allow matching with v5.2+ -Source: https://savannah.gnu.org/patch/index.php?9873 -Author: marius851000 - -diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp -index 2ae5ddb..b87b1e7 100644 ---- a/libbase/GnashImageGif.cpp -+++ b/libbase/GnashImageGif.cpp -@@ -120,7 +120,7 @@ GifInput::GifInput(std::shared_ptr in) - GifInput::~GifInput() - { - // Clean up allocated data. --#if GIFLIB_MAJOR==5 && GIFLIB_MINOR==1 -+#if GIFLIB_MAJOR==5 && GIFLIB_MINOR!=0 - DGifCloseFile(_gif, 0); - #else - DGifCloseFile(_gif);