cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more work on minimo:

Browse Source 
- WANTLIB for xenocara;
- fix initxpcom crashes with HACK_AROUND_NONREENTRANT_INITXPCOM;
- respect the layout, data files belong to /usr/local/share/minimo;
- respect homepage;
- cleanup;
"looks ok" robert@
This commit is contained in:
martynas 2007-04-01 13:19:58 +00:00
parent e7ece96457
commit b57122cfe1
13 changed files with 144 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
www/minimo/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.34 2007/04/01 09:36:15 martynas Exp $
# $OpenBSD: Makefile,v 1.35 2007/04/01 13:19:58 martynas Exp $
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc64
SHARED_ONLY= Yes
COMMENT= "small, simple, and powerful web browser for mobile devices"
DISTNAME= minimo-20070320
SO_VERSION= 4.0
PKGNAME= ${DISTNAME}p0
CATEGORIES= www
MASTER_SITES= http://mirrors.protection.cx/~jolan/
@ -28,7 +28,7 @@ LIB_DEPENDS= jpeg.>=62::graphics/jpeg \
gdk-x11-2.0.>=600.0,gdk_pixbuf-2.0.>=600.0,gtk-x11-2.0.>=600.0::x11/gtk+2 \
nspr4.>=17,plc4.>=17,plds4.>=17:nspr->=4.6.4p1:devel/nspr \
nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss
WANTLIB= X11 Xext Xft Xrender Xt Xcursor Xfixes Xi Xinerama Xrandr \
WANTLIB= X11 Xft Xrender Xt Xau Xdmcp expat \
c fontconfig freetype m pthread z \
atk-1.0.>=1011.0 glib-2.0.>=600.0 gmodule-2.0.>=600.0 \
gobject-2.0.>=600.0 pango-1.0.>=800.0 pangocairo-1.0 \
@ -85,21 +85,20 @@ INSTALL_STRIP=
MAKE_ENV= MOZ_CO_PROJECT=minimo \
LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \
BUILD_OFFICIAL=1 \
MOZILLA_OFFICIAL=1 \
SO_VERSION=${SO_VERSION}
MOZILLA_OFFICIAL=1
CONFIGURE_ENV= ${MAKE_ENV} \
PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" \
topsrcdir=${WRKSRC}
MOB= ${WRKSRC}/dist/bin
MOZ= ${PREFIX}/minimo
MOZ= ${PREFIX}/share/minimo
post-extract:
@cp ${FILESDIR}/xptc* ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/
do-install:
${INSTALL_DATA_DIR} ${MOZ}
${INSTALL_PROGRAM} ${MOB}/minimo ${MOZ}/
${INSTALL_PROGRAM} ${MOB}/minimo ${PREFIX}/bin/
${INSTALL_DATA_DIR} ${MOZ}/chrome
${INSTALL_DATA} ${MOB}/chrome/classic.{jar,manifest} \
${MOB}/chrome/en-US.{jar,manifest} \
@ -137,8 +136,5 @@ do-install:
rm -rf locale
@cp -f ${WRKSRC}/minimo/customization/all.js ${MOZ}/greprefs/
@cat ${WRKSRC}/minimo/customization/ua.css.additions >> ${MOZ}/res/ua.css
${INSTALL_SCRIPT} ${FILESDIR}/minimo ${PREFIX}/bin/ && \
perl -pi -e 's|!!LOCALBASE!!|${LOCALBASE}|g' \
${PREFIX}/bin/minimo
.include <bsd.port.mk>

30
www/minimo/files/minimo
View File

@ -1,30 +0,0 @@
#!/bin/sh
#
# Copyright (c) 2006 Martynas Venckus <martynas@altroot.org>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
# $OpenBSD: minimo,v 1.3 2007/04/01 09:36:15 martynas Exp $
LOCALBASE=!!LOCALBASE!!
MOZ_PLUGIN_PATH=${LOCALBASE}/lib/mozilla-plugins
if [ `/usr/X11R6/bin/fc-list | wc -l` -eq 0 ]; then
export GDK_USE_XFT=0
fi
export MOZ_PLUGIN_PATH
cd ${LOCALBASE}/minimo && ./minimo $@
exit $?

4
www/minimo/patches/patch-config_autoconf_mk_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-config_autoconf_mk_in,v 1.5 2007/04/01 09:36:15 martynas Exp $
$OpenBSD: patch-config_autoconf_mk_in,v 1.6 2007/04/01 13:19:58 martynas Exp $
--- config/autoconf.mk.in.orig Thu Sep 14 21:07:03 2006
+++ config/autoconf.mk.in Wed Mar 28 12:09:46 2007
@@ -63,7 +63,7 @@ datadir = @datadir@
@ -6,7 +6,7 @@ $OpenBSD: patch-config_autoconf_mk_in,v 1.5 2007/04/01 09:36:15 martynas Exp $
idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+mozappdir = $(prefix)/minimo
+mozappdir = $(prefix)/share/minimo
mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
mrelibdir = $(mredir)/lib

11
www/minimo/patches/patch-configure_in
View File

@ -1,15 +1,6 @@
$OpenBSD: patch-configure_in,v 1.5 2007/04/01 09:36:15 martynas Exp $
$OpenBSD: patch-configure_in,v 1.6 2007/04/01 13:19:58 martynas Exp $
--- configure.in.orig Sat Oct 28 06:29:25 2006
+++ configure.in Sat Nov 18 21:52:21 2006
@@ -1931,7 +1931,7 @@ case "$target" in
;;
*-openbsd*)
- DLL_SUFFIX=".so.1.0"
+ DLL_SUFFIX=".so.${SO_VERSION}"
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -3804,7 +3804,7 @@ _SAVE_LIBS=$LIBS
CFLAGS="$ZLIB_CFLAGS $CFLAGS"
LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"

12
www/minimo/patches/patch-embedding_base_nsEmbedAPI_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-embedding_base_nsEmbedAPI_cpp,v 1.1 2007/04/01 13:19:58 martynas Exp $
--- embedding/base/nsEmbedAPI.cpp.orig Thu Jul 21 16:33:40 2005
+++ embedding/base/nsEmbedAPI.cpp Sun Apr 1 13:29:27 2007
@@ -53,7 +53,7 @@ static PRBool sRegistryInitializedFlag = P
static PRUint32 sInitCounter = 0;
#define HACK_AROUND_THREADING_ISSUES
-//#define HACK_AROUND_NONREENTRANT_INITXPCOM
+#define HACK_AROUND_NONREENTRANT_INITXPCOM
#ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
// XXX hack class to clean up XPCOM when this module is unloaded

12
www/minimo/patches/patch-minimo_base_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-minimo_base_Makefile_in,v 1.1 2007/04/01 13:19:58 martynas Exp $
--- minimo/base/Makefile.in.orig Sun Apr 1 13:40:09 2007
+++ minimo/base/Makefile.in Sun Apr 1 13:35:53 2007
@@ -42,6 +42,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
+DEFINES += -DMOZAPPDIR=\"$(mozappdir)\"
+
MOZILLA_INTERNAL_API = 1

21
www/minimo/patches/patch-minimo_base_Minimo_cpp Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-minimo_base_Minimo_cpp,v 1.3 2007/04/01 13:19:58 martynas Exp $
--- minimo/base/Minimo.cpp.orig Fri Oct 27 23:30:36 2006
+++ minimo/base/Minimo.cpp Sun Apr 1 13:38:06 2007
@@ -34,6 +34,8 @@
*
* ***** END LICENSE BLOCK ***** */
+#include <unistd.h>
+
#include "MinimoPrivate.h"
#include "nsIFullScreen.h"
@@ -806,6 +808,8 @@ void UnloadKnownLibs()
int main(int argc, char *argv[])
{
+ chdir(MOZAPPDIR);
+
#ifdef WINCE
CreateListenerWindow();
#endif

28
www/minimo/patches/patch-minimo_chrome_content_minimo_js
View File

@ -1,7 +1,27 @@
$OpenBSD: patch-minimo_chrome_content_minimo_js,v 1.4 2007/04/01 09:36:15 martynas Exp $
$OpenBSD: patch-minimo_chrome_content_minimo_js,v 1.5 2007/04/01 13:19:58 martynas Exp $
--- minimo/chrome/content/minimo.js.orig Fri Feb 16 02:27:09 2007
+++ minimo/chrome/content/minimo.js Wed Mar 28 12:08:10 2007
@@ -1629,7 +1629,8 @@ function FullScreenToggle()
+++ minimo/chrome/content/minimo.js Sun Apr 1 13:48:18 2007
@@ -400,10 +400,6 @@ function MiniNavStartup()
gPref = Components.classes["@mozilla.org/preferences-service;1"]
.getService(nsIPrefBranch);
var page = null;
- try {
- page = gPref.getCharPref("browser.startup.homepage.override");
- }
- catch(e) {page=null;}
try {
gBackGroundColor = gPref.getCharPref("ui.chromebackgroundcolor");
@@ -413,8 +409,6 @@ function MiniNavStartup()
if (page == null)
page = gPref.getCharPref("browser.startup.homepage");
- gPref.clearUserPref("browser.startup.homepage.override");
-
if ( page.split("|").length > 1 ) {
homepages = page.split("|");
} else {
@@ -1629,7 +1623,8 @@ function FullScreenToggle()
function DoFullScreen(fullscreen)
{
@ -11,7 +31,7 @@ $OpenBSD: patch-minimo_chrome_content_minimo_js,v 1.4 2007/04/01 09:36:15 martyn
// Show a Quit in the context menu
document.getElementById("context_menu_quit").hidden = !fullscreen;
@@ -2275,7 +2276,7 @@ function BrowserFileOpen() {
@@ -2275,7 +2270,7 @@ function BrowserFileOpen() {
fp.init(window, null, nsIFilePicker.modeOpenMultiple);
var fileCustomDirFile= refLocalFile.QueryInterface(nsILocalFile);

11
www/minimo/patches/patch-modules_plugin_base_public_nptypes_h
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.1 2006/12/04 09:47:54 jolan Exp $
$OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.2 2007/04/01 13:19:58 martynas Exp $
--- modules/plugin/base/public/nptypes.h.orig Fri May 20 00:49:42 2005
+++ modules/plugin/base/public/nptypes.h Mon Oct 30 18:18:44 2006
@@ -67,10 +67,8 @@
@ -13,12 +13,3 @@ $OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.1 2006/12/04 09:47:54 j
typedef u_int32_t uint32_t;
#if !defined(__cplusplus)
@@ -78,7 +76,7 @@
#endif
#else
/*
- * FreeBSD defines uint32_t and bool.
+ * FreeBSD, and OpenBSD defines uint32_t and bool.
*/
#include <inttypes.h>
#include <stdbool.h>

11
www/minimo/patches/patch-security_coreconf_OpenBSD_mk
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.5 2007/04/01 09:36:15 martynas Exp $
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.6 2007/04/01 13:19:58 martynas Exp $
--- security/coreconf/OpenBSD.mk.orig Sun Apr 25 18:02:17 2004
+++ security/coreconf/OpenBSD.mk Thu Mar 22 20:29:45 2007
@@ -42,7 +42,7 @@ CC = gcc
@ -10,15 +10,6 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.5 2007/04/01 09:36:15 martynas
ifeq ($(CPU_ARCH),i386)
OS_REL_CFLAGS = -Di386
CPU_ARCH = x86
@@ -55,7 +55,7 @@ OS_LIBS += -pthread
DSO_LDOPTS += -pthread
endif
-DLL_SUFFIX = so.1.0
+DLL_SUFFIX = so.${SO_VERSION}
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
@@ -64,7 +64,7 @@ OS_LIBS =
ARCH = openbsd

14
www/minimo/patches/patch-security_manager_ssl_src_Makefile_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.1 2007/04/01 09:36:16 martynas Exp $
--- security/manager/ssl/src/Makefile.in.orig Wed Jan 10 13:09:11 2007
+++ security/manager/ssl/src/Makefile.in Wed Jan 10 14:17:42 2007
@@ -126,7 +126,10 @@ REQUIRES = nspr \
EXTRA_DEPS = $(NSS_DEP_LIBS)
+NSS_LIBDIR = $(shell $(NSS_CONFIG) --libdir)
+
DEFINES += -DNSS_ENABLE_ECC
+DEFINES += -DNSS_LIBDIR=\"$(NSS_LIBDIR)\"
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's

27
www/minimo/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.1 2007/04/01 09:36:16 martynas Exp $
--- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 15 21:24:30 2006
+++ security/manager/ssl/src/nsNSSComponent.cpp Wed Jan 10 18:13:16 2007
@@ -699,11 +699,10 @@ nsNSSComponent::InstallLoadableRoots()
return;
const char *possible_ckbi_locations[] = {
+ 0, // This special value means:
+ // search for ckbi in the the system NSS_LIBDIR
NS_GRE_DIR,
- NS_XPCOM_CURRENT_PROCESS_DIR,
- 0 // This special value means:
- // search for ckbi in the directories on the shared
- // library/DLL search path
+ NS_XPCOM_CURRENT_PROCESS_DIR
};
for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
@@ -712,7 +711,7 @@ nsNSSComponent::InstallLoadableRoots()
if (!possible_ckbi_locations[il])
{
- fullModuleName = PR_GetLibraryName(nsnull, "nssckbi");
+ fullModuleName = PR_GetLibraryName(NSS_LIBDIR, "nssckbi");
}
else
{

129
www/minimo/pkg/PLIST
View File

@ -1,66 +1,65 @@
@comment $OpenBSD: PLIST,v 1.9 2007/04/01 09:36:16 martynas Exp $
@comment $OpenBSD: PLIST,v 1.10 2007/04/01 13:19:58 martynas Exp $
bin/minimo
minimo/
minimo/chrome/
minimo/chrome/classic.jar
minimo/chrome/classic.manifest
minimo/chrome/en-US.jar
minimo/chrome/en-US.manifest
minimo/chrome/minimo-skin-vga.jar
minimo/chrome/minimo-skin-vga.manifest
minimo/chrome/minimo-skin.jar
minimo/chrome/minimo-skin.manifest
minimo/chrome/minimo.jar
minimo/chrome/minimo.manifest
minimo/chrome/pippki.jar
minimo/chrome/pippki.manifest
minimo/chrome/toolkit.jar
minimo/chrome/toolkit.manifest
minimo/components/
minimo/components/all.xpt
minimo/components/nsHelperAppDlg.js
minimo/components/nsProgressDialog.js
minimo/components/snav.xpt
minimo/greprefs/
minimo/greprefs/all.js
minimo/greprefs/security-prefs.js
minimo/minimo
minimo/plugins/
minimo/res/
minimo/res/arrow.gif
minimo/res/arrowd.gif
minimo/res/broken-image.gif
minimo/res/charsetData.properties
minimo/res/charsetalias.properties
minimo/res/dtd/
minimo/res/dtd/xhtml11.dtd
minimo/res/entityTables/
minimo/res/entityTables/html40Latin1.properties
minimo/res/entityTables/html40Special.properties
minimo/res/entityTables/html40Symbols.properties
minimo/res/entityTables/htmlEntityVersions.properties
minimo/res/entityTables/transliterate.properties
minimo/res/fonts/
minimo/res/fonts/fontEncoding.properties
minimo/res/fonts/pangoFontEncoding.properties
minimo/res/forms.css
minimo/res/html/
minimo/res/html.css
minimo/res/html/gopher-audio.gif
minimo/res/html/gopher-binary.gif
minimo/res/html/gopher-find.gif
minimo/res/html/gopher-image.gif
minimo/res/html/gopher-menu.gif
minimo/res/html/gopher-movie.gif
minimo/res/html/gopher-sound.gif
minimo/res/html/gopher-telnet.gif
minimo/res/html/gopher-text.gif
minimo/res/html/gopher-unknown.gif
minimo/res/langGroups.properties
minimo/res/language.properties
minimo/res/loading-image.gif
minimo/res/quirk.css
minimo/res/sites.css
minimo/res/smallScreen.css
minimo/res/ua.css
minimo/res/unixcharset.properties
share/minimo/
share/minimo/chrome/
share/minimo/chrome/classic.jar
share/minimo/chrome/classic.manifest
share/minimo/chrome/en-US.jar
share/minimo/chrome/en-US.manifest
share/minimo/chrome/minimo-skin-vga.jar
share/minimo/chrome/minimo-skin-vga.manifest
share/minimo/chrome/minimo-skin.jar
share/minimo/chrome/minimo-skin.manifest
share/minimo/chrome/minimo.jar
share/minimo/chrome/minimo.manifest
share/minimo/chrome/pippki.jar
share/minimo/chrome/pippki.manifest
share/minimo/chrome/toolkit.jar
share/minimo/chrome/toolkit.manifest
share/minimo/components/
share/minimo/components/all.xpt
share/minimo/components/nsHelperAppDlg.js
share/minimo/components/nsProgressDialog.js
share/minimo/components/snav.xpt
share/minimo/greprefs/
share/minimo/greprefs/all.js
share/minimo/greprefs/security-prefs.js
share/minimo/plugins/
share/minimo/res/
share/minimo/res/arrow.gif
share/minimo/res/arrowd.gif
share/minimo/res/broken-image.gif
share/minimo/res/charsetData.properties
share/minimo/res/charsetalias.properties
share/minimo/res/dtd/
share/minimo/res/dtd/xhtml11.dtd
share/minimo/res/entityTables/
share/minimo/res/entityTables/html40Latin1.properties
share/minimo/res/entityTables/html40Special.properties
share/minimo/res/entityTables/html40Symbols.properties
share/minimo/res/entityTables/htmlEntityVersions.properties
share/minimo/res/entityTables/transliterate.properties
share/minimo/res/fonts/
share/minimo/res/fonts/fontEncoding.properties
share/minimo/res/fonts/pangoFontEncoding.properties
share/minimo/res/forms.css
share/minimo/res/html/
share/minimo/res/html.css
share/minimo/res/html/gopher-audio.gif
share/minimo/res/html/gopher-binary.gif
share/minimo/res/html/gopher-find.gif
share/minimo/res/html/gopher-image.gif
share/minimo/res/html/gopher-menu.gif
share/minimo/res/html/gopher-movie.gif
share/minimo/res/html/gopher-sound.gif
share/minimo/res/html/gopher-telnet.gif
share/minimo/res/html/gopher-text.gif
share/minimo/res/html/gopher-unknown.gif
share/minimo/res/langGroups.properties
share/minimo/res/language.properties
share/minimo/res/loading-image.gif
share/minimo/res/quirk.css
share/minimo/res/sites.css
share/minimo/res/smallScreen.css
share/minimo/res/ua.css
share/minimo/res/unixcharset.properties