* Fix build with Mozilla 1.7
* Use the new GConf schema policy
This commit is contained in:
parent
bddaab67fb
commit
0018a7ed4e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=112432
3 changed files with 34 additions and 98 deletions
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= galeon2
|
||||
PORTVERSION= 1.3.15
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= www gnome
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
|
||||
http://osdn.dl.sourceforge.net/sourceforge/galeon/
|
||||
|
@ -19,7 +20,7 @@ COMMENT= A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
|
|||
BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
|
||||
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
|
||||
|
||||
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.6"
|
||||
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.7"
|
||||
|
||||
MOZILLA= mozilla
|
||||
HEADERS_SUFX=
|
||||
|
@ -31,7 +32,7 @@ HEADERS_SUFX=
|
|||
.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
|
||||
MOZILLA= mozilla-devel
|
||||
HEADERS_SUFX= -devel
|
||||
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.7rc2"
|
||||
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.8a"
|
||||
.else
|
||||
MOZILLA= mozilla
|
||||
HEADERS_SUFX=
|
||||
|
|
29
www/galeon2/files/patch-mozilla_GtkNSSKeyPairDialogs.cpp
Normal file
29
www/galeon2/files/patch-mozilla_GtkNSSKeyPairDialogs.cpp
Normal file
|
@ -0,0 +1,29 @@
|
|||
--- mozilla/GtkNSSKeyPairDialogs.cpp.orig Sun Jun 27 20:41:07 2004
|
||||
+++ mozilla/GtkNSSKeyPairDialogs.cpp Sun Jun 27 20:47:09 2004
|
||||
@@ -84,7 +84,7 @@
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIDOMWINDOWINTERNAL
|
||||
NS_DECL_NSIDOMWINDOW
|
||||
-#if MOZILLA_SNAPSHOT > 17
|
||||
+#if MOZILLA_SNAPSHOT > 15
|
||||
NS_DECL_NSIDOMWINDOW2
|
||||
#endif
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
gboolean close_called;
|
||||
};
|
||||
|
||||
-#if MOZILLA_SNAPSHOT > 17
|
||||
+#if MOZILLA_SNAPSHOT > 15
|
||||
NS_IMPL_ISUPPORTS3(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow, nsIDOMWindow2)
|
||||
#else
|
||||
NS_IMPL_ISUPPORTS2(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow)
|
||||
@@ -242,7 +242,7 @@
|
||||
MOZ_NOT_IMPLEMENTED
|
||||
}
|
||||
|
||||
-#if MOZILLA_SNAPSHOT > 17
|
||||
+#if MOZILLA_SNAPSHOT > 15
|
||||
NS_IMETHODIMP KeyPairHelperWindow::GetWindowRoot(nsIDOMEventTarget * *aEvent)
|
||||
{
|
||||
MOZ_NOT_IMPLEMENTED
|
|
@ -1,55 +1,9 @@
|
|||
bin/galeon
|
||||
bin/galeon-bin
|
||||
bin/galeon-config-tool
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Filtering/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks/Editor/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Find/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Print/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/FontsColors/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/State/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/UI/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/UI/Toolbar/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks/Editor/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Find/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/FontsColors/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Toolbar/%gconf.xml
|
||||
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Windows/%gconf.xml
|
||||
@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/galeon.schemas > /dev/null || /usr/bin/true
|
||||
etc/gconf/schemas/galeon.schemas
|
||||
@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/galeon.schemas > /dev/null || /usr/bin/true
|
||||
etc/sound/events/galeon.soundlist
|
||||
lib/galeon/components/libgaleon-xpcom.so
|
||||
libdata/bonobo/servers/GNOME_Galeon_Automation.server
|
||||
|
@ -272,53 +226,5 @@ share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
|
|||
@dirrm share/gnome/galeon
|
||||
@dirrm lib/galeon/components
|
||||
@dirrm lib/galeon
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Windows
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Toolbar
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/FontsColors
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Find
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks/Editor
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced
|
||||
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Toolbar
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/FontsColors
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Print
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Find
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks/Editor
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Filtering
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced
|
||||
@dirrm etc/gconf/gconf.xml.defaults/apps/galeon
|
||||
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/galeon/galeon-C.omf 2>/dev/null || /usr/bin/true
|
||||
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/galeon/galeon-es.omf 2>/dev/null || /usr/bin/true
|
||||
|
|
Loading…
Reference in a new issue