summaryrefslogtreecommitdiff
path: root/opt
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-02-26 22:40:16 +0100
committerErich Eckner <git@eckner.net>2017-02-26 22:40:16 +0100
commit98be0a1fc38c68e0453884e074240df37b501ed4 (patch)
treed8d0e18253786a4aa4216ca12f52c1da8e05d925 /opt
parent0d63900f5be92ef0d1f0db103d612a41076095f5 (diff)
downloadcrux-patches-98be0a1fc38c68e0453884e074240df37b501ed4.tar.xz
conky removed
Diffstat (limited to 'opt')
-rw-r--r--opt/conky/MAX_SP-Pkgfile.patch18
-rw-r--r--opt/conky/MAX_SP.patch.new15
-rw-r--r--opt/conky/MAX_SP_20.patch.new11
3 files changed, 0 insertions, 44 deletions
diff --git a/opt/conky/MAX_SP-Pkgfile.patch b/opt/conky/MAX_SP-Pkgfile.patch
deleted file mode 100644
index 4cf52cc..0000000
--- a/opt/conky/MAX_SP-Pkgfile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Pkgfile 2015-11-01 14:40:19.045169678 +0100
-+++ Pkgfile 2016-11-22 15:35:51.097814800 +0100
-@@ -6,10 +6,14 @@
- name=conky
- version=1.9.0
- release=1
--source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.bz2)
-+source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.bz2
-+ MAX_SP.patch
-+ MAX_SP_20.patch)
-
- build() {
- cd $name-$version
-+ patch -p1 -i ../MAX_SP.patch
-+ patch -p1 -i ../MAX_SP_20.patch
- ./configure --prefix=/usr \
- --mandir=/usr/man \
- --disable-lua \
diff --git a/opt/conky/MAX_SP.patch.new b/opt/conky/MAX_SP.patch.new
deleted file mode 100644
index 7a6119d..0000000
--- a/opt/conky/MAX_SP.patch.new
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/top.c b/src/top.c
-index 98907f4..3217c1a 100644
---- a/src/top.c
-+++ b/src/top.c
-@@ -661,8 +661,8 @@ int parse_top_args(const char *s, const char *arg, struct text_object *obj)
- free(obj->data.opaque);
- return 0;
- }
-- if (n < 1 || n > 10) {
-- NORM_ERR("invalid num arg for top. Must be between 1 and 10.");
-+ if (n < 1 || n > MAX_SP) {
-+ NORM_ERR("invalid num arg for top. Must be between 1 and %d.", MAX_SP);
- free(td->s);
- free(obj->data.opaque);
- return 0;
diff --git a/opt/conky/MAX_SP_20.patch.new b/opt/conky/MAX_SP_20.patch.new
deleted file mode 100644
index 6e5db89..0000000
--- a/opt/conky/MAX_SP_20.patch.new
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/top.h 2012-05-03 23:08:27.000000000 +0200
-+++ b/src/top.h 2016-11-22 15:34:06.804553823 +0100
-@@ -78,7 +78,7 @@
- #define PROCFS_TEMPLATE_MEM "/proc/%d/statm"
- #define PROCFS_TEMPLATE_IO "/proc/%d/io"
- #define PROCFS_CMDLINE_TEMPLATE "/proc/%d/cmdline"
--#define MAX_SP 10 // number of elements to sort
-+#define MAX_SP 20 // number of elements to sort
-
- enum top_field {
- TOP_CPU,