Re v 17966 build failure due to calligraphic profiles
The recent addition of calligraphic profiles breaks the build due to unresolved references. Did anyone test it before committing?
Regards, Krzysztof (Chris) Kosiński
On Fri, Mar 21, 2008 at 5:02 PM, Krzysztof Kosiński <tweenk.pl@...400...> wrote:
The recent addition of calligraphic profiles breaks the build due to unresolved references. Did anyone test it before committing?
I guess it worked on Windows :) Aubanel, can you please fix it asap? I fixed one apparent error in 17970 but it still fails:
widgets/libspwidgets.a(toolbox.o): In function `sp_dcc_save_profile':widgets/toolbox.cpp:3476: undefined reference to `Inkscape::UI::Dialogs::CalligraphicProfileDialog::show(SPDesktop*)' widgets/libspwidgets.a(toolbox.o): In function `sp_dcc_save_profile':./dialogs/calligraphic-profile-rename.h:48: undefined reference to `Inkscape::UI::Dialogs::CalligraphicProfileDialog::CalligraphicProfileDialog()' :./dialogs/calligraphic-profile-rename.h:48: undefined reference to `Inkscape::UI::Dialogs::CalligraphicProfileDialog::CalligraphicProfileDialog()' widgets/libspwidgets.a(toolbox.o): In function `Inkscape::UI::Dialogs::CalligraphicProfileDialog::instance()':./dialogs/calligraphic-profile-rename.h:48: undefined reference to `Inkscape::UI::Dialogs::CalligraphicProfileDialog::CalligraphicProfileDialog()' collect2: ld returned 1 exit status make: *** [inkscape] Error 1
The solution is to move calligraphic-profiles-rename.h and cpp from src/dialogs to src/widgets and update the makefiles accordingly, here is a patch.
Regards, Krzysztof (Chris) Kosiński
Resend of the patch, I can't figure out how the file upload works on Nabble
Index: src/widgets/toolbox.cpp =================================================================== --- src/widgets/toolbox.cpp (revision 17972) +++ src/widgets/toolbox.cpp (working copy) @@ -103,7 +103,7 @@
#include "svg/css-ostringstream.h"
-#include "../dialogs/calligraphic-profile-rename.h" +#include "widgets/calligraphic-profile-rename.h"
using Inkscape::UnitTracker;
Index: src/widgets/Makefile_insert =================================================================== --- src/widgets/Makefile_insert (revision 17972) +++ src/widgets/Makefile_insert (working copy) @@ -13,6 +13,8 @@ widgets_libspwidgets_a_SOURCES = \ widgets/button.cpp \ widgets/button.h \ + widgets/calligraphic-profile-rename.cpp \ + widgets/calligraphic-profile-rename.h \ widgets/dash-selector.cpp \ widgets/dash-selector.h \ widgets/desktop-widget.cpp \ Index: src/dialogs/Makefile_insert =================================================================== --- src/dialogs/Makefile_insert (revision 17972) +++ src/dialogs/Makefile_insert (working copy) @@ -63,9 +63,7 @@ dialogs/unclump.cpp \ dialogs/unclump.h \ dialogs/iconpreview.cpp \ - dialogs/iconpreview.h \ - dialogs/calligraphic-profile-rename.h \ - dialogs/calligraphic-profile-rename.cpp + dialogs/iconpreview.h
# dialogs/sp-widget.c \ # dialogs/sp-widget.h \ Index: src/dialogs/calligraphic-profile-rename.cpp =================================================================== --- src/dialogs/calligraphic-profile-rename.cpp (revision 17972) +++ src/dialogs/calligraphic-profile-rename.cpp (working copy) @@ -1,99 +0,0 @@ -/**
- *
- * \brief Dialog for naming calligraphic profiles
- *
- * Author:
- * Aubanel MONNIER
- *
- * Copyright (C) 2007 Aubanel MONNIER
- *
- * Released under GNU GPL. Read the file 'COPYING' for more information
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <glibmm/i18n.h>
-#include <gtkmm/stock.h>
-
-#include "desktop.h"
-#include "calligraphic-profile-rename.h"
-
-
-namespace Inkscape {
-namespace UI {
-namespace Dialogs {
-CalligraphicProfileDialog::CalligraphicProfileDialog(): _applied(false){
- Gtk::VBox *mainVBox = get_vbox();
- _layout_table.set_spacings(4);
- _layout_table.resize (1, 2);
-
- _profile_name_entry.set_activates_default(true);
-
- _profile_name_label.set_label(_("Profile name:"));
- _profile_name_label.set_alignment(1.0, 0.5);
-
- _layout_table.attach(_profile_name_label,
- 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
- _layout_table.attach(_profile_name_entry,
- 1, 2, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
- mainVBox->pack_start(_layout_table, false, false, 4);
- // Buttons
- _close_button.set_use_stock(true);
- _close_button.set_label(Gtk::Stock::CANCEL.id);
- _close_button.set_flags(Gtk::CAN_DEFAULT);
-
- _apply_button.set_use_underline(true);
- _apply_button.set_label(_("Save"));
- _apply_button.set_flags(Gtk::CAN_DEFAULT);
-
- _close_button.signal_clicked()
- .connect(sigc::mem_fun(*this, &CalligraphicProfileDialog::_close));
- _apply_button.signal_clicked()
- .connect(sigc::mem_fun(*this, &CalligraphicProfileDialog::_apply));
-
- signal_delete_event().connect(
- sigc::bind_return(
- sigc::hide(sigc::mem_fun(*this, &CalligraphicProfileDialog::_close)),
- true
- )
- );
-
- add_action_widget(_close_button, Gtk::RESPONSE_CLOSE);
- add_action_widget(_apply_button, Gtk::RESPONSE_APPLY);
-
- _apply_button.grab_default();
-
- show_all_children();
-
-}
-
-void
-CalligraphicProfileDialog::_apply()
-{
- _profile_name = _profile_name_entry.get_text();
- _applied = true;
- _close();
-}
-
-void
-CalligraphicProfileDialog::_close()
-{
- this->Gtk::Dialog::hide();
-
-}
-
-void CalligraphicProfileDialog::show(SPDesktop *desktop){
- CalligraphicProfileDialog &dial = instance();
- dial._applied=false;
- dial.set_modal(true);
- desktop->setWindowTransient (dial.gobj());
- dial.property_destroy_with_parent() = true;
- // dial.Gtk::Dialog::show();
- //dial.present();
- dial.run();
-}
-
-
-}}}
Index: src/dialogs/calligraphic-profile-rename.h =================================================================== --- src/dialogs/calligraphic-profile-rename.h (revision 17972) +++ src/dialogs/calligraphic-profile-rename.h (working copy) @@ -1,56 +0,0 @@ -/**
- *
- * \brief Dialog for naming calligraphic profiles
- *
- * Author:
- * Aubanel MONNIER
- *
- * Copyright (C) 2007 Aubanel MONNIER
- *
- * Released under GNU GPL. Read the file 'COPYING' for more information
- */
-
-#ifndef INKSCAPE_DIALOG_CALLIGRAPHIC_PROFILE_H
-#define INKSCAPE_DIALOG_CALLIGRAPHIC_PROFILE_H
-
-#include <gtkmm/dialog.h>
-#include <gtkmm/entry.h>
-#include <gtkmm/label.h>
-#include <gtkmm/table.h>
-
-namespace Inkscape {
- namespace UI {
- namespace Dialogs {
-
- class CalligraphicProfileDialog: public Gtk::Dialog {
- public:
- CalligraphicProfileDialog();
- virtual ~CalligraphicProfileDialog(){} ;
- static void show(SPDesktop *desktop);
- static bool applied(){return instance()._applied;}
- static Glib::ustring getProfileName() { return instance()._profile_name;}
-
- Glib::ustring getName() const { return "CalligraphicProfileDialog"; }
-
-
- protected:
- void _close();
- void _apply();
-
- Gtk::Label _profile_name_label;
- Gtk::Entry _profile_name_entry;
- Gtk::Table _layout_table;
- Gtk::Button _close_button;
- Gtk::Button _apply_button;
- Glib::ustring _profile_name;
- bool _applied;
- private:
- static CalligraphicProfileDialog &instance(){static CalligraphicProfileDialog instance; return instance;}
- CalligraphicProfileDialog(CalligraphicProfileDialog const &); // no copy
- CalligraphicProfileDialog &operator=(CalligraphicProfileDialog const &); // no assign
- };
- }
- }
-}
-
-#endif INKSCAPE_DIALOG_CALLIGRAPHIC_PROFILE_H
Regards, Krzysztof (Chris) Kosiński
On Sat, Mar 22, 2008 at 1:34 AM, Krzysztof Kosiński wrote:
Resend of the patch, I can't figure out how the file upload works on Nabble
There is file upload? Seriuosly? That would be a disaster :)
Just use our launchpad's tracker or pastebin.ca :)
Alexandre
Alexandre Prokoudine wrote:
On Sat, Mar 22, 2008 at 1:34 AM, Krzysztof Kosiński wrote:
Resend of the patch, I can't figure out how the file upload works on Nabble
There is file upload? Seriuosly? That would be a disaster :)
Just use our launchpad's tracker or pastebin.ca :)
There's a button "Upload File..." when posting on Nabble, but it doesn't seem to do anything at all. Some newsgroups (like the one of my university's students' chemical society) allow file uploads, e.g. via Google Groups. I guess it's disabled on SF.net.
Regards, Krzysztof Kosiński
ARGH, because this file is from a Windows developer, \r\n line endings destroyed everything. I uploaded it to an external web server: http://www.vmc.org.pl/pliki/inkscape-broken-build-calligraphic-profiles.diff Broken build patch
Regards, Krzysztof (Chris) Kosiński
Krzysztof Kosiński schrieb:
The solution is to move calligraphic-profiles-rename.h and cpp from src/dialogs to src/widgets and update the makefiles accordingly, here is a patch.
Thanks, committed. And building works again. :)
Max
I'm not on my dev machine right now, sorry. Looks like the new file dialogs/calligraphic-profile-rename.cpp is not part of the build, but I added it to the Makefile_include. Shoudl I've done somthing more to have it included in the build ?
2008/3/21, bulia byak <buliabyak@...400...>:
On Fri, Mar 21, 2008 at 5:02 PM, Krzysztof Kosiński <tweenk.pl@...400...> wrote:
The recent addition of calligraphic profiles breaks the build due to unresolved references. Did anyone test it before committing?
I guess it worked on Windows :) Aubanel, can you please fix it asap? I fixed one apparent error in 17970 but it still fails:
widgets/libspwidgets.a(toolbox.o): In function `sp_dcc_save_profile':widgets/toolbox.cpp:3476: undefined reference to `Inkscape::UI::Dialogs::CalligraphicProfileDialog::show(SPDesktop*)' widgets/libspwidgets.a(toolbox.o): In function `sp_dcc_save_profile':./dialogs/calligraphic-profile-rename.h:48: undefined reference to
`Inkscape::UI::Dialogs::CalligraphicProfileDialog::CalligraphicProfileDialog()' :./dialogs/calligraphic-profile-rename.h:48: undefined reference to
`Inkscape::UI::Dialogs::CalligraphicProfileDialog::CalligraphicProfileDialog()' widgets/libspwidgets.a(toolbox.o): In function
`Inkscape::UI::Dialogs::CalligraphicProfileDialog::instance()':./dialogs/calligraphic- profile-rename.h:48: undefined reference to
`Inkscape::UI::Dialogs::CalligraphicProfileDialog::CalligraphicProfileDialog()' collect2: ld returned 1 exit status make: *** [inkscape] Error 1
-- bulia byak Inkscape. Draw Freely. http://www.inkscape.org
participants (5)
-
Alexandre Prokoudine -
Aubanel MONNIER -
bulia byak -
Krzysztof Kosiński -
Maximilian Albert