pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

firefox-hg: remove unnecessary patch now that nss-hg installs nss-config.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri May 20 13:31:21 2016 +0200
Changeset:	bc7fc51f7f1fe8a848a5abfad3abc0dc5387cfae

Modified Files:
	firefox-hg/distinfo
Removed Files:
	firefox-hg/patches/patch-build_autoconf_nss.m4

Log Message:
firefox-hg: remove unnecessary patch now that nss-hg installs nss-config.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bc7fc51f7f1fe8a848a5abfad3abc0dc5387cfae

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 firefox-hg/distinfo                            |  1 -
 firefox-hg/patches/patch-build_autoconf_nss.m4 | 50 --------------------------
 2 files changed, 51 deletions(-)

diffs:
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index 7303bd9..75a0f28 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -5,7 +5,6 @@ RMD160 (firefox-31.0.source.tar.bz2) = 8512ed164920c9fdad492ba2b47b46aae4894564
 Size (firefox-31.0.source.tar.bz2) = 147507120 bytes
 SHA1 (patch-aa) = 12baede30120947ffae5cf1aed2886943548b46a
 SHA1 (patch-ao) = fd708563f119823f5634ecd57e5a2089682040e0
-SHA1 (patch-build_autoconf_nss.m4) = 83f3f48095e4b5e2a33320b1cc6a0c7034441716
 SHA1 (patch-build_gyp.mozbuild) = b811edb2f76fdd241edff0b4945977c810a987b8
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = fb650d1ae95321a6fc7565ffe3375944d06f95a9
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 37c5750a2994d338de2c3e729be0360ad1da9b95
diff --git a/firefox-hg/patches/patch-build_autoconf_nss.m4 b/firefox-hg/patches/patch-build_autoconf_nss.m4
deleted file mode 100644
index 888ec8d..0000000
--- a/firefox-hg/patches/patch-build_autoconf_nss.m4
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-build_autoconf_nss.m4,v 1.2 2015/04/05 07:33:51 thomasklausner Exp $
-
-nss in pkgsrc does not install nss-config, but a pkg-config .pc
-file. Convert the detection logic.
-https://bugzilla.mozilla.org/show_bug.cgi?id=1268883
-
---- build/autoconf/nss.m4.orig	2015-04-05 06:58:11.000000000 +0000
-+++ build/autoconf/nss.m4
-@@ -22,18 +22,18 @@ AC_ARG_WITH(nss-exec-prefix,
- 	if test -n "$nss_config_exec_prefix"; then
- 		nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
- 		if test -z "$NSS_CONFIG"; then
--			NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
-+			NSS_CONFIG=$nss_config_exec_prefix/bin/pkg-config
- 		fi
- 	fi
- 	if test -n "$nss_config_prefix"; then
- 		nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
- 		if test -z "$NSS_CONFIG"; then
--			NSS_CONFIG=$nss_config_prefix/bin/nss-config
-+			NSS_CONFIG=$nss_config_prefix/bin/pkg-config
- 		fi
- 	fi
- 
- 	unset ac_cv_path_NSS_CONFIG
--	AC_PATH_PROG(NSS_CONFIG, nss-config, no)
-+	AC_PATH_PROG(NSS_CONFIG, pkg-config, no)
- 	min_nss_version=ifelse([$1], ,3.0.0,$1)
- 	AC_MSG_CHECKING(for NSS - version >= $min_nss_version)
- 
-@@ -41,14 +41,14 @@ AC_ARG_WITH(nss-exec-prefix,
- 	if test "$NSS_CONFIG" = "no"; then
- 		no_nss="yes"
- 	else
--		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
--		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
-+		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args nss --cflags`
-+		NSS_LIBS=`$NSS_CONFIG $nss_config_args nss --libs`
- 
--		nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
-+		nss_config_major_version=`$NSS_CONFIG $nss_config_args nss --modversion | \
- 			sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\1/'`
--		nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
-+		nss_config_minor_version=`$NSS_CONFIG $nss_config_args nss --modversion | \
- 			sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\2/'`
--		nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
-+		nss_config_micro_version=`$NSS_CONFIG $nss_config_args nss --modversion | \
- 			sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\4/'`
- 		if test -z "$nss_config_micro_version"; then
- 			nss_config_micro_version="0"


Home | Main Index | Thread Index | Old Index