File mugshot-opensuse.patch of Package Mugshot

diff -uNr mugshot.orig/common-dist/hippoipc/hippo-ipc-locator.cpp mugshot/common-dist/hippoipc/hippo-ipc-locator.cpp
--- mugshot.orig/common-dist/hippoipc/hippo-ipc-locator.cpp	2008-02-26 22:26:37.000000000 -0500
+++ mugshot/common-dist/hippoipc/hippo-ipc-locator.cpp	2008-03-13 21:12:14.000000000 -0400
@@ -1,6 +1,7 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 #include "hippo-ipc.h"
 #include <string>
+#include <cstring>
 #include <vector>
 #include "string.h"
 
@@ -27,7 +28,7 @@
     for (std::vector<HippoIpcLocatorMapEntry>::iterator i = entries_.begin();
          i != entries_.end();
          i++) {
-        if (strcmp(i->url_.c_str(), url) == 0) {
+        if (std::strcmp(i->url_.c_str(), url) == 0) {
             i->refcount_++;
             return i->controller_;
         }
diff -uNr mugshot.orig/configure.ac mugshot/configure.ac
--- mugshot.orig/configure.ac	2008-02-26 22:26:14.000000000 -0500
+++ mugshot/configure.ac	2008-03-13 21:11:45.000000000 -0400
@@ -408,7 +408,7 @@
 
 
 ##
-## Checks for Firefox build environment
+## Checks for Gecko build environment
 ##
 AC_ARG_WITH(gecko_sdk, 
 	AC_HELP_STRING([--with-gecko-sdk=DIR],
@@ -462,34 +462,34 @@
     AC_MSG_RESULT([no])
 fi
 
-# if the firefox-devel RPM is installed, set paths from that
+# if the mozilla-xulrunner181-devel RPM is installed, set paths from that
 if test \( x"$GECKO_IDLDIR" = x -o "x$GECKO_INCLUDEDIR" = x -o "x$XPIDL" = x \) -a -x /bin/rpm ; then
-   AC_MSG_CHECKING([for Gecko SDK via the firefox-devel package])
-   FIREFOX_VERSION="`/bin/rpm -q --qf '%{version} ' firefox-devel`"
+   AC_MSG_CHECKING([for Gecko SDK via the mozilla-xulrunner181-devel package])
+   XULRUNNER_VERSION="`/bin/rpm -q --qf '%{version} ' mozilla-xulrunner181-devel`"
    if  test $? = 0 ; then
-       # In multi-arch situations, there might be multiple versions of firefox-devel
+       # In multi-arch situations, there might be multiple versions of mozilla-xulrunner181-devel
        # installed; we assume it doesn't matter which one we find; ideally we'd
        # like to find the one that matches the architecture we are building for
        # but that's hard to do, and what we use shouldn't be dependent on
        # architecture or exact version. The only problem would be if the two versions 
        # are for wildly different versions of firefox.
        #
-       FIREFOX_VERSION=`(set $FIREFOX_VERSION && echo $1)`
+       XULRUNNER_VERSION=`(set $XULRUNNER_VERSION && echo $1)`
 
        AC_MSG_RESULT([yes])
        if test x"$GECKO_IDLDIR" = x ; then
-           GECKO_IDLDIR=/usr/share/idl/firefox-$FIREFOX_VERSION
+           GECKO_IDLDIR=/usr/include/xulrunner-$XULRUNNER_VERSION
        fi
        if test x"$GECKO_INCLUDEDIR" = x ; then
-           GECKO_INCLUDEDIR=/usr/include/firefox-$FIREFOX_VERSION
+           GECKO_INCLUDEDIR=/usr/include/xulrunner-$XULRUNNER_VERSION
        fi
        if test x"$XPIDL" = x ; then
-           if test -x /usr/lib/firefox-$FIREFOX_VERSION/xpidl ; then
-               XPIDL=/usr/lib/firefox-$FIREFOX_VERSION/xpidl
-	   elif test -x /usr/lib64/firefox-$FIREFOX_VERSION/xpidl ; then
-               XPIDL=/usr/lib64/firefox-$FIREFOX_VERSION/xpidl
+           if test -x /usr/lib/xulrunner-$XULRUNNER_VERSION/xpidl ; then
+               XPIDL=/usr/lib/xulrunner-$XULRUNNER_VERSION/xpidl
+	   elif test -x /usr/lib64/xulrunner-$XULRUNNER_VERSION/xpidl ; then
+               XPIDL=/usr/lib64/xulrunner-$XULRUNNER_VERSION/xpidl
 	   else
-	       AC_MSG_WARN([Found firefox-devel RPM, but couldn't find xpidl binary])
+	       AC_MSG_WARN([Found mozilla-xulrunner181-devel RPM, but couldn't find xpidl binary])
            fi
        fi
    else

openSUSE Build Service is sponsored by