From patchwork Sun Jan 31 20:19:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 26795 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 455A127BC1E; Sun, 31 Jan 2021 20:21:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B452527BC1D for ; Sun, 31 Jan 2021 20:21:31 +0000 (GMT) Received: from localhost ([::1]:47244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6JDu-0000ZN-Ob for patchwork@mira.cbaines.net; Sun, 31 Jan 2021 15:21:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6JDS-0000ZF-G2 for guix-patches@gnu.org; Sun, 31 Jan 2021 15:21:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46584) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6JDS-00058o-7b for guix-patches@gnu.org; Sun, 31 Jan 2021 15:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l6JDS-0005BT-41 for guix-patches@gnu.org; Sun, 31 Jan 2021 15:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46075] [liferea]: Update + Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Jan 2021 20:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46075 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Efraim Flashner Received: via spool by 46075-submit@debbugs.gnu.org id=B46075.161212440519836 (code B ref 46075); Sun, 31 Jan 2021 20:21:02 +0000 Received: (at 46075) by debbugs.gnu.org; 31 Jan 2021 20:20:05 +0000 Received: from localhost ([127.0.0.1]:58130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6JCM-00059M-N9 for submit@debbugs.gnu.org; Sun, 31 Jan 2021 15:20:05 -0500 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:62605) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6JCJ-000597-TI for 46075@debbugs.gnu.org; Sun, 31 Jan 2021 15:19:53 -0500 X-Originating-IP: 76.68.120.100 Received: from [192.168.5.10] (bras-vprn-toroon474rw-lp130-08-76-68-120-100.dsl.bell.ca [76.68.120.100]) (Authenticated sender: rg@raghavgururajan.name) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id D653440005; Sun, 31 Jan 2021 20:19:43 +0000 (UTC) References: <303e0998-cdc5-8363-9004-43dc0e31a1dc@raghavgururajan.name> <132ed099-5e32-b965-0ffb-cae7258f00d4@raghavgururajan.name> From: Raghav Gururajan Message-ID: <8dddcdd2-30bd-effd-761f-147f36c5eb4d@raghavgururajan.name> Date: Sun, 31 Jan 2021 15:19:41 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.6.1 MIME-Version: 1.0 In-Reply-To: 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: , Cc: 46075@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Efraim! > That patch is some 62k lines. Is there something shorter that we can use > that isn't a repackaging of HEAD? Thanks for pushing the other 2 patches. Here is the revised 3rd patch. Regards, RG. From 2ba60cc44eb3a488c295bb654a3673d305dccf05 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 31 Jan 2021 15:15:15 -0500 Subject: [PATCH 4/4] gnu: liferea: Update to 1.13.5. * gnu/packages/patches/liferea-getfocus.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/syndication.scm (liferea) [version]: Modify. [source][sha256]: Modify. [patches]: Add liferea-getfocus.patch. --- gnu/local.mk | 1 + gnu/packages/patches/liferea-getfocus.patch | 269 ++++++++++++++++++++ gnu/packages/syndication.scm | 10 +- 3 files changed, 277 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/liferea-getfocus.patch diff --git a/gnu/local.mk b/gnu/local.mk index e93425f394..6679b6fb17 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1313,6 +1313,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-newer-libconfig.patch \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ + %D%/packages/patches/liferea-getfocus.patch \ %D%/packages/patches/linbox-fix-pkgconfig.patch \ %D%/packages/patches/linkchecker-tests-require-network.patch \ %D%/packages/patches/linphoneqt-tabbutton.patch \ diff --git a/gnu/packages/patches/liferea-getfocus.patch b/gnu/packages/patches/liferea-getfocus.patch new file mode 100644 index 0000000000..aa756cd71f --- /dev/null +++ b/gnu/packages/patches/liferea-getfocus.patch @@ -0,0 +1,269 @@ +From 250e4f00572404e60c92b7f348c25ee6b160ff6b Mon Sep 17 00:00:00 2001 +From: Lars Windolf +Date: Thu, 14 Jan 2021 17:03:14 +0100 +Subject: [PATCH] Avoid scanning files in inst/. Fixes getfocus.py include. + +--- + po/POTFILES.in | 189 ++++++++++++++++++++++++------------------------- + 1 file changed, 94 insertions(+), 95 deletions(-) + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 8f8c52730..aac45eaa6 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -1,15 +1,12 @@ + [encoding: UTF-8] +- + # List of source files containing translatable strings. +- + net.sourceforge.liferea.appdata.xml.in + net.sourceforge.liferea.desktop.in +-xslt/feed.xml.in +-xslt/source.xml.in +-xslt/folder.xml.in +-xslt/item.xml.in +-xslt/newsbin.xml.in +-xslt/vfolder.xml.in ++plugins/getfocus.py ++plugins/headerbar.py ++plugins/libnotify.py ++plugins/plugin-installer.py ++plugins/trayicon.py + src/browser.c + src/browser_history.c + src/comments.c +@@ -31,10 +28,35 @@ src/favicon.c + src/favicon.h + src/feed.c + src/feed.h +-src/feed_parser.c +-src/feed_parser.h + src/feedlist.c + src/feedlist.h ++src/feed_parser.c ++src/feed_parser.h ++src/fl_sources/default_source.c ++src/fl_sources/default_source.h ++src/fl_sources/dummy_source.c ++src/fl_sources/dummy_source.h ++src/fl_sources/google_source.c ++src/fl_sources/google_source.h ++src/fl_sources/node_source.c ++src/fl_sources/node_source.h ++src/fl_sources/opml_source.c ++src/fl_sources/opml_source.h ++src/fl_sources/reedah_source.c ++src/fl_sources/reedah_source_feed.c ++src/fl_sources/reedah_source_feed_list.c ++src/fl_sources/reedah_source_feed_list.h ++src/fl_sources/reedah_source.h ++src/fl_sources/theoldreader_source.c ++src/fl_sources/theoldreader_source_feed.c ++src/fl_sources/theoldreader_source_feed_list.c ++src/fl_sources/theoldreader_source_feed_list.h ++src/fl_sources/theoldreader_source.h ++src/fl_sources/ttrss_source.c ++src/fl_sources/ttrss_source_feed.c ++src/fl_sources/ttrss_source_feed_list.c ++src/fl_sources/ttrss_source_feed_list.h ++src/fl_sources/ttrss_source.h + src/folder.c + src/folder.h + src/html.c +@@ -45,10 +67,10 @@ src/item.c + src/item.h + src/item_history.c + src/item_history.h +-src/item_loader.c +-src/item_loader.h + src/itemlist.c + src/itemlist.h ++src/item_loader.c ++src/item_loader.h + src/itemset.c + src/itemset.h + src/liferea_application.c +@@ -62,6 +84,30 @@ src/node.c + src/node.h + src/node_type.c + src/node_type.h ++src/parsers/atom10.c ++src/parsers/atom10.h ++src/parsers/html5_feed.c ++src/parsers/html5_feed.h ++src/parsers/ldjson_feed.c ++src/parsers/ldjson_feed.h ++src/parsers/ns_admin.c ++src/parsers/ns_admin.h ++src/parsers/ns_ag.c ++src/parsers/ns_ag.h ++src/parsers/ns_cC.c ++src/parsers/ns_cC.h ++src/parsers/ns_content.c ++src/parsers/ns_content.h ++src/parsers/ns_dc.c ++src/parsers/ns_dc.h ++src/parsers/ns_slash.c ++src/parsers/ns_slash.h ++src/parsers/ns_syn.c ++src/parsers/ns_syn.h ++src/parsers/rss_channel.c ++src/parsers/rss_channel.h ++src/parsers/rss_item.c ++src/parsers/rss_item.h + src/render.c + src/render.h + src/rule.c +@@ -73,112 +119,59 @@ src/subscription.h + src/subscription_icon.c + src/subscription_icon.h + src/subscription_type.h +-src/update.c +-src/update.h +-src/vfolder.c +-src/vfolder.h +-src/vfolder_loader.c +-src/vfolder_loader.h +-src/xml.c +-src/xml.h ++src/ui/auth_dialog.c ++src/ui/auth_dialog.h ++src/ui/browser_tabs.c ++src/ui/browser_tabs.h + src/ui/enclosure_list_view.c + src/ui/enclosure_list_view.h ++src/ui/feed_list_view.c ++src/ui/feed_list_view.h + src/ui/icons.c + src/ui/icons.h ++src/ui/item_list_view.c ++src/ui/item_list_view.h + src/ui/itemview.c + src/ui/itemview.h +-src/ui/liferea_shell.c +-src/ui/liferea_shell.h +-src/ui/rule_editor.c +-src/ui/rule_editor.h +-src/ui/search_dialog.c +-src/ui/search_dialog.h +-src/ui/search_folder_dialog.h +-src/ui/search_folder_dialog.c +-src/ui/auth_dialog.c +-src/ui/auth_dialog.h + src/ui/liferea_dialog.c + src/ui/liferea_dialog.h +-src/ui/ui_common.c +-src/ui/ui_dnd.c +-src/ui/ui_dnd.h +-src/ui/feed_list_view.c +-src/ui/feed_list_view.h +-src/ui/ui_folder.c +-src/ui/ui_folder.h + src/ui/liferea_htmlview.c + src/ui/liferea_htmlview.h +-src/ui/item_list_view.c +-src/ui/item_list_view.h + src/ui/liferea_shell.c ++src/ui/liferea_shell.c ++src/ui/liferea_shell.h + src/ui/liferea_shell.h + src/ui/popup_menu.c + src/ui/popup_menu.h + src/ui/preferences_dialog.c + src/ui/preferences_dialog.h ++src/ui/rule_editor.c ++src/ui/rule_editor.h ++src/ui/search_dialog.c ++src/ui/search_dialog.h ++src/ui/search_folder_dialog.c ++src/ui/search_folder_dialog.h + src/ui/subscription_dialog.c + src/ui/subscription_dialog.h +-src/ui/browser_tabs.c +-src/ui/browser_tabs.h ++src/ui/ui_common.c ++src/ui/ui_dnd.c ++src/ui/ui_dnd.h ++src/ui/ui_folder.c ++src/ui/ui_folder.h + src/ui/ui_update.c + src/ui/ui_update.h +-src/parsers/atom10.c +-src/parsers/atom10.h +-src/parsers/html5_feed.c +-src/parsers/html5_feed.h +-src/parsers/ldjson_feed.c +-src/parsers/ldjson_feed.h +-src/parsers/ns_admin.c +-src/parsers/ns_admin.h +-src/parsers/ns_ag.c +-src/parsers/ns_ag.h +-src/parsers/ns_cC.c +-src/parsers/ns_cC.h +-src/parsers/ns_content.c +-src/parsers/ns_content.h +-src/parsers/ns_dc.c +-src/parsers/ns_dc.h +-src/parsers/ns_slash.c +-src/parsers/ns_slash.h +-src/parsers/ns_syn.c +-src/parsers/ns_syn.h +-src/parsers/rss_channel.c +-src/parsers/rss_channel.h +-src/parsers/rss_item.c +-src/parsers/rss_item.h +-src/fl_sources/default_source.c +-src/fl_sources/default_source.h +-src/fl_sources/dummy_source.c +-src/fl_sources/dummy_source.h +-src/fl_sources/google_source.c +-src/fl_sources/google_source.h +-src/fl_sources/opml_source.c +-src/fl_sources/opml_source.h +-src/fl_sources/node_source.c +-src/fl_sources/node_source.h +-src/fl_sources/reedah_source.c +-src/fl_sources/reedah_source.h +-src/fl_sources/reedah_source_feed.c +-src/fl_sources/reedah_source_feed_list.c +-src/fl_sources/reedah_source_feed_list.h +-src/fl_sources/ttrss_source.c +-src/fl_sources/ttrss_source.h +-src/fl_sources/ttrss_source_feed.c +-src/fl_sources/ttrss_source_feed_list.c +-src/fl_sources/ttrss_source_feed_list.h +-src/fl_sources/theoldreader_source.c +-src/fl_sources/theoldreader_source.h +-src/fl_sources/theoldreader_source_feed.c +-src/fl_sources/theoldreader_source_feed_list.c +-src/fl_sources/theoldreader_source_feed_list.h +-src/webkit/webkit.c ++src/update.c ++src/update.h ++src/vfolder.c ++src/vfolder.h ++src/vfolder_loader.c ++src/vfolder_loader.h + src/webkit/liferea_web_view.c + src/webkit/web_extension/liferea_web_extension.c + src/webkit/web_extension/web_extension_main.c +-plugins/headerbar.py +-plugins/libnotify.py +-plugins/plugin-installer.py +-plugins/trayicon.py ++src/webkit/webkit.c ++src/xml.c ++src/xml.h + [type: gettext/glade]glade/about.ui + [type: gettext/glade]glade/auth.ui + [type: gettext/glade]glade/enclosure_handler.ui +@@ -202,3 +195,9 @@ plugins/trayicon.py + [type: gettext/glade]glade/theoldreader_source.ui + [type: gettext/glade]glade/ttrss_source.ui + [type: gettext/glade]glade/update_monitor.ui ++xslt/feed.xml.in ++xslt/folder.xml.in ++xslt/item.xml.in ++xslt/newsbin.xml.in ++xslt/source.xml.in ++xslt/vfolder.xml.in diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 0e33f99910..f5d40b2c96 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -184,7 +184,7 @@ file system, and many more features.") (define-public liferea (package (name "liferea") - (version "1.13.4") + (version "1.13.5") (source (origin (method git-fetch) @@ -192,13 +192,17 @@ file system, and many more features.") (url "https://github.com/lwindolf/liferea/") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches + (search-patches + ;; To be removed in version 1.13.6. + "liferea-getfocus.patch")) (sha256 - (base32 "1g9463bvswsm899j6dfhslcg6np70m5wq143mjicr24zy8d17bm7")))) + (base32 "0yz5k4shdw12pwyvyhwx0vicjickv2ljfhryhc9s886swiq8ssrs")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags (list - "--disable-static") + "--disable-static") #:phases (modify-phases %standard-phases (add-before 'configure 'prepare-build-environment -- 2.30.0