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

remove 'don't close dlopened objects' type ld.so work-arounds

Browse Source
This commit is contained in:
kurt 2005-10-14 04:00:37 +00:00
parent 632b69bf84
commit c34ab1b1a4
9 changed files with 20 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/mozilla-thunderbird/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2005/10/13 04:32:41 bernd Exp $
# $OpenBSD: Makefile,v 1.26 2005/10/14 04:00:37 kurt Exp $
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
@ -6,7 +6,7 @@ COMMENT= "redesign of the integrated Mozilla App-Suite mail component"
VER= 1.0.6
DISTNAME= mozilla
PKGNAME= mozilla-thunderbird-${VER}p1
PKGNAME= mozilla-thunderbird-${VER}p2
SO_VERSION= 3.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.

26
mail/mozilla-thunderbird/patches/patch-gfx_src_gtk_nsDeviceContextSpecG_cpp
View File

@ -1,30 +1,12 @@
$OpenBSD: patch-gfx_src_gtk_nsDeviceContextSpecG_cpp,v 1.1 2005/04/09 08:11:19 wilfried Exp $
$OpenBSD: patch-gfx_src_gtk_nsDeviceContextSpecG_cpp,v 1.2 2005/10/14 04:00:38 kurt Exp $
--- gfx/src/gtk/nsDeviceContextSpecG.cpp.orig Thu Feb 17 16:24:34 2005
+++ gfx/src/gtk/nsDeviceContextSpecG.cpp Mon Apr 4 12:56:30 2005
@@ -68,6 +68,8 @@
#include "prlink.h"
+static PRLibrary *clib = nsnull;
+
typedef struct /**** Printer Options ****/
{
char *name; /* Name of option */
@@ -1133,7 +1135,8 @@ nsresult GlobalPrinters::InitializeGloba
+++ gfx/src/gtk/nsDeviceContextSpecG.cpp Mon Oct 3 14:49:14 2005
@@ -1133,7 +1133,7 @@ nsresult GlobalPrinters::InitializeGloba
free(printerList);
} else {
/* Try to use CUPS */
- PRLibrary *clib = PR_LoadLibrary("libcups.so.2");
+ if (clib == nsnull)
+ clib = PR_LoadLibrary("libcups.so");
+ PRLibrary *clib = PR_LoadLibrary("libcups.so");
if (clib) {
CupsGetDestsType CupsGetDests;
CupsGetDestType CupsGetDest;
@@ -1178,7 +1181,6 @@ nsresult GlobalPrinters::InitializeGloba
(*CupsFreeDests)(num_dests, dests);
}
}
- PR_UnloadLibrary(clib);
}
}

11
mail/mozilla-thunderbird/patches/patch-xpcom_components_xcDll_cpp
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-xpcom_components_xcDll_cpp,v 1.1 2005/04/01 19:24:07 kurt Exp $
--- xpcom/components/xcDll.cpp.orig Thu Mar 31 15:01:22 2005
+++ xpcom/components/xcDll.cpp Thu Mar 31 15:03:30 2005
@@ -66,7 +66,6 @@
#include "nsTraceRefcntImpl.h"
-#define UNLOAD_DEPENDENT_LIBS
#ifdef HPUX
#undef UNLOAD_DEPENDENT_LIBS
#endif

4
www/mozilla-firefox/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2005/10/13 04:32:41 bernd Exp $
# $OpenBSD: Makefile,v 1.37 2005/10/14 04:00:38 kurt Exp $
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
@ -6,7 +6,7 @@ COMMENT= "redesign of Mozilla's browser component"
VER= 1.0.7
DISTNAME= mozilla
PKGNAME= mozilla-firefox-${VER}p0
PKGNAME= mozilla-firefox-${VER}p1
SO_VERSION= 7.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.

26
www/mozilla-firefox/patches/patch-gfx_src_gtk_nsDeviceContextSpecG_cpp
View File

@ -1,30 +1,12 @@
$OpenBSD: patch-gfx_src_gtk_nsDeviceContextSpecG_cpp,v 1.1 2005/04/04 21:24:00 kurt Exp $
$OpenBSD: patch-gfx_src_gtk_nsDeviceContextSpecG_cpp,v 1.2 2005/10/14 04:00:38 kurt Exp $
--- gfx/src/gtk/nsDeviceContextSpecG.cpp.orig Thu Feb 17 16:24:34 2005
+++ gfx/src/gtk/nsDeviceContextSpecG.cpp Mon Apr 4 12:56:30 2005
@@ -68,6 +68,8 @@
#include "prlink.h"
+static PRLibrary *clib = nsnull;
+
typedef struct /**** Printer Options ****/
{
char *name; /* Name of option */
@@ -1133,7 +1135,8 @@ nsresult GlobalPrinters::InitializeGloba
+++ gfx/src/gtk/nsDeviceContextSpecG.cpp Sun Oct 2 01:11:12 2005
@@ -1133,7 +1133,7 @@ nsresult GlobalPrinters::InitializeGloba
free(printerList);
} else {
/* Try to use CUPS */
- PRLibrary *clib = PR_LoadLibrary("libcups.so.2");
+ if (clib == nsnull)
+ clib = PR_LoadLibrary("libcups.so");
+ PRLibrary *clib = PR_LoadLibrary("libcups.so");
if (clib) {
CupsGetDestsType CupsGetDests;
CupsGetDestType CupsGetDest;
@@ -1178,7 +1181,6 @@ nsresult GlobalPrinters::InitializeGloba
(*CupsFreeDests)(num_dests, dests);
}
}
- PR_UnloadLibrary(clib);
}
}

11
www/mozilla-firefox/patches/patch-xpcom_components_xcDll_cpp
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-xpcom_components_xcDll_cpp,v 1.1 2005/04/01 16:44:52 kurt Exp $
--- xpcom/components/xcDll.cpp.orig Tue Mar 29 14:53:46 2005
+++ xpcom/components/xcDll.cpp Tue Mar 29 14:54:13 2005
@@ -66,7 +66,6 @@
#include "nsTraceRefcntImpl.h"
-#define UNLOAD_DEPENDENT_LIBS
#ifdef HPUX
#undef UNLOAD_DEPENDENT_LIBS
#endif

6
www/mozilla/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.92 2005/10/13 04:32:41 bernd Exp $
# $OpenBSD: Makefile,v 1.93 2005/10/14 04:00:38 kurt Exp $
ONLY_FOR_ARCHS= alpha i386 sparc sparc64 amd64 powerpc
@ -7,8 +7,8 @@ COMMENT-devel= "devel files for Gecko"
VER= 1.7.12
DISTNAME= mozilla
PKGNAME= mozilla-${VER}p1
PKGNAME-devel= mozilla-devel-${VER}p0
PKGNAME= mozilla-${VER}p2
PKGNAME-devel= mozilla-devel-${VER}p2
DISTFILES= mozilla-${VER}-source.tar.bz2
SO_VERSION= 5.0
# NOTE: Must bump minor version if any shlib's are removed from the

28
www/mozilla/patches/patch-gfx_src_gtk_nsDeviceContextSpecG_cpp
View File

@ -1,30 +1,12 @@
$OpenBSD: patch-gfx_src_gtk_nsDeviceContextSpecG_cpp,v 1.1 2005/04/11 15:03:18 kurt Exp $
--- gfx/src/gtk/nsDeviceContextSpecG.cpp.orig Thu Feb 17 16:24:34 2005
+++ gfx/src/gtk/nsDeviceContextSpecG.cpp Mon Apr 4 12:56:30 2005
@@ -68,6 +68,8 @@
#include "prlink.h"
+static PRLibrary *clib = nsnull;
+
typedef struct /**** Printer Options ****/
{
char *name; /* Name of option */
@@ -1133,7 +1135,8 @@ nsresult GlobalPrinters::InitializeGloba
$OpenBSD: patch-gfx_src_gtk_nsDeviceContextSpecG_cpp,v 1.2 2005/10/14 04:00:38 kurt Exp $
--- gfx/src/gtk/nsDeviceContextSpecG.cpp.orig Thu Feb 17 16:25:16 2005
+++ gfx/src/gtk/nsDeviceContextSpecG.cpp Mon Sep 26 17:14:17 2005
@@ -1133,7 +1133,7 @@ nsresult GlobalPrinters::InitializeGloba
free(printerList);
} else {
/* Try to use CUPS */
- PRLibrary *clib = PR_LoadLibrary("libcups.so.2");
+ if (clib == nsnull)
+ clib = PR_LoadLibrary("libcups.so");
+ PRLibrary *clib = PR_LoadLibrary("libcups.so");
if (clib) {
CupsGetDestsType CupsGetDests;
CupsGetDestType CupsGetDest;
@@ -1178,7 +1181,6 @@ nsresult GlobalPrinters::InitializeGloba
(*CupsFreeDests)(num_dests, dests);
}
}
- PR_UnloadLibrary(clib);
}
}

11
www/mozilla/patches/patch-xpcom_components_xcDll_cpp
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-xpcom_components_xcDll_cpp,v 1.1 2005/03/13 05:02:17 kurt Exp $
--- xpcom/components/xcDll.cpp.orig Wed Mar 2 11:45:40 2005
+++ xpcom/components/xcDll.cpp Wed Mar 2 11:46:08 2005
@@ -66,7 +66,6 @@
#include "nsTraceRefcntImpl.h"
-#define UNLOAD_DEPENDENT_LIBS
#ifdef HPUX
#undef UNLOAD_DEPENDENT_LIBS
#endif