From b38411789f54a13c47f6fa721cb0c785706a5246 Mon Sep 17 00:00:00 2001 From: Thomas Lin Pedersen Date: Wed, 8 Jan 2025 14:28:25 +0100 Subject: [PATCH] another try --- NAMESPACE | 2 +- inst/src/Makevars | 7 ------- {inst/src => src}/.gitignore | 0 {inst/src => src}/Makevars.in | 0 {inst/src => src}/Makevars.win | 0 {inst/src => src}/cache_lru.h | 0 {inst/src => src}/cpp11.cpp | 0 {inst/src => src}/face_feature.cpp | 0 {inst/src => src}/face_feature.h | 0 {inst/src => src}/hb_shaper.cpp | 0 {inst/src => src}/hb_shaper.h | 0 {inst/src => src}/init.cpp | 0 {inst/src => src}/string_bidi.cpp | 0 {inst/src => src}/string_bidi.h | 0 {inst/src => src}/string_metrics.cpp | 0 {inst/src => src}/string_metrics.h | 0 {inst/src => src}/string_shape.cpp | 0 {inst/src => src}/string_shape.h | 0 {inst/src => src}/utils.h | 0 19 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 inst/src/Makevars rename {inst/src => src}/.gitignore (100%) rename {inst/src => src}/Makevars.in (100%) rename {inst/src => src}/Makevars.win (100%) rename {inst/src => src}/cache_lru.h (100%) rename {inst/src => src}/cpp11.cpp (100%) rename {inst/src => src}/face_feature.cpp (100%) rename {inst/src => src}/face_feature.h (100%) rename {inst/src => src}/hb_shaper.cpp (100%) rename {inst/src => src}/hb_shaper.h (100%) rename {inst/src => src}/init.cpp (100%) rename {inst/src => src}/string_bidi.cpp (100%) rename {inst/src => src}/string_bidi.h (100%) rename {inst/src => src}/string_metrics.cpp (100%) rename {inst/src => src}/string_metrics.h (100%) rename {inst/src => src}/string_shape.cpp (100%) rename {inst/src => src}/string_shape.h (100%) rename {inst/src => src}/utils.h (100%) diff --git a/NAMESPACE b/NAMESPACE index 7087e45..7b4023f 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -10,4 +10,4 @@ importFrom(lifecycle,deprecated) importFrom(systemfonts,font_feature) importFrom(systemfonts,match_fonts) importFrom(systemfonts,system_fonts) -useDynLib(textshaping, .registration = TRUE) +#useDynLib(textshaping, .registration = TRUE) diff --git a/inst/src/Makevars b/inst/src/Makevars deleted file mode 100644 index 0c668c3..0000000 --- a/inst/src/Makevars +++ /dev/null @@ -1,7 +0,0 @@ -PKG_CPPFLAGS = -DNDEBUG -I/opt/homebrew/Cellar/harfbuzz/10.1.0/include/harfbuzz -I/opt/homebrew/Cellar/glib/2.82.4/include/glib-2.0 -I/opt/homebrew/Cellar/glib/2.82.4/lib/glib-2.0/include -I/opt/homebrew/opt/gettext/include -I/opt/homebrew/Cellar/pcre2/10.44/include -I/opt/homebrew/Cellar/graphite2/1.3.14/include -I/opt/homebrew/opt/freetype/include/freetype2 -I/opt/homebrew/opt/libpng/include/libpng16 -I/opt/homebrew/Cellar/fribidi/1.0.16/include/fribidi -DFRIBIDI_LIB_STATIC -PKG_LIBS = -L/opt/homebrew/Cellar/harfbuzz/10.1.0/lib -lharfbuzz -lm -framework ApplicationServices -L/opt/homebrew/Cellar/glib/2.82.4/lib -lglib-2.0 -L/opt/homebrew/opt/gettext/lib -lintl -liconv -lm -framework Foundation -framework CoreFoundation -framework AppKit -framework Carbon -L/opt/homebrew/Cellar/pcre2/10.44/lib -lpcre2-8 -D_THREAD_SAFE -pthread -L/opt/homebrew/Cellar/graphite2/1.3.14/lib -lgraphite2 -L/opt/homebrew/opt/freetype/lib -lfreetype -lbz2 -L/opt/homebrew/opt/libpng/lib -lpng16 -lz -L/opt/homebrew/Cellar/fribidi/1.0.16/lib -lfribidi - -all: clean - -clean: - rm -f $(SHLIB) $(OBJECTS) diff --git a/inst/src/.gitignore b/src/.gitignore similarity index 100% rename from inst/src/.gitignore rename to src/.gitignore diff --git a/inst/src/Makevars.in b/src/Makevars.in similarity index 100% rename from inst/src/Makevars.in rename to src/Makevars.in diff --git a/inst/src/Makevars.win b/src/Makevars.win similarity index 100% rename from inst/src/Makevars.win rename to src/Makevars.win diff --git a/inst/src/cache_lru.h b/src/cache_lru.h similarity index 100% rename from inst/src/cache_lru.h rename to src/cache_lru.h diff --git a/inst/src/cpp11.cpp b/src/cpp11.cpp similarity index 100% rename from inst/src/cpp11.cpp rename to src/cpp11.cpp diff --git a/inst/src/face_feature.cpp b/src/face_feature.cpp similarity index 100% rename from inst/src/face_feature.cpp rename to src/face_feature.cpp diff --git a/inst/src/face_feature.h b/src/face_feature.h similarity index 100% rename from inst/src/face_feature.h rename to src/face_feature.h diff --git a/inst/src/hb_shaper.cpp b/src/hb_shaper.cpp similarity index 100% rename from inst/src/hb_shaper.cpp rename to src/hb_shaper.cpp diff --git a/inst/src/hb_shaper.h b/src/hb_shaper.h similarity index 100% rename from inst/src/hb_shaper.h rename to src/hb_shaper.h diff --git a/inst/src/init.cpp b/src/init.cpp similarity index 100% rename from inst/src/init.cpp rename to src/init.cpp diff --git a/inst/src/string_bidi.cpp b/src/string_bidi.cpp similarity index 100% rename from inst/src/string_bidi.cpp rename to src/string_bidi.cpp diff --git a/inst/src/string_bidi.h b/src/string_bidi.h similarity index 100% rename from inst/src/string_bidi.h rename to src/string_bidi.h diff --git a/inst/src/string_metrics.cpp b/src/string_metrics.cpp similarity index 100% rename from inst/src/string_metrics.cpp rename to src/string_metrics.cpp diff --git a/inst/src/string_metrics.h b/src/string_metrics.h similarity index 100% rename from inst/src/string_metrics.h rename to src/string_metrics.h diff --git a/inst/src/string_shape.cpp b/src/string_shape.cpp similarity index 100% rename from inst/src/string_shape.cpp rename to src/string_shape.cpp diff --git a/inst/src/string_shape.h b/src/string_shape.h similarity index 100% rename from inst/src/string_shape.h rename to src/string_shape.h diff --git a/inst/src/utils.h b/src/utils.h similarity index 100% rename from inst/src/utils.h rename to src/utils.h