diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-04-26 19:28:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-26 10:28:21 -0700 |
| commit | 546813ae7b9e2873dd3d38e78b27ac5582feae10 (patch) | |
| tree | 6acb3bf022bf9060c70c0665d3586bb33a60f4d9 /ports/libsigcpp | |
| parent | a9b27ed5dffbf70b135eddb0c4729f3ca87f106c (diff) | |
| download | vcpkg-546813ae7b9e2873dd3d38e78b27ac5582feae10.tar.gz vcpkg-546813ae7b9e2873dd3d38e78b27ac5582feae10.zip | |
[glib up to gtk] update and make it work with meson (#13100)
* 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>
Diffstat (limited to 'ports/libsigcpp')
| -rw-r--r-- | ports/libsigcpp/CMakeLists.txt | 68 | ||||
| -rw-r--r-- | ports/libsigcpp/CONTROL | 4 | ||||
| -rw-r--r-- | ports/libsigcpp/disable_tests_enable_static_build.patch | 41 | ||||
| -rw-r--r-- | ports/libsigcpp/portfile.cmake | 36 | ||||
| -rw-r--r-- | ports/libsigcpp/vcpkg.json | 6 | ||||
| -rw-r--r-- | ports/libsigcpp/version.patch | 17 |
6 files changed, 76 insertions, 96 deletions
diff --git a/ports/libsigcpp/CMakeLists.txt b/ports/libsigcpp/CMakeLists.txt deleted file mode 100644 index e5a1dbee0..000000000 --- a/ports/libsigcpp/CMakeLists.txt +++ /dev/null @@ -1,68 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(libsigc++) - -set(CMAKE_CXX_STANDARD 17) - -set(SIGCPP_API_VERSION 2.0) - -add_definitions(-DSIGC_BUILD) - -include_directories(./MSVC_Net2013) # config file for windows is there -include_directories(.) - -set(SICGPP_SOURCES - sigc++/connection.cc - sigc++/signal_base.cc - sigc++/trackable.cc - sigc++/adaptors/lambda/lambda.cc - sigc++/functors/slot_base.cc) - -add_library(sigc ${SICGPP_SOURCES}) -set_target_properties(sigc PROPERTIES OUTPUT_NAME sigc-${SIGCPP_API_VERSION}) -install(TARGETS sigc RUNTIME DESTINATION bin ARCHIVE DESTINATION lib) - -if(NOT SIGCPP_SKIP_HEADERS) - install(FILES MSVC_Net2013/sigc++config.h DESTINATION include) - install(FILES sigc++/sigc++.h DESTINATION include/sigc++) - install(FILES sigc++/bind.h DESTINATION include/sigc++) - install(FILES sigc++/bind_return.h DESTINATION include/sigc++) - install(FILES sigc++/connection.h DESTINATION include/sigc++) - install(FILES sigc++/limit_reference.h DESTINATION include/sigc++) - install(FILES sigc++/reference_wrapper.h DESTINATION include/sigc++) - install(FILES sigc++/retype_return.h DESTINATION include/sigc++) - install(FILES sigc++/signal.h DESTINATION include/sigc++) - install(FILES sigc++/signal_base.h DESTINATION include/sigc++) - install(FILES sigc++/slot.h DESTINATION include/sigc++) - install(FILES sigc++/trackable.h DESTINATION include/sigc++) - install(FILES sigc++/type_traits.h DESTINATION include/sigc++) - install(FILES sigc++/visit_each.h DESTINATION include/sigc++) - install(FILES sigc++/adaptors/adaptors.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/adaptor_trait.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/bind.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/bind_return.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/bound_argument.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/compose.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/deduce_result_type.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/exception_catch.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/hide.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/retype.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/retype_return.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/track_obj.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/lambda/base.h DESTINATION include/sigc++/adaptors/lambda) - install(FILES sigc++/adaptors/lambda/select.h DESTINATION include/sigc++/adaptors/lambda) - install(FILES sigc++/functors/functors.h DESTINATION include/sigc++/functors) - install(FILES sigc++/functors/functor_trait.h DESTINATION include/sigc++/functors) - install(FILES sigc++/functors/mem_fun.h DESTINATION include/sigc++/functors) - install(FILES sigc++/functors/ptr_fun.h DESTINATION include/sigc++/functors) - install(FILES sigc++/functors/slot.h DESTINATION include/sigc++/functors) - install(FILES sigc++/functors/slot_base.h DESTINATION include/sigc++/functors) -endif() - -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -set(libdir ${CMAKE_INSTALL_PREFIX}/lib) -set(includedir ${CMAKE_INSTALL_PREFIX}/include) -set(SIGCXX_API_VERSION "2.0") -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sigc++.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/sigc++.pc" @ONLY) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sigc++.pc" DESTINATION lib/pkgconfig) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sigc++.pc" DESTINATION lib/pkgconfig RENAME sigc++-2.0.pc) diff --git a/ports/libsigcpp/CONTROL b/ports/libsigcpp/CONTROL deleted file mode 100644 index 82b48ec57..000000000 --- a/ports/libsigcpp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libsigcpp
-Version: 2.10-3
-Port-Version: 2
-Description: Typesafe callback framework for C++
diff --git a/ports/libsigcpp/disable_tests_enable_static_build.patch b/ports/libsigcpp/disable_tests_enable_static_build.patch new file mode 100644 index 000000000..2c4909df3 --- /dev/null +++ b/ports/libsigcpp/disable_tests_enable_static_build.patch @@ -0,0 +1,41 @@ +From 219b3f5a681731bcaeee9fee0f136e6eb6143d33 Mon Sep 17 00:00:00 2001
+From: Bruk Tedla <biruk.tedla93@gmail.com>
+Date: Thu, 17 Sep 2020 19:45:27 +0300
+Subject: [PATCH] disable_tests_enable_static_build
+
+---
+ CMakeLists.txt | 4 ++--
+ sigc++/CMakeLists.txt | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2e7f383..b2b8395 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -89,8 +89,8 @@ enable_testing()
+
+
+ add_subdirectory (sigc++)
+-add_subdirectory (examples)
+-add_subdirectory (tests)
++#add_subdirectory (examples)
++#add_subdirectory (tests)
+
+
+ set (PROJECT_CMAKE_NAME "${PROJECT_NAME}-3")
+diff --git a/sigc++/CMakeLists.txt b/sigc++/CMakeLists.txt
+index fa5a91a..86f1be7 100644
+--- a/sigc++/CMakeLists.txt
++++ b/sigc++/CMakeLists.txt
+@@ -23,7 +23,7 @@ set (SOURCE_FILES
+
+ set (SIGCPP_LIB_NAME sigc-${SIGCXX_API_VERSION})
+
+-add_library(${SIGCPP_LIB_NAME} SHARED ${SOURCE_FILES})
++add_library(${SIGCPP_LIB_NAME} ${SOURCE_FILES})
+
+ set_property (TARGET ${SIGCPP_LIB_NAME} PROPERTY VERSION ${PACKAGE_VERSION})
+ set_property(TARGET ${SIGCPP_LIB_NAME} PROPERTY SOVERSION ${LIBSIGCPP_SOVERSION})
+--
+2.27.0.windows.1
+
diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake index a8b70d053..7dceaa2f4 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -1,33 +1,21 @@ -
-vcpkg_download_distfile(ARCHIVE
- URLS "https://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz"
- FILENAME "libsigc++-2.10.0.tar.xz"
- SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE ${ARCHIVE}
+ REPO libsigcplusplus/libsigcplusplus
+ REF 7e20b36bddab74faed39aa3768d07fd372fce596
+ SHA512 6220a3974ee90afb5028a5b60ffcbff353fffbbfcf1570d8db05b6d91604324a73badcb17c73c852d6c5265e2b31e1c2de1b3ea20c0e60ecdb17ce90c9ca40bd
+ HEAD_REF master
+ PATCHES
+ disable_tests_enable_static_build.patch
+ version.patch
)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS_DEBUG
- -DSIGCPP_SKIP_HEADERS=ON)
-
+)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sigc++-3 TARGET_PATH share/sigc++-3)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- file(READ ${CURRENT_PACKAGES_DIR}/include/sigc++config.h SIGCPPCONFIG_H)
- string(REPLACE "endif /* !SIGC_MSC */"
- "endif /* !SIGC_MSC */
-#undef SIGC_DLL" SIGCPPCONFIG_H "${SIGCPPCONFIG_H}")
- file(WRITE ${CURRENT_PACKAGES_DIR}/include/sigc++config.h "${SIGCPPCONFIG_H}")
-endif()
-
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsigcpp)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libsigcpp/COPYING ${CURRENT_PACKAGES_DIR}/share/libsigcpp/copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/libsigcpp/vcpkg.json b/ports/libsigcpp/vcpkg.json new file mode 100644 index 000000000..bf94085c5 --- /dev/null +++ b/ports/libsigcpp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libsigcpp", + "version": "3.0.3", + "description": "Typesafe callback framework for C++", + "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/" +} diff --git a/ports/libsigcpp/version.patch b/ports/libsigcpp/version.patch new file mode 100644 index 000000000..dd485021e --- /dev/null +++ b/ports/libsigcpp/version.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b06ef121c..9b9520342 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,9 +16,9 @@ + + cmake_minimum_required (VERSION 3.2) + +-set (SIGCXX_MAJOR_VERSION 2) +-set (SIGCXX_MINOR_VERSION 99) +-set (SIGCXX_MICRO_VERSION 1) ++set (SIGCXX_MAJOR_VERSION 3) ++set (SIGCXX_MINOR_VERSION 0) ++set (SIGCXX_MICRO_VERSION 3) + + set (SIGCXX_API_VERSION 3.0) + set (PACKAGE_VERSION ${SIGCXX_MAJOR_VERSION}.${SIGCXX_MINOR_VERSION}.${SIGCXX_MICRO_VERSION}) |
