openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
April 2011
- 1 participants
- 640 discussions
Hello community,
here is the log from the commit of package mozilla-nss for openSUSE:Factory
checked in at Fri Apr 29 09:07:42 CEST 2011.
--------
--- GNOME/mozilla-nss/mozilla-nss.changes 2011-01-10 00:11:31.000000000 +0100
+++ /mounts/work_src_done/STABLE/mozilla-nss/mozilla-nss.changes 2011-04-28 08:40:58.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Apr 28 06:34:50 UTC 2011 - wr(a)rosenauer.org
+
+- update to 3.12.10beta1
+ * root CA changes
+ * filter certain bogus certs (bmo#642815)
+ * fix minor memory leaks
+ * other bugfixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
PayPalEE.cert
nss-3.12.9.tar.bz2
New:
----
nss-3.12.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-nss.spec ++++++
--- /var/tmp/diff_new_pack.vMS2uu/_old 2011-04-29 09:06:49.000000000 +0200
+++ /var/tmp/diff_new_pack.vMS2uu/_new 2011-04-29 09:06:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mozilla-nss (Version 3.12.9)
+# spec file for package mozilla-nss
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2006-2011 Wolfgang Rosenauer
@@ -28,9 +28,9 @@
%if %suse_version > 1030
BuildRequires: sqlite3-devel
%endif
-License: GPLv2+ ; LGPLv2.1+ ; MPL
-Version: 3.12.9
-Release: 2
+License: MPLv1.1 or GPLv2+ or LGPLv2.1+
+Version: 3.12.10
+Release: 1
# bug437293
%ifarch ppc64
Obsoletes: mozilla-nss-64bit
@@ -49,7 +49,7 @@
Source7: cert9.db
Source8: key4.db
Source9: pkcs11.txt
-Source10: PayPalEE.cert
+#Source10: PayPalEE.cert
Patch1: nss-opt.patch
Patch3: system-nspr.patch
Patch4: char.patch
@@ -76,7 +76,7 @@
%package devel
-License: GPLv2+ ; LGPLv2.1+ ; MPL
+License: MPLv1.1 or GPLv2+ or LGPLv2.1+
Summary: Network (Netscape) Security Services development files
Group: Development/Libraries/Other
Requires: mozilla-nspr-devel
@@ -97,7 +97,7 @@
%package tools
-License: GPLv2+ ; LGPLv2.1+ ; MPL
+License: MPLv1.1 or GPLv2+ or LGPLv2.1+
Summary: Tools for developing, debugging, and managing applications that use NSS
Group: System/Management
PreReq: mozilla-nss >= %{version}
@@ -108,7 +108,7 @@
%package sysinit
-License: GPLv2+ ; LGPLv2.1+ ; MPL
+License: MPLv1.1 or GPLv2+ or LGPLv2.1+
Summary: System NSS Initialization
Group: System/Management
Requires: mozilla-nss >= %{version}
@@ -122,7 +122,7 @@
%package -n libfreebl3
-License: GPLv2+ ; LGPLv2.1+ ; MPL
+License: MPLv1.1 or GPLv2+ or LGPLv2.1+
Summary: Freebl library for the Network Security Services
Group: System/Libraries
@@ -137,7 +137,7 @@
%package -n libsoftokn3
-License: GPLv2+ ; LGPLv2.1+ ; MPL
+License: MPLv1.1 or GPLv2+ or LGPLv2.1+
Summary: Network Security Services Soktoken Module
Group: System/Libraries
Requires: libfreebl3 = %{version}-%{release}
@@ -153,7 +153,7 @@
%package certs
-License: GPLv2+ ; LGPLv2.1+ ; MPL
+License: MPLv1.1 or GPLv2+ or LGPLv2.1+
Summary: CA certificates for NSS
Group: Productivity/Networking/Security
@@ -180,7 +180,7 @@
%build
cd mozilla/security/nss
-cp %SOURCE10 tests/libpkix/certs/PayPalEE.cert
+#cp %SOURCE10 tests/libpkix/certs/PayPalEE.cert
export FREEBL_NO_DEPEND=1
export NSPR_INCLUDE_DIR=`nspr-config --includedir`
export NSPR_LIB_DIR=`nspr-config --libdir`
++++++ nss-3.12.9.tar.bz2 -> nss-3.12.10.tar.bz2 ++++++
++++ 29554 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mozilla-nspr for openSUSE:Factory
checked in at Fri Apr 29 09:06:37 CEST 2011.
--------
--- GNOME/mozilla-nspr/mozilla-nspr.changes 2011-01-09 23:57:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/mozilla-nspr/mozilla-nspr.changes 2011-04-28 08:02:18.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Apr 28 05:45:30 UTC 2011 - wr(a)rosenauer.org
+
+- update to 4.8.8beta3
+ * support IPv6 on Android (bmo#626866)
+ * use AI_ADDRCONFIG for loopback hostnames (bmo#614526)
+ * support SDP sockets (bmo#518078)
+ * support m32r architecture (bmo#635667)
+ * use atomic functions on ARM (bmo#626309)
+ * some other fixes not affecting the Linux platform
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
nspr-4.8.7.tar.bz2
New:
----
nspr-4.8.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-nspr.spec ++++++
--- /var/tmp/diff_new_pack.g4g2Ga/_old 2011-04-29 09:06:07.000000000 +0200
+++ /var/tmp/diff_new_pack.g4g2Ga/_new 2011-04-29 09:06:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mozilla-nspr (Version 4.8.7)
+# spec file for package mozilla-nspr
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# 2006-2011 Wolfgang Rosenauer
@@ -21,9 +21,9 @@
Name: mozilla-nspr
BuildRequires: gcc-c++ pkg-config
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: 4.8.7
-Release: 2
+License: MPLv1.1 or GPLv2+ or LGPLv2.1+
+Version: 4.8.8
+Release: 1
Summary: Netscape Portable Runtime
Url: http://www.mozilla.org/projects/nspr/
# bug437293
@@ -45,7 +45,7 @@
%package devel
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License: MPLv1.1 or GPLv2+ or LGPLv2.1+
Summary: Netscape Portable Runtime development files
Group: Development/Libraries/Other
Requires: mozilla-nspr = %{version}
++++++ nspr-4.8.7.tar.bz2 -> nspr-4.8.8.tar.bz2 ++++++
++++ 1707 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/admin/repackage.sh new/nspr-4.8.8/mozilla/nsprpub/admin/repackage.sh
--- old/nspr-4.8.7/mozilla/nsprpub/admin/repackage.sh 2010-12-09 15:34:05.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/admin/repackage.sh 2011-04-28 07:42:59.000000000 +0200
@@ -64,10 +64,10 @@
#
# ------------------------------------------------------------------
-FROMTOP=/share/builds/components/nspr20/v4.8.7
-TOTOP=./v4.8.7
-NSPRDIR=nspr-4.8.7
-SOURCETAG=NSPR_4_8_7_RTM
+FROMTOP=/share/builds/components/nspr20/v4.8.8
+TOTOP=./v4.8.8
+NSPRDIR=nspr-4.8.8
+SOURCETAG=NSPR_4_8_8_RTM
#
# enumerate Unix object directories on /s/b/c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/configure.in new/nspr-4.8.8/mozilla/nsprpub/configure.in
--- old/nspr-4.8.7/mozilla/nsprpub/configure.in 2010-12-09 15:34:05.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/configure.in 2011-04-28 07:42:59.000000000 +0200
@@ -50,7 +50,7 @@
dnl ========================================================
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=8
-MOD_PATCH_VERSION=7
+MOD_PATCH_VERSION=8
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
@@ -916,7 +916,7 @@
dnl = Enable building the Thumb2 instruction set
dnl ========================================================
AC_ARG_ENABLE(thumb2,
- [ --enable-thumb2 Enable Thumb2 instruction set],
+ [ --enable-thumb2 Enable Thumb-2 instruction set],
[ if test "$enableval" = "yes"; then
MOZ_THUMB2=1,
fi ])
@@ -925,8 +925,8 @@
case "$target_cpu" in
arm*)
if test "$GNU_CC"; then
- CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
+ CFLAGS="$CFLAGS -march=armv7-a -mthumb"
+ CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb"
ASFLAGS="$ASFLAGS -march=armv7-a -mthumb"
else
AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
@@ -937,11 +937,11 @@
;;
esac
else
- case "$target_cpu" in
- arm*)
+ case "$target" in
+ arm-android-eabi)
if test "$GNU_CC"; then
- CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
- CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
+ CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork"
+ CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork"
ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork"
fi
;;
@@ -1144,10 +1144,12 @@
CC="$CC -arch x86_64"
else
CPU_ARCH=i386
+ CC="$CC -arch i386"
fi
;;
*)
CPU_ARCH=ppc
+ CC="$CC -arch ppc"
;;
esac
DSO_CFLAGS=-fPIC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/lib/ds/plarena.c new/nspr-4.8.8/mozilla/nsprpub/lib/ds/plarena.c
--- old/nspr-4.8.7/mozilla/nsprpub/lib/ds/plarena.c 2010-07-23 21:01:00.000000000 +0200
+++ new/nspr-4.8.8/mozilla/nsprpub/lib/ds/plarena.c 2011-04-28 07:42:59.000000000 +0200
@@ -314,8 +314,8 @@
{
PLArena *a;
- for (a = pool->first.next; a; a = a->next) {
- if (PR_UPTRDIFF(mark, a->base) < PR_UPTRDIFF(a->avail, a->base)) {
+ for (a = &pool->first; a; a = a->next) {
+ if (PR_UPTRDIFF(mark, a->base) <= PR_UPTRDIFF(a->avail, a->base)) {
a->avail = (PRUword)PL_ARENA_ALIGN(pool, mark);
FreeArenaList(pool, a, PR_FALSE);
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/md/_hpux.h new/nspr-4.8.8/mozilla/nsprpub/pr/include/md/_hpux.h
--- old/nspr-4.8.7/mozilla/nsprpub/pr/include/md/_hpux.h 2008-01-21 10:52:48.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/md/_hpux.h 2011-04-28 07:42:59.000000000 +0200
@@ -110,6 +110,30 @@
#define _PR_HAVE_INET_NTOP
#else
#define _PR_INET6_PROBE
+
+/* for HP-UX 11.11 without IPv6 */
+#ifndef AF_INET6
+#define AF_INET6 22
+#define AI_CANONNAME 2
+#define AI_NUMERICHOST 4
+#define AI_NUMERICSERV 8
+#define AI_V4MAPPED 0x00000010
+#define AI_ADDRCONFIG 0x00000040
+#define AI_ALL 0x00000020
+#define AI_DEFAULT (AI_V4MAPPED|AI_ADDRCONFIG)
+#define NI_NUMERICHOST 2
+struct addrinfo {
+ int ai_flags; /* AI_PASSIVE, AI_CANONNAME */
+ int ai_family; /* PF_xxx */
+ int ai_socktype; /* SOCK_xxx */
+ int ai_protocol; /* IPPROTO_xxx for IPv4 and IPv6 */
+ socklen_t ai_addrlen; /* length of ai_addr */
+ char *ai_canonname; /* canonical name for host */
+ struct sockaddr *ai_addr; /* binary address */
+ struct addrinfo *ai_next; /* next structure in linked list */
+};
+#endif /* for HP-UX 11.11 without IPv6 */
+
#define _PR_HAVE_MD_SOCKADDR_IN6
/* isomorphic to struct in6_addr on HP-UX B.11.23 */
struct _md_in6_addr {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/md/_linux.cfg new/nspr-4.8.8/mozilla/nsprpub/pr/include/md/_linux.cfg
--- old/nspr-4.8.7/mozilla/nsprpub/pr/include/md/_linux.cfg 2010-03-05 07:26:27.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/md/_linux.cfg 2011-04-28 07:42:59.000000000 +0200
@@ -797,6 +797,51 @@
#define PR_BYTES_PER_WORD_LOG2 2
#define PR_BYTES_PER_DWORD_LOG2 3
+#elif defined(__m32r__)
+
+#undef IS_LITTLE_ENDIAN
+#define IS_BIG_ENDIAN 1
+
+#define PR_BYTES_PER_BYTE 1
+#define PR_BYTES_PER_SHORT 2
+#define PR_BYTES_PER_INT 4
+#define PR_BYTES_PER_INT64 8
+#define PR_BYTES_PER_LONG 4
+#define PR_BYTES_PER_FLOAT 4
+#define PR_BYTES_PER_DOUBLE 8
+#define PR_BYTES_PER_WORD 4
+#define PR_BYTES_PER_DWORD 8
+
+#define PR_BITS_PER_BYTE 8
+#define PR_BITS_PER_SHORT 16
+#define PR_BITS_PER_INT 32
+#define PR_BITS_PER_INT64 64
+#define PR_BITS_PER_LONG 32
+#define PR_BITS_PER_FLOAT 32
+#define PR_BITS_PER_DOUBLE 64
+#define PR_BITS_PER_WORD 32
+
+#define PR_BITS_PER_BYTE_LOG2 3
+#define PR_BITS_PER_SHORT_LOG2 4
+#define PR_BITS_PER_INT_LOG2 5
+#define PR_BITS_PER_INT64_LOG2 6
+#define PR_BITS_PER_LONG_LOG2 5
+#define PR_BITS_PER_FLOAT_LOG2 5
+#define PR_BITS_PER_DOUBLE_LOG2 6
+#define PR_BITS_PER_WORD_LOG2 5
+
+#define PR_ALIGN_OF_SHORT 2
+#define PR_ALIGN_OF_INT 4
+#define PR_ALIGN_OF_LONG 4
+#define PR_ALIGN_OF_INT64 4
+#define PR_ALIGN_OF_FLOAT 4
+#define PR_ALIGN_OF_DOUBLE 4
+#define PR_ALIGN_OF_POINTER 4
+#define PR_ALIGN_OF_WORD 4
+
+#define PR_BYTES_PER_WORD_LOG2 2
+#define PR_BYTES_PER_DWORD_LOG2 3
+
#else
#error "Unknown CPU architecture"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/md/_linux.h new/nspr-4.8.8/mozilla/nsprpub/pr/include/md/_linux.h
--- old/nspr-4.8.7/mozilla/nsprpub/pr/include/md/_linux.h 2010-07-23 21:01:01.000000000 +0200
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/md/_linux.h 2011-04-28 07:42:59.000000000 +0200
@@ -83,6 +83,8 @@
#define _PR_SI_ARCHITECTURE "sh"
#elif defined(__avr32__)
#define _PR_SI_ARCHITECTURE "avr32"
+#elif defined(__m32r__)
+#define _PR_SI_ARCHITECTURE "m32r"
#else
#error "Unknown CPU architecture"
#endif
@@ -216,7 +218,18 @@
})
#endif
-#if defined(__arm__) && defined(_PR_ARM_KUSER)
+#if defined(__arm__)
+#if defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
+/* Use GCC built-in functions */
+#define _PR_HAVE_ATOMIC_OPS
+#define _MD_INIT_ATOMIC()
+
+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
+
+#elif defined(_PR_ARM_KUSER)
#define _PR_HAVE_ATOMIC_OPS
#define _MD_INIT_ATOMIC()
@@ -259,21 +272,24 @@
return ov;
}
#endif
+#endif /* __arm__ */
#define USE_SETJMP
-#if defined(__GLIBC__) && __GLIBC__ >= 2
+#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(ANDROID)
#define _PR_POLL_AVAILABLE
#endif
#undef _PR_USE_POLL
#define _PR_STAT_HAS_ONLY_ST_ATIME
#if defined(__alpha) || defined(__ia64__)
#define _PR_HAVE_LARGE_OFF_T
-#elif (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+#elif (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \
+ || defined(ANDROID)
#define _PR_HAVE_OFF64_T
#else
#define _PR_NO_LARGE_FILES
#endif
-#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \
+ || defined(ANDROID)
#define _PR_INET6
#define _PR_HAVE_INET_NTOP
#define _PR_HAVE_GETHOSTBYNAME2
@@ -284,6 +300,7 @@
#define _PR_HAVE_SYSV_SEMAPHORES
#define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
#endif
+/* Android has gethostbyname_r but not gethostbyaddr_r or gethostbyname2_r. */
#if (__GLIBC__ >= 2) && defined(_PR_PTHREADS)
#define _PR_HAVE_GETHOST_R
#define _PR_HAVE_GETHOST_R_INT
@@ -457,6 +474,18 @@
#error "SH/Linux pre-glibc2 not supported yet"
#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+#elif defined(__m32r__)
+/* Linux/M32R */
+#if defined(__GLIBC__) && __GLIBC__ >= 2
+#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[0].__regs[JB_SP]
+#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[0].__regs[JB_FP] = (val))
+#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
+#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[0].__regs[JB_FP])
+#define _MD_SP_TYPE __ptr_t
+#else
+#error "Linux/M32R pre-glibc2 not supported yet"
+#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+
#else
#error "Unknown CPU architecture"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/pratom.h new/nspr-4.8.8/mozilla/nsprpub/pr/include/pratom.h
--- old/nspr-4.8.7/mozilla/nsprpub/pr/include/pratom.h 2010-12-10 00:03:00.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/pratom.h 2011-04-28 07:42:59.000000000 +0200
@@ -140,6 +140,8 @@
defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \
defined(__ia64__) || defined(__x86_64__) || \
(defined(__powerpc__) && !defined(__powerpc64__)) || \
+ (defined(__arm__) && \
+ defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \
defined(__alpha))))
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/prinit.h new/nspr-4.8.8/mozilla/nsprpub/pr/include/prinit.h
--- old/nspr-4.8.7/mozilla/nsprpub/pr/include/prinit.h 2011-01-09 23:24:20.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/prinit.h 2011-04-28 07:42:59.000000000 +0200
@@ -63,11 +63,11 @@
** The format of the version string is
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
*/
-#define PR_VERSION "4.8.7"
+#define PR_VERSION "4.8.8 Beta"
#define PR_VMAJOR 4
#define PR_VMINOR 8
-#define PR_VPATCH 7
-#define PR_BETA PR_FALSE
+#define PR_VPATCH 8
+#define PR_BETA PR_TRUE
/*
** PRVersionCheck
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/prio.h new/nspr-4.8.8/mozilla/nsprpub/pr/include/prio.h
--- old/nspr-4.8.7/mozilla/nsprpub/pr/include/prio.h 2009-05-20 21:54:24.000000000 +0200
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/prio.h 2011-04-28 07:42:59.000000000 +0200
@@ -142,6 +142,9 @@
#define PR_AF_INET6 100
#endif
+#define PR_AF_INET_SDP 101
+#define PR_AF_INET6_SDP 102
+
#ifndef PR_AF_UNSPEC
#define PR_AF_UNSPEC 0
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/include/prtypes.h new/nspr-4.8.8/mozilla/nsprpub/pr/include/prtypes.h
--- old/nspr-4.8.7/mozilla/nsprpub/pr/include/prtypes.h 2010-07-23 21:01:01.000000000 +0200
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/include/prtypes.h 2011-04-28 07:42:59.000000000 +0200
@@ -235,7 +235,7 @@
** PRInt8
** DESCRIPTION:
** The int8 types are known to be 8 bits each. There is no type that
-** is equivalent to a plain "char".
+** is equivalent to a plain "char".
************************************************************************/
#if PR_BYTES_PER_BYTE == 1
typedef unsigned char PRUint8;
@@ -274,7 +274,7 @@
** TYPES: PRUint16
** PRInt16
** DESCRIPTION:
-** The int16 types are known to be 16 bits each.
+** The int16 types are known to be 16 bits each.
************************************************************************/
#if PR_BYTES_PER_SHORT == 2
typedef unsigned short PRUint16;
@@ -299,7 +299,7 @@
** TYPES: PRUint32
** PRInt32
** DESCRIPTION:
-** The int32 types are known to be 32 bits each.
+** The int32 types are known to be 32 bits each.
************************************************************************/
#if PR_BYTES_PER_INT == 4
typedef unsigned int PRUint32;
@@ -372,7 +372,7 @@
** The PRIntn types are most appropriate for automatic variables. They are
** guaranteed to be at least 16 bits, though various architectures may
** define them to be wider (e.g., 32 or even 64 bits). These types are
-** never valid for fields of a structure.
+** never valid for fields of a structure.
************************************************************************/
#if PR_BYTES_PER_INT >= 2
typedef int PRIntn;
@@ -384,14 +384,14 @@
/************************************************************************
** TYPES: PRFloat64
** DESCRIPTION:
-** NSPR's floating point type is always 64 bits.
+** NSPR's floating point type is always 64 bits.
************************************************************************/
typedef double PRFloat64;
/************************************************************************
** TYPES: PRSize
** DESCRIPTION:
-** A type for representing the size of objects.
+** A type for representing the size of objects.
************************************************************************/
typedef size_t PRSize;
@@ -399,7 +399,7 @@
/************************************************************************
** TYPES: PROffset32, PROffset64
** DESCRIPTION:
-** A type for representing byte offsets from some location.
+** A type for representing byte offsets from some location.
************************************************************************/
typedef PRInt32 PROffset32;
typedef PRInt64 PROffset64;
@@ -408,7 +408,7 @@
** TYPES: PRPtrDiff
** DESCRIPTION:
** A type for pointer difference. Variables of this type are suitable
-** for storing a pointer or pointer subtraction.
+** for storing a pointer or pointer subtraction.
************************************************************************/
typedef ptrdiff_t PRPtrdiff;
@@ -416,7 +416,7 @@
** TYPES: PRUptrdiff
** DESCRIPTION:
** A type for pointer difference. Variables of this type are suitable
-** for storing a pointer or pointer sutraction.
+** for storing a pointer or pointer sutraction.
************************************************************************/
#ifdef _WIN64
typedef PRUint64 PRUptrdiff;
@@ -430,7 +430,7 @@
** Use PRBool for variables and parameter types. Use PR_FALSE and PR_TRUE
** for clarity of target type in assignments and actual arguments. Use
** 'if (bool)', 'while (!bool)', '(bool) ? x : y' etc., to test booleans
-** just as you would C int-valued conditions.
+** just as you would C int-valued conditions.
************************************************************************/
typedef PRIntn PRBool;
#define PR_TRUE 1
@@ -445,7 +445,7 @@
typedef PRUint8 PRPackedBool;
/*
-** Status code used by some routines that have a single point of failure or
+** Status code used by some routines that have a single point of failure or
** special status return.
*/
typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/linking/prlink.c new/nspr-4.8.8/mozilla/nsprpub/pr/src/linking/prlink.c
--- old/nspr-4.8.7/mozilla/nsprpub/pr/src/linking/prlink.c 2010-12-09 15:34:05.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/linking/prlink.c 2011-04-28 07:42:59.000000000 +0200
@@ -1360,7 +1360,8 @@
PR_IMPLEMENT(char *)
PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr)
{
-#if defined(USE_DLFCN) && !defined(ANDROID) && (defined(SOLARIS) || defined(FREEBSD) \
+#if defined(USE_DLFCN) && !defined(ANDROID) \
+ && (defined(SOLARIS) || defined(FREEBSD) \
|| defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
|| defined(DARWIN))
Dl_info dli;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s
--- old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s 2008-01-21 10:52:48.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s 2011-04-28 07:43:00.000000000 +0200
@@ -1,46 +1,46 @@
-/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-/
-/ ***** BEGIN LICENSE BLOCK *****
-/ Version: MPL 1.1/GPL 2.0/LGPL 2.1
-/
-/ The contents of this file are subject to the Mozilla Public License Version
-/ 1.1 (the "License"); you may not use this file except in compliance with
-/ the License. You may obtain a copy of the License at
-/ http://www.mozilla.org/MPL/
-/
-/ Software distributed under the License is distributed on an "AS IS" basis,
-/ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-/ for the specific language governing rights and limitations under the
-/ License.
-/
-/ The Original Code is the Netscape Portable Runtime (NSPR).
-/
-/ The Initial Developer of the Original Code is
-/ Netscape Communications Corporation.
-/ Portions created by the Initial Developer are Copyright (C) 2000
-/ the Initial Developer. All Rights Reserved.
-/
-/ Contributor(s):
-/
-/ Alternatively, the contents of this file may be used under the terms of
-/ either the GNU General Public License Version 2 or later (the "GPL"), or
-/ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-/ in which case the provisions of the GPL or the LGPL are applicable instead
-/ of those above. If you wish to allow use of your version of this file only
-/ under the terms of either the GPL or the LGPL, and not to allow others to
-/ use your version of this file under the terms of the MPL, indicate your
-/ decision by deleting the provisions above and replace them with the notice
-/ and other provisions required by the GPL or the LGPL. If you do not delete
-/ the provisions above, a recipient may use your version of this file under
-/ the terms of any one of the MPL, the GPL or the LGPL.
-/
-/ ***** END LICENSE BLOCK *****
+// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+//
+// ***** BEGIN LICENSE BLOCK *****
+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
+//
+// The contents of this file are subject to the Mozilla Public License Version
+// 1.1 (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+// http://www.mozilla.org/MPL/
+//
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the
+// License.
+//
+// The Original Code is the Netscape Portable Runtime (NSPR).
+//
+// The Initial Developer of the Original Code is
+// Netscape Communications Corporation.
+// Portions created by the Initial Developer are Copyright (C) 2000
+// the Initial Developer. All Rights Reserved.
+//
+// Contributor(s):
+//
+// Alternatively, the contents of this file may be used under the terms of
+// either the GNU General Public License Version 2 or later (the "GPL"), or
+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+// in which case the provisions of the GPL or the LGPL are applicable instead
+// of those above. If you wish to allow use of your version of this file only
+// under the terms of either the GPL or the LGPL, and not to allow others to
+// use your version of this file under the terms of the MPL, indicate your
+// decision by deleting the provisions above and replace them with the notice
+// and other provisions required by the GPL or the LGPL. If you do not delete
+// the provisions above, a recipient may use your version of this file under
+// the terms of any one of the MPL, the GPL or the LGPL.
+//
+// ***** END LICENSE BLOCK *****
-/ PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val)
-/
-/ Atomically increment the integer pointed to by 'val' and return
-/ the result of the increment.
-/
+// PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val)
+//
+// Atomically increment the integer pointed to by 'val' and return
+// the result of the increment.
+//
.text
.globl _PR_x86_AtomicIncrement
.align 4
@@ -52,11 +52,11 @@
incl %eax
ret
-/ PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val)
-/
-/ Atomically decrement the integer pointed to by 'val' and return
-/ the result of the decrement.
-/
+// PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val)
+//
+// Atomically decrement the integer pointed to by 'val' and return
+// the result of the decrement.
+//
.text
.globl _PR_x86_AtomicDecrement
.align 4
@@ -68,25 +68,25 @@
decl %eax
ret
-/ PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval)
-/
-/ Atomically set the integer pointed to by 'val' to the new
-/ value 'newval' and return the old value.
-/
-/ An alternative implementation:
-/ .text
-/ .globl _PR_x86_AtomicSet
-/ .align 4
-/_PR_x86_AtomicSet:
-/ movl 4(%esp), %ecx
-/ movl 8(%esp), %edx
-/ movl (%ecx), %eax
-/retry:
-/ lock
-/ cmpxchgl %edx, (%ecx)
-/ jne retry
-/ ret
-/
+// PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval)
+//
+// Atomically set the integer pointed to by 'val' to the new
+// value 'newval' and return the old value.
+//
+// An alternative implementation:
+// .text
+// .globl _PR_x86_AtomicSet
+// .align 4
+//_PR_x86_AtomicSet:
+// movl 4(%esp), %ecx
+// movl 8(%esp), %edx
+// movl (%ecx), %eax
+//retry:
+// lock
+// cmpxchgl %edx, (%ecx)
+// jne retry
+// ret
+//
.text
.globl _PR_x86_AtomicSet
.align 4
@@ -96,11 +96,11 @@
xchgl %eax, (%ecx)
ret
-/ PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-/
-/ Atomically add 'val' to the integer pointed to by 'ptr'
-/ and return the result of the addition.
-/
+// PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val)
+//
+// Atomically add 'val' to the integer pointed to by 'ptr'
+// and return the result of the addition.
+//
.text
.globl _PR_x86_AtomicAdd
.align 4
@@ -113,5 +113,5 @@
addl %edx, %eax
ret
-/ Magic indicating no need for an executable stack
+// Magic indicating no need for an executable stack
.section .note.GNU-stack, "", @progbits ; .previous
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s
--- old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 2010-07-23 21:01:01.000000000 +0200
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 2011-04-28 07:43:00.000000000 +0200
@@ -1,46 +1,46 @@
-/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-/
-/ ***** BEGIN LICENSE BLOCK *****
-/ Version: MPL 1.1/GPL 2.0/LGPL 2.1
-/
-/ The contents of this file are subject to the Mozilla Public License Version
-/ 1.1 (the "License"); you may not use this file except in compliance with
-/ the License. You may obtain a copy of the License at
-/ http://www.mozilla.org/MPL/
-/
-/ Software distributed under the License is distributed on an "AS IS" basis,
-/ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-/ for the specific language governing rights and limitations under the
-/ License.
-/
-/ The Original Code is the Netscape Portable Runtime (NSPR).
-/
-/ The Initial Developer of the Original Code is
-/ Netscape Communications Corporation.
-/ Portions created by the Initial Developer are Copyright (C) 2004
-/ the Initial Developer. All Rights Reserved.
-/
-/ Contributor(s):
-/
-/ Alternatively, the contents of this file may be used under the terms of
-/ either the GNU General Public License Version 2 or later (the "GPL"), or
-/ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-/ in which case the provisions of the GPL or the LGPL are applicable instead
-/ of those above. If you wish to allow use of your version of this file only
-/ under the terms of either the GPL or the LGPL, and not to allow others to
-/ use your version of this file under the terms of the MPL, indicate your
-/ decision by deleting the provisions above and replace them with the notice
-/ and other provisions required by the GPL or the LGPL. If you do not delete
-/ the provisions above, a recipient may use your version of this file under
-/ the terms of any one of the MPL, the GPL or the LGPL.
-/
-/ ***** END LICENSE BLOCK *****
+// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+//
+// ***** BEGIN LICENSE BLOCK *****
+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
+//
+// The contents of this file are subject to the Mozilla Public License Version
+// 1.1 (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+// http://www.mozilla.org/MPL/
+//
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the
+// License.
+//
+// The Original Code is the Netscape Portable Runtime (NSPR).
+//
+// The Initial Developer of the Original Code is
+// Netscape Communications Corporation.
+// Portions created by the Initial Developer are Copyright (C) 2004
+// the Initial Developer. All Rights Reserved.
+//
+// Contributor(s):
+//
+// Alternatively, the contents of this file may be used under the terms of
+// either the GNU General Public License Version 2 or later (the "GPL"), or
+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+// in which case the provisions of the GPL or the LGPL are applicable instead
+// of those above. If you wish to allow use of your version of this file only
+// under the terms of either the GPL or the LGPL, and not to allow others to
+// use your version of this file under the terms of the MPL, indicate your
+// decision by deleting the provisions above and replace them with the notice
+// and other provisions required by the GPL or the LGPL. If you do not delete
+// the provisions above, a recipient may use your version of this file under
+// the terms of any one of the MPL, the GPL or the LGPL.
+//
+// ***** END LICENSE BLOCK *****
-/ PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val)
-/
-/ Atomically increment the integer pointed to by 'val' and return
-/ the result of the increment.
-/
+// PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val)
+//
+// Atomically increment the integer pointed to by 'val' and return
+// the result of the increment.
+//
.text
.globl _PR_x86_64_AtomicIncrement
.type _PR_x86_64_AtomicIncrement, @function
@@ -53,11 +53,11 @@
ret
.size _PR_x86_64_AtomicIncrement, .-_PR_x86_64_AtomicIncrement
-/ PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val)
-/
-/ Atomically decrement the integer pointed to by 'val' and return
-/ the result of the decrement.
-/
+// PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val)
+//
+// Atomically decrement the integer pointed to by 'val' and return
+// the result of the decrement.
+//
.text
.globl _PR_x86_64_AtomicDecrement
.type _PR_x86_64_AtomicDecrement, @function
@@ -70,11 +70,11 @@
ret
.size _PR_x86_64_AtomicDecrement, .-_PR_x86_64_AtomicDecrement
-/ PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval)
-/
-/ Atomically set the integer pointed to by 'val' to the new
-/ value 'newval' and return the old value.
-/
+// PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval)
+//
+// Atomically set the integer pointed to by 'val' to the new
+// value 'newval' and return the old value.
+//
.text
.globl _PR_x86_64_AtomicSet
.type _PR_x86_64_AtomicSet, @function
@@ -85,11 +85,11 @@
ret
.size _PR_x86_64_AtomicSet, .-_PR_x86_64_AtomicSet
-/ PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-/
-/ Atomically add 'val' to the integer pointed to by 'ptr'
-/ and return the result of the addition.
-/
+// PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val)
+//
+// Atomically add 'val' to the integer pointed to by 'ptr'
+// and return the result of the addition.
+//
.text
.globl _PR_x86_64_AtomicAdd
.type _PR_x86_64_AtomicAdd, @function
@@ -102,5 +102,5 @@
ret
.size _PR_x86_64_AtomicAdd, .-_PR_x86_64_AtomicAdd
-/ Magic indicating no need for an executable stack
+// Magic indicating no need for an executable stack
.section .note.GNU-stack, "", @progbits ; .previous
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86.s new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86.s
--- old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86.s 2008-01-21 10:52:48.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86.s 2011-04-28 07:43:00.000000000 +0200
@@ -1,40 +1,40 @@
-/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-/
-/ ***** BEGIN LICENSE BLOCK *****
-/ Version: MPL 1.1/GPL 2.0/LGPL 2.1
-/
-/ The contents of this file are subject to the Mozilla Public License Version
-/ 1.1 (the "License"); you may not use this file except in compliance with
-/ the License. You may obtain a copy of the License at
-/ http://www.mozilla.org/MPL/
-/
-/ Software distributed under the License is distributed on an "AS IS" basis,
-/ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-/ for the specific language governing rights and limitations under the
-/ License.
-/
-/ The Original Code is the Netscape Portable Runtime (NSPR).
-/
-/ The Initial Developer of the Original Code is
-/ Netscape Communications Corporation.
-/ Portions created by the Initial Developer are Copyright (C) 1998-2000
-/ the Initial Developer. All Rights Reserved.
-/
-/ Contributor(s):
-/
-/ Alternatively, the contents of this file may be used under the terms of
-/ either the GNU General Public License Version 2 or later (the "GPL"), or
-/ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-/ in which case the provisions of the GPL or the LGPL are applicable instead
-/ of those above. If you wish to allow use of your version of this file only
-/ under the terms of either the GPL or the LGPL, and not to allow others to
-/ use your version of this file under the terms of the MPL, indicate your
-/ decision by deleting the provisions above and replace them with the notice
-/ and other provisions required by the GPL or the LGPL. If you do not delete
-/ the provisions above, a recipient may use your version of this file under
-/ the terms of any one of the MPL, the GPL or the LGPL.
-/
-/ ***** END LICENSE BLOCK *****
+// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+//
+// ***** BEGIN LICENSE BLOCK *****
+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
+//
+// The contents of this file are subject to the Mozilla Public License Version
+// 1.1 (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+// http://www.mozilla.org/MPL/
+//
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the
+// License.
+//
+// The Original Code is the Netscape Portable Runtime (NSPR).
+//
+// The Initial Developer of the Original Code is
+// Netscape Communications Corporation.
+// Portions created by the Initial Developer are Copyright (C) 1998-2000
+// the Initial Developer. All Rights Reserved.
+//
+// Contributor(s):
+//
+// Alternatively, the contents of this file may be used under the terms of
+// either the GNU General Public License Version 2 or later (the "GPL"), or
+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+// in which case the provisions of the GPL or the LGPL are applicable instead
+// of those above. If you wish to allow use of your version of this file only
+// under the terms of either the GPL or the LGPL, and not to allow others to
+// use your version of this file under the terms of the MPL, indicate your
+// decision by deleting the provisions above and replace them with the notice
+// and other provisions required by the GPL or the LGPL. If you do not delete
+// the provisions above, a recipient may use your version of this file under
+// the terms of any one of the MPL, the GPL or the LGPL.
+//
+// ***** END LICENSE BLOCK *****
.text
@@ -60,31 +60,31 @@
ret
-/
-/ sol_getsp()
-/
-/ Return the current sp (for debugging)
-/
+//
+// sol_getsp()
+//
+// Return the current sp (for debugging)
+//
.globl sol_getsp
sol_getsp:
movl %esp, %eax
ret
-/
-/ sol_curthread()
-/
-/ Return a unique identifier for the currently active thread.
-/
+//
+// sol_curthread()
+//
+// Return a unique identifier for the currently active thread.
+//
.globl sol_curthread
sol_curthread:
movl %ecx, %eax
ret
-/ PRInt32 _MD_AtomicIncrement(PRInt32 *val)
-/
-/ Atomically increment the integer pointed to by 'val' and return
-/ the result of the increment.
-/
+// PRInt32 _MD_AtomicIncrement(PRInt32 *val)
+//
+// Atomically increment the integer pointed to by 'val' and return
+// the result of the increment.
+//
.text
.globl _MD_AtomicIncrement
.align 4
@@ -96,11 +96,11 @@
incl %eax
ret
-/ PRInt32 _MD_AtomicDecrement(PRInt32 *val)
-/
-/ Atomically decrement the integer pointed to by 'val' and return
-/ the result of the decrement.
-/
+// PRInt32 _MD_AtomicDecrement(PRInt32 *val)
+//
+// Atomically decrement the integer pointed to by 'val' and return
+// the result of the decrement.
+//
.text
.globl _MD_AtomicDecrement
.align 4
@@ -112,25 +112,25 @@
decl %eax
ret
-/ PRInt32 _MD_AtomicSet(PRInt32 *val, PRInt32 newval)
-/
-/ Atomically set the integer pointed to by 'val' to the new
-/ value 'newval' and return the old value.
-/
-/ An alternative implementation:
-/ .text
-/ .globl _MD_AtomicSet
-/ .align 4
-/_MD_AtomicSet:
-/ movl 4(%esp), %ecx
-/ movl 8(%esp), %edx
-/ movl (%ecx), %eax
-/retry:
-/ lock
-/ cmpxchgl %edx, (%ecx)
-/ jne retry
-/ ret
-/
+// PRInt32 _MD_AtomicSet(PRInt32 *val, PRInt32 newval)
+//
+// Atomically set the integer pointed to by 'val' to the new
+// value 'newval' and return the old value.
+//
+// An alternative implementation:
+// .text
+// .globl _MD_AtomicSet
+// .align 4
+//_MD_AtomicSet:
+// movl 4(%esp), %ecx
+// movl 8(%esp), %edx
+// movl (%ecx), %eax
+//retry:
+// lock
+// cmpxchgl %edx, (%ecx)
+// jne retry
+// ret
+//
.text
.globl _MD_AtomicSet
.align 4
@@ -140,11 +140,11 @@
xchgl %eax, (%ecx)
ret
-/ PRInt32 _MD_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-/
-/ Atomically add 'val' to the integer pointed to by 'ptr'
-/ and return the result of the addition.
-/
+// PRInt32 _MD_AtomicAdd(PRInt32 *ptr, PRInt32 val)
+//
+// Atomically add 'val' to the integer pointed to by 'ptr'
+// and return the result of the addition.
+//
.text
.globl _MD_AtomicAdd
.align 4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s
--- old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s 2008-01-21 10:52:48.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s 2011-04-28 07:43:00.000000000 +0200
@@ -1,46 +1,46 @@
-/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-/
-/ ***** BEGIN LICENSE BLOCK *****
-/ Version: MPL 1.1/GPL 2.0/LGPL 2.1
-/
-/ The contents of this file are subject to the Mozilla Public License Version
-/ 1.1 (the "License"); you may not use this file except in compliance with
-/ the License. You may obtain a copy of the License at
-/ http://www.mozilla.org/MPL/
-/
-/ Software distributed under the License is distributed on an "AS IS" basis,
-/ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-/ for the specific language governing rights and limitations under the
-/ License.
-/
-/ The Original Code is the Netscape Portable Runtime (NSPR).
-/
-/ The Initial Developer of the Original Code is
-/ Netscape Communications Corporation.
-/ Portions created by the Initial Developer are Copyright (C) 2004
-/ the Initial Developer. All Rights Reserved.
-/
-/ Contributor(s):
-/
-/ Alternatively, the contents of this file may be used under the terms of
-/ either the GNU General Public License Version 2 or later (the "GPL"), or
-/ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-/ in which case the provisions of the GPL or the LGPL are applicable instead
-/ of those above. If you wish to allow use of your version of this file only
-/ under the terms of either the GPL or the LGPL, and not to allow others to
-/ use your version of this file under the terms of the MPL, indicate your
-/ decision by deleting the provisions above and replace them with the notice
-/ and other provisions required by the GPL or the LGPL. If you do not delete
-/ the provisions above, a recipient may use your version of this file under
-/ the terms of any one of the MPL, the GPL or the LGPL.
-/
-/ ***** END LICENSE BLOCK *****
+// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+//
+// ***** BEGIN LICENSE BLOCK *****
+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
+//
+// The contents of this file are subject to the Mozilla Public License Version
+// 1.1 (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+// http://www.mozilla.org/MPL/
+//
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the
+// License.
+//
+// The Original Code is the Netscape Portable Runtime (NSPR).
+//
+// The Initial Developer of the Original Code is
+// Netscape Communications Corporation.
+// Portions created by the Initial Developer are Copyright (C) 2004
+// the Initial Developer. All Rights Reserved.
+//
+// Contributor(s):
+//
+// Alternatively, the contents of this file may be used under the terms of
+// either the GNU General Public License Version 2 or later (the "GPL"), or
+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+// in which case the provisions of the GPL or the LGPL are applicable instead
+// of those above. If you wish to allow use of your version of this file only
+// under the terms of either the GPL or the LGPL, and not to allow others to
+// use your version of this file under the terms of the MPL, indicate your
+// decision by deleting the provisions above and replace them with the notice
+// and other provisions required by the GPL or the LGPL. If you do not delete
+// the provisions above, a recipient may use your version of this file under
+// the terms of any one of the MPL, the GPL or the LGPL.
+//
+// ***** END LICENSE BLOCK *****
-/ PRInt32 _MD_AtomicIncrement(PRInt32 *val)
-/
-/ Atomically increment the integer pointed to by 'val' and return
-/ the result of the increment.
-/
+// PRInt32 _MD_AtomicIncrement(PRInt32 *val)
+//
+// Atomically increment the integer pointed to by 'val' and return
+// the result of the increment.
+//
.text
.globl _MD_AtomicIncrement
.align 4
@@ -51,11 +51,11 @@
incl %eax
ret
-/ PRInt32 _MD_AtomicDecrement(PRInt32 *val)
-/
-/ Atomically decrement the integer pointed to by 'val' and return
-/ the result of the decrement.
-/
+// PRInt32 _MD_AtomicDecrement(PRInt32 *val)
+//
+// Atomically decrement the integer pointed to by 'val' and return
+// the result of the decrement.
+//
.text
.globl _MD_AtomicDecrement
.align 4
@@ -66,11 +66,11 @@
decl %eax
ret
-/ PRInt32 _MD_AtomicSet(PRInt32 *val, PRInt32 newval)
-/
-/ Atomically set the integer pointed to by 'val' to the new
-/ value 'newval' and return the old value.
-/
+// PRInt32 _MD_AtomicSet(PRInt32 *val, PRInt32 newval)
+//
+// Atomically set the integer pointed to by 'val' to the new
+// value 'newval' and return the old value.
+//
.text
.globl _MD_AtomicSet
.align 4
@@ -79,11 +79,11 @@
xchgl %eax, (%rdi)
ret
-/ PRInt32 _MD_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-/
-/ Atomically add 'val' to the integer pointed to by 'ptr'
-/ and return the result of the addition.
-/
+// PRInt32 _MD_AtomicAdd(PRInt32 *ptr, PRInt32 val)
+//
+// Atomically add 'val' to the integer pointed to by 'ptr'
+// and return the result of the addition.
+//
.text
.globl _MD_AtomicAdd
.align 4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/unix.c new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/unix.c
--- old/nspr-4.8.7/mozilla/nsprpub/pr/src/md/unix/unix.c 2010-03-05 07:26:28.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/md/unix/unix.c 2011-04-28 07:43:00.000000000 +0200
@@ -2256,6 +2256,10 @@
PR_Lock(_pr_rename_lock);
}
+#if defined(ANDROID)
+ osflags |= O_LARGEFILE;
+#endif
+
rv = _md_iovector._open64(name, osflags, mode);
if (rv < 0) {
@@ -2742,6 +2746,23 @@
} /* _MD_Unix_mmap64 */
#endif /* defined(_PR_NO_LARGE_FILES) || defined(SOLARIS2_5) */
+/* Android doesn't have mmap64. */
+#if defined(ANDROID)
+extern void *__mmap2(void *, size_t, int, int, int, size_t);
+
+#define ANDROID_PAGE_SIZE 4096
+
+static void *
+mmap64(void *addr, size_t len, int prot, int flags, int fd, loff_t offset)
+{
+ if (offset & (ANDROID_PAGE_SIZE - 1)) {
+ errno = EINVAL;
+ return MAP_FAILED;
+ }
+ return __mmap2(addr, len, prot, flags, fd, offset / ANDROID_PAGE_SIZE);
+}
+#endif
+
#if defined(OSF1) && defined(__GNUC__)
/*
@@ -2796,7 +2817,11 @@
_md_iovector._stat64 = stat;
_md_iovector._lseek64 = _MD_Unix_lseek64;
#elif defined(_PR_HAVE_OFF64_T)
-#if defined(IRIX5_3)
+#if defined(IRIX5_3) || defined(ANDROID)
+ /*
+ * Android doesn't have open64. We pass the O_LARGEFILE flag to open
+ * in _MD_open.
+ */
_md_iovector._open64 = open;
#else
_md_iovector._open64 = open64;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/misc/dtoa.c new/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/dtoa.c
--- old/nspr-4.8.7/mozilla/nsprpub/pr/src/misc/dtoa.c 2010-07-23 21:01:01.000000000 +0200
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/dtoa.c 2011-04-28 07:43:00.000000000 +0200
@@ -70,7 +70,8 @@
* #define IBM for IBM mainframe-style floating-point arithmetic.
* #define VAX for VAX-style floating-point arithmetic (D_floating).
* #define No_leftright to omit left-right logic in fast floating-point
- * computation of dtoa.
+ * computation of dtoa. This will cause dtoa modes 4 and 5 to be
+ * treated the same as modes 2 and 3 for some inputs.
* #define Honor_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3
* and strtod and dtoa should round accordingly. Unless Trust_FLT_ROUNDS
* is also #defined, fegetround() will be queried for the rounding mode.
@@ -84,7 +85,12 @@
* #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines
* that use extended-precision instructions to compute rounded
* products and quotients) with IBM.
- * #define ROUND_BIASED for IEEE-format with biased rounding.
+ * #define ROUND_BIASED for IEEE-format with biased rounding and arithmetic
+ * that rounds toward +Infinity.
+ * #define ROUND_BIASED_without_Round_Up for IEEE-format with biased
+ * rounding when the underlying floating-point arithmetic uses
+ * unbiased rounding. This prevent using ordinary floating-point
+ * arithmetic when the result could be computed with one rounding error.
* #define Inaccurate_Divide for IEEE-format with correctly rounded
* products but inaccurate quotients, e.g., for Intel i860.
* #define NO_LONG_LONG on machines that do not have a "long long"
@@ -453,6 +459,11 @@
#ifndef IEEE_Arith
#define ROUND_BIASED
+#else
+#ifdef ROUND_BIASED_without_Round_Up
+#undef ROUND_BIASED
+#define ROUND_BIASED
+#endif
#endif
#ifdef RND_PRODQUOT
@@ -2576,6 +2587,8 @@
for(; c == '0'; c = *++s)
nz++;
if (c > '0' && c <= '9') {
+ bc.dp0 = s0 - s;
+ bc.dp1 = bc.dp0 + bc.dplen;
s0 = s;
nf += nz;
nz = 0;
@@ -2703,6 +2716,7 @@
) {
if (!e)
goto ret;
+#ifndef ROUND_BIASED_without_Round_Up
if (e > 0) {
if (e <= Ten_pmax) {
#ifdef VAX
@@ -2763,6 +2777,7 @@
goto ret;
}
#endif
+#endif /* ROUND_BIASED_without_Round_Up */
}
e1 += nd - k;
@@ -3678,6 +3693,9 @@
U d2, eps, u;
double ds;
char *s, *s0;
+#ifdef IEEE_Arith
+ U eps1;
+#endif
#ifdef SET_INEXACT
int inexact, oldinexact;
#endif
@@ -3941,14 +3959,26 @@
* generating digits needed.
*/
dval(&eps) = 0.5/tens[ilim-1] - dval(&eps);
+#ifdef IEEE_Arith
+ if (k0 < 0 && j1 >= 307) {
+ eps1.d = 1.01e256; /* 1.01 allows roundoff in the next few lines */
+ word0(&eps1) -= Exp_msk1 * (Bias+P-1);
+ dval(&eps1) *= tens[j1 & 0xf];
+ for(i = 0, j = (j1-256) >> 4; j; j >>= 1, i++)
+ if (j & 1)
+ dval(&eps1) *= bigtens[i];
+ if (eps.d < eps1.d)
+ eps.d = eps1.d;
+ }
+#endif
for(i = 0;;) {
L = dval(&u);
dval(&u) -= L;
*s++ = '0' + (int)L;
- if (dval(&u) < dval(&eps))
- goto ret1;
if (1. - dval(&u) < dval(&eps))
goto bump_up;
+ if (dval(&u) < dval(&eps))
+ goto ret1;
if (++i >= ilim)
break;
dval(&eps) *= 10.;
@@ -4022,7 +4052,12 @@
}
#endif
dval(&u) += dval(&u);
- if (dval(&u) > ds || (dval(&u) == ds && L & 1)) {
+#ifdef ROUND_BIASED
+ if (dval(&u) >= ds)
+#else
+ if (dval(&u) > ds || (dval(&u) == ds && L & 1))
+#endif
+ {
bump_up:
while(*--s == '9')
if (s == s0) {
@@ -4106,15 +4141,6 @@
* and for all and pass them and a shift to quorem, so it
* can do shifts and ors to compute the numerator for q.
*/
-#ifdef Pack_32
- if ((i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0x1f))
- i = 32 - i;
-#define iInc 28
-#else
- if (i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0xf)
- i = 16 - i;
-#define iInc 12
-#endif
i = dshift(S, s2);
b2 += i;
m2 += i;
@@ -4207,7 +4233,11 @@
if (j1 > 0) {
b = lshift(b, 1);
j1 = cmp(b, S);
+#ifdef ROUND_BIASED
+ if (j1 >= 0 /*)*/
+#else
if ((j1 > 0 || (j1 == 0 && dig & 1))
+#endif
&& dig++ == '9')
goto round_9_up;
}
@@ -4267,7 +4297,12 @@
#endif
b = lshift(b, 1);
j = cmp(b, S);
- if (j > 0 || (j == 0 && dig & 1)) {
+#ifdef ROUND_BIASED
+ if (j >= 0)
+#else
+ if (j > 0 || (j == 0 && dig & 1))
+#endif
+ {
roundoff:
while(*--s == '9')
if (s == s0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/misc/prnetdb.c new/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prnetdb.c
--- old/nspr-4.8.7/mozilla/nsprpub/pr/src/misc/prnetdb.c 2010-07-23 21:01:01.000000000 +0200
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prnetdb.c 2011-04-28 07:43:00.000000000 +0200
@@ -95,8 +95,8 @@
#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
|| (defined(LINUX) && defined(_REENTRANT) \
- && !(defined(__GLIBC__) && __GLIBC__ >= 2)) \
- && !defined(ANDROID)
+ && !(defined(__GLIBC__) && __GLIBC__ >= 2) \
+ && !defined(ANDROID))
#define _PR_HAVE_GETPROTO_R
#define _PR_HAVE_GETPROTO_R_POINTER
#endif
@@ -2039,7 +2039,32 @@
*/
memset(&hints, 0, sizeof(hints));
- hints.ai_flags = (flags & PR_AI_NOCANONNAME) ? 0: AI_CANONNAME;
+ if (!(flags & PR_AI_NOCANONNAME))
+ hints.ai_flags |= AI_CANONNAME;
+#ifdef AI_ADDRCONFIG
+ /*
+ * Propagate AI_ADDRCONFIG to the GETADDRINFO call if PR_AI_ADDRCONFIG
+ * is set.
+ *
+ * Need a workaround for loopback host addresses:
+ * The problem is that in glibc and Windows, AI_ADDRCONFIG applies the
+ * existence of an outgoing network interface to IP addresses of the
+ * loopback interface, due to a strict interpretation of the
+ * specification. For example, if a computer does not have any
+ * outgoing IPv6 network interface, but its loopback network interface
+ * supports IPv6, a getaddrinfo call on "localhost" with AI_ADDRCONFIG
+ * won't return the IPv6 loopback address "::1", because getaddrinfo
+ * thinks the computer cannot connect to any IPv6 destination,
+ * ignoring the remote vs. local/loopback distinction.
+ */
+ if ((flags & PR_AI_ADDRCONFIG) &&
+ strcmp(hostname, "localhost") != 0 &&
+ strcmp(hostname, "localhost.localdomain") != 0 &&
+ strcmp(hostname, "localhost6") != 0 &&
+ strcmp(hostname, "localhost6.localdomain6") != 0) {
+ hints.ai_flags |= AI_ADDRCONFIG;
+ }
+#endif
hints.ai_family = (af == PR_AF_INET) ? AF_INET : AF_UNSPEC;
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/misc/prsystem.c new/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prsystem.c
--- old/nspr-4.8.7/mozilla/nsprpub/pr/src/misc/prsystem.c 2010-07-23 21:01:01.000000000 +0200
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prsystem.c 2011-04-28 07:43:00.000000000 +0200
@@ -284,7 +284,7 @@
long pageCount = sysconf(_SC_PHYS_PAGES);
bytes = (PRUint64) pageSize * pageCount;
-#elif defined(NETBSD)
+#elif defined(NETBSD) || defined(OPENBSD)
int mib[2];
int rc;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/src/pthreads/ptio.c new/nspr-4.8.8/mozilla/nsprpub/pr/src/pthreads/ptio.c
--- old/nspr-4.8.7/mozilla/nsprpub/pr/src/pthreads/ptio.c 2010-12-09 15:34:06.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/src/pthreads/ptio.c 2011-04-28 07:43:00.000000000 +0200
@@ -218,6 +218,20 @@
#error "Cannot determine architecture"
#endif
+#if defined(SOLARIS)
+#ifndef PROTO_SDP
+/* on solaris, SDP is a new type of protocol */
+#define PROTO_SDP 257
+#endif
+#define _PR_HAVE_SDP
+#elif defined(LINUX)
+#ifndef AF_INET_SDP
+/* on linux, SDP is a new type of address family */
+#define AF_INET_SDP 27
+#endif
+#define _PR_HAVE_SDP
+#endif /* LINUX */
+
static PRFileDesc *pt_SetMethods(
PRIntn osfd, PRDescType type, PRBool isAcceptedSocket, PRBool imported);
@@ -3462,6 +3476,12 @@
if (PF_INET != domain
&& PR_AF_INET6 != domain
+#if defined(_PR_HAVE_SDP)
+ && PR_AF_INET_SDP != domain
+#if defined(SOLARIS)
+ && PR_AF_INET6_SDP != domain
+#endif /* SOLARIS */
+#endif /* _PR_HAVE_SDP */
&& PF_UNIX != domain)
{
PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
@@ -3474,6 +3494,20 @@
(void)PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
return fd;
}
+#if defined(_PR_HAVE_SDP)
+#if defined(LINUX)
+ if (PR_AF_INET_SDP == domain)
+ domain = AF_INET_SDP;
+#elif defined(SOLARIS)
+ if (PR_AF_INET_SDP == domain) {
+ domain = AF_INET;
+ proto = PROTO_SDP;
+ } else if(PR_AF_INET6_SDP == domain) {
+ domain = AF_INET6;
+ proto = PROTO_SDP;
+ }
+#endif /* SOLARIS */
+#endif /* _PR_HAVE_SDP */
#if defined(_PR_INET6_PROBE)
if (PR_AF_INET6 == domain)
domain = _pr_ipv6_is_present() ? AF_INET6 : AF_INET;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.7/mozilla/nsprpub/pr/tests/vercheck.c new/nspr-4.8.8/mozilla/nsprpub/pr/tests/vercheck.c
--- old/nspr-4.8.7/mozilla/nsprpub/pr/tests/vercheck.c 2010-12-09 15:34:06.000000000 +0100
+++ new/nspr-4.8.8/mozilla/nsprpub/pr/tests/vercheck.c 2011-04-28 07:43:00.000000000 +0200
@@ -52,9 +52,9 @@
#include <stdlib.h>
/*
- * This release (4.8.7) is backward compatible with the
+ * This release (4.8.8) is backward compatible with the
* 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x,
- * 4.8, 4.8.1, 4.8.2, 4.8.3, 4.8.4, 4.8.5, and 4.8.6 releases.
+ * 4.8, 4.8.1, 4.8.2, 4.8.3, 4.8.4, 4.8.5, 4.8.6 and 4.8.7 releases.
* It, of course, is compatible with itself.
*/
static char *compatible_version[] = {
@@ -66,7 +66,7 @@
"4.7", "4.7.1", "4.7.2", "4.7.3", "4.7.4", "4.7.5",
"4.7.6",
"4.8", "4.8.1", "4.8.2", "4.8.3", "4.8.4", "4.8.5",
- "4.8.6", PR_VERSION
+ "4.8.6", "4.8.7", PR_VERSION
};
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package release-notes-openSUSE for openSUSE:11.4
checked in at Thu Apr 28 17:36:58 CEST 2011.
--------
--- old-versions/11.4/all/release-notes-openSUSE/release-notes-openSUSE.changes 2011-02-28 13:34:10.000000000 +0100
+++ 11.4/release-notes-openSUSE/release-notes-openSUSE.changes 2011-04-19 13:19:23.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Apr 19 13:18:04 CEST 2011 - ke(a)suse.de
+
+- 11.4.4:
+* New entries: Intel SSD Drives Causing System Hangs (bnc#678743),
+ Removing the Xorg setUID Bit (bnc#632737), Default Download Mode Needs
+ More Space (bnc#684104), Minimum Server Software Selection Pattern Is
+ Broken (bnc#686397).
+* Update translations > 50% (da es fi fr gl hu it ja km lt nb nl pt_BR
+ ru); remove less translated languages.
+
+-------------------------------------------------------------------
Package does not exist at destination yet. Using Fallback old-versions/11.4/all/release-notes-openSUSE
Destination is old-versions/11.4/UPDATES/all/release-notes-openSUSE
calling whatdependson for 11.4-i586
Old:
----
release-notes-opensuse-11.4.3.tar.bz2
New:
----
release-notes-opensuse-11.4.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ release-notes-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.omd3hY/_old 2011-04-28 17:36:39.000000000 +0200
+++ /var/tmp/diff_new_pack.omd3hY/_new 2011-04-28 17:36:39.000000000 +0200
@@ -25,8 +25,8 @@
Summary: Most Important Changes for This openSUSE Release
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 11.4.3
-Release: 1.<RELEASE2>
+Version: 11.4.4
+Release: 0.<RELEASE2>
Provides: release-notes = %{version}
Source0: release-notes-opensuse-%{version}.tar.bz2
Source8: %{name}.desktop.in
++++++ release-notes-opensuse-11.4.3.tar.bz2 -> release-notes-opensuse-11.4.4.tar.bz2 ++++++
++++ 7023 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package doxygen for openSUSE:11.3
checked in at Thu Apr 28 17:36:26 CEST 2011.
--------
--- old-versions/11.3/UPDATES/all/doxygen/doxygen.changes 2010-11-23 16:08:29.000000000 +0100
+++ 11.3/doxygen/doxygen.changes 2011-04-28 10:31:41.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Apr 28 09:23:38 CEST 2011 - pgajdos(a)suse.cz
+
+- check if parent() don't return 0 when dereferencing it
+ [bnc#650330c22]
+ * modified pure-virtual-method-called.patch
+
+-------------------------------------------------------------------
calling whatdependson for 11.3-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ doxygen.spec ++++++
--- /var/tmp/diff_new_pack.e2U7qu/_old 2011-04-28 17:35:55.000000000 +0200
+++ /var/tmp/diff_new_pack.e2U7qu/_new 2011-04-28 17:35:55.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package doxygen (Version 1.6.3)
+# spec file for package doxygen
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
Name: doxygen
BuildRequires: bison flex gcc-c++ libpng-devel
Version: 1.6.3
-Release: 4.<RELEASE1>
+Release: 4.<RELEASE5>
AutoReqProv: on
License: GPLv2+
Group: Development/Tools/Doc Generators
++++++ doxywizard.spec ++++++
--- /var/tmp/diff_new_pack.e2U7qu/_old 2011-04-28 17:35:55.000000000 +0200
+++ /var/tmp/diff_new_pack.e2U7qu/_new 2011-04-28 17:35:55.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package doxywizard (Version 1.6.3)
+# spec file for package doxywizard
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
Name: doxywizard
BuildRequires: bison flex gcc-c++ libdrm-devel libjpeg-devel
Version: 1.6.3
-Release: 4.<RELEASE1>
+Release: 4.<RELEASE3>
AutoReqProv: on
Requires: doxygen = %{version}
License: GPLv2+
++++++ doxygen-1.6.3-pure-virtual-method-called.patch ++++++
--- /var/tmp/diff_new_pack.e2U7qu/_old 2011-04-28 17:35:55.000000000 +0200
+++ /var/tmp/diff_new_pack.e2U7qu/_new 2011-04-28 17:35:55.000000000 +0200
@@ -11,3 +11,16 @@
/*! Acceptor function for node visitors. Part of the visitor pattern.
* @param v Abstract visitor.
+Index: src/docparser.cpp
+===================================================================
+--- src/docparser.cpp.orig
++++ src/docparser.cpp
+@@ -5602,7 +5602,7 @@ reparsetoken:
+ break;
+ case TK_ENDLIST:
+ DBG(("Found end of list inside of paragraph at line %d\n",doctokenizerYYlineno));
+- if (parent()->kind()==DocNode::Kind_AutoListItem)
++ if (parent()->kind()==DocNode::Kind_AutoListItem && parent()->parent()!=0)
+ {
+ ASSERT(parent()->parent()->kind()==DocNode::Kind_AutoList);
+ DocAutoList *al = (DocAutoList *)parent()->parent();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package caribou for openSUSE:Factory
checked in at Thu Apr 28 15:44:18 CEST 2011.
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/caribou/caribou.changes 2011-04-26 23:02:56.000000000 +0200
@@ -0,0 +1,54 @@
+-------------------------------------------------------------------
+Wed Apr 6 08:23:18 UTC 2011 - fcrozat(a)novell.com
+
+- Update to version 0.2.00:
+ + Use /org/gnome as starting path for schemas
+ + Updated translations.
+- Changes from version 0.1.92:
+ + Separate autorun desktop file.
+ + Updated translations.
+- Changes from version 0.1.91:
+ + Raise an error when no keyboard is loaded.
+ + Make caribou startup automatically
+ + Use GTK3 CSS theming for custom colors.
+ + Look if a11y is enabled in GSettings.
+ + Port app preferences and schema to GSettings.
+ + Updated translations.
+- Changes from version 0.1.7:
+ + Ported to GTK3 and PyGI.
+ + New Japanese keyboard.
+ + Many bugs fixed.
+ + Updated translations.
+- Changes from version 0.1.6:
+ + Added basic scanning support.
+ + Added proper key highlight colors.
+ + Cleaned up configuration and preferences and made it more MVC
+ like.
+ + Created cleaner preferences window.
+ + Updated translations.
+- Changes from version 0.1.5:
+ + Added configurable key and highlight colors (bgo#622246).
+ + Added a desktop file (bgo#618292).
+ + Fix layout retrieval (bgo#622221).
+ + Don't change layout when switching focus (bgo#621654).
+ + Unpress modifier when Caribou quites (bgo#621596).
+ + Source files reshuffling.
+ + Added JSON/XML configurable layouts (bgo#613229).
+ + Updated translations.
+- Changes from version 0.1.2:
+ + First development release for GNOME 3.0.
+ + Updated translations.
+- Drop caribou-fix-listdir.patch: fixed upstream
+- Handle GSettings schemas, with %glib2_gsettings_schema_* macros.
+- Add BuildRequires: fdupes, gnome-doc-utils-devel, intltool,
+ python-xml, update-desktop-files, pkgconfig(clutter-1.0),
+ pkgconfig(gtk+-3.0), pkgconfig(pygobject-2.0).
+- Add python-xml Requires.
+- Remove icon from caribou.desktop with a sed, since the icon is
+ not shipped at all.
+
+-------------------------------------------------------------------
+Fri Apr 2 02:40:23 CEST 2010 - vuntz(a)opensuse.org
+
+- Initial package.
+
calling whatdependson for head-i586
New:
----
caribou-0.2.00.tar.bz2
caribou.changes
caribou.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caribou.spec ++++++
#
# spec file for package caribou
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: caribou
Version: 0.2.00
Release: 1
License: LGPLv2.1+
Summary: On-screen Keyboard for GNOME
Url: http://live.gnome.org/Caribou
Group: System/GUI/GNOME
Source0: %{name}-%{version}.tar.bz2
BuildRequires: fdupes
BuildRequires: gnome-doc-utils-devel
BuildRequires: intltool
BuildRequires: python-xml
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(clutter-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(pygobject-2.0)
# We need a Requires on the typelib (bnc#590025#c1)
Requires: gconf2
# We need a Requires on the typelib (bnc#590025#c1)
Requires: libclutter-glx-1_0-0
# We need a Requires on the typelib (bnc#590025#c1)
Requires: libgtk-3-0
Requires: python-atspi
Requires: python-virtkey
Requires: python-xml
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%py_requires
%glib2_gsettings_schema_requires
%description
Caribou is a text entry and UI navigation application being developed
as an alternative to the Gnome On-screen Keyboard. The overarching goal
for Caribou is to create a usable solution for people whose primary way
of accessing a computer is a switch device.
%lang_package
%prep
%setup -q
%build
%configure
make %{?jobs:-j%jobs}
%install
%make_install
%find_lang %{name} %{?no_lang_C}
# As the icon is not shipped, don't mention it in the .desktop file
sed -i -e s'/Icon=.*/Icon=/g' %{buildroot}%{_datadir}/applications/caribou.desktop
%suse_update_desktop_file %{name}
%suse_update_desktop_file %{name}-autostart
%fdupes %{buildroot}
%post
%glib2_gsettings_schema_post
%postun
%glib2_gsettings_schema_postun
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root)
%doc COPYING README
%{_bindir}/caribou
%{python_sitelib}/caribou/
%{_datadir}/caribou/
%{_datadir}/applications/caribou.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.caribou.gschema.xml
%{_sysconfdir}/xdg/autostart/caribou-autostart.desktop
%files lang -f %{name}.lang
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Thu Apr 28 15:12:07 CEST 2011.
--------
--- yast2-installation/yast2-installation.changes 2011-03-25 10:48:18.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2011-04-27 15:10:51.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Apr 27 15:08:04 CEST 2011 - jsuchome(a)suse.cz
+
+- added option to configure FCoE Interfaces when started with
+ WithFCoE=1 argument (fate#307445)
+- 2.21.3
+
+-------------------------------------------------------------------
+Wed Apr 27 11:19:50 CEST 2011 - jsuchome(a)suse.cz
+
+- Copy /media.1/build to the installed system (fate#311377)
+- 2.21.2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.21.1.tar.bz2
New:
----
yast2-installation-2.21.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.6yY5Nx/_old 2011-04-28 15:11:40.000000000 +0200
+++ /var/tmp/diff_new_pack.6yY5Nx/_new 2011-04-28 15:11:40.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-installation
-Version: 2.21.1
+Version: 2.21.3
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.21.1.tar.bz2
+Source0: yast2-installation-2.21.3.tar.bz2
Prefix: /usr
@@ -136,7 +136,7 @@
System installation code as present on installation media.
%prep
-%setup -n yast2-installation-2.21.1
+%setup -n yast2-installation-2.21.3
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-installation-2.21.1.tar.bz2 -> yast2-installation-2.21.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.1/VERSION new/yast2-installation-2.21.3/VERSION
--- old/yast2-installation-2.21.1/VERSION 2011-03-25 10:47:21.000000000 +0100
+++ new/yast2-installation-2.21.3/VERSION 2011-04-27 15:09:49.000000000 +0200
@@ -1 +1 @@
-2.21.1
+2.21.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.1/src/clients/inst_disks_activate.ycp new/yast2-installation-2.21.3/src/clients/inst_disks_activate.ycp
--- old/yast2-installation-2.21.1/src/clients/inst_disks_activate.ycp 2009-12-18 14:52:04.000000000 +0100
+++ new/yast2-installation-2.21.3/src/clients/inst_disks_activate.ycp 2011-04-27 13:01:21.000000000 +0200
@@ -23,6 +23,7 @@
import "Arch";
import "GetInstArgs";
import "Label";
+import "Linuxrc";
import "Popup";
import "Storage";
import "Wizard";
@@ -32,6 +33,7 @@
boolean have_dasd = false;
boolean have_zfcp = false;
+boolean want_fcoe = false;
void RestoreButtons (boolean enable_back, boolean enable_next) {
Wizard::RestoreAbortButton();
@@ -72,7 +74,9 @@
UI::CloseDialog ();
}
-if (have_dasd || have_zfcp)
+want_fcoe = Linuxrc::InstallInf ("WithFCoE") == "1";
+
+if (have_dasd || have_zfcp || want_fcoe)
{
// dialog caption
string caption = _("Disk Activation");
@@ -93,6 +97,12 @@
_("Configure &ZFCP Disks")))
: `VSpacing (0),
`VSpacing (have_zfcp ? 2 : 0),
+ want_fcoe
+ ? `HWeight (1, `PushButton (`id (`fcoe), `opt (`hstretch),
+ // push button
+ _("Configure &FCoE Interfaces")))
+ : `VSpacing (0),
+ `VSpacing (want_fcoe? 2 : 0),
`HWeight (1, `PushButton (`id (`iscsi), `opt (`hstretch),
// push button
_("Configure &iSCSI Disks"))),
@@ -121,7 +131,12 @@
}
else if (ret == `iscsi)
{
- ret = WFM::call ("inst_iscsi-client");
+ ret = WFM::call ("inst_iscsi-client", [argmap]);
+ ret = `redraw;
+ }
+ else if (ret == `fcoe)
+ {
+ ret = WFM::call ("inst_fcoe-client", [argmap]);
ret = `redraw;
}
if (ret == `redraw)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.1/src/include/inst_inc_all.ycp new/yast2-installation-2.21.3/src/include/inst_inc_all.ycp
--- old/yast2-installation-2.21.1/src/include/inst_inc_all.ycp 2011-02-08 21:27:44.000000000 +0100
+++ new/yast2-installation-2.21.3/src/include/inst_inc_all.ycp 2011-04-27 13:01:15.000000000 +0200
@@ -199,8 +199,9 @@
// update the workflow according to current situation
// disable disks activation if not needed
boolean iscsi = Linuxrc::InstallInf("WithiSCSI") == "1";
+ boolean fcoe = Linuxrc::InstallInf ("WithFCoE") == "1";
- if (! (Arch::s390() || iscsi)) {
+ if (! (Arch::s390() || iscsi || fcoe)) {
y2milestone ("Disabling disk activation module");
ProductControl::DisableModule ("disks_activate");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.21.1/src/inst_finish/copy_files_finish.ycp new/yast2-installation-2.21.3/src/inst_finish/copy_files_finish.ycp
--- old/yast2-installation-2.21.1/src/inst_finish/copy_files_finish.ycp 2010-04-26 15:20:53.000000000 +0200
+++ new/yast2-installation-2.21.3/src/inst_finish/copy_files_finish.ycp 2011-04-27 13:00:13.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: copy_files_finish.ycp 61719 2010-04-15 15:12:45Z locilka $
+ * $Id: copy_files_finish.ycp 63870 2011-04-27 11:00:10Z jsuchome $
*
*/
@@ -20,6 +20,7 @@
import "Linuxrc";
import "Installation";
import "Directory";
+import "Packages";
import "ProductControl";
import "FileUtils";
import "String";
@@ -168,6 +169,22 @@
)
);
+ // Copy /media.1/build to the installed system (fate#311377)
+ integer src_id = Packages::GetBaseSourceID();
+ string build_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/build");
+ if (build_file != nil)
+ {
+ y2milestone ("Copying /media.1/build file");
+ WFM::Execute (.local.bash,
+ sformat (
+ "/bin/cp '%1' '%2%3/' && /bin/chmod 0644 '%2%3/build'",
+ String::Quote (build_file),
+ String::Quote (Installation::destdir),
+ String::Quote (Directory::etcdir)
+ )
+ );
+ }
+
// List of files used as additional workflow definitions
CopyAllWorkflowFiles();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gnome-video-effects for openSUSE:Factory
checked in at Thu Apr 28 15:11:30 CEST 2011.
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-video-effects/gnome-video-effects.changes 2011-04-26 20:42:21.000000000 +0200
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Fri Mar 4 22:31:01 UTC 2011 - adam(a)mizerski.pl
+
+- New package, based on version 0.2.0.
+
calling whatdependson for head-i586
New:
----
gnome-video-effects-0.2.0.tar.bz2
gnome-video-effects.changes
gnome-video-effects.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-video-effects.spec ++++++
#
# spec file for package gnome-video-effects
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: gnome-video-effects
Version: 0.2.0
Release: 1
License: GPLv2+
Summary: Collection of GStreamer effects
Url: http://live.gnome.org/GnomeVideoEffects
Group: Productivity/Multimedia/Other
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-video-effects/0.2/%{name}-%{ve…
BuildRequires: intltool
BuildRequires: pkg-config
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
A collection of GStreamer effects to be used in different GNOME Modules.
%package devel
License: GPLv2+
Summary: Collection of GStreamer effects -- Development Files
Group: Development/Tools/Other
Requires: %{name} = %{version}
%description devel
A collection of GStreamer effects to be used in different GNOME Modules.
%prep
%setup -q
%build
%configure
make %{?_smp_mflags}
%install
%make_install
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_datadir}/%{name}/
%files devel
%defattr(-,root,root,-)
%{_datadir}/pkgconfig/%{name}.pc
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory
checked in at Thu Apr 28 14:57:49 CEST 2011.
--------
--- AUTO/all/arpwatch-ethercodes/arpwatch-ethercodes.changes 2011-04-21 11:40:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/arpwatch-ethercodes/arpwatch-ethercodes.changes 2011-04-28 13:40:07.000000000 +0200
@@ -2 +2 @@
-Thu Apr 21 11:40:10 CEST 2011 - autobuild(a)suse.de
+Thu Apr 28 13:40:07 CEST 2011 - autobuild(a)suse.de
@@ -4 +4 @@
-- automated update on 2011-04-21
+- automated update on 2011-04-28
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arpwatch-ethercodes.spec ++++++
--- /var/tmp/diff_new_pack.49AjPz/_old 2011-04-28 14:57:37.000000000 +0200
+++ /var/tmp/diff_new_pack.49AjPz/_new 2011-04-28 14:57:37.000000000 +0200
@@ -25,7 +25,7 @@
Group: Productivity/Networking/Diagnostic
AutoReqProv: on
Summary: Ethercodes Data for arpwatch
-Version: 2011.4.21
+Version: 2011.4.28
Release: 1
Source: http://standards.ieee.org/regauth/oui/oui.txt.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ oui.txt.bz2 ++++++
--- /var/tmp/diff_new_pack.49AjPz/_old 2011-04-28 14:57:37.000000000 +0200
+++ /var/tmp/diff_new_pack.49AjPz/_new 2011-04-28 14:57:37.000000000 +0200
@@ -31480,7 +31480,8 @@
00-13-69 (hex) Honda Electron Co., LED.
001369 (base 16) Honda Electron Co., LED.
- 2-14-1, Kyobashi
+ Kanematsu Building 3 Floor
+ 2-14-1, Kyobashi
Chuo-ku Tokyo 104-0031
JAPAN
@@ -66289,10 +66290,10 @@
GERMANY
GERMANY
-00-40-B3 (hex) PAR MICROSYSTEMS CORPORATION
-0040B3 (base 16) PAR MICROSYSTEMS CORPORATION
- 220 SENECA TURNPIKE
- NEW HARTFORD NY 13413-1191
+00-40-B3 (hex) ParTech Inc.
+0040B3 (base 16) ParTech Inc.
+ 8383 Seneca Turnpike
+ NEW HARTFORD NY 13413
UNITED STATES
00-40-B4 (hex) NEXTCOM K.K.
@@ -69969,6 +69970,12 @@
RUEIL MALMAISON 92848
FRANCE
+00-7F-28 (hex) Actiontec Electronics, Inc
+007F28 (base 16) Actiontec Electronics, Inc
+ 760 North Mary Ave
+ Sunnyvale CA 94085
+ UNITED STATES
+
00-80-00 (hex) MULTITECH SYSTEMS, INC.
008000 (base 16) MULTITECH SYSTEMS, INC.
2205 WOODALE DRIVE
@@ -81790,6 +81797,12 @@
Taipei 11493
TAIWAN, REPUBLIC OF CHINA
+0C-92-4E (hex) Rice Lake Weighing Systems
+0C924E (base 16) Rice Lake Weighing Systems
+ 230 West Coleman St
+ Rice Lake WI 54868
+ UNITED STATES
+
0C-A4-02 (hex) Alcatel Lucent IPD
0CA402 (base 16) Alcatel Lucent IPD
600 March Drive
@@ -83213,6 +83226,12 @@
Woffelsbach NRW 52152
GERMANY
+28-CF-DA (hex) Apple Inc
+28CFDA (base 16) Apple Inc
+ 1 infinite Loop
+ Cupertino CA 95014
+ UNITED STATES
+
28-E2-97 (hex) Shanghai InfoTM Microelectronics Co.,Ltd.
28E297 (base 16) Shanghai InfoTM Microelectronics Co.,Ltd.
building 11,NO.115,lane 572,BiBo Road,
@@ -84162,6 +84181,13 @@
Hemel Hempstead Herts HP2 4NW
UNITED KINGDOM
+40-04-0C (hex) A&T
+40040C (base 16) A&T
+ #411, Will Town, 402-3
+ Sang-Dong, Wonmi-Gu,
+ Bucheon-Si Gyeonggi-Do 420-814
+ KOREA, REPUBLIC OF
+
40-12-E4 (hex) Compass-EOS
4012E4 (base 16) Compass-EOS
7 Giborei Israel
@@ -84221,6 +84247,12 @@
Lund SE 221 88
SWEDEN
+40-2C-F4 (hex) Universal Global Scientific Industrial Co., Ltd.
+402CF4 (base 16) Universal Global Scientific Industrial Co., Ltd.
+ 141, Lane 351, Taiping Rd. Sec. 1, Tsao Tuen,
+ Nan-Tou Hsien, 542
+ TAIWAN, REPUBLIC OF CHINA
+
40-30-04 (hex) Apple, Inc.
403004 (base 16) Apple, Inc.
1 Infinite Loop
@@ -84234,6 +84266,12 @@
Seoul 138-950
KOREA, REPUBLIC OF
+40-3C-FC (hex) Apple Inc
+403CFC (base 16) Apple Inc
+ 1 infinite Loop
+ Cupertino CA 95014
+ UNITED STATES
+
40-40-22 (hex) ZIV
404022 (base 16) ZIV
Parque Tecnol�gico, 210
@@ -84344,6 +84382,12 @@
Pretoria Gauteng 0184
SOUTH AFRICA
+40-98-4E (hex) Texas Instruments
+40984E (base 16) Texas Instruments
+ 12500 TI Boulevard
+ Dallas TX 75243
+ UNITED STATES
+
40-98-7B (hex) Aisino Corporation
40987B (base 16) Aisino Corporation
No.18 A,Xingshikou Road,Haidian District,
@@ -84771,6 +84815,12 @@
Xindian City Taipei County 231
TAIWAN, REPUBLIC OF CHINA
+48-60-BC (hex) Apple Inc
+4860BC (base 16) Apple Inc
+ 1 infinite Loop
+ Cupertino CA 95014
+ UNITED STATES
+
48-6B-91 (hex) Fleetwood Group Inc.
486B91 (base 16) Fleetwood Group Inc.
11832 James St
@@ -84809,6 +84859,12 @@
Argenteuil 95100
FRANCE
+48-C8-62 (hex) Simo Wireless,Inc.
+48C862 (base 16) Simo Wireless,Inc.
+ 326#,Building 4,Zhongxing Industrial Park,Chuangye
+ Shenzhen Guangdong 518054
+ CHINA
+
48-C8-B6 (hex) SysTec GmbH
48C8B6 (base 16) SysTec GmbH
Ludwig-Erhard-Strasse 6
@@ -85139,6 +85195,13 @@
Carleton Place Ontario K7C4J4
CANADA
+50-8A-CB (hex) SHENZHEN MAXMADE TECHNOLOGY CO., LTD.
+508ACB (base 16) SHENZHEN MAXMADE TECHNOLOGY CO., LTD.
+ Building 3,No.5 Fuqiao Industrial Estate,
+ Qiaotou,Fuyong,Baoan District
+ Shenzhen Guangdong 518103
+ CHINA
+
50-93-4F (hex) Gradual Tecnologia Ltda.
50934F (base 16) Gradual Tecnologia Ltda.
Rod. Alkindar M. Junqueira, Km 34,2
@@ -87806,6 +87869,13 @@
Wald ZH 8636
SWITZERLAND
+80-47-31 (hex) Packet Design, Inc.
+804731 (base 16) Packet Design, Inc.
+ 2455 Augustine Drive
+ Suite 100
+ Santa Clara CA 95054
+ UNITED STATES
+
80-4F-58 (hex) ThinkEco, Inc.
804F58 (base 16) ThinkEco, Inc.
303 Fifth Avenue
@@ -88355,8 +88425,8 @@
Beiijng 102613
CHINA
-8C-64-0B (hex) BS Storitve d.o.o.
-8C640B (base 16) BS Storitve d.o.o.
+8C-64-0B (hex) http://standards.ieee.org/about/bog/sppmt/target=%22_blank%22
+8C640B (base 16) http://standards.ieee.org/about/bog/sppmt/target=%22_blank%22
Trzaska cesta 515
Brezovica pri Ljubljani SI-1351
SLOVENIA
@@ -88446,6 +88516,12 @@
San Jose CA 95134
UNITED STATES
+8C-B8-64 (hex) AcSiP Technology Corp.
+8CB864 (base 16) AcSiP Technology Corp.
+ 3F., No.22, Dalin Rd.,
+ Taoyuan City 330
+ TAIWAN, REPUBLIC OF CHINA
+
8C-D6-28 (hex) Ikor Metering
8CD628 (base 16) Ikor Metering
Francisco Grandmontagne 4
@@ -88958,6 +89034,12 @@
Cupertino CA 95014
UNITED STATES
+98-0C-82 (hex) Samsung Electro Mechanics
+980C82 (base 16) Samsung Electro Mechanics
+ Metan Dong 314, Youngtong Gu
+ Suwon Kyung-gi Do. 443-743
+ KOREA, REPUBLIC OF
+
98-0E-E4 (hex) PRIVATE
980EE4 (base 16)
@@ -89607,6 +89689,13 @@
Mountain View CA 94041
UNITED STATES
+A4-4B-15 (hex) Sun Cupid Technology (HK) LTD
+A44B15 (base 16) Sun Cupid Technology (HK) LTD
+ Room 1201-3, 12/F., Tower 6
+ China Hong Kong City
+ Tsim Sha Tsui
+ HONG KONG
+
A4-50-55 (hex) busware.de
A45055 (base 16) busware.de
Loessnitzgrundstrasse 115a
@@ -90797,6 +90886,12 @@
Cupertino CA 95014
UNITED STATES
+B8-CD-A7 (hex) Maxeler Technologies Ltd.
+B8CDA7 (base 16) Maxeler Technologies Ltd.
+ 1 Down Place
+ London UK W6 9JH
+ UNITED KINGDOM
+
B8-D0-6F (hex) GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE
B8D06F (base 16) GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE
Rm 403, North of Software Building,Nansha IT Park,
@@ -91485,6 +91580,12 @@
Shenzhen Guandong 518057
CHINA
+C8-3E-99 (hex) Texas Instruments
+C83E99 (base 16) Texas Instruments
+ 12500 TI Boulevard
+ Dallas TX 75243
+ UNITED STATES
+
C8-3E-A7 (hex) KUNBUS GmbH
C83EA7 (base 16) KUNBUS GmbH
Heerweg 15A
@@ -93820,6 +93921,12 @@
Kowloon
HONG KONG
+F0-8B-FE (hex) COSTEL.,CO.LTD
+F08BFE (base 16) COSTEL.,CO.LTD
+ 223-39, Sangdaewon-Dong, Jungwon-Gu
+ Seongnam-si Kyunggi-Do 462-807
+ KOREA, REPUBLIC OF
+
F0-93-3A (hex) NxtConect
F0933A (base 16) NxtConect
Schillerstrasse 4
@@ -94084,6 +94191,12 @@
Vilnius LT-08221
LITHUANIA
+F4-94-61 (hex) NexGen Storage
+F49461 (base 16) NexGen Storage
+ 400 Centennial Blvd.
+ Louisville CO 80027
+ UNITED STATES
+
F4-9F-54 (hex) Samsung Electronics
F49F54 (base 16) Samsung Electronics
#94-1, Imsoo-Dong
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rfc for openSUSE:Factory
checked in at Thu Apr 28 14:57:27 CEST 2011.
--------
--- AUTO/all/rfc/rfc.changes 2011-04-21 12:42:11.000000000 +0200
+++ /mounts/work_src_done/STABLE/rfc/rfc.changes 2011-04-28 13:42:26.000000000 +0200
@@ -2 +2 @@
-Thu Apr 21 12:42:10 CEST 2011 - autobuild(a)suse.de
+Thu Apr 28 13:42:26 CEST 2011 - autobuild(a)suse.de
@@ -4 +4 @@
-- automated update on 2011-04-21
+- automated update on 2011-04-28
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rfc.spec ++++++
--- /var/tmp/diff_new_pack.MvNtRu/_old 2011-04-28 14:57:12.000000000 +0200
+++ /var/tmp/diff_new_pack.MvNtRu/_new 2011-04-28 14:57:12.000000000 +0200
@@ -25,7 +25,7 @@
Summary: The RFCs (Request For Comments)
Source: rfc.tgz
BuildArch: noarch
-Version: 2011.4.21
+Version: 2011.4.28
Release: 1
Url: ftp://ftp.isi.edu/in-notes
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ rfc.tgz ++++++
AUTO/all/rfc/rfc.tgz /mounts/work_src_done/STABLE/rfc/rfc.tgz differ: char 5, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gnome-themes-standard for openSUSE:Factory
checked in at Thu Apr 28 14:56:38 CEST 2011.
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-themes-standard/gnome-themes-standard.changes 2011-04-27 10:53:18.000000000 +0200
@@ -0,0 +1,87 @@
+-------------------------------------------------------------------
+Wed Apr 27 08:50:30 UTC 2011 - fcrozat(a)novell.com
+
+- Update to version 3.0.1:
+ + Reduce vertical padding for most of the common widgets,
+ requires GTK+ 3.0.9.
+
+-------------------------------------------------------------------
+Wed Apr 27 10:26:31 CEST 2011 - vuntz(a)opensuse.org
+
+- Move accessibility themes to a gnome-themes-accessibility
+ subpackage.
+
+-------------------------------------------------------------------
+Tue Apr 5 12:44:41 UTC 2011 - fcrozat(a)novell.com
+
+- Update to version 3.0.0:
+ + Don't propagate an 1px separator width to the whole toolbar
+ + Add icon-size property for NaTrayApplet
+- Add Conflicts to gnome-themes < 3.0.0 because of accessibility
+ themes.
+
+-------------------------------------------------------------------
+Mon Mar 28 17:50:31 UTC 2011 - fcrozat(a)novell.com
+
+- Update to version 2.91.93:
+ + Remove the dark theme variant for 3.0
+ + Fix gnome-terminal background
+- Changes from version 2.91.92.1:
+ + Theme fail whale dialog
+ + Add a dark Adwaita variant
+ + Add an inline toolbar style class
+ + Add a sidebar style class
+ + Fixes for insensitive state
+ + Fix focus ring on primary toolbars
+ + Tweak GTK2 theme colors
+ + Theme GtkScale marks
+ + Add an 1px spacing between scrollbar sliders and steppers
+ + Theme menu arrows
+ + Theme menu accelerators
+ + Tweak GtkSwitch theming
+ + Lots of tweaks for Fallback mode panel/applets
+- Changes from version 2.91.91.1:
+ + Add raised toolbar buttons
+ + Make focus ring match latest mockups
+ + Make active toolbar buttons match latest mockups
+ + Fix pane separators
+ + Properly align check/radio buttons
+ + Fix a typo to work correctly with GTK+ 3.0.3
+- Changes from version 2.91.91:
+ + Big revamp of the Adwaita engine to match 3.0 designs.
+- Accessibility themes are now in gnome-themes-standard package.
+
+-------------------------------------------------------------------
+Mon Feb 28 15:43:13 UTC 2011 - fcrozat(a)novell.com
+
+- Update to version 2.91.90.1:
+ + Fix appearance of check boxes
+- Changes from version 2.91.90:
+ + Don't hardcode Cantarell in the CSS file
+ + Miscellaneous rendering fixes
+ + Separate theme colors from the CSS
+ + Add a settings.ini file
+- Changes from version 2.91.8:
+ + Don't set background for evince background
+ + Remove gtkrc file for GTK+ 3.0
+ + Plain style for 'internal' toolbars
+- Changes from version 2.91.7:
+ + Improved resize grip rendering
+ + Fix gnome-terminal text colors
+ + Fix expander rendering +/- confusion
+ + Fix install location of the engine
+- Changes from version 2.91.5:
+ + Add Adwaita engine
+- Create subpackage for adwaita engine and remove
+ gtk3-theming-engine-clearlooks requires in
+ gtk3-metatheme-adwaita.
+- Add gtk3-devel BuildRequires and stop marking the main package as
+ noarch since we now have a arch-specific subpackage. Instead,
+ mark metatheme-adwaita-common, gtk2-metatheme-adwaita and
+ gtk3-metatheme-adwaita as noarch.
+
+-------------------------------------------------------------------
+Wed Dec 15 16:07:31 CET 2010 - vuntz(a)opensuse.org
+
+- New package (version 2.91.4).
+
calling whatdependson for head-i586
New:
----
gnome-themes-standard-3.0.1.tar.bz2
gnome-themes-standard.changes
gnome-themes-standard.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-themes-standard.spec ++++++
#
# spec file for package gnome-themes-standard
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: gnome-themes-standard
Summary: Standard GNOME Themes
Version: 3.0.1
Release: 1
License: LGPLv2.1+
Group: System/GUI/GNOME
Url: http://www.gnome.org
Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/2.91/%{name}-%…
BuildRequires: fdupes
BuildRequires: gtk3-devel
BuildRequires: intltool
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This packages contains the standard GNOME themes from GNOME 3 and
later.
%package -n metatheme-adwaita-common
Summary: Adwaita GNOME Theme -- Common Files
License: LGPLv2.1+
Group: System/GUI/GNOME
# We don't even recommend the lang package since there's actually no
# need for it.
#Recommends: %%{name}-lang
Suggests: gtk2-metatheme-adwaita
Suggests: gtk3-metatheme-adwaita
# this is really just to make the lang package installable
Provides: %{name} = %{version}
BuildArch: noarch
%description -n metatheme-adwaita-common
Adwaita is the default GNOME theme in GNOME 3.
%package -n gtk2-metatheme-adwaita
Summary: Adwaita GNOME Theme -- GTK+ 2 Support
License: LGPLv2.1+
Group: System/GUI/GNOME
# we need clearlooks
Requires: gtk2-engines
Requires: metatheme-adwaita-common = %{version}
Supplements: packageand(metatheme-adwaita-common:gtk2)
BuildArch: noarch
%description -n gtk2-metatheme-adwaita
Adwaita is the default GNOME theme in GNOME 3.
%package -n gtk3-metatheme-adwaita
Summary: Adwaita GNOME Theme -- GTK+ 3 Support
License: LGPLv2.1+
Group: System/GUI/GNOME
Requires: cantarell-fonts
Requires: gtk3-theming-engine-adwaita = %{version}
Requires: metatheme-adwaita-common = %{version}
Supplements: packageand(metatheme-adwaita-common:gtk3)
BuildArch: noarch
%description -n gtk3-metatheme-adwaita
Adwaita is the default GNOME theme in GNOME 3.
%package -n gtk3-theming-engine-adwaita
Summary: Adwaita GTK+ Theming Engine
License: LGPLv2.1+
Group: System/GUI/GNOME
%description -n gtk3-theming-engine-adwaita
Adwaita is the default GNOME theme in GNOME 3.
%package -n gnome-themes-accessibility
Summary: Accessibility GNOME Themes
License: LGPLv2.1+
Group: System/GUI/GNOME
Conflicts: gnome-themes < 3.0.0
BuildArch: noarch
%description -n gnome-themes-accessibility
This package contains high-contrast and low-contrast themes for GNOME.
%lang_package
%prep
%setup -q
%build
%configure
%__make %{?_smp_mflags}
%install
%makeinstall
%find_lang %{name}
%icon_theme_cache_create_ghost HighContrast
%icon_theme_cache_create_ghost HighContrastInverse
%icon_theme_cache_create_ghost LowContrast
%fdupes %{buildroot}%{_datadir}/icons/Adwaita/cursors/
%fdupes %{buildroot}%{_datadir}/icons/HighContrast/
%fdupes %{buildroot}%{_datadir}/icons/HighContrastInverse/
rm -f %{buildroot}%{_libdir}/gtk-3.0/*/theming-engines/*.la
%clean
rm -rf %{buildroot}
%post -n gnome-themes-accessibility
%icon_theme_cache_post HighContrast
%icon_theme_cache_post HighContrastInverse
%icon_theme_cache_post LowContrast
# No need for %%icon_theme_cache_postun in %%postun since the theme won't exist anymore
%files -n metatheme-adwaita-common
%defattr(-,root,root)
%doc COPYING NEWS
%dir %{_datadir}/icons/Adwaita
%dir %{_datadir}/themes/Adwaita
%dir %{_datadir}/gnome-background-properties
%{_datadir}/icons/Adwaita/cursors/
%{_datadir}/gnome-background-properties/adwaita.xml
%{_datadir}/themes/Adwaita/backgrounds/
%{_datadir}/themes/Adwaita/metacity-1/
%{_datadir}/themes/Adwaita/index.theme
%files -n gtk2-metatheme-adwaita
%defattr(-,root,root)
%{_datadir}/themes/Adwaita/gtk-2.0/
%files -n gtk3-metatheme-adwaita
%defattr(-,root,root)
%{_datadir}/themes/Adwaita/gtk-3.0/
%files -n gtk3-theming-engine-adwaita
%defattr(-,root,root)
%{_libdir}/gtk-3.0/3.0.0/theming-engines/libadwaita.so
%files -n gnome-themes-accessibility
%defattr(-,root,root)
%ghost %{_datadir}/icons/HighContrast/icon-theme.cache
%ghost %{_datadir}/icons/HighContrastInverse/icon-theme.cache
%ghost %{_datadir}/icons/LowContrast/icon-theme.cache
%{_datadir}/icons/HighContrast/
%{_datadir}/icons/HighContrastInverse/
%{_datadir}/icons/LowContrast/
%{_datadir}/themes/HighContrast/
%{_datadir}/themes/HighContrastInverse/
%{_datadir}/themes/LowContrast/
%files lang -f %{name}.lang
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0