remove HAVE_POTRACE

17 files changed, 8 insertions, 151 deletions

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index b41b18cc9..91f93e760 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -208,8 +208,6 @@ list(APPEND INKSCAPE_LIBS ${PNG_LIBRARY})
 find_package(Potrace REQUIRED)
 list(APPEND INKSCAPE_INCS_SYS ${POTRACE_INCLUDE_DIRS})
 list(APPEND INKSCAPE_LIBS ${POTRACE_LIBRARIES})
-set(HAVE_POTRACE ON)
-add_definitions(-DHAVE_POTRACE)
 
 
 if(WITH_DBUS)
diff --git a/share/ui/menus.xml b/share/ui/menus.xml
index 9bc5f9603..3b42d0f5f 100644
--- a/share/ui/menus.xml
+++ b/share/ui/menus.xml
@@ -239,7 +239,7 @@
    <submenu _name="_Path">
        <verb verb-id="ObjectToPath" />
        <verb verb-id="StrokeToPath" />
-       <verb verb-id="SelectionTrace" /> <!-- depends on HAVE_POTRACE -->
+       <verb verb-id="SelectionTrace" /> 
        <separator/>
        <verb verb-id="SelectionUnion"        show-icons="true" />
        <verb verb-id="SelectionDiff"         show-icons="true" />
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index 0332d4d5b..ba32c1753 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -665,12 +665,6 @@ static void read_shortcuts_file(char const *filename, bool const is_user_set) {
 
         Inkscape::Verb *verb=Inkscape::Verb::getbyid(verb_name);
         if (!verb
-#if !HAVE_POTRACE
-                // Squash warning about disabled features
-                && strcmp(verb_name, "ToolPaintBucket")  != 0
-                && strcmp(verb_name, "SelectionTrace")   != 0
-                && strcmp(verb_name, "PaintBucketPrefs") != 0
-#endif
 #if !HAVE_ASPELL
                 && strcmp(verb_name, "DialogSpellcheck") != 0
 #endif
diff --git a/src/trace/CMakeLists.txt b/src/trace/CMakeLists.txt
index a680166bf..45b3125f3 100644
--- a/src/trace/CMakeLists.txt
+++ b/src/trace/CMakeLists.txt
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-if (${HAVE_POTRACE})
-
 set(trace_SRC
 	filterset.cpp
 	imagemap.cpp
@@ -29,7 +27,5 @@ set(trace_SRC
 	depixelize/inkscape-depixelize.h
 )
 
-# add_inkscape_lib(trace_LIB "${trace_SRC}")
 add_inkscape_source("${trace_SRC}")
 
-endif()
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 2cf18e890..cae637bfb 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -48,6 +48,7 @@ set(ui_SRC
 	toolbar/measure-toolbar.cpp
 	toolbar/mesh-toolbar.cpp
 	toolbar/node-toolbar.cpp
+	toolbar/paintbucket-toolbar.cpp
 	toolbar/pencil-toolbar.cpp
 	toolbar/rect-toolbar.cpp
 	toolbar/select-toolbar.cpp
@@ -67,6 +68,7 @@ set(ui_SRC
 	tools/dropper-tool.cpp
 	tools/dynamic-base.cpp
 	tools/eraser-tool.cpp
+	tools/flood-tool.cpp
 	tools/freehand-base.cpp
 	tools/gradient-tool.cpp
 	tools/lpe-tool.cpp
@@ -144,6 +146,7 @@ set(ui_SRC
 	dialog/template-widget.cpp
 	dialog/text-edit.cpp
 	dialog/tile.cpp
+	dialog/tracedialog.cpp
 	dialog/transformation.cpp
 	dialog/undo-history.cpp
 	dialog/xml-tree.cpp
@@ -344,6 +347,7 @@ set(ui_SRC
 	toolbar/measure-toolbar.h
 	toolbar/mesh-toolbar.h
 	toolbar/node-toolbar.h
+	toolbar/paintbucket-toolbar.h
 	toolbar/pencil-toolbar.h
 	toolbar/rect-toolbar.h
 	toolbar/select-toolbar.h
@@ -465,19 +469,6 @@ endif()
 
 add_inkscape_source("${ui_SRC}")
 
-set ( ui_flood_and_trace_SRC
-	tools/flood-tool.h
-	tools/flood-tool.cpp
-	dialog/tracedialog.cpp
-	dialog/tracedialog.h
-	toolbar/paintbucket-toolbar.cpp
-	toolbar/paintbucket-toolbar.h
-)
-
-if ("${HAVE_POTRACE}")
-	add_inkscape_source("${ui_flood_and_trace_SRC}")
-endif()
-
 set ( ui_spellcheck_SRC
 	dialog/spellcheck.cpp
 	dialog/spellcheck.h
@@ -485,4 +476,4 @@ set ( ui_spellcheck_SRC
 
 if ("${HAVE_ASPELL}")
 	add_inkscape_source("${ui_spellcheck_SRC}")
-endif()
\ No newline at end of file
+endif()
diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp
index 2b281a096..fc2eda4c6 100644
--- a/src/ui/contextmenu.cpp
+++ b/src/ui/contextmenu.cpp
@@ -703,7 +703,6 @@ void ContextMenu::MakeImageMenu ()
         mi->set_sensitive( FALSE );
     }
 
-#if HAVE_POTRACE
     /* Trace Bitmap */
     mi = Gtk::manage(new Gtk::MenuItem(_("_Trace Bitmap..."), true));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ImageTraceBitmap));
@@ -712,16 +711,6 @@ void ContextMenu::MakeImageMenu ()
     if (_desktop->selection->isEmpty()) {
         mi->set_sensitive(FALSE);
     }
-#endif
-
-    /* Trace Pixel Art */
-    mi = Gtk::manage(new Gtk::MenuItem(_("Trace Pixel Art"), true));
-    mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ImageTracePixelArt));
-    mi->show();
-    insert(*mi,positionOfLastDialog++);
-    if (_desktop->selection->isEmpty()) {
-        mi->set_sensitive(FALSE);
-    }
 
     /* Embed image */
     if (Inkscape::Verb::getbyid( "org.ekips.filter.embedselectedimages" )) {
@@ -850,19 +839,11 @@ void ContextMenu::ImageEdit()
     }
 }
 
-#if HAVE_POTRACE
 void ContextMenu::ImageTraceBitmap()
 {
     INKSCAPE.dialogs_unhide();
     _desktop->_dlg_mgr->showDialog("Trace");
 }
-#endif
-
-void ContextMenu::ImageTracePixelArt()
-{
-    INKSCAPE.dialogs_unhide();
-    _desktop->_dlg_mgr->showDialog("PixelArt");
-}
 
 void ContextMenu::ImageEmbed()
 {
diff --git a/src/ui/contextmenu.h b/src/ui/contextmenu.h
index ea42d8a46..0e1bcffa0 100644
--- a/src/ui/contextmenu.h
+++ b/src/ui/contextmenu.h
@@ -187,14 +187,7 @@ class ContextMenu : public Gtk::Menu
         /**
          * callback, is executed on clicking the "Trace Bitmap" menu entry
          */
-#if HAVE_POTRACE
         void ImageTraceBitmap();
-#endif
-
-        /**
-         * callback, is executed on clicking the "Trace Pixel Art" menu entry
-         */
-        void ImageTracePixelArt();
 
         /**
          * callback, is executed on clicking the "Extract Image" menu entry
diff --git a/src/ui/desktop/menubar.cpp b/src/ui/desktop/menubar.cpp
index df21ca718..5e2b4edcd 100644
--- a/src/ui/desktop/menubar.cpp
+++ b/src/ui/desktop/menubar.cpp
@@ -480,9 +480,6 @@ build_menu(Gtk::MenuShell* menu, Inkscape::XML::Node* xml, Inkscape::UI::View::V
                             }
                         }
                     } else if (true
-#if !HAVE_POTRACE
-                        && !strcmp(verb_name.c_str(), "SelectionTrace")
-#endif
 #if !HAVE_ASPELL
                         && !strcmp(verb_name.c_str(), "DialogSpellcheck")
 #endif
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index ee1ede82e..526ccfa21 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -35,10 +35,7 @@
 #include "ui/dialog/prototype.h"
 #include "ui/dialog/symbols.h"
 #include "ui/dialog/tile.h"
-
-#if HAVE_POTRACE
 # include "ui/dialog/tracedialog.h"
-#endif
 
 #include "ui/dialog/transformation.h"
 #include "ui/dialog/undo-history.h"
@@ -131,10 +128,7 @@ DialogManager::DialogManager() {
         registerFactory("Symbols",             &create<SymbolsDialog,        FloatingBehavior>);
         registerFactory("PaintServers",        &create<PaintServersDialog,   FloatingBehavior>);
         registerFactory("StyleDialog",         &create<StyleDialog,          FloatingBehavior>);
-
-#if HAVE_POTRACE
         registerFactory("Trace",               &create<TraceDialog,          FloatingBehavior>);
-#endif
 
         registerFactory("Transformation",      &create<Transformation,       FloatingBehavior>);
         registerFactory("UndoHistory",         &create<UndoHistory,          FloatingBehavior>);
@@ -176,10 +170,7 @@ DialogManager::DialogManager() {
         registerFactory("TileDialog",          &create<ArrangeDialog,        DockBehavior>);
         registerFactory("Symbols",             &create<SymbolsDialog,        DockBehavior>);
         registerFactory("PaintServers",        &create<PaintServersDialog,   DockBehavior>);
-
-#if HAVE_POTRACE
         registerFactory("Trace",               &create<TraceDialog,          DockBehavior>);
-#endif
 
         registerFactory("Transformation",      &create<Transformation,       DockBehavior>);
         registerFactory("UndoHistory",         &create<UndoHistory,          DockBehavior>);
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index a0ddfe6dc..d8db99f4e 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -512,12 +512,10 @@ void InkscapePreferences::initPageTools()
     this->AddPage(_page_eraser, _("Eraser"), iter_tools, PREFS_PAGE_TOOLS_ERASER);
     this->AddNewObjectsStyle(_page_eraser, "/tools/eraser");
 
-#if HAVE_POTRACE
     //Paint Bucket
     this->AddPage(_page_paintbucket, _("Paint Bucket"), iter_tools, PREFS_PAGE_TOOLS_PAINTBUCKET);
     this->AddSelcueCheckbox(_page_paintbucket, "/tools/paintbucket", false);
     this->AddNewObjectsStyle(_page_paintbucket, "/tools/paintbucket");
-#endif
 
     //Gradient
     this->AddPage(_page_gradient, _("Gradient"), iter_tools, PREFS_PAGE_TOOLS_GRADIENT);
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index cfe2f36f1..db7d63176 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -56,11 +56,7 @@ enum {
     PREFS_PAGE_TOOLS_TEXT,
     PREFS_PAGE_TOOLS_SPRAY,
     PREFS_PAGE_TOOLS_ERASER,
-
-#if HAVE_POTRACE
     PREFS_PAGE_TOOLS_PAINTBUCKET,
-#endif
-
     PREFS_PAGE_TOOLS_GRADIENT,
     PREFS_PAGE_TOOLS_DROPPER,
     PREFS_PAGE_TOOLS_CONNECTOR,
diff --git a/src/ui/tool-factory.cpp b/src/ui/tool-factory.cpp
index eb41edd5b..8c80c3921 100644
--- a/src/ui/tool-factory.cpp
+++ b/src/ui/tool-factory.cpp
@@ -17,11 +17,7 @@
 #include "ui/tools/connector-tool.h"
 #include "ui/tools/dropper-tool.h"
 #include "ui/tools/eraser-tool.h"
-
-#if HAVE_POTRACE
-# include "ui/tools/flood-tool.h"
-#endif
-
+#include "ui/tools/flood-tool.h"
 #include "ui/tools/gradient-tool.h"
 #include "ui/tools/lpe-tool.h"
 #include "ui/tools/measure-tool.h"
@@ -55,10 +51,8 @@ ToolBase *ToolFactory::createObject(std::string const& id)
         tool = new DropperTool;
     else if (id == "/tools/eraser")
         tool = new EraserTool;
-#if HAVE_POTRACE
     else if (id == "/tools/paintbucket")
         tool = new FloodTool;
-#endif
     else if (id == "/tools/gradient")
         tool = new GradientTool;
     else if (id == "/tools/lpetool")
diff --git a/src/ui/tools-switch.cpp b/src/ui/tools-switch.cpp
index a2ec6cfbe..46695cf28 100644
--- a/src/ui/tools-switch.cpp
+++ b/src/ui/tools-switch.cpp
@@ -37,11 +37,7 @@
 #include "ui/tools/connector-tool.h"
 #include "ui/tools/dropper-tool.h"
 #include "ui/tools/eraser-tool.h"
-
-#if HAVE_POTRACE
 #include "ui/tools/flood-tool.h"
-#endif
-
 #include "ui/tools/gradient-tool.h"
 #include "ui/tools/lpe-tool.h"
 #include "ui/tools/measure-tool.h"
@@ -81,9 +77,7 @@ static char const *const tool_names[] = {
     "/tools/measure",
     "/tools/dropper",
     "/tools/connector",
-#if HAVE_POTRACE
     "/tools/paintbucket",
-#endif
     "/tools/eraser",
     "/tools/lpetool",
     nullptr
@@ -111,9 +105,7 @@ static char const *const tool_msg[] = {
     N_("<b>Drag</b> to measure the dimensions of objects."),
     N_("<b>Click</b> to set fill, <b>Shift+click</b> to set stroke; <b>drag</b> to average color in area; with <b>Alt</b> to pick inverse color; <b>Ctrl+C</b> to copy the color under mouse to clipboard"),
     N_("<b>Click and drag</b> between shapes to create a connector."),
-#if HAVE_POTRACE
     N_("<b>Click</b> to paint a bounded area, <b>Shift+click</b> to union the new fill with the current selection, <b>Ctrl+click</b> to change the clicked object's fill and stroke to the current setting."),
-#endif
     N_("<b>Drag</b> to erase."),
     N_("Choose a subtool from the toolbar"),
 };
diff --git a/src/ui/tools-switch.h b/src/ui/tools-switch.h
index 804918a7f..ad2a73118 100644
--- a/src/ui/tools-switch.h
+++ b/src/ui/tools-switch.h
@@ -41,11 +41,7 @@ enum {
   TOOLS_MEASURE,
   TOOLS_DROPPER,
   TOOLS_CONNECTOR,
-
-#if HAVE_POTRACE
   TOOLS_PAINTBUCKET,
-#endif
-
   TOOLS_ERASER,
   TOOLS_LPETOOL
 };
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 86551939c..77ed46689 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -798,12 +798,6 @@ Verb *Verb::getbyid(gchar const *id, bool verbose)
     }
 
     if (verb == nullptr
-#if !HAVE_POTRACE
-                // Squash warning about disabled features
-                && strcmp(id, "ToolPaintBucket")  != 0
-                && strcmp(id, "SelectionTrace")   != 0
-                && strcmp(id, "PaintBucketPrefs") != 0
-#endif
 #if !HAVE_ASPELL
                 && strcmp(id, "DialogSpellcheck") != 0
 #endif
@@ -1253,14 +1247,10 @@ void SelectionVerb::perform(SPAction *action, void *data)
             selection->toCurves(true);
             SelectionHelper::reverse(dt);
             break;
-
-#if HAVE_POTRACE
         case SP_VERB_SELECTION_TRACE:
             INKSCAPE.dialogs_unhide();
             dt->_dlg_mgr->showDialog("Trace");
             break;
-#endif
-
         case SP_VERB_SELECTION_CREATE_BITMAP:
             dt->selection->createBitmapCopy();
             break;
@@ -1712,13 +1702,9 @@ void ContextVerb::perform(SPAction *action, void *data)
         case SP_VERB_CONTEXT_CONNECTOR:
             tools_switch(dt,  TOOLS_CONNECTOR);
             break;
-
-#if HAVE_POTRACE
         case SP_VERB_CONTEXT_PAINTBUCKET:
             tools_switch(dt, TOOLS_PAINTBUCKET);
             break;
-#endif
-
         case SP_VERB_CONTEXT_ERASER:
             tools_switch(dt, TOOLS_ERASER);
             break;
@@ -1802,14 +1788,10 @@ void ContextVerb::perform(SPAction *action, void *data)
             prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_CONNECTOR);
             dt->_dlg_mgr->showDialog("InkscapePreferences");
             break;
-
-#if HAVE_POTRACE
         case SP_VERB_CONTEXT_PAINTBUCKET_PREFS:
             prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_PAINTBUCKET);
             dt->_dlg_mgr->showDialog("InkscapePreferences");
             break;
-#endif
-
         case SP_VERB_CONTEXT_ERASER_PREFS:
             prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_TOOLS_ERASER);
             dt->_dlg_mgr->showDialog("InkscapePreferences");
@@ -2294,13 +2276,9 @@ void TutorialVerb::perform(SPAction *action, void *data)
         case SP_VERB_TUTORIAL_ADVANCED:
             sp_help_open_tutorial("tutorial-advanced");
             break;
-
-#if HAVE_POTRACE
         case SP_VERB_TUTORIAL_TRACING:
             sp_help_open_tutorial("tutorial-tracing");
             break;
-#endif
-
         case SP_VERB_TUTORIAL_TRACING_PIXELART:
             sp_help_open_tutorial("tutorial-tracing-pixelart");
             break;
@@ -2768,13 +2746,9 @@ Verb *Verb::_base_verbs[] = {
     new SelectionVerb(SP_VERB_SELECTION_REVERSE, "SelectionReverse", N_("_Reverse"),
                       N_("Reverse the direction of selected paths (useful for flipping markers)"),
                       INKSCAPE_ICON("path-reverse")),
-
-#if HAVE_POTRACE
     // TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize)
     new SelectionVerb(SP_VERB_SELECTION_TRACE, "SelectionTrace", N_("_Trace Bitmap..."),
                       N_("Create one or more paths from a bitmap by tracing it"), INKSCAPE_ICON("bitmap-trace")),
-#endif
-
     new SelectionVerb(SP_VERB_SELECTION_CREATE_BITMAP, "SelectionCreateBitmap", N_("Make a _Bitmap Copy"),
                       N_("Export selection to a bitmap and insert it into document"),
                       INKSCAPE_ICON("selection-make-bitmap-copy")),
@@ -2909,12 +2883,8 @@ Verb *Verb::_base_verbs[] = {
                     INKSCAPE_ICON("color-picker")),
     new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "ToolConnector", NC_("ContextVerb", "Connector"),
                     N_("Create diagram connectors"), INKSCAPE_ICON("draw-connector")),
-
-#if HAVE_POTRACE
     new ContextVerb(SP_VERB_CONTEXT_PAINTBUCKET, "ToolPaintBucket", NC_("ContextVerb", "Paint Bucket"),
                     N_("Fill bounded areas"), INKSCAPE_ICON("color-fill")),
-#endif
-
     new ContextVerb(SP_VERB_CONTEXT_LPE, "ToolLPE", NC_("ContextVerb", "LPE Edit"), N_("Edit Path Effect parameters"),
                     nullptr),
     new ContextVerb(SP_VERB_CONTEXT_ERASER, "ToolEraser", NC_("ContextVerb", "Eraser"), N_("Erase existing paths"),
@@ -2960,12 +2930,8 @@ Verb *Verb::_base_verbs[] = {
                     N_("Open Preferences for the Dropper tool"), nullptr),
     new ContextVerb(SP_VERB_CONTEXT_CONNECTOR_PREFS, "ConnectorPrefs", N_("Connector Preferences"),
                     N_("Open Preferences for the Connector tool"), nullptr),
-
-#if HAVE_POTRACE
     new ContextVerb(SP_VERB_CONTEXT_PAINTBUCKET_PREFS, "PaintBucketPrefs", N_("Paint Bucket Preferences"),
                     N_("Open Preferences for the Paint Bucket tool"), nullptr),
-#endif
-
     new ContextVerb(SP_VERB_CONTEXT_ERASER_PREFS, "EraserPrefs", N_("Eraser Preferences"),
                     N_("Open Preferences for the Eraser tool"), nullptr),
     new ContextVerb(SP_VERB_CONTEXT_LPETOOL_PREFS, "LPEToolPrefs", N_("LPE Tool Preferences"),
diff --git a/src/verbs.h b/src/verbs.h
index 171af3f2d..67920499d 100644
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -149,11 +149,7 @@ enum {
     SP_VERB_SELECTION_OUTLINE_LEGACY,
     SP_VERB_SELECTION_SIMPLIFY,
     SP_VERB_SELECTION_REVERSE,
-
-#if HAVE_POTRACE
     SP_VERB_SELECTION_TRACE,
-#endif
-
     SP_VERB_SELECTION_CREATE_BITMAP,
     SP_VERB_SELECTION_COMBINE,
     SP_VERB_SELECTION_BREAK_APART,
@@ -219,11 +215,7 @@ enum {
     SP_VERB_CONTEXT_MEASURE,
     SP_VERB_CONTEXT_DROPPER,
     SP_VERB_CONTEXT_CONNECTOR,
-
-#if HAVE_POTRACE
     SP_VERB_CONTEXT_PAINTBUCKET,
-#endif
-
     SP_VERB_CONTEXT_LPE, /* not really a tool but used for editing LPE parameters on-canvas for example */
     SP_VERB_CONTEXT_ERASER,
     SP_VERB_CONTEXT_LPETOOL, /* note that this is very different from SP_VERB_CONTEXT_LPE above! */
@@ -247,11 +239,7 @@ enum {
     SP_VERB_CONTEXT_MEASURE_PREFS,
     SP_VERB_CONTEXT_DROPPER_PREFS,
     SP_VERB_CONTEXT_CONNECTOR_PREFS,
-
-#if HAVE_POTRACE
     SP_VERB_CONTEXT_PAINTBUCKET_PREFS,
-#endif
-
     SP_VERB_CONTEXT_ERASER_PREFS,
     SP_VERB_CONTEXT_LPETOOL_PREFS,
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index cb9a32e95..fc5bad47a 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -79,11 +79,7 @@
 #include "ui/toolbar/measure-toolbar.h"
 #include "ui/toolbar/node-toolbar.h"
 #include "ui/toolbar/rect-toolbar.h"
-
-#if HAVE_POTRACE
-# include "ui/toolbar/paintbucket-toolbar.h"
-#endif
-
+#include "ui/toolbar/paintbucket-toolbar.h"
 #include "ui/toolbar/pencil-toolbar.h"
 #include "ui/toolbar/select-toolbar.h"
 #include "ui/toolbar/snap-toolbar.h"
@@ -164,12 +160,7 @@ static struct {
 	{ "/tools/calligraphic", "dyna_draw_tool", SP_VERB_CONTEXT_CALLIGRAPHIC, SP_VERB_CONTEXT_CALLIGRAPHIC_PREFS },
 	{ "/tools/lpetool",  "lpetool_tool",   SP_VERB_CONTEXT_LPETOOL, SP_VERB_CONTEXT_LPETOOL_PREFS },
 	{ "/tools/eraser",   "eraser_tool",    SP_VERB_CONTEXT_ERASER, SP_VERB_CONTEXT_ERASER_PREFS },
-#if HAVE_POTRACE
 	{ "/tools/paintbucket",    "paintbucket_tool",     SP_VERB_CONTEXT_PAINTBUCKET, SP_VERB_CONTEXT_PAINTBUCKET_PREFS },
-#else
-        // Replacement blank action for ToolPaintBucket to prevent loading errors in ui file
-	{ "/tools/paintbucket",    "ToolPaintBucket",     SP_VERB_NONE, SP_VERB_NONE },
-#endif
 	{ "/tools/text",     "text_tool",      SP_VERB_CONTEXT_TEXT, SP_VERB_CONTEXT_TEXT_PREFS },
 	{ "/tools/connector","connector_tool", SP_VERB_CONTEXT_CONNECTOR, SP_VERB_CONTEXT_CONNECTOR_PREFS },
 	{ "/tools/gradient", "gradient_tool",  SP_VERB_CONTEXT_GRADIENT, SP_VERB_CONTEXT_GRADIENT_PREFS },
@@ -231,13 +222,8 @@ static struct {
       SP_VERB_INVALID,                    nullptr,                   nullptr},
     { "/tools/mesh",            "mesh_toolbox",        Inkscape::UI::Toolbar::MeshToolbar::create,          "MeshToolbar",
       SP_VERB_INVALID,                    nullptr,                   nullptr},
-#if HAVE_POTRACE
     { "/tools/paintbucket",     "paintbucket_toolbox", Inkscape::UI::Toolbar::PaintbucketToolbar::create,   "PaintbucketToolbar",
       SP_VERB_CONTEXT_PAINTBUCKET_PREFS, "/tools/paintbucket",       N_("Style of Paint Bucket fill objects")},
-#else
-    { "/tools/paintbucket",     "paintbucket_toolbox", nullptr,                                             "PaintbucketToolbar",
-        SP_VERB_NONE,                    "/tools/paintbucket",       N_("Disabled")},
-#endif
     { nullptr,                  nullptr,               nullptr,                                             nullptr,
         SP_VERB_INVALID,                 nullptr,                    nullptr }
 };