Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=jerceltesting.git;a=commitdiff;h=4105b1dc363e663dd038417a630c1aaf4270691a

commit 4105b1dc363e663dd038417a630c1aaf4270691a
Author: jercel <jerce...@gmail.com>
Date:   Tue Mar 22 20:26:30 2011 +0100

nspr-4.8.7-2-x86_64

* build fixed

diff --git a/source/lib/nspr/FrugalBuild b/source/lib/nspr/FrugalBuild
index 28a6def..ec2309c 100644
--- a/source/lib/nspr/FrugalBuild
+++ b/source/lib/nspr/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=nspr
pkgver=4.8.7
-pkgrel=1
+pkgrel=2
pkgdesc="NSPR library from mozilla.org"
url="http://www.mozilla.org/projects/nspr/";
pkgurl="http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/";
@@ -12,8 +12,9 @@ archs=('i686' 'x86_64' 'ppc')
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)
-sha1sums=('34d9eb75b47a3d19b57ef1ed5aef2004e79b5fc4')
+source=($pkgurl/v${pkgver}/src/$pkgname-$pkgver.tar.gz pkgconfig.patch)
+sha1sums=('34d9eb75b47a3d19b57ef1ed5aef2004e79b5fc4' \
+          'a538989bf58ae7910cacd65fd9bcbe9e6c4206d0')

build()
{
diff --git a/source/lib/nspr/pkgconfig.patch b/source/lib/nspr/pkgconfig.patch
new file mode 100644
index 0000000..f7fb787
--- /dev/null
+++ b/source/lib/nspr/pkgconfig.patch
@@ -0,0 +1,91 @@
+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
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to