1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-15 07:56:36 +00:00

- Added conflict with Qt3

- Fixed build with new glibc

PR:		ports/175429
Submitted by:	Heino Tiedemann <rotkap@gmx.de>
Approved by:	eadler (mentor)
This commit is contained in:
Veniamin Gvozdikov 2013-08-10 15:08:22 +00:00
parent e5e93837a0
commit 2dd345ba32
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=324538
2 changed files with 13 additions and 0 deletions

View File

@ -33,6 +33,7 @@ USE_GCC= 4.2+
INSTALLS_ICONS= yes
USE_GSTREAMER= gio ogg mp3 flac soup vorbis
MAKE_JOBS_UNSAFE= yes
CONFLICTS_BUILD= qt-3.*
CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"

View File

@ -0,0 +1,12 @@
--- src/main.cpp.orig 2013-08-05 07:51:55.259557059 +0000
+++ src/main.cpp 2013-08-05 08:02:30.142556079 +0000
@@ -265,7 +265,9 @@
#endif
// This makes us show up nicely in gnome-volume-control
+#if !GLIB_CHECK_VERSION(2, 36, 0)
g_type_init();
+#endif
g_set_application_name(QCoreApplication::applicationName().toLocal8Bit());
RegisterMetaTypes();