From 5ae9a20d20d23c000f24f5edfe810f1126c4b323 Mon Sep 17 00:00:00 2001 From: truckmonth Date: Thu, 28 Feb 2019 11:23:00 -0600 Subject: [PATCH 1/6] update `.gitignore` to ignore custom build dirs --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 980259c484..1f004ac6fc 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ inkscape_devel_source.tar.bz2 /*.snap /*_source.tar.bz2 + +# @truckmonth +_build_macos_native/ -- GitLab From 824c5821b2a3852f00685957ac19fd3165dcc4bd Mon Sep 17 00:00:00 2001 From: truckmonth Date: Thu, 28 Feb 2019 15:36:53 -0600 Subject: [PATCH 2/6] update submodules for inkscape --- share/extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/extensions b/share/extensions index 9a0bc4b725..71f21129a7 160000 --- a/share/extensions +++ b/share/extensions @@ -1 +1 @@ -Subproject commit 9a0bc4b725f597e9d79aa57a1f24483b76b73dad +Subproject commit 71f21129a7c7ffac03c103ea777b09214f2a63b6 -- GitLab From 740787491de4102195cc528a9ec112dce297bbcf Mon Sep 17 00:00:00 2001 From: truckmonth Date: Sun, 3 Mar 2019 14:35:50 -0600 Subject: [PATCH 3/6] update submodules for inkscape --- share/extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/extensions b/share/extensions index 71f21129a7..d6894fd0ef 160000 --- a/share/extensions +++ b/share/extensions @@ -1 +1 @@ -Subproject commit 71f21129a7c7ffac03c103ea777b09214f2a63b6 +Subproject commit d6894fd0eff647b7fb908a767a102093e292f7b4 -- GitLab From 2fe5c7a05d56421054ad83b3f6963f909e5151d7 Mon Sep 17 00:00:00 2001 From: truckmonth Date: Thu, 11 Apr 2019 10:24:41 -0500 Subject: [PATCH 4/6] pull updates --- po/POTFILES.in | 2 +- share/extensions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index dcd6effc15..f520d1aea6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -# Generated by generate_POTFILES.sh at Sat Mar 23 00:20:17 CET 2019 +# Generated by generate_POTFILES.sh at Wed Mar 27 20:44:54 CDT 2019 [encoding: UTF-8] org.inkscape.Inkscape.appdata.xml.in share/filters/filters.svg.h diff --git a/share/extensions b/share/extensions index 591f46b453..2bd2313b4f 160000 --- a/share/extensions +++ b/share/extensions @@ -1 +1 @@ -Subproject commit 591f46b453af44b00e020c9577d2f3a0a56ec7a1 +Subproject commit 2bd2313b4f64a584f1de178fa356944bada91bff -- GitLab From 44f4dffff10bb1371793b55040af947fb1c094bf Mon Sep 17 00:00:00 2001 From: truckmonth Date: Thu, 25 Apr 2019 11:04:59 -0500 Subject: [PATCH 5/6] update extensions --- share/extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/extensions b/share/extensions index 2107c80cf6..8532f58c0e 160000 --- a/share/extensions +++ b/share/extensions @@ -1 +1 @@ -Subproject commit 2107c80cf6140745c33fd64d445dfe283067f01a +Subproject commit 8532f58c0e844e7c887d1bc80ef7ea4efebfccc0 -- GitLab From 9ac95132ff99d461ef8592fd9de9d4ed5e1e12c9 Mon Sep 17 00:00:00 2001 From: truckmonth Date: Sat, 1 Jun 2019 16:31:14 -0500 Subject: [PATCH 6/6] fix ninja cli build for gtk-mac-integration --- CMakeScripts/DefineDependsandFlags.cmake | 7 ++-- .../Modules/FindGtkMacIntegration.cmake | 42 +++++++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 CMakeScripts/Modules/FindGtkMacIntegration.cmake diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 73e15fbb16..269049526d 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -212,9 +212,10 @@ else() endif() if(APPLE) - pkg_check_modules(MacIntegration REQUIRED gtk-mac-integration-gtk3) - list(APPEND INKSCAPE_INCS_SYS ${MacIntegration_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${MacIntegration_LIBRARIES}) + find_package(GtkMacIntegration REQUIRED) + list(APPEND INKSCAPE_INCS_SYS ${GTKMACINTEGRATION_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${GTKMACINTEGRATION_LIBRARIES}) + add_definitions(${GTKMACINTEGRATION_DEFINITIONS}) endif() # ---------------------------------------------------------------------------- diff --git a/CMakeScripts/Modules/FindGtkMacIntegration.cmake b/CMakeScripts/Modules/FindGtkMacIntegration.cmake new file mode 100644 index 0000000000..509dff96bc --- /dev/null +++ b/CMakeScripts/Modules/FindGtkMacIntegration.cmake @@ -0,0 +1,42 @@ +# - Try to find gtk-mac-integration +# NOTE: gtk-mac-intergration works with both GTK2 and GTK3 +# Once done, this will define +# +# GTKMACINTEGRATION_FOUND - system has libgtkmacintegration +# GTKMACINTEGRATION_INCLUDE_DIRS - the libgtkmacintegration include directory +# GTKMACINTEGRATION_LIBRARIES - The libraries needed to use libgtkmacintegration +# GTKMACINTEGRATION_CPPFLAGS - The cflags needed to use libgtkmacintegration + +set(_GTKMACINTEGRATION_ROOT_PATHS + ${CMAKE_INSTALL_PREFIX} +) + +find_path(GTKMACINTEGRATION_INCLUDE_DIRS + NAMES + gtkosxapplication.h + HINTS + _GTKMACINTEGRATION_ROOT_PATHS + PATH_SUFFIXES + include/gtkmacintegration-gtk3 + include/gtkmacintegration +) + +find_library(GTKMACINTEGRATION_LIBRARIES + NAMES + gtkmacintegration-gtk3 gtkmacintegration + HINTS + ${_GTKMACINTEGRATION_ROOT_PATHS} + PATH_SUFFIXES + bin + lib +) + +set(GTKMACINTEGRATION_CPPFLAGS "-DMAC_INTEGRATION") + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(GTKMACINTEGRATION + DEFAULT_MSG + GTKMACINTEGRATION_INCLUDE_DIRS GTKMACINTEGRATION_LIBRARIES GTKMACINTEGRATION_CPPFLAGS +) + +mark_as_advanced(GTKMACINTEGRATION_INCLUDE_DIRS GTKMACINTEGRATION_LIBRARIES GTKMACINTEGRATION_CPPFLAGS) -- GitLab