mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 17:59:00 +08:00
546813ae7b
* update glib to meson * update ci baseline * update glib to 2.66.3 remove cmakelists * fix some minor meson issue but meson is still a mess * add_bin_to_path to vcpkg_install_meson * regen docs * try fixing/touching all glib dependent ports * fix libsigcpp-3 version * fix glibmm * fix gmime * fix libcroco * update libnice * fix atk build * update harfbuzz * fix few builds * update libxmlpp * fix gdk-pixbuf * fix gts * gts add patch * remove old libsigcpp * add missing comma * fix supports logic * fix name mismatch * restore original ci baseline. * fix a lot of small details. increment controls. * fix harfbuzz & glib * bump port version * update port_versions * fix version field * update versions * fix glib in harfbuzz * update port versions * silly uppercase type * update port-versions * fix cairo build * update version * fix atk * update atk port-verisons * fix gts public includes * update versions * fix cairomm * fix pango * fix ignition * update versions. * fix gtk * fix librsvg * update versions * fix atk linux * fix libgpod * update versions * fix lcm * fix librsvg * update pango and pangomm * update pango to meson * more updates * update pixman * fix cairo * fix cairo * some fixes * reorder meson a bit * add none.txt for meson * fix x86_x64 to x86 "cross" builds * add tiff pkgconfig * update gdk-pixbuf * fix tiff and jpeg * add graphene * fix gdk-pixbuf * add sassc * update gtk * fix cairo complete build * add harfbuzz inlcude in pango since meson does not add it into pkgconfig. * fix gtk build. Remaining issue fix install script. * fix gtk build * fix io2d * add supports field * fix cartographer? * fix librsvg build * fix gtk build * fix cartographer * fix sassc on linux * fix tiff and libjpeg pc files * fix pixman x86 * _isnanf is undefined on arm- * merge fix for make on arm64 * fix gdk-pixbuf on arm64-windows * pixman remove test/demos. should fix it on osx. * [vcpkg_install_meson] add bin to path to run code generators * [vcpkg_configure_meson] deactivate native compiler in cross builds make x86 on x86_x64 a native instead of a cross build (as long as we are not building for UWP) * pixman reenable UWP support. * pixman reenable arm support * add pixman:arm-uwp=fail to baseline * update gtkmm * remove double whitespaces * gtk baseline gtk dependency on cairo x11 remove double spaces in flags * fix linux build * native none again * cairo fix cairo-script.pc * comment out patch since the cairo changes should have fixed it. * disable wayland backend in GTK since CI is missing system packages * silly typo in cairo pc file correction install lzo pc on windows * remove double spaces in _FLAGS remove unnecessary comments * actually disabling wayland backend * fix glib codegen issue having the wrong path * try to fix paths in glib codegen * integrate changes form #12860 * add the uwp patch back in * deactivate extra harfbuzz shapers. * vcpkg x-add-version --all --overwrite-version * remove patches in tesseract. * fix version * rerun add-version * add libgpod:x64-linux=fail to baseline due to missing system tools/libraries * change regex to take double - into account. * run x-add-version * run format-manifest * add missing removal of multiple spaces back into the regex * remove ws diff change * fix gtkmm the upstream way * remove ws to reduce diff * make glib build on osx * format manifest * run x-add-version * add pthread dependency * update baseline due to glib compiling on osx now. * add meson as a dep to glib * - add glib host dependencies - switch to manifest of touched ports * switch to manifest. * [libxml2] add gnuinstalldirs * [libxml2] add missing include of GNUInstallDirs * add version info * add include dir to pc files .... * update version * add UWP as crosscompiling target * Apply suggestions from code review * trying to fix cairo pthread detection on osx. * fix libmicrohttpd by adding the required system frameworks on osx * fix poppler by not removing the CXX standard * fix missing coretext header from harfbuzz in pano * fix formating issues * fix librsvg on osx * revert version changes * bump version * version stuff. * fix graphene version stuff * fix version stuff * removing ports from ci baseline to cause me pain * move cairomm:x64-linux=fail to gtkmm:x64-linx=fail remove pangomm:x64-osx=fail * fix typo * revert ws changes to vcpkg_install_meson * update port version after merge * version stuff * fix fluidsynth by adding vcpkg_check_features * move cairo to ci baseline on osx * version stuff * fluidsynth corrections * more version stuff * apply code review changes * clean version stuff. * update version stuff * code review cleanup * version stuff * formating * update version stuff again * remove gdi again * version stuff * version stuff * version baseline * Apply strega-nil suggestions from code review * run x-add-version * reset versions to upstream/master * v8 CONTROL -> json * reset fluidsynth to upstream/master * first batch of version-string -> version conversion * second and last batch of version-string -> version conversions * update version stuff * disable gdi feature in harfbuzz (missing user32 linkage in qt5-base) * version stuff * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * more CR stuff * update versions * back out provision changes so that pr can be merged. Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
123 lines
3.3 KiB
Diff
123 lines
3.3 KiB
Diff
diff --git a/Makefile.am b/Makefile.am
|
|
index 03fa35236..94a7a263a 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -16,11 +16,11 @@ EXTRA_DIST += \
|
|
|
|
ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
|
|
|
|
-DIST_SUBDIRS = src doc util boilerplate test perf
|
|
-SUBDIRS = src doc util
|
|
+DIST_SUBDIRS = src util boilerplate
|
|
+SUBDIRS = src util
|
|
# libpng is required for our test programs
|
|
if CAIRO_HAS_PNG_FUNCTIONS
|
|
-SUBDIRS += boilerplate test perf
|
|
+SUBDIRS += boilerplate
|
|
endif
|
|
|
|
configure: cairo-version.h
|
|
@@ -28,12 +28,11 @@ configure: cairo-version.h
|
|
doc:
|
|
cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
|
|
test retest recheck: all
|
|
- cd test && $(MAKE) $(AM_MAKEFLAGS) $@
|
|
+ echo "do nothing"
|
|
perf: all
|
|
cd perf && $(MAKE) $(AM_MAKEFLAGS) $@
|
|
check-valgrind: all
|
|
- cd test && $(MAKE) $(AM_MAKEFLAGS) check-valgrind
|
|
- cd perf && $(MAKE) $(AM_MAKEFLAGS) check-valgrind
|
|
+ echo "do nothing"
|
|
.PHONY: doc test retest recheck perf check-valgrind
|
|
|
|
|
|
diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
|
|
index 29ad015ac..9234014ed 100644
|
|
--- a/boilerplate/Makefile.am
|
|
+++ b/boilerplate/Makefile.am
|
|
@@ -69,7 +69,7 @@ test: check
|
|
|
|
if CROSS_COMPILING
|
|
else
|
|
-TESTS += check-link$(EXEEXT)
|
|
+#TESTS += check-link$(EXEEXT)
|
|
endif
|
|
|
|
check_PROGRAMS += check-link
|
|
diff --git a/perf/cairo-analyse-trace.c b/perf/cairo-analyse-trace.c
|
|
index 994148660..5d2dceaec 100644
|
|
--- a/perf/cairo-analyse-trace.c
|
|
+++ b/perf/cairo-analyse-trace.c
|
|
@@ -53,7 +53,7 @@
|
|
#include <sys/stat.h>
|
|
|
|
#ifdef _MSC_VER
|
|
-#include "dirent-win32.h"
|
|
+#include "dirent.h"
|
|
|
|
static char *
|
|
basename_no_ext (char *path)
|
|
diff --git a/perf/cairo-perf-trace.c b/perf/cairo-perf-trace.c
|
|
index 02e0e29f9..36daf3fd6 100644
|
|
--- a/perf/cairo-perf-trace.c
|
|
+++ b/perf/cairo-perf-trace.c
|
|
@@ -54,7 +54,7 @@
|
|
#include <sys/stat.h>
|
|
|
|
#ifdef _MSC_VER
|
|
-#include "dirent-win32.h"
|
|
+#include "dirent.h"
|
|
|
|
static char *
|
|
basename_no_ext (char *path)
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index fe339a3cf..df6de0136 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -100,8 +100,8 @@ else
|
|
TESTS += check-link$(EXEEXT)
|
|
endif
|
|
|
|
-EXTRA_DIST += $(TESTS_SH) check-has-hidden-symbols.c check-doc-syntax.awk
|
|
-check_PROGRAMS += check-link
|
|
+# EXTRA_DIST += $(TESTS_SH) check-has-hidden-symbols.c check-doc-syntax.awk
|
|
+# check_PROGRAMS += check-link
|
|
check_link_LDADD = libcairo.la
|
|
|
|
check: headers-standalone
|
|
diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h
|
|
index d982c101d..ad9b26ba0 100644
|
|
--- a/src/cairo-compiler-private.h
|
|
+++ b/src/cairo-compiler-private.h
|
|
@@ -201,10 +201,10 @@
|
|
#define hypot _hypot
|
|
#define pclose _pclose
|
|
#define popen _popen
|
|
-#define snprintf _snprintf
|
|
+//#define snprintf _snprintf
|
|
#define strdup _strdup
|
|
#define unlink _unlink
|
|
-#define vsnprintf _vsnprintf
|
|
+//#define vsnprintf _vsnprintf
|
|
#endif
|
|
|
|
#ifdef _MSC_VER
|
|
diff --git a/test/Makefile.am b/test/Makefile.am
|
|
index e3c42ea88..099ca8b22 100644
|
|
--- a/test/Makefile.am
|
|
+++ b/test/Makefile.am
|
|
@@ -351,9 +351,9 @@ FAILED_TESTS = `grep -l '\<FAIL\>' $(test_sources:.c=.log) 2>/dev/null | tr '\n'
|
|
recheck = check CAIRO_TESTS="$(FAILED_TESTS)"
|
|
|
|
# Re-checks all failed tests, i.e. tests with a log file that has a failure
|
|
-recheck:
|
|
- @echo Re-checking failed tests
|
|
- @$(MAKE) $(AM_MAKEFLAGS) $(recheck)
|
|
+# recheck:
|
|
+# @echo Re-checking failed tests
|
|
+# @$(MAKE) $(AM_MAKEFLAGS) $(recheck)
|
|
|
|
# Checks tests.
|
|
# Target doesn't fail if tests fail.
|