diff options
| -rw-r--r-- | main/conky/0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch | 27 | ||||
| -rw-r--r-- | main/conky/APKBUILD | 26 | ||||
| -rw-r--r-- | main/conky/musl-fixes.patch | 69 | ||||
| -rw-r--r-- | main/conky/posix-awk.patch | 68 |
4 files changed, 7 insertions, 183 deletions
diff --git a/main/conky/0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch b/main/conky/0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch deleted file mode 100644 index 66dfbfe815..0000000000 --- a/main/conky/0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1a0998ff81aae523544b6f0a2afd71ea8667a5db Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 23 Jul 2015 15:58:07 +0200 -Subject: [PATCH] Change ipv6 check to warning instead of fatal error - -The compile server might not have ipv6 but that does not prevent us from -building conky and run it on a machine which has ipv6. ---- - cmake/ConkyPlatformChecks.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake -index a2ebafc..26d0bea 100644 ---- a/cmake/ConkyPlatformChecks.cmake -+++ b/cmake/ConkyPlatformChecks.cmake -@@ -105,7 +105,7 @@ endif(BUILD_IRC) - if(BUILD_IPV6) - find_file(IF_INET6 if_inet6 PATHS /proc/net) - if(NOT IF_INET6) -- message(FATAL_ERROR "/proc/net/if_inet6 unavailable") -+ message(WARNING "/proc/net/if_inet6 unavailable") - endif(NOT IF_INET6) - endif(BUILD_IPV6) - --- -2.4.6 - diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD index 3a3ca5ac87..347eaa8575 100644 --- a/main/conky/APKBUILD +++ b/main/conky/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=conky -pkgver=1.10.0 -pkgrel=1 +pkgver=1.10.1 +pkgrel=0 pkgdesc="An advanced, highly configurable system monitor for X based on torsmo" url="http://conky.sourceforge.net/" arch="all" @@ -12,11 +12,7 @@ makedepends="alsa-lib-dev libxml2-dev curl-dev wireless-tools-dev cairo-dev tolua++ ncurses-dev linux-headers cmake gawk " subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/brndnmtthws/conky/archive/v$pkgver.tar.gz - musl-fixes.patch - posix-awk.patch - 0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/brndnmtthws/conky/archive/v$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -28,6 +24,7 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done + sed -i -e '32 iinclude(CheckIncludeFile)' CMakeLists.txt } build() { @@ -53,15 +50,6 @@ package() { install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE } -md5sums="cdc0298e5f257829d574ae8114170d9b conky-1.10.0.tar.gz -033686de05697157dbd04f08f7b7eb03 musl-fixes.patch -a2b1463fe06741f1e0707e130eb57700 posix-awk.patch -9f6688a7ffe94b22ce4b30a2b493498c 0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch" -sha256sums="f392f3f91fcc37f04ff65d53957512e4d81b7b9b36394acb5ecaefe92623f8eb conky-1.10.0.tar.gz -5f5d7b0aaed99199ccc628d482b30ccce228e15fa4f9794bf01dda9a05587691 musl-fixes.patch -c23d2df3c0250162ce16cb718fe4c87e171bc58baf29ad8898df5387888f1718 posix-awk.patch -235ce40d1915a970b8962ff0cbbda71d0236cd57a8f764b9cbc63926b21bce49 0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch" -sha512sums="08664c2c736c078848e4864f7a2df5ed536e683da6aa482cf003c675b03c274802cfd27127adb3d99145fe6c4103cc06046b40322383beafc4ca2e7e811b5caf conky-1.10.0.tar.gz -8753e171d143cfcd4e34187d3edbe6b1d92846319c9732931dd9addd1c9da65d88e7318dc49244db08462100cf527e1a07ddd3e005d669c551460cbfaff19ed4 musl-fixes.patch -7508ddbfa0610d54a030563bd173ec496d5a0279cab410308e15adc558416d14ff322687bd88d5a7b76d17d8d948e117993d655790a4cc6bb3650ab4ba530f9f posix-awk.patch -b5593dd088ac7c9351b4426b9ba55b87c819aecad5a62b48496325e0e8c1cca768559d2513cc29bf1dca273abbf6db5f80086b05016cc36a9870edc08184a002 0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch" +md5sums="e871fd229a6e9804cfe23fc76d4bef11 conky-1.10.1.tar.gz" +sha256sums="b4e66a71e8211d02b8dbe8cd4873af209af25326e63afd90c90ba9416c79cf21 conky-1.10.1.tar.gz" +sha512sums="bcd3efa722fcd1d264157843fac0e9c5e5e0aa881f38b676cb1634efe57c3f07c535f063c0c9eba7bcd5deebf7b8e87099856fc5092cd01955c09b70e155cfd2 conky-1.10.1.tar.gz" diff --git a/main/conky/musl-fixes.patch b/main/conky/musl-fixes.patch deleted file mode 100644 index 4891f32785..0000000000 --- a/main/conky/musl-fixes.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 21b0a052af22a355321cce13abd573dbcf90dd4a Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 23 Jul 2015 13:57:18 +0200 -Subject: [PATCH 2/3] Remove use of sysctl.h - ---- - src/common.cc | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/common.cc b/src/common.cc -index 126f30a..116cd06 100644 ---- a/src/common.cc -+++ b/src/common.cc -@@ -42,7 +42,6 @@ - #include <errno.h> - #include <time.h> - #include <sys/ioctl.h> --#include <sys/sysctl.h> - #include <net/if.h> - #include <netinet/in.h> - #include <pthread.h> --- -2.4.6 - - -From 3d67ed4920d31e5b17dd61684713d061d4fd7598 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 23 Jul 2015 13:58:02 +0200 -Subject: [PATCH 3/3] Use portable version of strerror_r - ---- - src/c++wrap.cc | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/c++wrap.cc b/src/c++wrap.cc -index c21b473..213f9c4 100644 ---- a/src/c++wrap.cc -+++ b/src/c++wrap.cc -@@ -26,8 +26,14 @@ - #include "c++wrap.hh" - - #include <unistd.h> -+ -+/* force use of POSIX strerror_r instead of non-portable GNU specific */ -+#ifdef _GNU_SOURCE -+#undef _GNU_SOURCE -+#endif - #include <string.h> - -+ - #if !defined(HAVE_PIPE2) || !defined(HAVE_O_CLOEXEC) - #include <fcntl.h> - -@@ -62,8 +68,10 @@ namespace { - - std::string strerror_r(int errnum) - { -- char buf[100]; -- return strerror_r(errnum, buf, sizeof buf); -+ static thread_local char buf[100]; -+ if (strerror_r(errnum, buf, sizeof buf) != 0) -+ snprintf(buf, sizeof buf, "Unknown error %i", errnum); -+ return buf; - } - - std::pair<int, int> pipe2(int flags) --- -2.4.6 - diff --git a/main/conky/posix-awk.patch b/main/conky/posix-awk.patch deleted file mode 100644 index 722eaaa526..0000000000 --- a/main/conky/posix-awk.patch +++ /dev/null @@ -1,68 +0,0 @@ -From f9c14e3b78a9a4659eac124b79076ff91ffeb90f Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 23 Jul 2015 13:15:58 +0200 -Subject: [PATCH 1/3] Use posix awk instead of GNU awk - ---- - cmake/Conky.cmake | 10 +++++----- - cmake/ConkyCPackSetup.cmake | 2 +- - cmake/ConkyPlatformChecks.cmake | 2 +- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/cmake/Conky.cmake b/cmake/Conky.cmake -index b9605de..d9fd150 100644 ---- a/cmake/Conky.cmake -+++ b/cmake/Conky.cmake -@@ -71,10 +71,10 @@ set(VERSION_MAJOR "1") - set(VERSION_MINOR "10") - set(VERSION_PATCH "1") - --find_program(APP_GAWK gawk) --if(NOT APP_GAWK) -- message(FATAL_ERROR "Unable to find program 'gawk'") --endif(NOT APP_GAWK) -+find_program(APP_AWK awk) -+if(NOT APP_AWK) -+ message(FATAL_ERROR "Unable to find program 'awk'") -+endif(NOT APP_AWK) - - find_program(APP_WC wc) - if(NOT APP_WC) -@@ -99,7 +99,7 @@ if(NOT RELEASE) - mark_as_advanced(APP_GIT) - endif(NOT RELEASE) - --mark_as_advanced(APP_GAWK APP_WC APP_DATE APP_UNAME) -+mark_as_advanced(APP_AWK APP_WC APP_DATE APP_UNAME) - - #BUILD_DATE=$(LANG=en_US LC_ALL=en_US LOCALE=en_US date) - #BUILD_ARCH="$(uname -sr) ($(uname -m))" -diff --git a/cmake/ConkyCPackSetup.cmake b/cmake/ConkyCPackSetup.cmake -index a568922..c1046ef 100644 ---- a/cmake/ConkyCPackSetup.cmake -+++ b/cmake/ConkyCPackSetup.cmake -@@ -44,7 +44,7 @@ endif(CPACK_GENERATOR MATCHES "NSIS") - # Source package setup. Compile with "make package_source". - set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION}-src") - set(CPACK_SOURCE_GENERATOR "TBZ2") --execute_process(COMMAND ${APP_UNAME} COMMAND ${APP_GAWK} "{print $1}" -+execute_process(COMMAND ${APP_UNAME} COMMAND ${APP_AWK} "{print $1}" - RESULT_VARIABLE RETVAL OUTPUT_VARIABLE CPU_ARCH - OUTPUT_STRIP_TRAILING_WHITESPACE) - -diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake -index ca520ed..a2ebafc 100644 ---- a/cmake/ConkyPlatformChecks.cmake -+++ b/cmake/ConkyPlatformChecks.cmake -@@ -422,6 +422,6 @@ if(DEBUG) - execute_process(COMMAND - ${APP_GIT} --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git log - --since=${VERSION_MAJOR}-${VERSION_MINOR}-01 --pretty=oneline COMMAND -- ${APP_WC} -l COMMAND ${APP_GAWK} "{print $1}" RESULT_VARIABLE RETVAL -+ ${APP_WC} -l COMMAND ${APP_AWK} "{print $1}" RESULT_VARIABLE RETVAL - OUTPUT_VARIABLE COMMIT_COUNT OUTPUT_STRIP_TRAILING_WHITESPACE) - endif(DEBUG) --- -2.4.6 - - |