From 00e682313967278e669ee09640bc7230af5d57f8 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 5 Jun 2020 15:32:12 -0500 Subject: [PATCH 1/4] Set trisquel feeds --- helpers/DATA/akregator/trisquel_feeds.patch | 69 +++++++++++++++++++++ helpers/make-akregator | 37 +++++++++++ 2 files changed, 106 insertions(+) create mode 100644 helpers/DATA/akregator/trisquel_feeds.patch create mode 100644 helpers/make-akregator diff --git a/helpers/DATA/akregator/trisquel_feeds.patch b/helpers/DATA/akregator/trisquel_feeds.patch new file mode 100644 index 0000000..c62e7f0 --- /dev/null +++ b/helpers/DATA/akregator/trisquel_feeds.patch @@ -0,0 +1,69 @@ +--- src/akregator_part.cpp 2020-06-05 11:41:23.000000000 -0500 ++++ src/akregator_part_trisquel.cpp 2020-06-05 12:46:05.914051386 -0500 +@@ -189,6 +189,66 @@ + wire.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://wire.kubuntu.org/?feed=rss2")); + kubuntuFolder.appendChild(wire); + ++// Trisquel feeds ++ QDomElement trisquelFolder = doc.createElement(QStringLiteral("outline")); ++ trisquelFolder.setAttribute(QStringLiteral("text"), QStringLiteral("Trisquel GNU/Linux")); ++ body.appendChild(trisquelFolder); ++ ++ QDomElement tnews = doc.createElement(QStringLiteral("outline")); ++ tnews.setAttribute(QStringLiteral("text"), i18n("News")); ++ tnews.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://trisquel.info/en/node/feed")); ++ trisquelFolder.appendChild(tnews); ++ ++ QDomElement relAnnounce = doc.createElement(QStringLiteral("outline")); ++ relAnnounce.setAttribute(QStringLiteral("text"), i18n("Release announcements")); ++ relAnnounce.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://trisquel.info/en/taxonomy/term/700/0/feed")); ++ trisquelFolder.appendChild(relAnnounce); ++ ++ QDomElement enForum = doc.createElement(QStringLiteral("outline")); ++ enForum.setAttribute(QStringLiteral("text"), i18n("Forum")); ++ enForum.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://trisquel.info/en/taxonomy/term/50/0/feed")); ++ trisquelFolder.appendChild(enForum); ++ ++ QDomElement tReddit = doc.createElement(QStringLiteral("outline")); ++ tReddit.setAttribute(QStringLiteral("text"), i18n("Trisquel at Reddit")); ++ tReddit.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://www.reddit.com/r/trisquel/.rss")); ++ trisquelFolder.appendChild(tReddit); ++ ++// Free Software feeds ++ QDomElement fsFolder = doc.createElement(QStringLiteral("outline")); ++ fsFolder.setAttribute(QStringLiteral("text"), QStringLiteral("Free Software")); ++ body.appendChild(fsFolder); ++ ++ QDomElement newGNU = doc.createElement(QStringLiteral("outline")); ++ newGNU.setAttribute(QStringLiteral("text"), i18n("What's New at GNU")); ++ newGNU.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://www.reddit.com/r/trisquel/.rss")); ++ fsFolder.appendChild(newGNU); ++ ++ QDomElement fsfNews = doc.createElement(QStringLiteral("outline")); ++ fsfNews.setAttribute(QStringLiteral("text"), i18n("FSF News")); ++ fsfNews.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://static.fsf.org/fsforg/rss/news.xml")); ++ fsFolder.appendChild(fsfNews); ++ ++ QDomElement fsfEvents = doc.createElement(QStringLiteral("outline")); ++ fsfEvents.setAttribute(QStringLiteral("text"), i18n("FSF Events")); ++ fsfEvents.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://static.fsf.org/fsforg/rss/events.xml")); ++ fsFolder.appendChild(fsfEvents); ++ ++ QDomElement fsfBlog = doc.createElement(QStringLiteral("outline")); ++ fsfBlog.setAttribute(QStringLiteral("text"), i18n("FSF Blogs")); ++ fsfBlog.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://static.fsf.org/fsforg/rss/blogs.xml")); ++ fsFolder.appendChild(fsfBlog); ++ ++ QDomElement fsDaily = doc.createElement(QStringLiteral("outline")); ++ fsDaily.setAttribute(QStringLiteral("text"), i18n("fsdaily.com - Free Software News")); ++ fsDaily.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://www.fsdaily.com/feed/published/All")); ++ fsFolder.appendChild(fsDaily); ++ ++ QDomElement gnuReddit = doc.createElement(QStringLiteral("outline")); ++ gnuReddit.setAttribute(QStringLiteral("text"), i18n("GNU at Reddit")); ++ gnuReddit.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://www.reddit.com/r/gnu/.rss")); ++ fsFolder.appendChild(gnuReddit); ++ + return doc; + } + } diff --git a/helpers/make-akregator b/helpers/make-akregator new file mode 100644 index 0000000..658bea5 --- /dev/null +++ b/helpers/make-akregator @@ -0,0 +1,37 @@ +#!/bin/sh +# +# Copyright (C) 2020 Luis Guzmán +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=1 +#EXTERNAL="" +#REPOKEY="" +#BACKPORT="false" +#DEPENDS="" + +. ./config + +#Remove upstream distros feeds +rm debian/patches/series +#rm debian/patches/debianize_akregator_default.diff +#rm debian/patches/kubuntu_debianize_akregator_default.diff +patch src/akregator_part.cpp < $DATA/trisquel_feeds.patch + +changelog "Patched feeds for Trisquel" + +compile + From f194ae851a44bf7a6dff08d8a294c4fc4eb28878 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 5 Jun 2020 16:15:29 -0500 Subject: [PATCH 2/4] Clear comment lines --- helpers/make-akregator | 6 ------ 1 file changed, 6 deletions(-) diff --git a/helpers/make-akregator b/helpers/make-akregator index 658bea5..6767516 100644 --- a/helpers/make-akregator +++ b/helpers/make-akregator @@ -18,17 +18,11 @@ # VERSION=1 -#EXTERNAL="" -#REPOKEY="" -#BACKPORT="false" -#DEPENDS="" . ./config #Remove upstream distros feeds rm debian/patches/series -#rm debian/patches/debianize_akregator_default.diff -#rm debian/patches/kubuntu_debianize_akregator_default.diff patch src/akregator_part.cpp < $DATA/trisquel_feeds.patch changelog "Patched feeds for Trisquel" From a4b5b41b7de8d1f2a45ae795b7402660e4a92470 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 5 Jun 2020 17:19:16 -0500 Subject: [PATCH 3/4] new approach of patching --- helpers/make-akregator | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/helpers/make-akregator b/helpers/make-akregator index 6767516..ea898a4 100644 --- a/helpers/make-akregator +++ b/helpers/make-akregator @@ -20,9 +20,11 @@ VERSION=1 . ./config - +set -x #Remove upstream distros feeds -rm debian/patches/series +sed -i "/debianize_akregator_default.diff/d" debian/patches/series +rm debian/patches/debianize_akregator_default.diff debian/patches/kubuntu_debianize_akregator_default.diff + patch src/akregator_part.cpp < $DATA/trisquel_feeds.patch changelog "Patched feeds for Trisquel" From eea0231dc0c7b7d6d4d826927d4a2f927a2fefe9 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 5 Jun 2020 17:21:24 -0500 Subject: [PATCH 4/4] remove debug --- helpers/make-akregator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-akregator b/helpers/make-akregator index ea898a4..65bc02a 100644 --- a/helpers/make-akregator +++ b/helpers/make-akregator @@ -20,7 +20,7 @@ VERSION=1 . ./config -set -x + #Remove upstream distros feeds sed -i "/debianize_akregator_default.diff/d" debian/patches/series rm debian/patches/debianize_akregator_default.diff debian/patches/kubuntu_debianize_akregator_default.diff