| 1 |
jer 15/07/24 05:44:36 |
| 2 |
|
| 3 |
Added: wireshark-1.12.6-rcc.patch |
| 4 |
Log: |
| 5 |
With USE=qt5, make sure we discover the correct RCC (bug #555638). |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: wireshark-1.12.6-rcc.patch |
| 16 |
=================================================================== |
| 17 |
--- a/configure.ac |
| 18 |
+++ b/configure.ac |
| 19 |
@@ -1609,11 +1609,37 @@ |
| 20 |
# we don't know whether they'll be doing that, |
| 21 |
# so this is the best we can do. |
| 22 |
# |
| 23 |
- MIC=moc |
| 24 |
+ MOC=moc |
| 25 |
fi |
| 26 |
fi |
| 27 |
fi |
| 28 |
AC_SUBST(MOC) |
| 29 |
+AC_PATH_PROG(RCC, rcc) |
| 30 |
+if test "x$RCC" = x |
| 31 |
+then |
| 32 |
+ AC_PATH_PROG(RCC, rcc-qt4) |
| 33 |
+ if test "x$RCC" = x |
| 34 |
+ then |
| 35 |
+ if test "x$have_qt" = "xyes"; then |
| 36 |
+ # |
| 37 |
+ # If you want to build with Qt, you'd better |
| 38 |
+ # have rcc. |
| 39 |
+ # |
| 40 |
+ AC_MSG_ERROR(I couldn't find moc or rcc-qt4; make sure it's installed and in your path) |
| 41 |
+ else |
| 42 |
+ # |
| 43 |
+ # We shouldn't fail here, as the user's not |
| 44 |
+ # building with Qt, and we shouldn't force them |
| 45 |
+ # to have Qt installed if they're not doing so. |
| 46 |
+ # "make dist" will fail if they do that, but |
| 47 |
+ # we don't know whether they'll be doing that, |
| 48 |
+ # so this is the best we can do. |
| 49 |
+ # |
| 50 |
+ RCC=rcc |
| 51 |
+ fi |
| 52 |
+ fi |
| 53 |
+fi |
| 54 |
+AC_SUBST(RCC) |
| 55 |
|
| 56 |
# Error out if a glib header other than a "top level" header |
| 57 |
# (glib.h, glib-object.h, gio.h) or certain other headers( e.g.,gmodule.h) |
| 58 |
--- a/ui/qt/Makefile.am |
| 59 |
+++ b/ui/qt/Makefile.am |
| 60 |
@@ -116,7 +116,7 @@ |
| 61 |
|
| 62 |
.qrc.rcc.cpp: |
| 63 |
$(MKDIR_P) $(@D) |
| 64 |
- $(AM_V_RCC)rcc -name `basename $< .qrc` -o $@ $< |
| 65 |
+ $(AM_V_RCC)$(RCC) -name `basename $< .qrc` -o $@ $< |
| 66 |
|
| 67 |
ui_%.h: %.ui |
| 68 |
$(AM_V_UIC)$(UIC) $< -o $@ |
Archives