diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2015-12-04 07:38:26 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2015-12-04 07:38:43 +0000 |
| commit | 2d2a730f92988dc8ef8e5bc41cdd78a7ca1a9817 (patch) | |
| tree | 3dcc48728440bdfd25eeea2124dea1ac20725f71 /main/conky/posix-awk.patch | |
| parent | 45900dcf339106132282e2b697ab55845132b8b3 (diff) | |
| download | aports-2d2a730f92988dc8ef8e5bc41cdd78a7ca1a9817.tar.bz2 aports-2d2a730f92988dc8ef8e5bc41cdd78a7ca1a9817.tar.xz | |
main/conky: upgrade to 1.10.1. Fixes #4919
Diffstat (limited to 'main/conky/posix-awk.patch')
| -rw-r--r-- | main/conky/posix-awk.patch | 68 |
1 files changed, 0 insertions, 68 deletions
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 - - |