Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-27 09:08:25 +00:00
Code Issues Releases Activity

Comment out rsvg_handle_get_intrinsic_size_in_pixels for now.

Browse Source
This commit is contained in:
Brenden Matthews 2022-09-10 11:57:16 -05:00
parent 182b4f0c11
commit 5d02762903
No known key found for this signature in database
GPG Key ID: B49ABB7270D9D4FD
3 changed files with 14382 additions and 11053 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmake/ConkyPlatformChecks.cmake
View File

@ -328,29 +328,12 @@ if(BUILD_X11)
# check for Xft
if(BUILD_XFT)
find_path(freetype_INCLUDE_PATH
config/ftconfig.h
${INCLUDE_SEARCH_PATH}
/usr/include/freetype2
/usr/local/include/freetype2
/usr/pkg/include/freetype2)
if(freetype_INCLUDE_PATH)
set(freetype_FOUND true)
set(conky_includes ${conky_includes} ${freetype_INCLUDE_PATH})
else(freetype_INCLUDE_PATH)
find_path(freetype_INCLUDE_PATH
freetype/config/ftconfig.h
${INCLUDE_SEARCH_PATH}
/usr/include/freetype2
/usr/local/include/freetype2
/usr/pkg/include/freetype2)
if(freetype_INCLUDE_PATH)
set(freetype_FOUND true)
set(conky_includes ${conky_includes} ${freetype_INCLUDE_PATH})
else(freetype_INCLUDE_PATH)
if(FREETYPE_INCLUDE_DIR_freetype2)
set(FREETYPE_FOUND true)
set(conky_includes ${conky_includes} ${FREETYPE_INCLUDE_DIR_freetype2})
else(FREETYPE_INCLUDE_DIR_freetype2)
message(FATAL_ERROR "Unable to find freetype library")
endif(freetype_INCLUDE_PATH)
endif(freetype_INCLUDE_PATH)
endif(FREETYPE_INCLUDE_DIR_freetype2)
if(NOT X11_Xft_FOUND)
message(FATAL_ERROR "Unable to find Xft library")
endif(NOT X11_Xft_FOUND)

12
lua/rsvg.pkg
View File

@ -87,11 +87,13 @@ typedef struct _RsvgRectangle {
const char *rsvg_handle_get_base_uri (RsvgHandle * handle);
void rsvg_handle_set_base_uri (RsvgHandle * handle, const char *base_uri);
#if LIBRSVG_MAJOR_VERSION >= 2 && LIBRSVG_MINOR_VERSION >= 52
gboolean rsvg_handle_get_intrinsic_size_in_pixels (RsvgHandle *handle,
gdouble *out_width,
#endif /* LIBRSVG_MAJOR_VERSION >= 2 && LIBRSVG_MINOR_VERSION >= 52 */
gdouble *out_height);
/* BM: this function is temporarily disabled until I figure out a better way to
* handle the librsvg deprecated changes.
*
* gboolean rsvg_handle_get_intrinsic_size_in_pixels (RsvgHandle *handle,
* gdouble *out_width,
* gdouble *out_height);
*/
gboolean rsvg_handle_get_geometry_for_layer(RsvgHandle *handle,
const char *id,

11072
tests/catch2/catch.hpp
View File

File diff suppressed because it is too large Load Diff