init
This commit is contained in:
30
sysutils/conky/patches/patch-cmake_ConkyPlatformChecks_cmake
Normal file
30
sysutils/conky/patches/patch-cmake_ConkyPlatformChecks_cmake
Normal file
@@ -0,0 +1,30 @@
|
||||
$OpenBSD$
|
||||
|
||||
Index: cmake/ConkyPlatformChecks.cmake
|
||||
--- cmake/ConkyPlatformChecks.cmake.orig
|
||||
+++ cmake/ConkyPlatformChecks.cmake
|
||||
@@ -136,9 +136,13 @@ else(OS_LINUX)
|
||||
check_include_files("sys/soundcard.h" HAVE_SOME_SOUNDCARD_H)
|
||||
endif(OS_LINUX)
|
||||
|
||||
-if(BUILD_I18N AND OS_DRAGONFLY)
|
||||
- set(conky_libs ${conky_libs} -lintl)
|
||||
-endif(BUILD_I18N AND OS_DRAGONFLY)
|
||||
+if(BUILD_I18N)
|
||||
+ find_package(Intl)
|
||||
+ if (Intl_FOUND)
|
||||
+ set(conky_includes ${conky_includes} ${Intl_INCLUDE_DIRS})
|
||||
+ set(conky_libs ${conky_libs} ${Intl_LIBRARIES})
|
||||
+ endif(Intl_FOUND)
|
||||
+endif(BUILD_I18N)
|
||||
|
||||
if(BUILD_I18N AND OS_DARWIN)
|
||||
find_path(LIBINTL_H_N libintl.h
|
||||
@@ -340,6 +344,7 @@ if(BUILD_X11)
|
||||
find_path(freetype_INCLUDE_PATH
|
||||
freetype/config/ftconfig.h
|
||||
${INCLUDE_SEARCH_PATH}
|
||||
+ ${X11_INCLUDE_DIR}/freetype2
|
||||
/usr/include/freetype2
|
||||
/usr/local/include/freetype2
|
||||
/usr/pkg/include/freetype2)
|
||||
37
sysutils/conky/patches/patch-cmake_Conky_cmake
Normal file
37
sysutils/conky/patches/patch-cmake_Conky_cmake
Normal file
@@ -0,0 +1,37 @@
|
||||
$OpenBSD$
|
||||
|
||||
Index: cmake/Conky.cmake
|
||||
--- cmake/Conky.cmake.orig
|
||||
+++ cmake/Conky.cmake
|
||||
@@ -96,14 +96,14 @@ set(conky_includes ${CMAKE_BINARY_DIR})
|
||||
# enabled! Thus disable this and _LARGEFILE64_SOURCE isnt needed, it is already
|
||||
# used on macOS.
|
||||
#
|
||||
-if(NOT OS_DARWIN)
|
||||
+if(NOT OS_DARWIN AND NOT OS_OPENBSD)
|
||||
add_definitions(-D_LARGEFILE64_SOURCE -D_POSIX_C_SOURCE=200809L) # Standard
|
||||
# definitions
|
||||
set(
|
||||
CMAKE_REQUIRED_DEFINITIONS
|
||||
"${CMAKE_REQUIRED_DEFINITIONS} -D_LARGEFILE64_SOURCE -D_POSIX_C_SOURCE=200809L"
|
||||
)
|
||||
-endif(NOT OS_DARWIN)
|
||||
+endif(NOT OS_DARWIN AND NOT OS_OPENBSD)
|
||||
|
||||
if(OS_FREEBSD)
|
||||
add_definitions(-D__BSD_VISIBLE=1 -D_XOPEN_SOURCE=700)
|
||||
@@ -112,6 +112,14 @@ if(OS_FREEBSD)
|
||||
"${CMAKE_REQUIRED_DEFINITIONS} -D_LARGEFILE64_SOURCE -D_POSIX_C_SOURCE=200809L -D__BSD_VISIBLE=1 -D_XOPEN_SOURCE=700"
|
||||
)
|
||||
endif(OS_FREEBSD)
|
||||
+
|
||||
+if(OS_OPENBSD)
|
||||
+ add_definitions(-D_LARGEFILE64_SOURCE)
|
||||
+ set(
|
||||
+ CMAKE_REQUIRED_DEFINITIONS
|
||||
+ "${CMAKE_REQUIRED_DEFINITIONS} -D_LARGEFILE64_SOURCE"
|
||||
+ )
|
||||
+endif(OS_OPENBSD)
|
||||
|
||||
if(OS_DRAGONFLY)
|
||||
set(conky_libs ${conky_libs} -L/usr/pkg/lib)
|
||||
14
sysutils/conky/patches/patch-data_conky_no_x11_conf
Normal file
14
sysutils/conky/patches/patch-data_conky_no_x11_conf
Normal file
@@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-data_conky_no_x11_conf,v 1.1 2012/12/31 09:36:38 chrisz Exp $
|
||||
Index: data/conky_no_x11.conf
|
||||
--- data/conky_no_x11.conf.orig
|
||||
+++ data/conky_no_x11.conf
|
||||
@@ -28,7 +28,8 @@ conky.config = {
|
||||
cpu_avg_samples = 2,
|
||||
net_avg_samples = 2,
|
||||
no_buffers = true,
|
||||
- out_to_stderr = false,
|
||||
+ out_to_x = no,
|
||||
+ out_to_ncurses = yes,
|
||||
update_interval = 1.0,
|
||||
uppercase = false,
|
||||
use_spacer = 'none',
|
||||
Reference in New Issue
Block a user