Attachment 954 Details for Bug 943 – Patch to fix build errors

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Patch to fix build errors

kmplayer-dbus-tqt.diff (text/plain), 1.94 KB, created by Darrell on 2012-11-03 15:18:20 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2012-11-03 15:18:20 CDT

Size: 1.94 KB

patch

obsolete

>diff -urN kmplayer/configure.in kmplayer.new/configure.in
>--- kmplayer/configure.in	2012-09-14 17:42:35.000000000 -0500
>+++ kmplayer.new/configure.in	2012-11-03 03:13:35.000000000 -0500
>@@ -249,7 +249,12 @@
>             have_nspr=yes
>             AC_DEFINE(HAVE_DBUS, 1, [have DBus])
>             LIBQTDBUS="`$PKG_CONFIG --libs dbus-1` -ldbus-tqt-1"
>-	    LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-1`"
>+            LIBDBUS_VERSION=`$PKG_CONFIG --modversion dbus-tqt 2>/dev/null`
>+            if test -n "$LIBDBUS_VERSION"; then
>+              LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-tqt`"
>+            else
>+              LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-1`"
>+            fi
>             AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader])
>             LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`"
>             LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`"
>diff -urN kmplayer/configure.in.in kmplayer.new/configure.in.in
>--- kmplayer/configure.in.in	2012-09-14 17:42:35.000000000 -0500
>+++ kmplayer.new/configure.in.in	2012-11-03 03:13:43.000000000 -0500
>@@ -183,7 +183,12 @@
>             have_nspr=yes
>             AC_DEFINE(HAVE_DBUS, 1, [have DBus])
>             LIBQTDBUS="`$PKG_CONFIG --libs dbus-1` -ldbus-tqt-1"
>-	    LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-1`"
>+            LIBDBUS_VERSION=`$PKG_CONFIG --modversion dbus-tqt 2>/dev/null`
>+            if test -n "$LIBDBUS_VERSION"; then
>+              LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-tqt`"
>+            else
>+              LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-1`"
>+            fi
>             AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader])
>             LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`"
>             LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`"

Actions: View | Diff

Attachments on bug 943: 954 | 1101