From a74dd863ff67aa5e64be4d9d64914a0d3209f1be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lien=20Sell=C3=A6g?= Date: Mon, 31 Aug 2015 16:40:46 +0200 Subject: [PATCH 1/8] Add git to packages --- docs/install.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/install.md b/docs/install.md index ef2d95c..cbc1de6 100644 --- a/docs/install.md +++ b/docs/install.md @@ -4,7 +4,7 @@ Before installation, please install libclangmm, see [installation guide](http:// ## Debian/Ubuntu ```sh -sudo apt-get install pkg-config libboost-system-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev aspell-en libaspell-dev +sudo apt-get install pkg-config libboost-system-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev aspell-en libaspell-dev git ``` ```sh git clone http://github.com/cppit/jucipp.git @@ -16,7 +16,7 @@ sudo make install ## OS X with Homebrew (http://brew.sh/) ```sh -brew install pkg-config boost gtkmm3 gtksourceviewmm3 aspell +brew install pkg-config boost gtkmm3 gtksourceviewmm3 aspell git ``` ```sh @@ -30,7 +30,7 @@ make install ##Windows with MSYS2 (https://msys2.github.io/) Install dependencies(replace [arch] with i686 or x86_64 depending on your MSYS2 install): ```sh -pacman -S patch autoconf automake-wrapper mingw-w64-[arch]-gtkmm3 mingw-w64-[arch]-boost mingw-w64-[arch]-aspell mingw-w64-[arch]-aspell-en +pacman -S patch autoconf automake-wrapper mingw-w64-[arch]-gtkmm3 mingw-w64-[arch]-boost mingw-w64-[arch]-aspell mingw-w64-[arch]-aspell-en git ``` Get juCi++ source: From f29b753ada19d3a1d86b89e4ebfff33ddf033fee Mon Sep 17 00:00:00 2001 From: Ole Christian Eidheim Date: Mon, 31 Aug 2015 16:58:09 +0200 Subject: [PATCH 2/8] Added 15 after Ubuntu --- docs/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install.md b/docs/install.md index cbc1de6..6e313f8 100644 --- a/docs/install.md +++ b/docs/install.md @@ -2,7 +2,7 @@ ## Installation guide ## Before installation, please install libclangmm, see [installation guide](http://github.com/cppit/libclangmm/blob/master/docs/install.md). -## Debian/Ubuntu +## Debian/Ubuntu 15 ```sh sudo apt-get install pkg-config libboost-system-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev aspell-en libaspell-dev git ``` From 7165bf91a4e560de2ec86e5423e91e32e4a543ba Mon Sep 17 00:00:00 2001 From: Ole Christian Eidheim Date: Mon, 31 Aug 2015 17:45:08 +0200 Subject: [PATCH 3/8] Fixed OS X install dependency --- docs/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install.md b/docs/install.md index 6e313f8..9d73c43 100644 --- a/docs/install.md +++ b/docs/install.md @@ -16,7 +16,7 @@ sudo make install ## OS X with Homebrew (http://brew.sh/) ```sh -brew install pkg-config boost gtkmm3 gtksourceviewmm3 aspell git +brew install pkg-config boost gtkmm3 homebrew/x11/gtksourceviewmm3 aspell git ``` ```sh From 34cc21bc281c45f7693de22e2dd72ef83a98d1e0 Mon Sep 17 00:00:00 2001 From: Ole Christian Eidheim Date: Mon, 31 Aug 2015 19:23:32 +0200 Subject: [PATCH 4/8] Update install.md --- docs/install.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/install.md b/docs/install.md index 9d73c43..a4b4782 100644 --- a/docs/install.md +++ b/docs/install.md @@ -13,6 +13,17 @@ cmake . make sudo make install ``` + ## OS X with Homebrew (http://brew.sh/) ```sh From e589cd81a33377b9464766c0c7ba641a6d9a4e65 Mon Sep 17 00:00:00 2001 From: Ole Christian Eidheim Date: Mon, 31 Aug 2015 19:49:53 +0200 Subject: [PATCH 5/8] Update install.md --- docs/install.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/install.md b/docs/install.md index a4b4782..9d3da0d 100644 --- a/docs/install.md +++ b/docs/install.md @@ -13,17 +13,21 @@ cmake . make sudo make install ``` - +```sh +git clone http://github.com/cppit/jucipp.git +cd jucipp +cmake . +make +sudo make install +``` ## OS X with Homebrew (http://brew.sh/) ```sh From c782da2371a757fc91a09762ba753f8b112872c0 Mon Sep 17 00:00:00 2001 From: Ole Christian Eidheim Date: Tue, 1 Sep 2015 10:53:04 +0200 Subject: [PATCH 6/8] Ubuntu 14 fix --- docs/install.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/install.md b/docs/install.md index 9d3da0d..4d8981e 100644 --- a/docs/install.md +++ b/docs/install.md @@ -19,6 +19,7 @@ sudo make install sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update sudo apt-get install g++-4.9 +sudo apt-get remove g++-4.8 sudo apt-get install pkg-config libboost-system1.55-dev libboost-thread1.55-dev libboost-filesystem1.55-dev libboost-log1.55-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev aspell-en libaspell-dev git ``` ```sh From 909ce772c039c72c40054446e9861e60279e94e2 Mon Sep 17 00:00:00 2001 From: "U-olece-PC\\olece" Date: Tue, 1 Sep 2015 17:58:11 +0200 Subject: [PATCH 7/8] Now compiles on MSYS2 again. --- src/directories.cc | 2 ++ src/entrybox.cc | 2 ++ src/notebook.cc | 2 ++ src/selectiondialog.cc | 2 ++ src/source.cc | 2 ++ src/tooltips.cc | 2 ++ src/window.cc | 2 ++ 7 files changed, 14 insertions(+) diff --git a/src/directories.cc b/src/directories.cc index 00332cc..f114427 100644 --- a/src/directories.cc +++ b/src/directories.cc @@ -8,6 +8,7 @@ #include //TODO: remove using namespace std; //TODO: remove +#ifndef _WIN32 namespace sigc { template struct functor_trait { @@ -17,6 +18,7 @@ namespace sigc { typedef Functor functor_type; }; } +#endif Directories::Directories() : stop_update_thread(false) { DEBUG("adding treeview to scrolledwindow"); diff --git a/src/entrybox.cc b/src/entrybox.cc index df79ed4..20043bd 100644 --- a/src/entrybox.cc +++ b/src/entrybox.cc @@ -1,5 +1,6 @@ #include "entrybox.h" +#ifndef _WIN32 namespace sigc { template struct functor_trait { @@ -9,6 +10,7 @@ namespace sigc { typedef Functor functor_type; }; } +#endif std::unordered_map > EntryBox::entry_histories; diff --git a/src/notebook.cc b/src/notebook.cc index 4462d69..aea6ef1 100644 --- a/src/notebook.cc +++ b/src/notebook.cc @@ -9,6 +9,7 @@ #include //TODO: remove using namespace std; //TODO: remove +#ifndef _WIN32 namespace sigc { template struct functor_trait { @@ -18,6 +19,7 @@ namespace sigc { typedef Functor functor_type; }; } +#endif Notebook::Notebook(Directories &directories) : Gtk::Notebook(), directories(directories) { Gsv::init(); diff --git a/src/selectiondialog.cc b/src/selectiondialog.cc index 816041a..4cd0e5c 100644 --- a/src/selectiondialog.cc +++ b/src/selectiondialog.cc @@ -1,6 +1,7 @@ #include "selectiondialog.h" #include +#ifndef _WIN32 namespace sigc { template struct functor_trait { @@ -10,6 +11,7 @@ namespace sigc { typedef Functor functor_type; }; } +#endif SelectionDialogBase::SelectionDialogBase(Gtk::TextView& text_view, Glib::RefPtr start_mark, bool show_search_entry): text_view(text_view), start_mark(start_mark), show_search_entry(show_search_entry), list_view_text(1, false, Gtk::SelectionMode::SELECTION_BROWSE) { diff --git a/src/source.cc b/src/source.cc index 41d9fbf..fc330c4 100644 --- a/src/source.cc +++ b/src/source.cc @@ -11,6 +11,7 @@ using namespace std; //TODO: remove +#ifndef _WIN32 namespace sigc { template struct functor_trait { @@ -20,6 +21,7 @@ namespace sigc { typedef Functor functor_type; }; } +#endif Glib::RefPtr Source::guess_language(const boost::filesystem::path &file_path) { auto language_manager=Gsv::LanguageManager::get_default(); diff --git a/src/tooltips.cc b/src/tooltips.cc index 21696ef..a509c33 100644 --- a/src/tooltips.cc +++ b/src/tooltips.cc @@ -1,6 +1,7 @@ #include "tooltips.h" #include "singletons.h" +#ifndef _WIN32 namespace sigc { template struct functor_trait { @@ -10,6 +11,7 @@ namespace sigc { typedef Functor functor_type; }; } +#endif Gdk::Rectangle Tooltips::drawn_tooltips_rectangle=Gdk::Rectangle(); diff --git a/src/window.cc b/src/window.cc index f831b51..402c294 100644 --- a/src/window.cc +++ b/src/window.cc @@ -9,6 +9,7 @@ #include //TODO: remove using namespace std; //TODO: remove +#ifndef _WIN32 namespace sigc { template struct functor_trait { @@ -18,6 +19,7 @@ namespace sigc { typedef Functor functor_type; }; } +#endif void Window::generate_keybindings() { boost::filesystem::path path(Singleton::config_dir() + "menu.xml"); From 6e69cb17c4b528e3744db4971195b2bd61a2bf83 Mon Sep 17 00:00:00 2001 From: "U-olece-PC\\olece" Date: Tue, 1 Sep 2015 18:38:40 +0200 Subject: [PATCH 8/8] The SIGC weirdness should now work on all platforms. --- src/directories.cc | 6 ++++-- src/entrybox.cc | 6 ++++-- src/notebook.cc | 6 ++++-- src/selectiondialog.cc | 6 ++++-- src/source.cc | 6 ++++-- src/tooltips.cc | 6 ++++-- src/window.cc | 6 ++++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/directories.cc b/src/directories.cc index f114427..c55e9a0 100644 --- a/src/directories.cc +++ b/src/directories.cc @@ -8,8 +8,8 @@ #include //TODO: remove using namespace std; //TODO: remove -#ifndef _WIN32 namespace sigc { +#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE template struct functor_trait { typedef decltype (::sigc::mem_fun(std::declval(), @@ -17,8 +17,10 @@ namespace sigc { typedef typename _intermediate::result_type result_type; typedef Functor functor_type; }; -} +#else + SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE #endif +} Directories::Directories() : stop_update_thread(false) { DEBUG("adding treeview to scrolledwindow"); diff --git a/src/entrybox.cc b/src/entrybox.cc index 20043bd..8cfb1d2 100644 --- a/src/entrybox.cc +++ b/src/entrybox.cc @@ -1,7 +1,7 @@ #include "entrybox.h" -#ifndef _WIN32 namespace sigc { +#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE template struct functor_trait { typedef decltype (::sigc::mem_fun(std::declval(), @@ -9,8 +9,10 @@ namespace sigc { typedef typename _intermediate::result_type result_type; typedef Functor functor_type; }; -} +#else + SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE #endif +} std::unordered_map > EntryBox::entry_histories; diff --git a/src/notebook.cc b/src/notebook.cc index aea6ef1..802bf35 100644 --- a/src/notebook.cc +++ b/src/notebook.cc @@ -9,8 +9,8 @@ #include //TODO: remove using namespace std; //TODO: remove -#ifndef _WIN32 namespace sigc { +#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE template struct functor_trait { typedef decltype (::sigc::mem_fun(std::declval(), @@ -18,8 +18,10 @@ namespace sigc { typedef typename _intermediate::result_type result_type; typedef Functor functor_type; }; -} +#else + SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE #endif +} Notebook::Notebook(Directories &directories) : Gtk::Notebook(), directories(directories) { Gsv::init(); diff --git a/src/selectiondialog.cc b/src/selectiondialog.cc index 4cd0e5c..8924b58 100644 --- a/src/selectiondialog.cc +++ b/src/selectiondialog.cc @@ -1,8 +1,8 @@ #include "selectiondialog.h" #include -#ifndef _WIN32 namespace sigc { +#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE template struct functor_trait { typedef decltype (::sigc::mem_fun(std::declval(), @@ -10,8 +10,10 @@ namespace sigc { typedef typename _intermediate::result_type result_type; typedef Functor functor_type; }; -} +#else + SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE #endif +} SelectionDialogBase::SelectionDialogBase(Gtk::TextView& text_view, Glib::RefPtr start_mark, bool show_search_entry): text_view(text_view), start_mark(start_mark), show_search_entry(show_search_entry), list_view_text(1, false, Gtk::SelectionMode::SELECTION_BROWSE) { diff --git a/src/source.cc b/src/source.cc index fc330c4..25b6a88 100644 --- a/src/source.cc +++ b/src/source.cc @@ -11,8 +11,8 @@ using namespace std; //TODO: remove -#ifndef _WIN32 namespace sigc { +#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE template struct functor_trait { typedef decltype (::sigc::mem_fun(std::declval(), @@ -20,8 +20,10 @@ namespace sigc { typedef typename _intermediate::result_type result_type; typedef Functor functor_type; }; -} +#else + SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE #endif +} Glib::RefPtr Source::guess_language(const boost::filesystem::path &file_path) { auto language_manager=Gsv::LanguageManager::get_default(); diff --git a/src/tooltips.cc b/src/tooltips.cc index a509c33..9627309 100644 --- a/src/tooltips.cc +++ b/src/tooltips.cc @@ -1,8 +1,8 @@ #include "tooltips.h" #include "singletons.h" -#ifndef _WIN32 namespace sigc { +#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE template struct functor_trait { typedef decltype (::sigc::mem_fun(std::declval(), @@ -10,8 +10,10 @@ namespace sigc { typedef typename _intermediate::result_type result_type; typedef Functor functor_type; }; -} +#else + SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE #endif +} Gdk::Rectangle Tooltips::drawn_tooltips_rectangle=Gdk::Rectangle(); diff --git a/src/window.cc b/src/window.cc index 402c294..9cca7be 100644 --- a/src/window.cc +++ b/src/window.cc @@ -9,8 +9,8 @@ #include //TODO: remove using namespace std; //TODO: remove -#ifndef _WIN32 namespace sigc { +#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE template struct functor_trait { typedef decltype (::sigc::mem_fun(std::declval(), @@ -18,8 +18,10 @@ namespace sigc { typedef typename _intermediate::result_type result_type; typedef Functor functor_type; }; -} +#else + SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE #endif +} void Window::generate_keybindings() { boost::filesystem::path path(Singleton::config_dir() + "menu.xml");