pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

codelite: apply patch from upstream to fix myxh_progrid.cpp build failure.



Module Name:	pkgsrc-wip
Committed By:	Andrius Varanavicius <vezhlys%netscape.net@localhost>
Pushed By:	vezhlys
Date:		Sat Oct 15 13:54:43 2022 +0300
Changeset:	45575a612dd0529aca055102d5dc75b95ef58691

Modified Files:
	codelite/distinfo
	codelite/patches/patch-wxcrafter_myxh__propgrid.cpp

Log Message:
codelite: apply patch from upstream to fix myxh_progrid.cpp build failure.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=45575a612dd0529aca055102d5dc75b95ef58691

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 codelite/distinfo                                   |  2 +-
 codelite/patches/patch-wxcrafter_myxh__propgrid.cpp | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs:
diff --git a/codelite/distinfo b/codelite/distinfo
index 44f2e74ebe..349a6a15fc 100644
--- a/codelite/distinfo
+++ b/codelite/distinfo
@@ -11,4 +11,4 @@ SHA1 (patch-ctagsd_CMakeLists.txt) = 4b7f216ae9384f4e4293463a3dbbd588d1e907f1
 SHA1 (patch-sdk_asio-1.12.1_asio_detail_impl_kqueue__reactor.ipp) = bdbcf78c6198da9ceb123373fd6b99419ae94896
 SHA1 (patch-svgs_svgs-dark_create-logo.sh) = d794ca7bb16a248a7aead3ca30e6c9f16073e1a3
 SHA1 (patch-svgs_svgs-light_create-logo.sh) = 4b0d06911baf89636311cc10e7042f3a2b4f22b3
-SHA1 (patch-wxcrafter_myxh__propgrid.cpp) = 68a28603f733f8cf6347d0c65d79fd1adc48f8a9
+SHA1 (patch-wxcrafter_myxh__propgrid.cpp) = 2cdf5abea02aabb187098fb08d5f9ceb1d4148f1
diff --git a/codelite/patches/patch-wxcrafter_myxh__propgrid.cpp b/codelite/patches/patch-wxcrafter_myxh__propgrid.cpp
index 193a05f19a..386bfc882a 100644
--- a/codelite/patches/patch-wxcrafter_myxh__propgrid.cpp
+++ b/codelite/patches/patch-wxcrafter_myxh__propgrid.cpp
@@ -1,14 +1,15 @@
+$NetBSD$
 
---- wxcrafter/myxh_propgrid.cpp.orig	2022-10-15 00:18:54.895365650 +0300
+Fix from upstream: SetSplitterLeft was internal function in wxWidgets and became protected.
+
+--- wxcrafter/myxh_propgrid.cpp.orig	2022-04-18 08:09:00.000000000 +0300
 +++ wxcrafter/myxh_propgrid.cpp
-@@ -47,8 +47,8 @@ wxObject* MyWxPropGridXmlHandler::DoCrea
-         CreateChildren(m_pgmgr, true /*only this handler*/);
+@@ -48,7 +48,7 @@ wxObject* MyWxPropGridXmlHandler::DoCrea
  
          // add the splitter property after the children were added
--        int splitterLeft = GetBool("splitterleft");
+         int splitterLeft = GetBool("splitterleft");
 -        if(splitterLeft) { m_pgmgr->GetPage(0)->SetSplitterLeft(); }
-+        //int splitterLeft = GetBool("splitterleft");
-+        //if(splitterLeft) { m_pgmgr->GetPage(0)->SetSplitterLeft(); }
++        if(splitterLeft) { m_pgmgr->SetSplitterLeft(); }
  
          int splitterPos = GetLong("splitterpos", wxNOT_FOUND);
          if(splitterPos != wxNOT_FOUND) { m_pgmgr->GetPage(0)->SetSplitterPosition(splitterPos); }


Home | Main Index | Thread Index | Old Index