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

Remove useless dependency on deprecated pangox.

Browse Source 
- remove useless patch to gfx/thebes/Makefile.in adding -lpangox-1.0 to
EXTRA_DSO_LDOPTS, this was maybe useful before ffx 3.0, but mozilla
stopped using pangox between 2.0 and 3.0. See for the last traces of
pangox.h use : https://bugzilla.mozilla.org/show_bug.cgi?id=528941. See
also bugs #323671/#338446
- backport the patch from #528941 to remove useless pangox.h inclusion
from www/firefox35.
- remove the RUN_DEPENDS on pangox-compat
- bump all corresponding REVISIONS
- while here, make sure all moz ports depend on latest nspr 4.9.2 since
  it'll be a requirement for upcoming gecko 16 releases
This commit is contained in:
landry 2012-09-22 10:30:17 +00:00
parent 441a18d61a
commit 181d9b3892
17 changed files with 31 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/xulrunner/1.9/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.64 2012/09/01 14:35:06 landry Exp $
# $OpenBSD: Makefile,v 1.65 2012/09/22 10:30:17 landry Exp $
MOZILLA_VERSION = 1.9.2.28
MOZILLA_BRANCH = 1.9.2
@ -6,7 +6,7 @@ MOZILLA_PROJECT = xulrunner1.9
MOZILLA_DIST = firefox
MOZILLA_DIST_VERSION = 3.6.28
REVISION-devel = 1
REVISION-main = 3
REVISION-main = 4
SO_VERSION = 3.2
# NOTE: Must bump minor version if any shlib's are removed from the

7
mail/mozilla-thunderbird/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.157 2012/09/21 13:21:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.158 2012/09/22 10:30:17 landry Exp $
COMMENT-main = Mozilla e-mail, rss and usenet client
COMMENT-lightning = Mozilla Thunderbird calendar extension
@ -15,7 +15,7 @@ MOZILLA_CODENAME = mail
MULTI_PACKAGES = -main -lightning -enigmail
PKGNAME-main = ${PKGNAME}
REVISION-main = 0
REVISION-main = 1
PKGNAME-lightning = lightning-1.7beta1
ENIG_V = 1.4.4
PKGNAME-enigmail = enigmail-${ENIG_V}
@ -74,9 +74,6 @@ CONFIGURE_ENV += CPPFLAGS=-I${X11BASE}/include
CONFIGURE_ENV += MOZ_DEBUG_FLAGS="-Os"
.endif
# EXTRA_DSO_LDOPTS += -lpangox-1.0
RUN_DEPENDS-main += devel/pangox-compat
LIB_DEPENDS-main = ${LIB_DEPENDS}
WANTLIB-main = ${WANTLIB}
LIB_DEPENDS-lightning = STEM->=${MOZILLA_VERSION:S/b/beta/}:${BUILD_PKGPATH},-main

15
mail/mozilla-thunderbird/patches/patch-mozilla_gfx_thebes_Makefile_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.11 2012/09/01 14:22:45 landry Exp $
????
--- mozilla/gfx/thebes/Makefile.in.orig Sat Aug 25 02:31:09 2012
+++ mozilla/gfx/thebes/Makefile.in Sat Sep 1 01:59:37 2012
@@ -365,6 +365,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
+ifdef MOZ_ENABLE_COREXFONTS
+EXTRA_DSO_LDOPTS += -lpangox-1.0
+endif
+
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif

7
productivity/sunbird/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.45 2012/09/21 13:21:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.46 2012/09/22 10:30:17 landry Exp $
COMMENT = Mozilla calendar
@ -10,7 +10,7 @@ MOZILLA_BRANCH = 1.9.2
MOZILLA_CODENAME = calendar
EPOCH = 0
REVISION = 20
REVISION = 21
HOMEPAGE = http://www.mozilla.org/projects/calendar/sunbird/
@ -36,9 +36,6 @@ PERMIT_DISTFILES_FTP= Yes
MODULES = www/mozilla devel/gettext lang/python
MODPY_RUN_DEP = No
# EXTRA_DSO_LDOPTS += -lpangox-1.0
RUN_DEPENDS += devel/pangox-compat
# Regression tests are too hard to adapt to run here
NO_REGRESS = Yes

14
productivity/sunbird/patches/patch-mozilla_gfx_src_thebes_Makefile_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-mozilla_gfx_src_thebes_Makefile_in,v 1.3 2011/07/22 05:25:27 landry Exp $
--- mozilla/gfx/src/thebes/Makefile.in.orig Wed Jun 23 19:46:36 2010
+++ mozilla/gfx/src/thebes/Makefile.in Wed Jul 7 08:43:19 2010
@@ -149,6 +149,10 @@ DEFINES += -DMOZ_ENABLE_GTK2
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
+ifdef MOZ_ENABLE_COREXFONTS
+EXTRA_DSO_LDOPTS += -lpangox-1.0
+endif
+
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif

7
www/fennec/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2012/09/21 13:21:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.28 2012/09/22 10:30:17 landry Exp $
COMMENT = Mozilla mobile web browser
@ -7,7 +7,7 @@ MOZILLA_BRANCH = esr10
MOZILLA_PROJECT = fennec
MOZILLA_CODENAME = mobile
PKGNAME = ${MOZILLA_PROJECT}-${MOZILLA_VERSION:S/esr//}
REVISION = 1
REVISION = 2
SO_VERSION = 6.0
# NOTE: Must bump minor version if any shlib's are removed from the
@ -46,9 +46,6 @@ WANTLIB += event
CONFIGURE_ARGS += --disable-tracejit --disable-methodjit
.endif
# EXTRA_DSO_LDOPTS += -lpangox-1.0
RUN_DEPENDS += devel/pangox-compat
# ensure we depend on cairo with tee backend enabled
LIB_DEPENDS = graphics/cairo>=1.10.2p0
# --with-system-png=${LOCALBASE}

14
www/fennec/patches/patch-gfx_thebes_Makefile_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.6 2012/04/30 15:40:31 landry Exp $
--- gfx/thebes/Makefile.in.orig Fri Apr 20 23:52:33 2012
+++ gfx/thebes/Makefile.in Thu Apr 26 20:29:44 2012
@@ -385,6 +385,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
+ifdef MOZ_ENABLE_COREXFONTS
+EXTRA_DSO_LDOPTS += -lpangox-1.0
+endif
+
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif

7
www/firefox35/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.81 2012/09/21 13:21:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.82 2012/09/22 10:30:17 landry Exp $
COMMENT = Mozilla web browser
@ -8,7 +8,7 @@ MOZILLA_PROJECT = firefox35
MOZILLA_DIST = firefox
MOZILLA_CODENAME = browser
REVISION = 15
REVISION = 16
SO_VERSION = 24.0
# NOTE: Must bump minor version if any shlib's are removed from the
@ -41,9 +41,6 @@ MODULES = www/mozilla devel/gettext lang/python
MODPY_RUNDEP = No
# EXTRA_DSO_LDOPTS += -lpangox-1.0
RUN_DEPENDS += devel/pangox-compat
# Regression tests are too hard to adapt to run here
NO_REGRESS = Yes

14
www/firefox35/patches/patch-gfx_src_thebes_Makefile_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-gfx_src_thebes_Makefile_in,v 1.1.1.1 2009/06/21 01:31:24 martynas Exp $
--- gfx/src/thebes/Makefile.in.orig Wed Jun 17 07:21:46 2009
+++ gfx/src/thebes/Makefile.in Sat Jun 20 22:09:10 2009
@@ -147,6 +147,10 @@ DEFINES += -DMOZ_ENABLE_GTK2
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
+ifdef MOZ_ENABLE_COREXFONTS
+EXTRA_DSO_LDOPTS += -lpangox-1.0
+endif
+
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif

12
www/firefox35/patches/patch-gfx_src_thebes_nsThebesDeviceContext_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gfx_src_thebes_nsThebesDeviceContext_cpp,v 1.1 2012/09/22 10:30:17 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=528941
--- gfx/src/thebes/nsThebesDeviceContext.cpp.orig Sat Sep 22 12:14:10 2012
+++ gfx/src/thebes/nsThebesDeviceContext.cpp Sat Sep 22 12:14:19 2012
@@ -61,7 +61,6 @@
#include <pango/pango.h>
#ifdef MOZ_X11
#include <gdk/gdkx.h>
-#include <pango/pangox.h>
#endif /* MOZ_X11 */
#include <pango/pango-fontmap.h>
#endif /* GTK2 */

7
www/firefox36/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.26 2012/09/21 13:21:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.27 2012/09/22 10:30:17 landry Exp $
COMMENT = Mozilla web browser
# Don't forget to update devel/xulrunner/1.9 if patches changes.
MOZILLA_VERSION = 3.6.28
REVISION = 4
REVISION = 5
MOZILLA_BRANCH = 1.9.2
MOZILLA_PROJECT = firefox36
MOZILLA_DIST = firefox
@ -33,9 +33,6 @@ MODULES = www/mozilla devel/gettext lang/python
MODPY_RUNDEP = No
# EXTRA_DSO_LDOPTS += -lpangox-1.0
RUN_DEPENDS += devel/pangox-compat
USE_GROFF = Yes
# Regression tests are too hard to adapt to run here
NO_REGRESS = Yes

14
www/firefox36/patches/patch-gfx_src_thebes_Makefile_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-gfx_src_thebes_Makefile_in,v 1.3 2011/03/26 10:58:36 landry Exp $
--- gfx/src/thebes/Makefile.in.orig Wed Jan 6 05:35:16 2010
+++ gfx/src/thebes/Makefile.in Sun Jan 10 17:47:26 2010
@@ -149,6 +149,10 @@ DEFINES += -DMOZ_ENABLE_GTK2
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
+ifdef MOZ_ENABLE_COREXFONTS
+EXTRA_DSO_LDOPTS += -lpangox-1.0
+endif
+
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif

7
www/mozilla-firefox/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.210 2012/09/21 13:21:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.211 2012/09/22 10:30:17 landry Exp $
COMMENT = Mozilla web browser
BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
@ -10,7 +10,7 @@ MOZILLA_VERSION = 15.0.1
MOZILLA_BRANCH = release
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
REVISION = 0
REVISION = 1
SO_VERSION = 34.0
# NOTE: Must bump minor version if any shlib's are removed from the
@ -50,9 +50,6 @@ WANTLIB += gstvideo-0.10 xml2
RUN_DEPENDS += multimedia/gstreamer-0.10/plugins-good
# EXTRA_DSO_LDOPTS += -lpangox-1.0
RUN_DEPENDS += devel/pangox-compat
.if ${MACHINE_ARCH:Msparc64}
CONFIGURE_ARGS += --disable-tracejit --disable-methodjit
.endif

14
www/mozilla-firefox/patches/patch-gfx_thebes_Makefile_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.11 2012/09/01 13:56:45 landry Exp $
--- gfx/thebes/Makefile.in.orig Wed Aug 15 07:47:27 2012
+++ gfx/thebes/Makefile.in Sun Aug 19 13:30:27 2012
@@ -365,6 +365,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
+ifdef MOZ_ENABLE_COREXFONTS
+EXTRA_DSO_LDOPTS += -lpangox-1.0
+endif
+
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif

6
www/mozilla/mozilla.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: mozilla.port.mk,v 1.44 2012/09/01 17:48:19 landry Exp $
# $OpenBSD: mozilla.port.mk,v 1.45 2012/09/22 10:30:17 landry Exp $
SHARED_ONLY = Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc64
@ -28,8 +28,8 @@ MODMOZ_BUILD_DEPENDS = devel/libIDL \
archivers/zip>=2.3
MODMOZ_LIB_DEPENDS = x11/gtk+2 \
devel/nspr>=4.9 \
security/nss>=3.12.13
devel/nspr>=4.9.2 \
security/nss>=3.13.6
MODMOZ_WANTLIB = X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi \
Xinerama Xrandr Xrender Xt atk-1.0 c cairo crypto expat \

7
www/seamonkey/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.109 2012/09/21 13:21:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.110 2012/09/22 10:30:17 landry Exp $
COMMENT-main = Mozilla application suite
COMMENT-lightning = Mozilla Seamonkey calendar extension
@ -12,7 +12,7 @@ MOZILLA_CODENAME = suite
MULTI_PACKAGES = -main -lightning -enigmail
PKGNAME-main = ${PKGNAME}
REVISION-main = 0
REVISION-main = 1
PKGNAME-lightning = lightning-seamonkey-1.7beta1
ENIG_V = 1.4.4
PKGNAME-enigmail = enigmail-seamonkey-${ENIG_V}
@ -46,9 +46,6 @@ DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
MODULES= www/mozilla devel/gettext lang/python
BUILD_DEPENDS+= archivers/unzip
# EXTRA_DSO_LDOPTS += -lpangox-1.0
RUN_DEPENDS-main += devel/pangox-compat
USE_GROFF = Yes
NO_REGRESS= Yes

15
www/seamonkey/patches/patch-mozilla_gfx_thebes_Makefile_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.10 2012/09/01 14:10:03 landry Exp $
????
--- mozilla/gfx/thebes/Makefile.in.orig Mon Aug 27 06:49:13 2012
+++ mozilla/gfx/thebes/Makefile.in Sat Sep 1 02:00:11 2012
@@ -365,6 +365,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
+ifdef MOZ_ENABLE_COREXFONTS
+EXTRA_DSO_LDOPTS += -lpangox-1.0
+endif
+
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif