rpms/gnome-web-photo/devel gnome-web-photo.spec, 1.10, 1.11 xulrunner19.patch, 1.1, 1.2
Marco Pesenti Gritti (mpg)
fedora-extras-commits at redhat.com
Wed Mar 12 20:06:19 UTC 2008
- Previous message (by thread): rpms/libgnomeuimm26/devel .cvsignore, 1.10, 1.11 libgnomeuimm.spec, 1.18, 1.19 sources, 1.11, 1.12
- Next message (by thread): rpms/glade3/F-7 glade3-3.4.3-desktop.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 glade3.spec, 1.11, 1.12 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mpg
Update of /cvs/pkgs/rpms/gnome-web-photo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25852
Modified Files:
gnome-web-photo.spec xulrunner19.patch
Log Message:
* Wed Mar 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.3-11
- Better xulrunner-1.9 patch which also works with very long pages
Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-web-photo.spec 7 Mar 2008 20:18:59 -0000 1.10
+++ gnome-web-photo.spec 12 Mar 2008 20:05:08 -0000 1.11
@@ -3,7 +3,7 @@
Summary: HTML pages thumbnailer
Name: gnome-web-photo
Version: 0.3
-Release: 10%{?dist}
+Release: 11%{?dist}
License: LGPLv2+
Group: Applications/Internet
URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -81,6 +81,9 @@
%{_datadir}/gnome-web-photo
%changelog
+* Wed Mar 12 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.3-11
+- Better xulrunner-1.9 patch which also works with very long pages
+
* Fri Mar 7 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.3-10
- Add patch to make it work with xulrunner 1.9
xulrunner19.patch:
Index: xulrunner19.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/xulrunner19.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xulrunner19.patch 7 Mar 2008 17:58:06 -0000 1.1
+++ xulrunner19.patch 12 Mar 2008 20:05:08 -0000 1.2
@@ -1,74 +1,6 @@
-diff -u -r gnome-web-photo-0.3-orig/configure.ac gnome-web-photo-0.3/configure.ac
---- gnome-web-photo-0.3-orig/configure.ac 2008-03-07 18:41:35.000000000 +0100
-+++ gnome-web-photo-0.3/configure.ac 2008-03-07 18:42:24.000000000 +0100
-@@ -132,57 +132,12 @@
-
- AM_GCONF_SOURCE_2
-
-+# *********
-+# Xulrunner
-+# *********
-
--# *******
--# Mozilla
--# *******
--
--GECKO_INIT([GECKO])
--
--AC_SUBST([GECKO])
--AC_SUBST([GECKO_FLAVOUR])
--AC_SUBST([GECKO_INCLUDE_ROOT])
--AC_SUBST([GECKO_HOME])
--AC_SUBST([GECKO_PREFIX])
--
--case "$GECKO" in
--seamonkey) min_version=1.0 ;;
--*firefox) min_version=1.4 ;;
--xulrunner) min_version=1.8 ;;
--esac
--
--PKG_CHECK_MODULES([GECKO], [${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_extra_pkg_dependencies}])
--AC_SUBST([GECKO_CFLAGS])
--AC_SUBST([GECKO_LIBS])
--
--# In xulrunner, gkgfx is in libxul; for all others we need to
--# explicitly link against it
--
--if test "$GECKO" != "xulrunner"; then
-- GECKO_EXTRA_LIBS="$GECKO_EXTRA_LIBS -lgkgfx"
--fi
--
--AC_SUBST([GECKO_EXTRA_LIBS])
--
--# Check for PSM headers
--
--AC_MSG_CHECKING([for mozilla security compoment])
--GECKO_COMPILE_IFELSE([pipnss],
-- [AC_LANG_PROGRAM(
-- [[#include <nsIX509Cert.h>]],
-- [[nsIX509Cert *c;
-- c->GetIssuer (nsnull);]]
-- )],
-- [AC_DEFINE([HAVE_PSM], [1],[Define if you have the mozilla NSS headers installed]) have_psm=yes],
-- [have_psm=no])
--AC_MSG_RESULT([$have_psm])
--
--AM_CONDITIONAL([HAVE_PSM],[test "x$have_psm" = "xyes"])
--
--# Needed since 1.8b2
--# Define this down here so it doesn't affect the API checks above
--
--AC_DEFINE([MOZILLA_INTERNAL_API],[1],[Define for access to internal mozilla API])
-+LIBXUL_INIT
-+LIBXUL_DEFINES
-
- # ******************
- # Portability checks
-Only in gnome-web-photo-0.3: configure.ac.rej
-Only in gnome-web-photo-0.3/m4: libxul.m4
-diff -u -r gnome-web-photo-0.3-orig/src/Components.cpp gnome-web-photo-0.3/src/Components.cpp
---- gnome-web-photo-0.3-orig/src/Components.cpp 2008-03-07 18:41:35.000000000 +0100
-+++ gnome-web-photo-0.3/src/Components.cpp 2008-03-07 18:41:44.000000000 +0100
+diff -u -r gnome-web-photo-0.3/src/Components.cpp gnome-web-photo-0.3-new/src/Components.cpp
+--- gnome-web-photo-0.3/src/Components.cpp 2006-12-31 22:48:52.000000000 +0100
++++ gnome-web-photo-0.3-new/src/Components.cpp 2008-03-12 20:09:02.000000000 +0100
@@ -137,80 +137,15 @@
return NS_OK;
}
@@ -167,9 +99,9 @@
};
PRBool
-diff -u -r gnome-web-photo-0.3-orig/src/Listener.h gnome-web-photo-0.3/src/Listener.h
---- gnome-web-photo-0.3-orig/src/Listener.h 2008-03-07 18:41:35.000000000 +0100
-+++ gnome-web-photo-0.3/src/Listener.h 2008-03-07 18:41:44.000000000 +0100
+diff -u -r gnome-web-photo-0.3/src/Listener.h gnome-web-photo-0.3-new/src/Listener.h
+--- gnome-web-photo-0.3/src/Listener.h 2006-12-31 22:48:52.000000000 +0100
++++ gnome-web-photo-0.3-new/src/Listener.h 2008-03-12 20:09:02.000000000 +0100
@@ -23,7 +23,7 @@
#include <nsCOMPtr.h>
@@ -179,9 +111,9 @@
#include <gtkmozembed.h>
class Listener : public nsIDOMLoadListener
-diff -u -r gnome-web-photo-0.3-orig/src/main.cpp gnome-web-photo-0.3/src/main.cpp
---- gnome-web-photo-0.3-orig/src/main.cpp 2008-03-07 18:41:35.000000000 +0100
-+++ gnome-web-photo-0.3/src/main.cpp 2008-03-07 18:41:46.000000000 +0100
+diff -u -r gnome-web-photo-0.3/src/main.cpp gnome-web-photo-0.3-new/src/main.cpp
+--- gnome-web-photo-0.3/src/main.cpp 2007-01-29 19:53:02.000000000 +0100
++++ gnome-web-photo-0.3-new/src/main.cpp 2008-03-12 20:09:02.000000000 +0100
@@ -25,6 +25,7 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
@@ -297,9 +229,9 @@
#else
gtk_widget_show_all (window);
#endif
-diff -u -r gnome-web-photo-0.3-orig/src/Makefile.am gnome-web-photo-0.3/src/Makefile.am
---- gnome-web-photo-0.3-orig/src/Makefile.am 2008-03-07 18:41:35.000000000 +0100
-+++ gnome-web-photo-0.3/src/Makefile.am 2008-03-07 18:41:44.000000000 +0100
+diff -u -r gnome-web-photo-0.3/src/Makefile.am gnome-web-photo-0.3-new/src/Makefile.am
+--- gnome-web-photo-0.3/src/Makefile.am 2007-01-29 19:16:18.000000000 +0100
++++ gnome-web-photo-0.3-new/src/Makefile.am 2008-03-12 20:09:02.000000000 +0100
@@ -36,28 +36,31 @@
main.cpp
@@ -337,9 +269,9 @@
install-exec-hook: gnome-web-photo
cd $(DESTDIR)$(bindir) && \
-diff -u -r gnome-web-photo-0.3-orig/src/Prefs.cpp gnome-web-photo-0.3/src/Prefs.cpp
---- gnome-web-photo-0.3-orig/src/Prefs.cpp 2008-03-07 18:41:35.000000000 +0100
-+++ gnome-web-photo-0.3/src/Prefs.cpp 2008-03-07 18:41:44.000000000 +0100
+diff -u -r gnome-web-photo-0.3/src/Prefs.cpp gnome-web-photo-0.3-new/src/Prefs.cpp
+--- gnome-web-photo-0.3/src/Prefs.cpp 2006-12-31 22:48:52.000000000 +0100
++++ gnome-web-photo-0.3-new/src/Prefs.cpp 2008-03-12 20:09:02.000000000 +0100
@@ -26,9 +26,9 @@
#include <nsCOMPtr.h>
#include <nsIPrefService.h>
@@ -352,9 +284,9 @@
#include <pango/pango.h>
#include <gconf/gconf-client.h>
-diff -u -r gnome-web-photo-0.3-orig/src/Printer.cpp gnome-web-photo-0.3/src/Printer.cpp
---- gnome-web-photo-0.3-orig/src/Printer.cpp 2008-03-07 18:41:35.000000000 +0100
-+++ gnome-web-photo-0.3/src/Printer.cpp 2008-03-07 18:41:44.000000000 +0100
+diff -u -r gnome-web-photo-0.3/src/Printer.cpp gnome-web-photo-0.3-new/src/Printer.cpp
+--- gnome-web-photo-0.3/src/Printer.cpp 2006-12-31 22:48:52.000000000 +0100
++++ gnome-web-photo-0.3-new/src/Printer.cpp 2008-03-12 20:09:02.000000000 +0100
@@ -27,6 +27,7 @@
#include <nsIPrintSettings.h>
#include <nsIPrintSettingsService.h>
@@ -384,9 +316,9 @@
aSettings->SetPaperSizeUnit (nsIPrintSettings::kPaperSizeMillimeters);
aSettings->SetPaperWidth (210.0);
aSettings->SetPaperHeight (297.0);
-diff -u -r gnome-web-photo-0.3-orig/src/Printer.h gnome-web-photo-0.3/src/Printer.h
---- gnome-web-photo-0.3-orig/src/Printer.h 2008-03-07 18:41:35.000000000 +0100
-+++ gnome-web-photo-0.3/src/Printer.h 2008-03-07 18:41:44.000000000 +0100
+diff -u -r gnome-web-photo-0.3/src/Printer.h gnome-web-photo-0.3-new/src/Printer.h
+--- gnome-web-photo-0.3/src/Printer.h 2006-12-31 22:48:52.000000000 +0100
++++ gnome-web-photo-0.3-new/src/Printer.h 2008-03-12 20:09:02.000000000 +0100
@@ -27,7 +27,7 @@
#include <nsIWebBrowserPrint.h>
#include <nsIWebProgressListener.h>
@@ -396,9 +328,9 @@
#include <gtkmozembed.h>
class nsIPrintSettings;
-diff -u -r gnome-web-photo-0.3-orig/src/Writer.cpp gnome-web-photo-0.3/src/Writer.cpp
---- gnome-web-photo-0.3-orig/src/Writer.cpp 2008-03-07 18:41:35.000000000 +0100
-+++ gnome-web-photo-0.3/src/Writer.cpp 2008-03-07 18:41:44.000000000 +0100
+diff -u -r gnome-web-photo-0.3/src/Writer.cpp gnome-web-photo-0.3-new/src/Writer.cpp
+--- gnome-web-photo-0.3/src/Writer.cpp 2007-01-29 19:53:02.000000000 +0100
++++ gnome-web-photo-0.3-new/src/Writer.cpp 2008-03-12 20:09:02.000000000 +0100
@@ -37,13 +37,13 @@
#include <nsIDocShell.h>
#include <nsIDocumentViewer.h>
@@ -486,79 +418,90 @@
nsIScrollableView* scrollableView = nsnull;
viewManager->GetRootScrollableView (&scrollableView);
nsIView* view;
-@@ -132,15 +127,11 @@
+@@ -132,13 +127,11 @@
viewManager->GetRootView(view);
}
- /* Get conversion factors */
- float p2t = presContext->PixelsToTwips();
- float t2p = presContext->TwipsToPixels();
-+ nsRect r = view->GetBounds() - view->GetPosition();
++ PRInt32 p2a = dc->AppUnitsPerDevPixel();
/* Limit the bitmap size */
- nscoord twipLimitW = NSIntPixelsToTwips(mWidth, p2t);
- nscoord twipLimitH = NSIntPixelsToTwips(mHeight, p2t);
--
-- nsRect r = view->GetBounds() - view->GetPosition();
-+ nscoord twipLimitW = NSIntPixelsToAppUnits(mWidth, dc->AppUnitsPerDevPixel ());
-+ nscoord twipLimitH = NSIntPixelsToAppUnits(mHeight, dc->AppUnitsPerDevPixel ());
-
- if (r.height > twipLimitH) {
- r.height = twipLimitH;
-@@ -149,89 +140,37 @@
- r.width = twipLimitW;
- }
++ nscoord twipLimitW = NSIntPixelsToAppUnits(mWidth, p2a);
++ nscoord twipLimitH = NSIntPixelsToAppUnits(mHeight, p2a);
+
+ nsRect r = view->GetBounds() - view->GetPosition();
-- /* sanity check */
-- if (r.IsEmpty()) {
-- LOG ("Rect is empty!\n");
-- return PR_FALSE;
-- }
-+ mWidth = NSAppUnitsToIntPixels(r.width, dc->AppUnitsPerDevPixel ());
-+ mHeight = NSAppUnitsToIntPixels(r.height, dc->AppUnitsPerDevPixel ());
+@@ -155,11 +148,11 @@
+ return PR_FALSE;
+ }
- mWidth = NSTwipsToIntPixels(r.width, t2p);
- mHeight = NSTwipsToIntPixels(r.height, t2p);
++ mWidth = NSAppUnitsToIntPixels(r.width, p2a);
++ mHeight = NSAppUnitsToIntPixels(r.height, p2a);
+
+ PRUint32 stripe = (2 << 20) / mWidth;
+- nscoord twipStripe = NSIntPixelsToTwips(stripe, p2t);
++ nscoord twipStripe = NSIntPixelsToAppUnits(stripe, p2a);
+
+ nsRect cutout(r);
+ cutout.SizeTo(r.width, PR_MIN(r.height, twipStripe));
+@@ -167,71 +160,62 @@
+ PRUint32 roundCount = 0;
+ const char* status = "";
+
++ PRUint32 width = NSAppUnitsToIntPixels(cutout.width, p2a);
++ PRUint32 height = NSAppUnitsToIntPixels(cutout.height, p2a);
++
+ nsRefPtr<gfxImageSurface> imgSurface =
-+ new gfxImageSurface(gfxIntSize(mWidth, mHeight),
++ new gfxImageSurface(gfxIntSize(width, height),
+ gfxImageSurface::ImageFormatRGB24);
+ NS_ENSURE_TRUE(imgSurface, PR_FALSE);
-
-- PRUint32 stripe = (2 << 20) / mWidth;
-- nscoord twipStripe = NSIntPixelsToTwips(stripe, p2t);
++
+ nsRefPtr<gfxContext> imgContext = new gfxContext(imgSurface);
-
-- nsRect cutout(r);
-- cutout.SizeTo(r.width, PR_MIN(r.height, twipStripe));
++
+ nsRefPtr<gfxASurface> surface =
+ gfxPlatform::GetPlatform()->
-+ CreateOffscreenSurface(gfxIntSize(mWidth, mHeight),
++ CreateOffscreenSurface(gfxIntSize(width, height),
+ gfxASurface::ImageFormatRGB24);
+ NS_ENSURE_TRUE(surface, PR_FALSE);
-
-- PRUint32 roundCount = 0;
-- const char* status = "";
++
+ nsRefPtr<gfxContext> context = new gfxContext(surface);
+ NS_ENSURE_TRUE(context, PR_FALSE);
++
+ if (r.IsEmpty()) {
+ status = "EMPTY";
++ } else if (!Prepare(imgSurface)) {
++ status = "PNGPREPAREFAILED";
+ } else {
+ PRBool failed = PR_FALSE;
++
+ while (!cutout.IsEmpty() && !mHadError && !failed) {
+ ++roundCount;
-- if (r.IsEmpty()) {
-- status = "EMPTY";
-- } else {
-- PRBool failed = PR_FALSE;
-- while (!cutout.IsEmpty() && !mHadError && !failed) {
-- ++roundCount;
--
- PRUint32 width = NSTwipsToIntPixels(cutout.width, t2p);
- PRUint32 height = NSTwipsToIntPixels(cutout.height, t2p);
--
++ width = NSAppUnitsToIntPixels(cutout.width, p2a);
++ height = NSAppUnitsToIntPixels(cutout.height, p2a);
++
++ rv = presShell->RenderDocument(cutout, PR_FALSE, PR_TRUE,
++ NS_RGB(255, 255, 255), context);
++ if (NS_SUCCEEDED(rv)) {
++ imgContext->DrawSurface(surface, gfxSize(width, height));
++ }
+
- nsCOMPtr<nsIRenderingContext> context;
- rv = viewManager->RenderOffscreen (view, cutout,
- PR_FALSE, PR_TRUE, NS_RGB(255, 255, 255),
- getter_AddRefs(context));
-- if (NS_FAILED(rv)) {
-- failed = PR_TRUE;
-- status = "FAILEDRENDER";
-- } else {
+ if (NS_FAILED(rv)) {
+ failed = PR_TRUE;
+ status = "FAILEDRENDER";
+ } else {
- nsIDrawingSurface* surface;
- context->GetDrawingSurface(&surface);
- if (!surface) {
@@ -593,32 +536,28 @@
- }
- }
- context->DestroyDrawingSurface(surface);
-- }
-- cutout.MoveBy(0, twipStripe);
++ WriteSurface(imgSurface, width, height);
+ }
+ cutout.MoveBy(0, twipStripe);
- cutout.IntersectRect(r, cutout);
-- }
-+ rv = presShell->RenderDocument(r, PR_FALSE, PR_TRUE,
-+ NS_RGB(255, 255, 0), context);
-+ NS_ENSURE_SUCCESS(rv, PR_FALSE);
++ cutout.height = PR_MIN(cutout.height, r.y + r.height - cutout.y);
+ }
- retval = Finish();
- status = retval ? "OK" : status[0] != '\0' ? status : "FAILED";
-- LOG ("\n");
-- }
-+ imgContext->DrawSurface(surface, gfxSize(mWidth, mHeight));
-
-- LOG ("%d round(s) of height %d, result: %s\n", roundCount, stripe, status);
-+ if (Prepare(imgSurface)) {
-+ WriteSurface(imgSurface, mWidth, mHeight);
-+ return Finish();
-+ }
++ rv = Finish();
++ status = rv ? "OK" : status[0] != '\0' ? status : "FAILED";
+ LOG ("\n");
+ }
+
+ LOG ("%d round(s) of height %d, result: %s\n", roundCount, stripe, status);
- return retval;
-+ return PR_FALSE;
++ return rv;
}
/* PNG Writer */
-@@ -267,7 +206,7 @@
+@@ -267,7 +251,7 @@
};
PRBool
@@ -627,7 +566,7 @@
{
if (mInitialised) return PR_TRUE;
-@@ -337,10 +276,6 @@
+@@ -337,10 +321,6 @@
// PNG_RESOLUTION_METER);
// 1000 * 72 / 25.4 = 2834
@@ -638,7 +577,7 @@
/* FIXME: do I need 8, or the format.m[R|G|B]Count here? */
png_set_IHDR (mPNG, mInfo, mWidth, mHeight, 8 /* bits per sample */ /* FIXME? */,
PNG_COLOR_TYPE_RGB /* FIXME: alpha? */, PNG_INTERLACE_NONE,
-@@ -348,10 +283,10 @@
+@@ -348,10 +328,10 @@
if (mHadError) return PR_FALSE;
png_color_8 sig_bit;
@@ -653,7 +592,7 @@
png_set_sBIT (mPNG, mInfo, &sig_bit);
if (mHadError) return PR_FALSE;
-@@ -370,43 +305,28 @@
+@@ -370,43 +350,27 @@
}
void
@@ -708,14 +647,13 @@
+ dest[2] = (*cairoPixel >> 0) & 0xFF;
+ dest += 3;
}
-+
+ png_write_row (mPNG, mRow);
+ if (mHadError) break;
+ }
}
PRBool
-@@ -464,7 +384,7 @@
+@@ -464,7 +428,7 @@
};
PRBool
@@ -724,7 +662,7 @@
{
if (mInitialised) return PR_TRUE;
-@@ -482,45 +402,30 @@
+@@ -482,45 +446,30 @@
}
void
@@ -790,7 +728,7 @@
}
PRBool
-@@ -553,7 +458,7 @@
+@@ -553,7 +502,7 @@
}
PRBool
@@ -799,7 +737,7 @@
{
if (!mInitialised) {
void *buf = malloc (sizeof (GdkPixdata) + 3 * THUMBNAIL_WIDTH * THUMBNAIL_HEIGHT);
-@@ -576,38 +481,25 @@
+@@ -576,38 +525,25 @@
}
void
@@ -853,7 +791,7 @@
}
PRBool
-@@ -670,7 +562,7 @@
+@@ -670,7 +606,7 @@
};
PRBool
@@ -862,7 +800,7 @@
{
if (mInitialised) return PR_TRUE;
-@@ -713,44 +605,29 @@
+@@ -713,44 +649,29 @@
}
void
@@ -926,10 +864,10 @@
}
PRBool
-Only in gnome-web-photo-0.3/src: Writer.cpp.orig
-diff -u -r gnome-web-photo-0.3-orig/src/Writer.h gnome-web-photo-0.3/src/Writer.h
---- gnome-web-photo-0.3-orig/src/Writer.h 2008-03-07 18:41:35.000000000 +0100
-+++ gnome-web-photo-0.3/src/Writer.h 2008-03-07 18:41:44.000000000 +0100
+Only in gnome-web-photo-0.3-new/src: Writer.cpp.orig
+diff -u -r gnome-web-photo-0.3/src/Writer.h gnome-web-photo-0.3-new/src/Writer.h
+--- gnome-web-photo-0.3/src/Writer.h 2007-01-29 19:53:02.000000000 +0100
++++ gnome-web-photo-0.3-new/src/Writer.h 2008-03-12 20:09:02.000000000 +0100
@@ -21,7 +21,8 @@
#ifndef WRITER_H
#define WRITER_H
@@ -1012,8 +950,8 @@
private:
PRUint16 mQuality;
---- /dev/null 2008-03-07 10:07:23.927002592 +0100
-+++ gnome-web-photo-0.3/m4/libxul.m4 2008-03-07 18:41:46.000000000 +0100
+--- /dev/null 2008-03-12 18:51:03.904002981 +0100
++++ gnome-web-photo-0.3-new/m4/libxul.m4 2008-03-12 20:09:24.000000000 +0100
@@ -0,0 +1,566 @@
+# Copyright © 2000-2004 Marco Pesenti Gritti
+# Copyright © 2003, 2004, 2005, 2006, 2007 Christian Persch
@@ -1581,3 +1519,68 @@
+fi
+
+])
+--- gnome-web-photo-0.3/configure.ac 2007-01-29 20:07:02.000000000 +0100
++++ gnome-web-photo-0.3-new/configure.ac 2008-03-12 20:26:47.000000000 +0100
+@@ -132,57 +132,12 @@
+
+ AM_GCONF_SOURCE_2
+
++# *********
++# Xulrunner
++# *********
+
+-# *******
+-# Mozilla
+-# *******
+-
+-GECKO_INIT([GECKO])
+-
+-AC_SUBST([GECKO])
+-AC_SUBST([GECKO_FLAVOUR])
+-AC_SUBST([GECKO_INCLUDE_ROOT])
+-AC_SUBST([GECKO_HOME])
+-AC_SUBST([GECKO_PREFIX])
+-
+-case "$GECKO" in
+-seamonkey) min_version=1.0 ;;
+-*firefox) min_version=1.4 ;;
+-xulrunner) min_version=1.8 ;;
+-esac
+-
+-PKG_CHECK_MODULES([GECKO], [${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_extra_pkg_dependencies}])
+-AC_SUBST([GECKO_CFLAGS])
+-AC_SUBST([GECKO_LIBS])
+-
+-# In xulrunner, gkgfx is in libxul; for all others we need to
+-# explicitly link against it
+-
+-if test "$GECKO" != "xulrunner"; then
+- GECKO_EXTRA_LIBS="$GECKO_EXTRA_LIBS -lgkgfx"
+-fi
+-
+-AC_SUBST([GECKO_EXTRA_LIBS])
+-
+-# Check for PSM headers
+-
+-AC_MSG_CHECKING([for mozilla security compoment])
+-GECKO_COMPILE_IFELSE([pipnss],
+- [AC_LANG_PROGRAM(
+- [[#include <nsIX509Cert.h>]],
+- [[nsIX509Cert *c;
+- c->GetIssuer (nsnull);]]
+- )],
+- [AC_DEFINE([HAVE_PSM], [1],[Define if you have the mozilla NSS headers installed]) have_psm=yes],
+- [have_psm=no])
+-AC_MSG_RESULT([$have_psm])
+-
+-AM_CONDITIONAL([HAVE_PSM],[test "x$have_psm" = "xyes"])
+-
+-# Needed since 1.8b2
+-# Define this down here so it doesn't affect the API checks above
+-
+-AC_DEFINE([MOZILLA_INTERNAL_API],[1],[Define for access to internal mozilla API])
++LIBXUL_INIT
++LIBXUL_DEFINES
+
+ # ******************
+ # Portability checks
- Previous message (by thread): rpms/libgnomeuimm26/devel .cvsignore, 1.10, 1.11 libgnomeuimm.spec, 1.18, 1.19 sources, 1.11, 1.12
- Next message (by thread): rpms/glade3/F-7 glade3-3.4.3-desktop.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 glade3.spec, 1.11, 1.12 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list