[liferea]: Update +

Open

Details

2 participants

Efraim Flashner
Raghav Gururajan

Owner: unassigned

Submitted by: Raghav Gururajan

Severity: normal

Raghav Gururajan wrote on 24 Jan 2021 17:23

Recipients:(address . guix-patches@gnu.org)

Message-ID:303e0998-cdc5-8363-9004-43dc0e31a1dc@raghavgururajan.name

From 738325e29ba202f91e9d7db34001ff4f2a6d06a6 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Sun, 24 Jan 2021 11:20:03 -0500
Subject: [PATCH 3/3] gnu: liferea: Update to 1.13.5.

* gnu/packages/syndication.scm (liferea) [version]: Modify.
[source]<origin>[sha256]: Modify.
---
 gnu/packages/syndication.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 5a5006e349..a84c7b3864 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)
@@ -193,7 +193,7 @@ file system, and many more features.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1g9463bvswsm899j6dfhslcg6np70m5wq143mjicr24zy8d17bm7"))))
+        (base32 "0yz5k4shdw12pwyvyhwx0vicjickv2ljfhryhc9s886swiq8ssrs"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags
-- 
2.30.0

From 423ff5fe605e3ab5bd7743a5d515bfd79bc4f6f6 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Sun, 24 Jan 2021 11:16:39 -0500
Subject: [PATCH 2/3] gnu: liferea: Disable static libraries.

* gnu/packages/syndication.scm (liferea) [arguments]<#:configure-flags>
[--disable-static]: New flag.
---
 gnu/packages/syndication.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Toggle diff (18 lines)diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 4a5c042309..5a5006e349 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -196,7 +196,10 @@ file system, and many more features.")
         (base32 "1g9463bvswsm899j6dfhslcg6np70m5wq143mjicr24zy8d17bm7"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     `(#:phases
+     `(#:configure-flags
+       (list
+        "--disable-static")
+       #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'prepare-build-environment
            (lambda* (#:key inputs #:allow-other-keys)
-- 
2.30.0

From a3a86c6d7ecfae79731efd0188ab41ad873e432e Mon Sep 17 00:00:00 2001

These new inputs are referenced by the package but was missing in

the package definition. Some of these inputs might have been used

by the package indirectly via propagation from other inputs.

* gnu/packages/syndication.scm (liferea) [inputs]: Add glib, libsoup,

pango and sqlite.

---

gnu/packages/syndication.scm | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)

Toggle diff (31 lines)diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 54fa221fa6..4a5c042309 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -222,7 +222,8 @@ file system, and many more features.")
        ("pkg-config" ,pkg-config)
        ("which" ,which)))
     (inputs
-     `(("glib-networking" ,glib-networking)
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)
        ("gnome-keyring" ,gnome-keyring)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gstreamer" ,gstreamer)
@@ -230,11 +231,14 @@ file system, and many more features.")
        ("libnotify" ,libnotify)
        ("libpeas" ,libpeas)
        ("libsecret" ,libsecret)
+       ("libsoup" ,libsoup)
        ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
+       ("pango" ,pango)
        ("python" ,python)
        ("python-pycairo" ,python-pycairo)
        ("python-pygobject" ,python-pygobject)
+       ("sqlite" ,sqlite)
        ("webkitgtk" ,webkitgtk)))
     (home-page "https://lzone.de/liferea/")
     (synopsis "News reader for GTK/GNOME")
-- 
2.30.0

Efraim Flashner wrote on 28 Jan 2021 11:37

Recipients:(name . Raghav Gururajan)(address . rg@raghavgururajan.name)(address . 46075@debbugs.gnu.org)

Message-ID:YBKT/jJp5CXfM2f6@3900XT

I wasn't able to apply the upgrade to 1.13.5 patch, liferea wouldn't
build for me with the upgraded version.

Making check in po
make[1]: Entering directory '/tmp/guix-build-liferea-1.13.5.drv-0/source/po'
INTLTOOL_EXTRACT="/gnu/store/ddyxcvw6280hxwipyvzrlqsm6sv1irjc-intltool-0.51.0/bin/intltool-extract" XGETTEXT="/gnu/store/n9wx4dp68bfsw9bb1bwmklzl34ggrmgm-gettext-minimal-0.20.1/bin/xgettext" srcdir=. /gnu/store/ddyxcvw6280hxwipyvzrlqsm6sv1irjc-intltool-0.51.0/bin/intltool-update --gettext-package liferea --pot
rm -f missing notexist
srcdir=. /gnu/store/ddyxcvw6280hxwipyvzrlqsm6sv1irjc-intltool-0.51.0/bin/intltool-update -m
The following files contain translations and are currently not in use. Please
consider adding these to the POTFILES.in file, located in the po/ directory.

plugins/getfocus.py

If some of these files are left out on purpose then please add them to
POTFILES.skip instead of POTFILES.in. A file 'missing' containing this list
of left out files has been written in the current directory.
Please report to liferea-devel@lists.sourceforge.net
if [ -r missing -o -r notexist ]; then \
  exit 1; \
fi
make[1]: *** [Makefile:350: check] Error 1
make[1]: Leaving directory '/tmp/guix-build-liferea-1.13.5.drv-0/source/po'
make: *** [Makefile:711: check-recursive] Error 1

Test suite failed, dumping logs.
command "make" "check" "-j" "24" "gtk_update_icon_cache=true" failed with status 2
builder for `/gnu/store/f145f3mpdr0y12ybbhjs9inbbz90nl7q-liferea-1.13.5.drv' failed with exit code 1
build of /gnu/store/f145f3mpdr0y12ybbhjs9inbbz90nl7q-liferea-1.13.5.drv failed
View build log at '/var/log/guix/drvs/f1/45f3mpdr0y12ybbhjs9inbbz90nl7q-liferea-1.13.5.drv.bz2'.
guix build: error: build of `/gnu/store/f145f3mpdr0y12ybbhjs9inbbz90nl7q-liferea-1.13.5.drv' failed



-- 
Efraim Flashner   <efraim@flashner.co.il>   ????? ?????
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Raghav Gururajan wrote on 28 Jan 2021 21:33

Recipients:(name . Efraim Flashner)(address . efraim@flashner.co.il)(address . 46075@debbugs.gnu.org)

Message-ID:132ed099-5e32-b965-0ffb-cae7258f00d4@raghavgururajan.name

Hi Efraim!

Toggle quote (31 lines)> I wasn't able to apply the upgrade to 1.13.5 patch, liferea wouldn't
> build for me with the upgraded version.
> 
> Making check in po
> make[1]: Entering directory '/tmp/guix-build-liferea-1.13.5.drv-0/source/po'
> INTLTOOL_EXTRACT="/gnu/store/ddyxcvw6280hxwipyvzrlqsm6sv1irjc-intltool-0.51.0/bin/intltool-extract" XGETTEXT="/gnu/store/n9wx4dp68bfsw9bb1bwmklzl34ggrmgm-gettext-minimal-0.20.1/bin/xgettext" srcdir=. /gnu/store/ddyxcvw6280hxwipyvzrlqsm6sv1irjc-intltool-0.51.0/bin/intltool-update --gettext-package liferea --pot
> rm -f missing notexist
> srcdir=. /gnu/store/ddyxcvw6280hxwipyvzrlqsm6sv1irjc-intltool-0.51.0/bin/intltool-update -m
> The following files contain translations and are currently not in use. Please
> consider adding these to the POTFILES.in file, located in the po/ directory.
> 
> plugins/getfocus.py
> 
> If some of these files are left out on purpose then please add them to
> POTFILES.skip instead of POTFILES.in. A file 'missing' containing this list
> of left out files has been written in the current directory.
> Please report to liferea-devel@lists.sourceforge.net
> if [ -r missing -o -r notexist ]; then \
>    exit 1; \
> fi
> make[1]: *** [Makefile:350: check] Error 1
> make[1]: Leaving directory '/tmp/guix-build-liferea-1.13.5.drv-0/source/po'
> make: *** [Makefile:711: check-recursive] Error 1
> 
> Test suite failed, dumping logs.
> command "make" "check" "-j" "24" "gtk_update_icon_cache=true" failed with status 2
> builder for `/gnu/store/f145f3mpdr0y12ybbhjs9inbbz90nl7q-liferea-1.13.5.drv' failed with exit code 1
> build of /gnu/store/f145f3mpdr0y12ybbhjs9inbbz90nl7q-liferea-1.13.5.drv failed
> View build log at '/var/log/guix/drvs/f1/45f3mpdr0y12ybbhjs9inbbz90nl7q-liferea-1.13.5.drv.bz2'.
> guix build: error: build of `/gnu/store/f145f3mpdr0y12ybbhjs9inbbz90nl7q-liferea-1.13.5.drv' failed

Sorry about that. Please find the revised patches attached.

Regards,

RG.

From b24ba4a0dc021a89008c2eb5169e6e51ce9f4cac Mon Sep 17 00:00:00 2001

These new inputs are referenced by the package but was missing in

the package definition. Some of these inputs might have been used

by the package indirectly via propagation from other inputs.

* gnu/packages/syndication.scm (liferea) [inputs]: Add glib, libsoup,

pango and sqlite.

---

gnu/packages/syndication.scm | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)

Toggle diff (31 lines)diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 54fa221fa6..4a5c042309 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -222,7 +222,8 @@ file system, and many more features.")
        ("pkg-config" ,pkg-config)
        ("which" ,which)))
     (inputs
-     `(("glib-networking" ,glib-networking)
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)
        ("gnome-keyring" ,gnome-keyring)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gstreamer" ,gstreamer)
@@ -230,11 +231,14 @@ file system, and many more features.")
        ("libnotify" ,libnotify)
        ("libpeas" ,libpeas)
        ("libsecret" ,libsecret)
+       ("libsoup" ,libsoup)
        ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
+       ("pango" ,pango)
        ("python" ,python)
        ("python-pycairo" ,python-pycairo)
        ("python-pygobject" ,python-pygobject)
+       ("sqlite" ,sqlite)
        ("webkitgtk" ,webkitgtk)))
     (home-page "https://lzone.de/liferea/")
     (synopsis "News reader for GTK/GNOME")
-- 
2.30.0

From 950c8f364c65ca2e3b2c835cfee1077dc6a6cca0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Sun, 24 Jan 2021 11:16:39 -0500
Subject: [PATCH 20/21] gnu: liferea: Disable static libraries.

* gnu/packages/syndication.scm (liferea) [arguments]<#:configure-flags>
[--disable-static]: New flag.
---
 gnu/packages/syndication.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Toggle diff (18 lines)diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 4a5c042309..5a5006e349 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -196,7 +196,10 @@ file system, and many more features.")
         (base32 "1g9463bvswsm899j6dfhslcg6np70m5wq143mjicr24zy8d17bm7"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     `(#:phases
+     `(#:configure-flags
+       (list
+        "--disable-static")
+       #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'prepare-build-environment
            (lambda* (#:key inputs #:allow-other-keys)
-- 
2.30.0

Attachment: 0021-gnu-liferea-Update-to-1.13.5.patch

Efraim Flashner wrote on 31 Jan 2021 12:38

Recipients:(name . Raghav Gururajan)(address . rg@raghavgururajan.name)(address . 46075@debbugs.gnu.org)

Message-ID:YBaWrwjyo93Kc0fo@3900XT

On Thu, Jan 28, 2021 at 03:33:25PM -0500, Raghav Gururajan wrote:

Toggle quote (38 lines)> Hi Efraim!
> 
> > I wasn't able to apply the upgrade to 1.13.5 patch, liferea wouldn't
> > build for me with the upgraded version.
> > 
> > Making check in po
> > make[1]: Entering directory '/tmp/guix-build-liferea-1.13.5.drv-0/source/po'
> > INTLTOOL_EXTRACT="/gnu/store/ddyxcvw6280hxwipyvzrlqsm6sv1irjc-intltool-0.51.0/bin/intltool-extract" XGETTEXT="/gnu/store/n9wx4dp68bfsw9bb1bwmklzl34ggrmgm-gettext-minimal-0.20.1/bin/xgettext" srcdir=. /gnu/store/ddyxcvw6280hxwipyvzrlqsm6sv1irjc-intltool-0.51.0/bin/intltool-update --gettext-package liferea --pot
> > rm -f missing notexist
> > srcdir=. /gnu/store/ddyxcvw6280hxwipyvzrlqsm6sv1irjc-intltool-0.51.0/bin/intltool-update -m
> > The following files contain translations and are currently not in use. Please
> > consider adding these to the POTFILES.in file, located in the po/ directory.
> > 
> > plugins/getfocus.py
> > 
> > If some of these files are left out on purpose then please add them to
> > POTFILES.skip instead of POTFILES.in. A file 'missing' containing this list
> > of left out files has been written in the current directory.
> > Please report to liferea-devel@lists.sourceforge.net
> > if [ -r missing -o -r notexist ]; then \
> >    exit 1; \
> > fi
> > make[1]: *** [Makefile:350: check] Error 1
> > make[1]: Leaving directory '/tmp/guix-build-liferea-1.13.5.drv-0/source/po'
> > make: *** [Makefile:711: check-recursive] Error 1
> > 
> > Test suite failed, dumping logs.
> > command "make" "check" "-j" "24" "gtk_update_icon_cache=true" failed with status 2
> > builder for `/gnu/store/f145f3mpdr0y12ybbhjs9inbbz90nl7q-liferea-1.13.5.drv' failed with exit code 1
> > build of /gnu/store/f145f3mpdr0y12ybbhjs9inbbz90nl7q-liferea-1.13.5.drv failed
> > View build log at '/var/log/guix/drvs/f1/45f3mpdr0y12ybbhjs9inbbz90nl7q-liferea-1.13.5.drv.bz2'.
> > guix build: error: build of `/gnu/store/f145f3mpdr0y12ybbhjs9inbbz90nl7q-liferea-1.13.5.drv' failed
> 
> Sorry about that. Please find the revised patches attached.
> 
> Regards,
> RG.

That patch is some 62k lines. Is there something shorter that we can use

that isn't a repackaging of HEAD?

Efraim Flashner <efraim@flashner.co.il> ????? ?????

GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351

Confidentiality cannot be guaranteed on emails sent or received unencrypted

Raghav Gururajan wrote on 31 Jan 2021 21:19

Recipients:(name . Efraim Flashner)(address . efraim@flashner.co.il)(address . 46075@debbugs.gnu.org)

Message-ID:8dddcdd2-30bd-effd-761f-147f36c5eb4d@raghavgururajan.name

Hi Efraim!

Toggle quote (3 lines)

> 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.

Attachment: 0004-gnu-liferea-Update-to-1.13.5.patch

Attachment: OpenPGP_0x5F5816647F8BE551.asc

Attachment: OpenPGP_signature

Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 46075@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 46075

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date