diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch | 112 | ||||
| -rw-r--r-- | gnu/packages/wxwidgets.scm | 33 |
3 files changed, 0 insertions, 146 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index d4019b94f1f..fc0a519da36 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2088,7 +2088,6 @@ dist_patch_DATA = \ %D%/packages/patches/pounce-readable-checks.patch \ %D%/packages/patches/procps-strtod-test.patch \ %D%/packages/patches/prusa-slicer-add-cmake-module.patch \ - %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-3.11-fix-tests.patch \ %D%/packages/patches/python-3.12-fix-tests.patch \ diff --git a/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch deleted file mode 100644 index aadf9765882..00000000000 --- a/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 8f33aa2ff4..39928382da 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ - monodll_msw_utils.o \ - monodll_utilsexc.o \ - monodll_fswatcher.o \ -- monodll_msw_secretstore.o -+ monodll_msw_secretstore.o \ - monodll_msw_uilocale.o - @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS) - @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ -@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ - monodll_uuid.o \ - monodll_msw_evtloop.o \ - monodll_access.o \ -- monodll_dark_mode.o -+ monodll_dark_mode.o \ - monodll_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \ -@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ - monodll_uuid.o \ - monodll_msw_evtloop.o \ - monodll_access.o \ -- monodll_dark_mode.o -+ monodll_dark_mode.o \ - monodll_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \ -@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ - monolib_msw_utils.o \ - monolib_utilsexc.o \ - monolib_fswatcher.o \ -- monolib_msw_secretstore.o -+ monolib_msw_secretstore.o \ - monolib_msw_uilocale.o - @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1) - @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \ -@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ - monolib_uuid.o \ - monolib_msw_evtloop.o \ - monolib_access.o \ -- monolib_dark_mode.o -+ monolib_dark_mode.o \ - monolib_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \ -@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ - monolib_uuid.o \ - monolib_msw_evtloop.o \ - monolib_access.o \ -- monolib_dark_mode.o -+ monolib_dark_mode.o \ - monolib_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \ -@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ - basedll_msw_utils.o \ - basedll_utilsexc.o \ - basedll_fswatcher.o \ -- basedll_msw_secretstore.o -+ basedll_msw_secretstore.o \ - basedll_msw_uilocale.o - @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2) - @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \ -@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ - baselib_msw_utils.o \ - baselib_utilsexc.o \ - baselib_fswatcher.o \ -- baselib_msw_secretstore.o -+ baselib_msw_secretstore.o \ - baselib_msw_uilocale.o - @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3) - @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \ -@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ - coredll_uuid.o \ - coredll_msw_evtloop.o \ - coredll_access.o \ -- coredll_dark_mode.o -+ coredll_dark_mode.o \ - coredll_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \ -@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ - coredll_uuid.o \ - coredll_msw_evtloop.o \ - coredll_access.o \ -- coredll_dark_mode.o -+ coredll_dark_mode.o \ - coredll_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \ -@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ - corelib_uuid.o \ - corelib_msw_evtloop.o \ - corelib_access.o \ -- corelib_dark_mode.o -+ corelib_dark_mode.o \ - corelib_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \ -@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ - corelib_uuid.o \ - corelib_msw_evtloop.o \ - corelib_access.o \ -- corelib_dark_mode.o -+ corelib_dark_mode.o \ - corelib_msw_bmpbndl.o - @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7) - @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \ diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 7d716a1a07f..d8990a5b0eb 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -242,39 +242,6 @@ and many other languages.") (substitute* "src/unix/mimetype.cpp" (("/usr(/local)?/share/mime") mime)))))))))) -(define-public prusa-wxwidgets - ;; There is no proper tag/release, all patches are in separate branches based on - ;; the wxWidgets release (e.g. this commit is taken from "v3.2.0-patched" branch".) - (let ((commit "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26") - (revision "0")) - (package - (inherit wxwidgets-sans-egl) - (name "prusa-wxwidgets") - (version (git-version "3.2.0" revision commit)) - (home-page "https://github.com/prusa3d/wxWidgets") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit commit))) - (file-name (git-file-name name version)) - ;; The patch is taken from the NixOS nixpkgs repository (see - ;; <https://github.com/NixOS/nixpkgs/commit/0e724ac89f3dbf6ed31d647290a371b44a85e5ad>.) - (patches (search-patches "prusa-wxwidgets-makefile-fix.patch")) - (sha256 - (base32 - "1xk6w7q4xv4cj906xa5dwam5q51mc8bszbkkz7l8d3wjmsz73rwv")))) - (native-inputs (modify-inputs native-inputs - (prepend nanosvg))) - (arguments - (substitute-keyword-arguments arguments - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'unpack 'copy-nanosvg-source - (lambda _ - (copy-recursively #$(package-source nanosvg) "3rdparty/nanosvg/")))))))))) - (define-public python-wxpython (package (name "python-wxpython") |