Page MenuHomeSolus
Files F9735

0001-Update-to-2.7.3.patch
mmeinert (Michael Meinertzhagen)
Actions

Authored By
mmeinert
Jan 7 2017, 12:21 PM
Size
4 KB
Referenced Files
None
Subscribers
None

0001-Update-to-2.7.3.patch
View Options

From 8a0cb6acf16584329c2298d00cc3bb00b75238df Mon Sep 17 00:00:00 2001
From: Michael Meinertzhagen <mmeinert@protonmail.com>
Date: Sat, 7 Jan 2017 13:19:40 +0100
Subject: [PATCH 1/1] Update to 2.7.3
---
files/0001-Use-a-stateless-configuration.patch | 31 +++++++++++++-------------
package.yml | 6 ++---
pspec_x86_64.xml | 14 ++++++------
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/files/0001-Use-a-stateless-configuration.patch b/files/0001-Use-a-stateless-configuration.patch
index c2c6c75..b45b87a 100644
--- a/files/0001-Use-a-stateless-configuration.patch
+++ b/files/0001-Use-a-stateless-configuration.patch
@@ -1,32 +1,31 @@
-From c5ad83585a3893cfa72f375448d4060ff9d3973d Mon Sep 17 00:00:00 2001
-From: Ikey Doherty <ikey@solus-project.com>
-Date: Sat, 12 Mar 2016 15:28:09 +0000
-Subject: [PATCH] Use a stateless configuration
+From 58c6a817525a25b0259c2d8e3617d6fd67435d48 Mon Sep 17 00:00:00 2001
+From: Michael Meinertzhagen <mmeinert@protonmail.com>
+Date: Sat, 7 Jan 2017 13:08:27 +0100
+Subject: [PATCH 1/1] Use a stateless configuration
-Signed-off-by: Ikey Doherty <ikey@solus-project.com>
---
src/Makefile.am | 2 +-
src/rcfile.c | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index df65845..181db1a 100644
+index 22baa16f..11ec9e7b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DDATADIR=\"$(datadir)\"
- bin_PROGRAMS = nano
- nano_SOURCES = browser.c \
+ CLEANFILES = revision.h
+
diff --git a/src/rcfile.c b/src/rcfile.c
-index 7c10b3d..bde6d3b 100644
+index a9426d22..8ec59112 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
-@@ -1375,7 +1375,11 @@ void do_rcfile(void)
- struct stat rcinfo;
- FILE *rcstream;
-
+@@ -1258,7 +1258,11 @@ void parse_one_nanorc(void)
+ /* First read the system-wide rcfile, then the user's rcfile. */
+ void do_rcfiles(void)
+ {
- nanorc = mallocstrcpy(nanorc, SYSCONFDIR "/nanorc");
+ if (access(SYSCONFDIR "/nanorc", F_OK) == 0) {
+ nanorc = mallocstrcpy(nanorc, SYSCONFDIR "/nanorc");
@@ -34,8 +33,8 @@ index 7c10b3d..bde6d3b 100644
+ nanorc = mallocstrcpy(nanorc, DATADIR "/defaults/nano/nanorc");
+ }
- /* Don't open directories, character files, or block files. */
- if (stat(nanorc, &rcinfo) != -1) {
+ /* Process the system-wide nanorc. */
+ parse_one_nanorc();
--
-2.7.1
+2.11.0
diff --git a/package.yml b/package.yml
index 5416301..412258c 100644
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : nano
-version : 2.7.1
-release : 64
+version : 2.7.3
+release : 65
source :
- - https://www.nano-editor.org/dist/v2.7/nano-2.7.1.tar.xz : df5cbe69831d7394c0a32fb27373ab313335ea4dc586d6f4be4081eb1de857cd
+ - https://www.nano-editor.org/dist/v2.7/nano-2.7.3.tar.xz : d926ef5060d23bafec75dab9328bb9b9df9a08e58c56b9061d686f5698770bfc
license :
- GPL-3.0
summary : Small, friendly text editor inspired by Pico
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
index f4fbbf8..1749208 100644
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>nano</Name>
<Packager>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
+ <Name>Michael Meinertzhagen</Name>
+ <Email>mmeinert@protonmail.com</Email>
</Packager>
<License>GPL-3.0</License>
<PartOf>editor</PartOf>
@@ -29,12 +29,12 @@
</Files>
</Package>
<History>
- <Update release="63">
- <Date>2016-12-05</Date>
- <Version>2.7.1</Version>
+ <Update release="65">
+ <Date>2017-01-07</Date>
+ <Version>2.7.3</Version>
<Comment>Packaging update</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
+ <Name>Michael Meinertzhagen</Name>
+ <Email>mmeinert@protonmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
--
2.11.0

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
6033
Default Alt Text
0001-Update-to-2.7.3.patch (4 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.