Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting2.git;a=commitdiff;h=89e5637201bedce4b7d9af68e10b9437dea7d40f
commit 89e5637201bedce4b7d9af68e10b9437dea7d40f Author: Baste <[email protected]> Date: Mon Jun 25 12:28:40 2012 +0200 xulrunner-13.0-1-x86_64 * Version bump diff --git a/source/xlib/xulrunner/FrugalBuild b/source/xlib/xulrunner/FrugalBuild index fa8b84d..350a632 100644 --- a/source/xlib/xulrunner/FrugalBuild +++ b/source/xlib/xulrunner/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: AlexExtreme <[email protected]> pkgname=xulrunner -pkgver=6.0.2 -pkgrel=5 +pkgver=13.0 +pkgrel=1 pkgdesc="XULRunner is a Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications that are as rich as Firefox and Thunderbird." url="http://developer.mozilla.org/en/docs/XULRunner" depends=('libxml2>=2.7.8' 'alsa-lib' 'bzip2' 'cairo>=1.8.10-2' 'curl' 'dbus-glib' 'gtk+2>=2.20.0-2' 'libidl' 'libnotify>=0.4.5-3' \ @@ -14,8 +14,9 @@ groups=('xlib') archs=('i686' 'x86_64' 'arm') up2date="Flastarchive ftp://releases.mozilla.org/pub/mozilla.org/$pkgname/releases/" up2date=("echo $pkgver") -source=(ftp://ftp.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2 ipc.diff curl.diff build.diff buildsbrk.diff mozconfig) -signatures=("${source[0]}.asc" '' '' '' '' '') +source=(ftp://ftp.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2 build.diff pkgconfig.diff mozconfig) + +signatures=("${source[0]}.asc" '' '' '') if [ "$CARCH" == "arm" ]; then source=("${source[@]}" build-system-ffi.patch) signatures=("${signatures[@]}" '') diff --git a/source/xlib/xulrunner/build.diff b/source/xlib/xulrunner/build.diff index 11988fc..1621b98 100644 --- a/source/xlib/xulrunner/build.diff +++ b/source/xlib/xulrunner/build.diff @@ -1,7 +1,7 @@ -diff -up mozilla-central/security/manager/Makefile.in.build mozilla-central/security/manager/Makefile.in ---- mozilla-central/security/manager/Makefile.in.build 2010-08-06 03:09:27.000000000 +0200 -+++ mozilla-central/security/manager/Makefile.in 2010-08-16 10:49:10.000000000 +0200 -@@ -181,7 +181,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR= +diff -up mozilla-beta/security/manager/Makefile.in.build mozilla-beta/security/manager/Makefile.in +--- mozilla-beta/security/manager/Makefile.in.build 2012-03-09 01:39:56.000000000 +0100 ++++ mozilla-beta/security/manager/Makefile.in 2012-03-09 13:56:28.612328083 +0100 +@@ -174,7 +174,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR= DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR) DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 @@ -9,16 +9,15 @@ diff -up mozilla-central/security/manager/Makefile.in.build mozilla-central/secu DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)" ifndef MOZ_NATIVE_SQLITE DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3 -diff -up mozilla-central/security/manager/ssl/src/Makefile.in.build mozilla-central/security/manager/ssl/src/Makefile.in ---- mozilla-central/security/manager/ssl/src/Makefile.in.build 2010-08-06 03:09:17.000000000 +0200 -+++ mozilla-central/security/manager/ssl/src/Makefile.in 2010-08-16 10:46:22.000000000 +0200 -@@ -113,8 +113,6 @@ CSRCS += md4.c - +diff -up mozilla-beta/security/manager/ssl/src/Makefile.in.build mozilla-beta/security/manager/ssl/src/Makefile.in +--- mozilla-beta/security/manager/ssl/src/Makefile.in.build 2012-03-09 01:39:56.000000000 +0100 ++++ mozilla-beta/security/manager/ssl/src/Makefile.in 2012-03-09 13:57:37.055657208 +0100 +@@ -116,7 +116,6 @@ CSRCS += md4.c EXTRA_DEPS = $(NSS_DEP_LIBS) --DEFINES += -DNSS_ENABLE_ECC -- - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's - LOCAL_INCLUDES += $(NSS_CFLAGS) + DEFINES += \ +- -DNSS_ENABLE_ECC \ + -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ + -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ + $(NULL) diff --git a/source/xlib/xulrunner/mozconfig b/source/xlib/xulrunner/mozconfig index a9f5a5f..99830cd 100644 --- a/source/xlib/xulrunner/mozconfig +++ b/source/xlib/xulrunner/mozconfig @@ -12,7 +12,7 @@ ac_add_options --with-system-png ac_add_options --with-system-libevent ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite -ac_add_options --enable-system-cairo +#ac_add_options --enable-system-cairo ac_add_options --enable-system-ffi ac_add_options --with-system-libvpx ac_add_options --with-pthreads diff --git a/source/xlib/xulrunner/pkgconfig.diff b/source/xlib/xulrunner/pkgconfig.diff new file mode 100644 index 0000000..843ec8a --- /dev/null +++ b/source/xlib/xulrunner/pkgconfig.diff @@ -0,0 +1,33 @@ +diff -up mozilla-central/xulrunner/installer/libxul-embedding.pc.in.pk mozilla-central/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-central/xulrunner/installer/libxul-embedding.pc.in.pk 2010-08-06 03:09:24.000000000 +0200 ++++ mozilla-central/xulrunner/installer/libxul-embedding.pc.in 2010-08-16 11:12:32.000000000 +0200 +@@ -6,5 +6,6 @@ idldir=%idldir% + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue -ldl + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +diff -up mozilla-central/xulrunner/installer/libxul.pc.in.pk mozilla-central/xulrunner/installer/libxul.pc.in +--- mozilla-central/xulrunner/installer/libxul.pc.in.pk 2010-08-06 03:09:24.000000000 +0200 ++++ mozilla-central/xulrunner/installer/libxul.pc.in 2010-08-16 11:07:52.000000000 +0200 +@@ -2,6 +2,7 @@ prefix=%prefix% + sdkdir=%sdkdir% + includedir=%includedir% + idldir=%idldir% ++libdir=%libdir% + + Name: libxul + Description: The Mozilla Runtime and Embedding Engine +diff -up mozilla-central/xulrunner/installer/Makefile.in.pk mozilla-central/xulrunner/installer/Makefile.in +--- mozilla-central/xulrunner/installer/Makefile.in.pk 2010-08-16 11:07:52.000000000 +0200 ++++ mozilla-central/xulrunner/installer/Makefile.in 2010-08-16 11:07:52.000000000 +0200 +@@ -116,6 +116,7 @@ endif + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
