Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=096aebcea6c150a2821ea6a7334e7ffe321ac826
commit 096aebcea6c150a2821ea6a7334e7ffe321ac826 Author: DeX77 <[email protected]> Date: Sat Oct 5 12:55:31 2013 +0200 nspr-4.10.1-1-x86_64 * version bump diff --git a/source/base/nspr/FrugalBuild b/source/base/nspr/FrugalBuild index ece9f6e..bf52de8 100644 --- a/source/base/nspr/FrugalBuild +++ b/source/base/nspr/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix <[email protected]> pkgname=nspr -pkgver=4.9.2 -pkgrel=3 +pkgver=4.10.1 +pkgrel=1 pkgdesc="NSPR library from mozilla.org" url="http://www.mozilla.org/projects/nspr/"; pkgurl="http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/"; @@ -12,10 +12,10 @@ archs=('i686' 'x86_64' 'arm') license="MPL GPL" depends=('glibc>=2.12.1') up2date="lynx -dump '$pkgurl'|sort -n -r|head -n 2|sort -n|head -n 1|sed -e 's/.*v//' -e 's|/||g'" -#source=($pkgurl/v${pkgver}/src/$pkgname-$pkgver.tar.gz pkgconfig.patch) source=($pkgurl/v${pkgver}/src/$pkgname-$pkgver.tar.gz nspr.pc) -sha1sums=('455eab365f8fd732a4b014ca0af685f3c2dec598' \ +sha1sums=('bd1cdf5e7e107846ffe431c5c62b81a560e8c3f7' \ 'd42605b2dce3e222f4bdddb3609347b229e9ada8') +_F_cd_path="$pkgname-$pkgver/$pkgname" build() { @@ -23,8 +23,6 @@ build() opts="--enable-64bit" fi Fcd - Fpatchall - cd mozilla/nsprpub || Fdie Fconf \ --libdir=/usr/lib \ --includedir=/usr/include/nspr4 \ @@ -37,6 +35,7 @@ build() ## do not use Fmakeinstall here make || Fdie make DESTDIR=$Fdestdir install || Fdie + Fexe /usr/lib/pkgconfig/nspr.pc Fln nspr4 /usr/include/nspr Frm usr/bin/compile-et.pl diff --git a/source/base/nspr/pkgconfig.patch b/source/base/nspr/pkgconfig.patch deleted file mode 100644 index f7fb787..0000000 --- a/source/base/nspr/pkgconfig.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -Naur -X nope nspr-4.8.7/mozilla/nsprpub/config/config.mk nspr-4.8.7-p/mozilla/nsprpub/config/config.mk ---- nspr-4.8.7/mozilla/nsprpub/config/config.mk 2005-04-29 23:02:53.000000000 +0200 -+++ nspr-4.8.7-p/mozilla/nsprpub/config/config.mk 2008-06-23 01:52:14.000000000 +0200 -@@ -162,3 +162,4 @@ - RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include - RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin - RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib -+RELEASE_LIB_PKGCONFIG_DIR = $(RELEASE_LIB_DIR)/pkgconfig -diff -Naur -X nope nspr-4.8.7/mozilla/nsprpub/config/Makefile.in nspr-4.8.7-p/mozilla/nsprpub/config/Makefile.in ---- nspr-4.8.7/mozilla/nsprpub/config/Makefile.in 2005-11-23 07:35:18.000000000 +0100 -+++ nspr-4.8.7-p/mozilla/nsprpub/config/Makefile.in 2008-06-23 01:51:15.000000000 +0200 -@@ -52,9 +52,10 @@ - - # autoconf.mk must be deleted last (from the top-level directory) - # because it is included by every makefile. --DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config -+DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc - - RELEASE_BINS = nspr-config -+RELEASE_LIB_PKGCONFIG = nspr.pc - - include $(topsrcdir)/config/config.mk - -@@ -139,6 +140,7 @@ - - export:: $(TARGETS) - rm -f $(dist_bindir)/nspr-config -+ rm -f $(dist_bindir)/nspr.pc - - ifdef WRAP_SYSTEM_INCLUDES - export:: -diff -Naur -X nope nspr-4.7.1/mozilla/nsprpub/config/nspr.pc.in nspr-4.7.1-p/mozilla/nsprpub/config/nspr.pc.in ---- nspr-4.8.7/mozilla/nsprpub/config/nspr.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ nspr-4.8.7-p/mozilla/nsprpub/config/nspr.pc.in 2008-06-23 01:27:54.000000000 +0200 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: NSPR -+Description: The Netscape Portable Runtime -+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ -+Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread -ldl -+Cflags: -I${includedir} -+ -+ -diff -Naur -X nope nspr-4.8.7/mozilla/nsprpub/config/rules.mk nspr-4.8.7-p/mozilla/nsprpub/config/rules.mk ---- nspr-4.8.7/mozilla/nsprpub/config/rules.mk 2007-06-09 18:28:46.000000000 +0200 -+++ nspr-4.8.7-p/mozilla/nsprpub/config/rules.mk 2008-06-23 02:00:43.000000000 +0200 -@@ -224,7 +224,7 @@ - rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE) - +$(LOOP_OVER_DIRS) - --install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) -+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_LIB_PKGCONFIG) - ifdef RELEASE_BINS - $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir) - endif -@@ -234,6 +234,9 @@ - ifdef RELEASE_LIBS - $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir) - endif -+ifdef RELEASE_LIB_PKGCONFIG -+ $(NSINSTALL) -t -m 0644 $(RELEASE_LIB_PKGCONFIG) $(DESTDIR)$(libdir)/pkgconfig -+endif - +$(LOOP_OVER_DIRS) - - release:: export -diff -Naur -X nope nspr-4.8.7/mozilla/nsprpub/configure nspr-4.8.7-p/mozilla/nsprpub/configure ---- nspr-4.8.7/mozilla/nsprpub/configure 2008-04-29 01:21:11.000000000 +0200 -+++ nspr-4.8.7-p/mozilla/nsprpub/configure 2008-06-23 01:27:54.000000000 +0200 -@@ -5980,6 +5980,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile -diff -Naur -X nope nspr-4.8.7/mozilla/nsprpub/configure.in nspr-4.8.7-p/mozilla/nsprpub/configure.in ---- nspr-4.8.7/mozilla/nsprpub/configure.in 2008-04-29 01:21:11.000000000 +0200 -+++ nspr-4.8.7-p/mozilla/nsprpub/configure.in 2008-06-23 01:27:54.000000000 +0200 -@@ -2857,6 +2857,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
