Fix build with recent libsigc++20

This commit is contained in:
Baptiste Daroussin 2017-04-05 11:28:15 +00:00
parent 96ecb23693
commit 53063dd589
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=437776
10 changed files with 53 additions and 9 deletions

View File

@ -16,7 +16,8 @@ LIB_DEPENDS= libglademm-2.4.so:devel/libglademm24 \
libpulse.so:audio/pulseaudio
GNU_CONFIGURE= yes
USES= gmake pkgconfig
USES= compiler:c++11-lang gmake pkgconfig
USE_CXXSTD= c++11
CONFIGURE_ARGS= --disable-lynx

View File

@ -15,7 +15,8 @@ LIB_DEPENDS= libao.so:audio/libao \
libgconfmm-2.6.so:devel/gconfmm26
GNU_CONFIGURE= yes
USES= pkgconfig tar:bzip2
USES= compiler:c++11-lang pkgconfig tar:bzip2
USE_CXXSTD= c++11
PLIST_FILES= bin/gtkmmorse \
man/man1/gtkmmorse.1.gz

View File

@ -19,7 +19,8 @@ LIB_DEPENDS= libgtkglextmm-x11-1.2.so:x11-toolkits/gtkglextmm \
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= uses SSE instructions
USES= tar:bzip2 gmake pkgconfig
USES= compiler:c++11-lang tar:bzip2 gmake pkgconfig
USE_CXXSTD= c++11
GNU_CONFIGURE= yes
USE_GL= yes

View File

@ -15,7 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24
USES= pathfix pkgconfig gettext
USES= compiler:c++11-lang pathfix pkgconfig gettext
USE_CXXSTD= c++11
USE_GNOME= gnomeprefix
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-kde

View File

@ -0,0 +1,11 @@
--- src/gtkmm/MainWindow.cpp.orig 2017-04-05 11:24:58 UTC
+++ src/gtkmm/MainWindow.cpp
@@ -485,7 +485,7 @@ void MainWindow::openAboutWindow()
if (_aboutwin.get()) {
_aboutwin->present();
} else {
- std::auto_ptr<Gtk::MessageDialog> dialog(new Gtk::MessageDialog(_("LostIRC "VERSION), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK, false));
+ std::auto_ptr<Gtk::MessageDialog> dialog(new Gtk::MessageDialog(_("LostIRC " VERSION), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK, false));
dialog->signal_response().connect(sigc::mem_fun(*this, &MainWindow::hideAboutWindow));
dialog->show();

View File

@ -0,0 +1,16 @@
--- src/gtkmm/TextWidget.cpp.orig 2017-04-05 11:26:59 UTC
+++ src/gtkmm/TextWidget.cpp
@@ -210,11 +210,11 @@ void TextWidget::insertText(const TextProperties& tp,
std::vector< Glib::RefPtr<Gtk::TextTag> > tags;
Glib::RefPtr<Gtk::TextTag> fg = buffer->get_tag_table()->lookup(Glib::ustring("f")+crop(tp.fgnumber));
- if (fg == 0)
+ if (!fg)
fg = buffer->get_tag_table()->lookup("f0");
Glib::RefPtr<Gtk::TextTag> bg = buffer->get_tag_table()->lookup(Glib::ustring("b")+crop(tp.bgnumber));
- if (bg == 0)
+ if (!bg)
bg = buffer->get_tag_table()->lookup("b0");
tags.push_back(fg);

View File

@ -0,0 +1,11 @@
--- src/libirc/ServerConnection.cpp.orig 2017-04-05 11:23:15 UTC
+++ src/libirc/ServerConnection.cpp
@@ -322,7 +322,7 @@ bool ServerConnection::sendVersion(const ustring& to)
ustring r("");
ustring m("");
#endif
- ustring vstring("LostIRC "VERSION" on " + s + " " + r + " [" + m + "]");
+ ustring vstring("LostIRC " VERSION" on " + s + " " + r + " [" + m + "]");
ustring msg("NOTICE " + to + " :\001VERSION " + vstring + "\001\r\n");
return _socket.send(msg);

View File

@ -14,7 +14,8 @@ LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24
RUN_DEPENDS= bash:shells/bash \
smartctl:sysutils/smartmontools
USES= pkgconfig tar:bzip2 libtool
USES= compiler:c++11-lang pkgconfig tar:bzip2 libtool
USE_CXXSTD= c++11
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes

View File

@ -16,12 +16,12 @@ LIB_DEPENDS= libgconfmm-2.6.so:devel/gconfmm26 \
libgnomevfsmm-2.6.so:devel/gnome-vfsmm \
libxml++-2.6.so:textproc/libxml++26
USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USES= compiler:c++11-lang gettext gmake libtool localbase pathfix \
pkgconfig tar:bzip2
USE_CXXSTD= c++11
USE_GNOME= gnomeprefix intlhack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"

View File

@ -15,7 +15,8 @@ LICENSE= LGPL21
LIB_DEPENDS= libsexy.so:x11-toolkits/libsexy \
libgtkmm-2.4.so:x11-toolkits/gtkmm24
USES= gmake pathfix pkgconfig libtool
USES= compiler:c++11-lang gmake pathfix pkgconfig libtool
USE_CXXSTD= c++11
GNU_CONFIGURE= yes
USE_LDCONFIG= yes