March 2013 - openSUSE Commits - openSUSE Mailing Lists

commit mozilla-nspr for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package mozilla-nspr for openSUSE:Factory checked in at 2013-03-01 10:50:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozilla-nspr (Old) and /work/SRC/openSUSE:Factory/.mozilla-nspr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozilla-nspr", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/mozilla-nspr/mozilla-nspr.changes 2012-12-05 14:00:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mozilla-nspr.new/mozilla-nspr.changes 2013-03-01 10:50:42.000000000 +0100 @@ -1,0 +2,21 @@ +Thu Feb 28 22:56:59 UTC 2013 - wr(a)rosenauer.org + +- update to version 4.9.5 + * bmo#634793: define NSPR's exact-width integer types PRInt{N} and + PRUint{N} types to match the <stdint.h> exact-width integer types + int{N}_t and uint{N}_t. + * bmo#782815: passing 'int *' to parameter of type 'unsigned int *' + in setsockopt(). + * bmo#822932: Port bmo#802527 (NDK r8b support for x86) to NSPR. + * bmo#824742: NSPR shouldn't require librt on Android. + * bmo#831793: data race on lib->refCount in PR_UnloadLibrary. + +------------------------------------------------------------------- +Thu Feb 28 21:26:07 UTC 2013 - dmueller(a)suse.com + +- Add config-guess-sub-update.diff: + * update config.guess/sub for aarch64 support +- Add aarch64-support.patch: + * add support for aarch64 + +------------------------------------------------------------------- Old: ---- nspr-4.9.4.tar.bz2 New: ---- aarch64-support.patch config-guess-sub-update.diff nspr-4.9.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nspr.spec ++++++ --- /var/tmp/diff_new_pack.xUYjmM/_old 2013-03-01 10:50:44.000000000 +0100 +++ /var/tmp/diff_new_pack.xUYjmM/_new 2013-03-01 10:50:44.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package mozilla-nspr # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# 2006-2012 Wolfgang Rosenauer +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 2006-2013 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: mozilla-nspr -Version: 4.9.4 +Version: 4.9.5 Release: 0 Summary: Netscape Portable Runtime License: MPL-2.0 @@ -33,6 +33,8 @@ # Source: ftp://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/nspr-%{version}.tar… Source1: baselibs.conf +Patch0: config-guess-sub-update.diff +Patch1: aarch64-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +63,10 @@ %prep %setup -n nspr-%{version} -q +%patch0 +cd mozilla/nsprpub +%patch1 -p1 +cd - cd mozilla %build ++++++ aarch64-support.patch ++++++ --- a/pr/include/md/_linux.cfg +++ b/pr/include/md/_linux.cfg @@ -861,6 +861,59 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 +#elif defined(__aarch64__) + +#ifdef __AARCH64EB__ +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 +#elif defined(__AARCH64EL__) +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN +#else +#error "Unknown Aarch64 endianness." +#endif +#define IS_64 + +#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 8 +#define PR_BYTES_PER_FLOAT 4 +#define PR_BYTES_PER_DOUBLE 8 +#define PR_BYTES_PER_WORD 8 +#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 64 +#define PR_BITS_PER_FLOAT 32 +#define PR_BITS_PER_DOUBLE 64 +#define PR_BITS_PER_WORD 64 + +#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 6 +#define PR_BITS_PER_FLOAT_LOG2 5 +#define PR_BITS_PER_DOUBLE_LOG2 6 +#define PR_BITS_PER_WORD_LOG2 6 + +#define PR_ALIGN_OF_SHORT 2 +#define PR_ALIGN_OF_INT 4 +#define PR_ALIGN_OF_LONG 8 +#define PR_ALIGN_OF_INT64 8 +#define PR_ALIGN_OF_FLOAT 4 +#define PR_ALIGN_OF_DOUBLE 8 +#define PR_ALIGN_OF_POINTER 8 +#define PR_ALIGN_OF_WORD 8 + +#define PR_BYTES_PER_WORD_LOG2 3 +#define PR_BYTES_PER_DWORD_LOG2 3 + #else #error "Unknown CPU architecture" --- a/pr/include/md/_linux.h +++ b/pr/include/md/_linux.h @@ -53,6 +53,8 @@ #define _PR_SI_ARCHITECTURE "avr32" #elif defined(__m32r__) #define _PR_SI_ARCHITECTURE "m32r" +#elif defined(__aarch64__) +#define _PR_SI_ARCHITECTURE "aarch64" #else #error "Unknown CPU architecture" #endif @@ -186,7 +188,7 @@ }) #endif -#if defined(__arm__) +#if defined(__arm__) || defined(__aarch64__) #if defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) /* Use GCC built-in functions */ #define _PR_HAVE_ATOMIC_OPS @@ -242,6 +244,10 @@ #endif #endif /* __arm__ */ +#if defined(__aarch64__) +#define _MD_MINIMUM_STACK_SIZE 0x20000 +#endif + #define USE_SETJMP #if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(ANDROID) #define _PR_POLL_AVAILABLE ++++++ config-guess-sub-update.diff ++++++ ++++ 1615 lines (skipped) ++++++ nspr-4.9.4.tar.bz2 -> nspr-4.9.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/admin/repackage.sh new/nspr-4.9.5/mozilla/nsprpub/admin/repackage.sh --- old/nspr-4.9.4/mozilla/nsprpub/admin/repackage.sh 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/admin/repackage.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,179 +0,0 @@ -#! /bin/sh -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# ------------------------------------------------------------------ -# repackage.sh -- Repackage NSPR from /s/b/c to mozilla.org format -# -# syntax: repackage.sh -# -# Description: -# repackage.sh creates NSPR binary distributions for mozilla.org from -# the internal binary distributions in /share/builds/components/nspr20. -# There are reasons why we can't just push the internal binary distributions -# to mozilla.org. External developers prefer to use the common archive -# file format for their platforms, rather than the jar files we use internally. -# -# On Unix, we create a tar.gz file. On Windows, we create a zip file. -# For example: NSPR 4.1.1, these would be nspr-4.1.1.tar.gz and nspr-4.1.1.zip. -# -# When unpacked, nspr-4.1.1.tar.gz or nspr-4.1.1.zip should expand to a -# nspr-4.1.1 directory that contains three subdirectories: include, lib, -# and bin. The header files, with the correct line endings for the -# platform, are in nspr-4.1.1/include. The libraries are in nspr-4.1.1/lib. -# The executable programs are in nspr-4.1.1/bin. -# -# Note! Files written with Gnu tar are not readable by some non-Gnu -# versions. Sun, in particular. -# -# -# -# -# ------------------------------------------------------------------ - -FROMTOP=/share/builds/components/nspr20/v4.9.4 -TOTOP=./v4.9.4 -NSPRDIR=nspr-4.9.4 -SOURCETAG=NSPR_4_9_4_RTM - -# -# enumerate Unix object directories on /s/b/c -UNIX_OBJDIRS=" -HP-UXB.11.11_64_DBG.OBJ -HP-UXB.11.11_64_OPT.OBJ -HP-UXB.11.11_DBG.OBJ -HP-UXB.11.11_OPT.OBJ -HP-UXB.11.23_ia64_32_DBG.OBJ -HP-UXB.11.23_ia64_32_OPT.OBJ -HP-UXB.11.23_ia64_64_DBG.OBJ -HP-UXB.11.23_ia64_64_OPT.OBJ -Linux2.4_x86_glibc_PTH_DBG.OBJ -Linux2.4_x86_glibc_PTH_OPT.OBJ -Linux2.6_x86_64_glibc_PTH_DBG.OBJ -Linux2.6_x86_64_glibc_PTH_OPT.OBJ -Linux2.6_x86_glibc_PTH_DBG.OBJ -Linux2.6_x86_glibc_PTH_OPT.OBJ -SunOS5.9_64_DBG.OBJ -SunOS5.9_64_OPT.OBJ -SunOS5.9_DBG.OBJ -SunOS5.9_OPT.OBJ -" -# -# enumerate Windows object directories on /s/b/c -WIN_OBJDIRS=" -WIN954.0_DBG.OBJ -WIN954.0_DBG.OBJD -WIN954.0_OPT.OBJ -WINNT5.0_DBG.OBJ -WINNT5.0_DBG.OBJD -WINNT5.0_OPT.OBJ -" - -# -# Create the destination directory. -# -echo "removing directory $TOTOP" -rm -rf $TOTOP -echo "creating directory $TOTOP" -mkdir -p $TOTOP - -# -# Generate the tar.gz files for Unix platforms. -# -for OBJDIR in $UNIX_OBJDIRS; do - echo "removing directory $NSPRDIR" - rm -rf $NSPRDIR - echo "creating directory $NSPRDIR" - mkdir $NSPRDIR - - echo "creating directory $NSPRDIR/include" - mkdir $NSPRDIR/include - echo "copying $FROMTOP/$OBJDIR/include" - cp -r $FROMTOP/$OBJDIR/include $NSPRDIR - - echo "copying $FROMTOP/$OBJDIR/lib" - cp -r $FROMTOP/$OBJDIR/lib $NSPRDIR - - echo "copying $FROMTOP/$OBJDIR/bin" - cp -r $FROMTOP/$OBJDIR/bin $NSPRDIR - - echo "creating directory $TOTOP/$OBJDIR" - mkdir $TOTOP/$OBJDIR - echo "creating $TOTOP/$OBJDIR/$NSPRDIR.tar" - tar cvf $TOTOP/$OBJDIR/$NSPRDIR.tar $NSPRDIR - echo "gzipping $TOTOP/$OBJDIR/$NSPRDIR.tar" - gzip $TOTOP/$OBJDIR/$NSPRDIR.tar -done - -# -# Generate the zip files for Windows platforms. -# -for OBJDIR in $WIN_OBJDIRS; do - echo "removing directory $NSPRDIR" - rm -rf $NSPRDIR - echo "creating directory $NSPRDIR" - mkdir $NSPRDIR - - echo "creating directory $NSPRDIR/include" - mkdir $NSPRDIR/include - echo "creating directory $NSPRDIR/include/private" - mkdir $NSPRDIR/include/private - echo "creating directory $NSPRDIR/include/obsolete" - mkdir $NSPRDIR/include/obsolete - - # copy headers and adjust unix line-end to Windows line-end - # Note: Watch out for the "sed" command line. - # when editing the command, take care to preserve the "^M" as the literal - # cntl-M character! in vi, use "cntl-v cntl-m" to enter it! - # - headers=`ls $FROMTOP/$OBJDIR/include/*.h` - for header in $headers; do - sed -e 's/$/ /g' $header > $NSPRDIR/include/`basename $header` - done - headers=`ls $FROMTOP/$OBJDIR/include/obsolete/*.h` - for header in $headers; do - sed -e 's/$/ /g' $header > $NSPRDIR/include/obsolete/`basename $header` - done - headers=`ls $FROMTOP/$OBJDIR/include/private/*.h` - for header in $headers; do - sed -e 's/$/ /g' $header > $NSPRDIR/include/private/`basename $header` - done - - echo "copying $FROMTOP/$OBJDIR/lib" - cp -r $FROMTOP/$OBJDIR/lib $NSPRDIR - - echo "copying $FROMTOP/$OBJDIR/bin" - cp -r $FROMTOP/$OBJDIR/bin $NSPRDIR - - echo "creating directory $TOTOP/$OBJDIR" - mkdir -p $TOTOP/$OBJDIR - echo "creating $TOTOP/$OBJDIR/$NSPRDIR.zip" - zip -r $TOTOP/$OBJDIR/$NSPRDIR.zip $NSPRDIR -done - -# -# package the source from CVS -# -echo "Packaging source" -echo "removing directory $NSPRDIR" -rm -rf $NSPRDIR -echo "creating directory $NSPRDIR" -mkdir $NSPRDIR -myWD=`pwd` -cd $NSPRDIR -echo "Pulling source from CVS with tag $SOURCETAG" -cvs co -r $SOURCETAG mozilla/nsprpub -cd $myWD -mkdir $TOTOP/src -echo "Creating source tar file: $TOTOP/src/$NSPRDIR.tar" -tar cvf $TOTOP/src/$NSPRDIR.tar $NSPRDIR -echo "gzip $TOTOP/src/$NSPRDIR.tar" -gzip $TOTOP/src/$NSPRDIR.tar - -# -# Remove the working directory. -# -echo "removing directory $NSPRDIR" -rm -rf $NSPRDIR -# --- end repackage.sh --------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/config/prdepend.h new/nspr-4.9.5/mozilla/nsprpub/config/prdepend.h --- old/nspr-4.9.4/mozilla/nsprpub/config/prdepend.h 2012-07-24 10:48:27.000000000 +0200 +++ new/nspr-4.9.5/mozilla/nsprpub/config/prdepend.h 2013-02-02 16:53:23.000000000 +0100 @@ -10,3 +10,4 @@ */ #error "Do not include this header file." + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/configure new/nspr-4.9.5/mozilla/nsprpub/configure --- old/nspr-4.9.4/mozilla/nsprpub/configure 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/configure 2013-02-02 16:53:23.000000000 +0100 @@ -736,7 +736,7 @@ MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=9 -MOD_PATCH_VERSION=4 +MOD_PATCH_VERSION=5 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= @@ -878,7 +878,7 @@ android_tool_prefix="arm-linux-androideabi" ;; i?86-*android*) - android_tool_prefix="i686-android-linux" + android_tool_prefix="i686-linux-android" ;; mipsel-*android*) android_tool_prefix="mipsel-linux-android" @@ -973,6 +973,14 @@ fi fi + case "$target_cpu" in + i?86) + if ! test -e "$android_toolchain"/bin/"$android_tool_prefix"-gcc; then + android_tool_prefix="i686-android-linux" + fi + ;; + esac + AS="$android_toolchain"/bin/"$android_tool_prefix"-as CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc CXX="$android_toolchain"/bin/"$android_tool_prefix"-g++ @@ -1304,7 +1312,7 @@ # Extract the first word of "$WHOAMI whoami", so it can be a program name with args. set dummy $WHOAMI whoami; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1308: checking for $ac_word" >&5 +echo "configure:1316: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1376,13 +1384,13 @@ _SAVE_LDFLAGS="$LDFLAGS" echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 -echo "configure:1380: checking for $host compiler" >&5 +echo "configure:1388: checking for $host compiler" >&5 for ac_prog in $HOST_CC gcc cc /usr/ucb/cc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1386: checking for $ac_word" >&5 +echo "configure:1394: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1428,16 +1436,16 @@ LDFLAGS="$HOST_LDFLAGS" echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1432: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1440: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 cat > conftest.$ac_ext <<EOF -#line 1434 "configure" +#line 1442 "configure" #include "confdefs.h" int main() { return(0); ; return 0; } EOF -if { (eval echo configure:1441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6 else @@ -1472,7 +1480,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1476: checking for $ac_word" >&5 +echo "configure:1484: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1506,7 +1514,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1510: checking for $ac_word" >&5 +echo "configure:1518: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1536,7 +1544,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1540: checking for $ac_word" >&5 +echo "configure:1548: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1587,7 +1595,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1591: checking for $ac_word" >&5 +echo "configure:1599: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1619,7 +1627,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1623: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1631: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1630,12 +1638,12 @@ cat > conftest.$ac_ext << EOF -#line 1634 "configure" +#line 1642 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1661,12 +1669,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1665: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1673: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1670: checking whether we are using GNU C" >&5 +echo "configure:1678: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1675,7 +1683,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1694,7 +1702,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1698: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1706: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1731,7 +1739,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1735: checking for $ac_word" >&5 +echo "configure:1743: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1767,7 +1775,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1771: checking for $ac_word" >&5 +echo "configure:1779: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1799,7 +1807,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1803: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1811: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1810,12 +1818,12 @@ cat > conftest.$ac_ext << EOF -#line 1814 "configure" +#line 1822 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1841,12 +1849,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1845: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1853: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1850: checking whether we are using GNU C++" >&5 +echo "configure:1858: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1855,7 +1863,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1874,7 +1882,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1878: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1886: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1919,7 +1927,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1923: checking for $ac_word" >&5 +echo "configure:1931: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1954,7 +1962,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1958: checking for $ac_word" >&5 +echo "configure:1966: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1989,7 +1997,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1993: checking for $ac_word" >&5 +echo "configure:2001: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2024,7 +2032,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2028: checking for $ac_word" >&5 +echo "configure:2036: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2059,7 +2067,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2063: checking for $ac_word" >&5 +echo "configure:2071: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2094,7 +2102,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2098: checking for $ac_word" >&5 +echo "configure:2106: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2129,7 +2137,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2133: checking for $ac_word" >&5 +echo "configure:2141: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2159,7 +2167,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2163: checking for $ac_word" >&5 +echo "configure:2171: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2210,7 +2218,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2214: checking for $ac_word" >&5 +echo "configure:2222: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2242,7 +2250,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2246: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2254: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2253,12 +2261,12 @@ cat > conftest.$ac_ext << EOF -#line 2257 "configure" +#line 2265 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2284,12 +2292,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2288: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2296: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2293: checking whether we are using GNU C" >&5 +echo "configure:2301: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2298,7 +2306,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2317,7 +2325,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2321: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2329: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2357,7 +2365,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2361: checking for $ac_word" >&5 +echo "configure:2369: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2389,7 +2397,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2393: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2401: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2400,12 +2408,12 @@ cat > conftest.$ac_ext << EOF -#line 2404 "configure" +#line 2412 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2431,12 +2439,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2435: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2443: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:2440: checking whether we are using GNU C++" >&5 +echo "configure:2448: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2445,7 +2453,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -2464,7 +2472,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:2468: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2476: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2498,7 +2506,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2502: checking how to run the C preprocessor" >&5 +echo "configure:2510: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2513,13 +2521,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2517 "configure" +#line 2525 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2530,13 +2538,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2534 "configure" +#line 2542 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2547,13 +2555,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2551 "configure" +#line 2559 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2580,7 +2588,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2584: checking for $ac_word" >&5 +echo "configure:2592: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2612,7 +2620,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2616: checking for $ac_word" >&5 +echo "configure:2624: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2653,7 +2661,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2657: checking for $ac_word" >&5 +echo "configure:2665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2694,7 +2702,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2698: checking for $ac_word" >&5 +echo "configure:2706: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2735,7 +2743,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2739: checking for $ac_word" >&5 +echo "configure:2747: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2776,7 +2784,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2780: checking for $ac_word" >&5 +echo "configure:2788: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2844,7 +2852,7 @@ fi echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 -echo "configure:2848: checking for gcc -pipe support" >&5 +echo "configure:2856: checking for gcc -pipe support" >&5 if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then echo '#include <stdio.h>' > dummy-hello.c echo 'int main() { printf("Hello World\n"); return 0; }' >> dummy-hello.c @@ -2859,14 +2867,14 @@ _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -pipe" cat > conftest.$ac_ext <<EOF -#line 2863 "configure" +#line 2871 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:2870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else @@ -2896,16 +2904,16 @@ CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 -echo "configure:2900: checking whether C compiler supports -fprofile-generate" >&5 +echo "configure:2908: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <<EOF -#line 2902 "configure" +#line 2910 "configure" #include "confdefs.h" int main() { return 0; ; return 0; } EOF -if { (eval echo configure:2909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" @@ -2928,7 +2936,7 @@ if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 -echo "configure:2932: checking for visibility(hidden) attribute" >&5 +echo "configure:2940: checking for visibility(hidden) attribute" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2952,7 +2960,7 @@ EOF echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 -echo "configure:2956: checking for visibility pragma support" >&5 +echo "configure:2964: checking for visibility pragma support" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3005,7 +3013,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3009: checking for $ac_word" >&5 +echo "configure:3017: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3327,14 +3335,14 @@ _SAVE_CFLAGS="$CFLAGS" CFLAGS="$arch_flag" cat > conftest.$ac_ext <<EOF -#line 3331 "configure" +#line 3339 "configure" #include "confdefs.h" int main() { return sizeof(__thumb2__); ; return 0; } EOF -if { (eval echo configure:3338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* MOZ_THUMB2=1 else @@ -3396,16 +3404,16 @@ _SAVE_CFLAGS="$CFLAGS" CFLAGS="$all_flags" echo $ac_n "checking whether the chosen combination of compiler flags ($all_flags) works""... $ac_c" 1>&6 -echo "configure:3400: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 +echo "configure:3408: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 cat > conftest.$ac_ext <<EOF -#line 3402 "configure" +#line 3410 "configure" #include "confdefs.h" int main() { return 0; ; return 0; } EOF -if { (eval echo configure:3409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -3462,17 +3470,17 @@ DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 -echo "configure:3466: checking for sys/atomic_op.h" >&5 +echo "configure:3474: checking for sys/atomic_op.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3471 "configure" +#line 3479 "configure" #include "confdefs.h" #include <sys/atomic_op.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3629,7 +3637,7 @@ _DEBUG_FLAGS='-gdwarf-2 -O0' MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 -echo "configure:3633: checking for gethostbyaddr in -lbind" >&5 +echo "configure:3641: checking for gethostbyaddr in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3637,7 +3645,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 3641 "configure" +#line 3649 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3648,7 +3656,7 @@ gethostbyaddr() ; return 0; } EOF -if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3857,17 +3865,17 @@ fi ac_safe=`echo "crt_externs.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for crt_externs.h""... $ac_c" 1>&6 -echo "configure:3861: checking for crt_externs.h" >&5 +echo "configure:3869: checking for crt_externs.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3866 "configure" +#line 3874 "configure" #include "confdefs.h" #include <crt_externs.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4911,17 +4919,17 @@ _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000" ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 -echo "configure:4915: checking for machine/builtins.h" >&5 +echo "configure:4923: checking for machine/builtins.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4920 "configure" +#line 4928 "configure" #include "confdefs.h" #include <machine/builtins.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5480,7 +5488,7 @@ ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:5484: checking for dlopen in -ldl" >&5 +echo "configure:5492: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5488,7 +5496,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 5492 "configure" +#line 5500 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5499,7 +5507,7 @@ dlopen() ; return 0; } EOF -if { (eval echo configure:5503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5516,17 +5524,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:5520: checking for dlfcn.h" >&5 +echo "configure:5528: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5525 "configure" +#line 5533 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5559,13 +5567,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:5563: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:5571: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 5569 "configure" +#line 5577 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -5583,7 +5591,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 5587 "configure" +#line 5595 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -5609,12 +5617,12 @@ for ac_func in lchown strerror dladdr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5613: checking for $ac_func" >&5 +echo "configure:5621: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5618 "configure" +#line 5626 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5637,7 +5645,7 @@ ; return 0; } EOF -if { (eval echo configure:5641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5689,7 +5697,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5693: checking for $ac_word" >&5 +echo "configure:5701: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5748,7 +5756,7 @@ if test -z "$GNU_CC"; then echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 -echo "configure:5752: checking for +Olit support" >&5 +echo "configure:5760: checking for +Olit support" >&5 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5790,7 +5798,7 @@ *) echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:5794: checking for pthread_create in -lpthreads" >&5 +echo "configure:5802: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5812,7 +5820,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:5816: checking for pthread_create in -lpthread" >&5 +echo "configure:5824: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5834,7 +5842,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:5838: checking for pthread_create in -lc_r" >&5 +echo "configure:5846: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5856,7 +5864,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:5860: checking for pthread_create in -lc" >&5 +echo "configure:5868: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5974,7 +5982,7 @@ rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:5978: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:5986: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -5997,7 +6005,7 @@ ac_cv_have_dash_pthreads=no if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 -echo "configure:6001: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:6009: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -6582,7 +6590,7 @@ s%\]%\\&%g s%\$%$$%g EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' ' | tr '\015' ' '` # Manually modified for MKS support. +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` rm -f conftest.defs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/configure.in new/nspr-4.9.5/mozilla/nsprpub/configure.in --- old/nspr-4.9.4/mozilla/nsprpub/configure.in 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/configure.in 2013-02-02 16:53:23.000000000 +0100 @@ -15,7 +15,7 @@ dnl ======================================================== MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=9 -MOD_PATCH_VERSION=4 +MOD_PATCH_VERSION=5 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= @@ -127,7 +127,7 @@ android_tool_prefix="arm-linux-androideabi" ;; i?86-*android*) - android_tool_prefix="i686-android-linux" + android_tool_prefix="i686-linux-android" ;; mipsel-*android*) android_tool_prefix="mipsel-linux-android" @@ -221,6 +221,17 @@ fi fi + dnl Old NDK support. If minimum requirement is changed to NDK r8b, + dnl please remove this. + case "$target_cpu" in + i?86) + if ! test -e "$android_toolchain"/bin/"$android_tool_prefix"-gcc; then + dnl Old NDK toolchain name + android_tool_prefix="i686-android-linux" + fi + ;; + esac + dnl set up compilers AS="$android_toolchain"/bin/"$android_tool_prefix"-as CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/include/prinit.h new/nspr-4.9.5/mozilla/nsprpub/pr/include/prinit.h --- old/nspr-4.9.4/mozilla/nsprpub/pr/include/prinit.h 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/include/prinit.h 2013-02-02 16:53:23.000000000 +0100 @@ -31,10 +31,10 @@ ** The format of the version string is ** "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define PR_VERSION "4.9.4" +#define PR_VERSION "4.9.5" #define PR_VMAJOR 4 #define PR_VMINOR 9 -#define PR_VPATCH 4 +#define PR_VPATCH 5 #define PR_BETA PR_FALSE /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/include/prlong.h new/nspr-4.9.5/mozilla/nsprpub/pr/include/prlong.h --- old/nspr-4.9.4/mozilla/nsprpub/pr/include/prlong.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/include/prlong.h 2013-02-02 16:53:23.000000000 +0100 @@ -35,7 +35,7 @@ #if defined(HAVE_LONG_LONG) /* Keep this in sync with prtypes.h. */ -#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) +#if PR_BYTES_PER_LONG == 8 && !defined(PR_ALTERNATE_INT64_TYPEDEF) #define LL_MAXINT 9223372036854775807L #define LL_MININT (-LL_MAXINT - 1L) #define LL_ZERO 0L diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/include/prtypes.h new/nspr-4.9.5/mozilla/nsprpub/pr/include/prtypes.h --- old/nspr-4.9.4/mozilla/nsprpub/pr/include/prtypes.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/include/prtypes.h 2013-02-02 16:53:23.000000000 +0100 @@ -205,6 +205,36 @@ PR_BEGIN_EXTERN_C +/* +** Starting in NSPR 4.9.5, NSPR's exact-width integer types should match +** the exact-width integer types defined in <stdint.h>. This allows sloppy +** code to use PRInt{N} and int{N}_t interchangeably. +** +** The 8-bit and 16-bit integer types can only be defined using char and +** short. All platforms define the 32-bit integer types using int. So only +** the 64-bit integer types could be defined differently. +** +** NSPR's original strategy was to use the "shortest" 64-bit integer type: +** if long is 64-bit, then prefer it over long long. This strategy is also +** used by Linux/glibc, FreeBSD, and NetBSD. +** +** Other platforms use a different strategy: simply define the 64-bit +** integer types using long long. We define the PR_ALTERNATE_INT64_TYPEDEF +** macro on these platforms. Note that PR_ALTERNATE_INT64_TYPEDEF is for +** internal use by NSPR headers only. Do not define or test this macro in +** your code. +** +** NOTE: NSPR can't use <stdint.h> because C99 requires C++ code to define +** __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS to make all the macros +** defined in <stdint.h> available. This strange requirement is gone in +** C11. When most platforms ignore this C99 requirement, NSPR will be able +** to use <stdint.h>. A patch to do that is in NSPR bug 634793. +*/ + +#if defined(__APPLE__) || defined(__ANDROID__) || defined(__OpenBSD__) +#define PR_ALTERNATE_INT64_TYPEDEF +#endif + /************************************************************************ ** TYPES: PRUint8 ** PRInt8 @@ -331,12 +361,7 @@ ************************************************************************/ #ifdef HAVE_LONG_LONG /* Keep this in sync with prlong.h. */ -/* - * On 64-bit Mac OS X, uint64 needs to be defined as unsigned long long to - * match uint64_t, otherwise our uint64 typedef conflicts with the uint64 - * typedef in cssmconfig.h, which CoreServices.h includes indirectly. - */ -#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) +#if PR_BYTES_PER_LONG == 8 && !defined(PR_ALTERNATE_INT64_TYPEDEF) typedef long PRInt64; typedef unsigned long PRUint64; #define PR_INT64(x) x ## L diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/src/Makefile.in new/nspr-4.9.5/mozilla/nsprpub/pr/src/Makefile.in --- old/nspr-4.9.4/mozilla/nsprpub/pr/src/Makefile.in 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/src/Makefile.in 2013-02-02 16:53:23.000000000 +0100 @@ -118,7 +118,8 @@ endif endif -ifeq ($(OS_ARCH),Linux) +# Linux, GNU/Hurd, and GNU/kFreeBSD systems +ifneq (,$(filter Linux GNU%,$(OS_ARCH))) ifeq ($(USE_PTHREADS), 1) ifeq ($(OS_TARGET),Android) # Android has no libpthread.so in NDK @@ -129,8 +130,11 @@ else OS_LIBS = -ldl endif +ifneq ($(OS_TARGET),Android) +# Android has no librt - realtime functions are in libc OS_LIBS += -lrt endif +endif ifeq ($(OS_ARCH),HP-UX) ifeq ($(USE_PTHREADS), 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/src/linking/prlink.c new/nspr-4.9.5/mozilla/nsprpub/pr/src/linking/prlink.c --- old/nspr-4.9.4/mozilla/nsprpub/pr/src/linking/prlink.c 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/src/linking/prlink.c 2013-02-02 16:53:23.000000000 +0100 @@ -959,12 +959,19 @@ int result = 0; PRStatus status = PR_SUCCESS; - if ((lib == 0) || (lib->refCount <= 0)) { + if (lib == 0) { PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); return PR_FAILURE; } PR_EnterMonitor(pr_linker_lock); + + if (lib->refCount <= 0) { + PR_ExitMonitor(pr_linker_lock); + PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); + return PR_FAILURE; + } + if (--lib->refCount > 0) { PR_LOG(_pr_linker_lm, PR_LOG_MIN, ("%s decr => %d", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/src/pthreads/ptio.c new/nspr-4.9.5/mozilla/nsprpub/pr/src/pthreads/ptio.c --- old/nspr-4.9.4/mozilla/nsprpub/pr/src/pthreads/ptio.c 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/src/pthreads/ptio.c 2013-02-02 16:53:23.000000000 +0100 @@ -1150,7 +1150,7 @@ osfd = socket(AF_INET6, SOCK_STREAM, 0); if (osfd != -1) { int on; - int optlen = sizeof(on); + socklen_t optlen = sizeof(on); if (getsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, &on, &optlen) == 0) { _pr_ipv6_v6only_on_by_default = on; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.4/mozilla/nsprpub/pr/tests/vercheck.c new/nspr-4.9.5/mozilla/nsprpub/pr/tests/vercheck.c --- old/nspr-4.9.4/mozilla/nsprpub/pr/tests/vercheck.c 2012-11-30 13:50:46.000000000 +0100 +++ new/nspr-4.9.5/mozilla/nsprpub/pr/tests/vercheck.c 2013-02-02 16:53:23.000000000 +0100 @@ -20,10 +20,10 @@ #include <stdlib.h> /* - * This release (4.9.4) is backward compatible with the + * This release (4.9.5) 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.x, 4.9, 4.9.1, 4.9.2, and 4.9.3 releases. It, of course, - * is compatible with itself. + * 4.8.x, 4.9, 4.9.1, 4.9.2, 4.9.3, and 4.9.4 releases. + * It, of course, is compatible with itself. */ static char *compatible_version[] = { "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3", @@ -35,7 +35,7 @@ "4.7.6", "4.8", "4.8.1", "4.8.2", "4.8.3", "4.8.4", "4.8.5", "4.8.6", "4.8.7", "4.8.8", "4.8.9", - "4.9", "4.9.1", "4.9.2", "4.9.3", PR_VERSION + "4.9", "4.9.1", "4.9.2", "4.9.3", "4.9.4", PR_VERSION }; /* @@ -50,7 +50,7 @@ "3.0", "3.0.1", "3.1", "3.1.1", "3.1.2", "3.1.3", "3.5", "3.5.1", - "4.9.5", + "4.9.6", "4.10", "4.10.1", "10.0", "11.1", "12.14.20" }; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libproxy for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package libproxy for openSUSE:Factory checked in at 2013-03-01 10:49:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libproxy (Old) and /work/SRC/openSUSE:Factory/.libproxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libproxy", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libproxy/libproxy-plugins.changes 2012-12-07 14:41:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libproxy.new/libproxy-plugins.changes 2013-03-01 10:49:11.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 28 18:38:42 UTC 2013 - dmueller(a)suse.com + +- Remove mono support for aarch64 for now. + +------------------------------------------------------------------- libproxy.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libproxy-plugins.spec ++++++ --- /var/tmp/diff_new_pack.5VYspy/_old 2013-03-01 10:49:13.000000000 +0100 +++ /var/tmp/diff_new_pack.5VYspy/_new 2013-03-01 10:49:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libproxy-plugins # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -19,7 +19,7 @@ %define build_core_not_modules 0 %define build_mozjs 0 %if 0%{?suse_version} -%ifnarch %arm ppc64 +%ifnarch %arm ppc64 aarch64 %define have_mono 1 %else %define have_mono 0 ++++++ libproxy.spec ++++++ --- /var/tmp/diff_new_pack.5VYspy/_old 2013-03-01 10:49:13.000000000 +0100 +++ /var/tmp/diff_new_pack.5VYspy/_new 2013-03-01 10:49:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libproxy # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -19,7 +19,7 @@ %define build_core_not_modules 1 %define build_mozjs 0 %if 0%{?suse_version} -%ifnarch %arm ppc64 +%ifnarch %arm ppc64 aarch64 %define have_mono 1 %else %define have_mono 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libexpat0 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package libexpat0 for openSUSE:Factory checked in at 2013-03-01 10:48:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libexpat0 (Old) and /work/SRC/openSUSE:Factory/.libexpat0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libexpat0", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libexpat0/libexpat0.changes 2012-03-26 14:01:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libexpat0.new/libexpat0.changes 2013-03-01 10:48:58.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Feb 28 15:08:39 UTC 2013 - cfarrell(a)suse.com + +- license update: MIT and Apache-2.0 + No relevant GPL-2.0 files found + +------------------------------------------------------------------- +Thu Feb 28 06:04:35 UTC 2013 - coolo(a)suse.com + +- update license to new format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libexpat0.spec ++++++ --- /var/tmp/diff_new_pack.u4ludH/_old 2013-03-01 10:48:59.000000000 +0100 +++ /var/tmp/diff_new_pack.u4ludH/_new 2013-03-01 10:48:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libexpat0 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -14,12 +14,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: libexpat0 Version: 1.95.8 Release: 0 Url: http://expat.sourceforge.net/ Summary: XML Parser Toolkit -License: GPL-2.0+ ; Apache-2.0 ; MIT +License: MIT and Apache-2.0 Group: Development/Libraries/C and C++ Source0: expat-%{version}.tar.bz2 Source1: baselibs.conf -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package kiwi for openSUSE:12.3 checked in at 2013-03-01 10:48:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/kiwi (Old) and /work/SRC/openSUSE:12.3/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/kiwi/kiwi.changes 2013-03-01 07:23:43.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.kiwi.new/kiwi.changes 2013-03-01 10:48:50.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 1 09:30:20 CET 2013 - ms(a)suse.de + +- v5.04.57 released + +------------------------------------------------------------------- +Fri Mar 1 09:29:29 CET 2013 - ms(a)suse.de + +- fixed grub2 setup for older distros which packages into lib/grub2-efi + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.878dYy/_old 2013-03-01 10:48:52.000000000 +0100 +++ /var/tmp/diff_new_pack.878dYy/_new 2013-03-01 10:48:52.000000000 +0100 @@ -26,7 +26,7 @@ Summary: openSUSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.04.56 +Version: 5.04.57 Release: 0 # requirements to build packages BuildRequires: e2fsprogs ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2013-02-21 15:51:36.000000000 +0100 +++ new/kiwi/.revision 2013-02-21 15:51:36.000000000 +0100 @@ -1 +1 @@ -a3bdf56b57a7da45ec3c0b1a317ad7a197a1efa4 +a4f7b2026b3f3a6dd0ae78b97c3419e160869720 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2013-02-27 23:54:12.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2013-03-01 09:57:40.000000000 +0100 @@ -3302,15 +3302,16 @@ my $unzip = "$zipper -cd $initrd 2>&1"; my %stages = (); my $test = "cat $initrd"; - my $grub = 'grub2-efi'; + my $grub_bios= 'grub2'; + my $grub_efi = 'grub2'; my $lib = 'lib'; if ($zipped) { $test = $unzip; } $status = qxx ("$test | cpio -it --quiet | grep -q lib/grub2-efi 2>&1"); $result = $? >> 8; - if ($result != 0) { - $grub = 'grub2'; + if ($result == 0) { + $grub_efi = 'grub2-efi'; } $status = qxx ("$test | cpio -it --quiet | grep -q lib64/efi 2>&1"); $result = $? >> 8; @@ -3327,12 +3328,12 @@ #========================================== # Stage files #------------------------------------------ - $stages{bios}{initrd} = "'usr/lib/$grub/$grubpc/*'"; - $stages{bios}{stageSRC} = "/usr/lib/$grub/$grubpc"; + $stages{bios}{initrd} = "'usr/lib/$grub_bios/$grubpc/*'"; + $stages{bios}{stageSRC} = "/usr/lib/$grub_bios/$grubpc"; $stages{bios}{stageDST} = "/boot/grub2/$grubpc"; if (($firmware eq "efi") || ($firmware eq "uefi")) { - $stages{efi}{initrd} = "'usr/lib/$grub/$efipc/*'"; - $stages{efi}{stageSRC} = "/usr/lib/$grub/$efipc"; + $stages{efi}{initrd} = "'usr/lib/$grub_efi/$efipc/*'"; + $stages{efi}{stageSRC} = "/usr/lib/$grub_efi/$efipc"; $stages{efi}{stageDST} = "/boot/grub2-efi/$efipc"; } if ($firmware eq "uefi") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2013-02-28 12:43:42.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2013-03-01 09:57:40.000000000 +0100 @@ -934,7 +934,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.04.56"; + $data{Version} = "5.04.57"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2013-03-01 10:48:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2013-03-01 07:23:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2013-03-01 10:48:44.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 1 09:30:20 CET 2013 - ms(a)suse.de + +- v5.04.57 released + +------------------------------------------------------------------- +Fri Mar 1 09:29:29 CET 2013 - ms(a)suse.de + +- fixed grub2 setup for older distros which packages into lib/grub2-efi + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.1gkQKr/_old 2013-03-01 10:48:47.000000000 +0100 +++ /var/tmp/diff_new_pack.1gkQKr/_new 2013-03-01 10:48:47.000000000 +0100 @@ -26,7 +26,7 @@ Summary: openSUSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.04.56 +Version: 5.04.57 Release: 0 # requirements to build packages BuildRequires: e2fsprogs ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2013-02-21 15:51:36.000000000 +0100 +++ new/kiwi/.revision 2013-02-21 15:51:36.000000000 +0100 @@ -1 +1 @@ -a3bdf56b57a7da45ec3c0b1a317ad7a197a1efa4 +a4f7b2026b3f3a6dd0ae78b97c3419e160869720 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2013-02-27 23:54:12.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2013-03-01 09:57:40.000000000 +0100 @@ -3302,15 +3302,16 @@ my $unzip = "$zipper -cd $initrd 2>&1"; my %stages = (); my $test = "cat $initrd"; - my $grub = 'grub2-efi'; + my $grub_bios= 'grub2'; + my $grub_efi = 'grub2'; my $lib = 'lib'; if ($zipped) { $test = $unzip; } $status = qxx ("$test | cpio -it --quiet | grep -q lib/grub2-efi 2>&1"); $result = $? >> 8; - if ($result != 0) { - $grub = 'grub2'; + if ($result == 0) { + $grub_efi = 'grub2-efi'; } $status = qxx ("$test | cpio -it --quiet | grep -q lib64/efi 2>&1"); $result = $? >> 8; @@ -3327,12 +3328,12 @@ #========================================== # Stage files #------------------------------------------ - $stages{bios}{initrd} = "'usr/lib/$grub/$grubpc/*'"; - $stages{bios}{stageSRC} = "/usr/lib/$grub/$grubpc"; + $stages{bios}{initrd} = "'usr/lib/$grub_bios/$grubpc/*'"; + $stages{bios}{stageSRC} = "/usr/lib/$grub_bios/$grubpc"; $stages{bios}{stageDST} = "/boot/grub2/$grubpc"; if (($firmware eq "efi") || ($firmware eq "uefi")) { - $stages{efi}{initrd} = "'usr/lib/$grub/$efipc/*'"; - $stages{efi}{stageSRC} = "/usr/lib/$grub/$efipc"; + $stages{efi}{initrd} = "'usr/lib/$grub_efi/$efipc/*'"; + $stages{efi}{stageSRC} = "/usr/lib/$grub_efi/$efipc"; $stages{efi}{stageDST} = "/boot/grub2-efi/$efipc"; } if ($firmware eq "uefi") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2013-02-28 12:43:42.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2013-03-01 09:57:40.000000000 +0100 @@ -934,7 +934,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.04.56"; + $data{Version} = "5.04.57"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2013-03-01 10:48:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2013-02-23 08:08:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2013-03-01 10:48:30.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Feb 28 16:03:32 UTC 2013 - wbauer(a)tmo.at + +- Change default Bootmanager to "Grub2" in kdmrc (bnc#788867) + +------------------------------------------------------------------- +Thu Feb 28 04:06:11 UTC 2013 - crrodriguez(a)opensuse.org + +- Add powerdevil-logind.patch, allows powerdevil to + interact properly with systemd-logind + (https://git.reviewboard.kde.org/r/108407) + +------------------------------------------------------------------- New: ---- powerdevil-logind.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.PA1pq4/_old 2013-03-01 10:48:33.000000000 +0100 +++ /var/tmp/diff_new_pack.PA1pq4/_new 2013-03-01 10:48:33.000000000 +0100 @@ -125,6 +125,8 @@ # Downside is that ConsoleKit is no longer supported and requires that NetworkManager and PolKit # are also both build with systemd support. Not activated at the moment due to sysvinit fallback!! Patch214: workspace_systemd_initial_support.patch +#PATCH-FIX-OPENSUSE (?) Make powerdevil understand/talk with systemd-logind +Patch215: powerdevil-logind.patch %endif # Patch from Fedora to enable plymouth support in KDM. # Patch is based on the changes within GDM to detect running plymouth @@ -385,6 +387,7 @@ %patch213 -p1 %if %{with_systemd} %patch214 -p1 +%patch215 -p1 %endif %patch400 -p0 %patch401 -p1 ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.PA1pq4/_old 2013-03-01 10:48:34.000000000 +0100 +++ /var/tmp/diff_new_pack.PA1pq4/_new 2013-03-01 10:48:34.000000000 +0100 @@ -128,7 +128,7 @@ Burg/BO_BURG: Burg boot manager Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only) -Default: None -+Default: Grub ++Default: Grub2 User: core User: greeter Instance: #Grub ++++++ powerdevil-logind.patch ++++++ diff --git a/powerdevil/daemon/BackendConfig.cmake b/powerdevil/daemon/BackendConfig.cmake index 5dbe6f6..5344925 100644 --- a/powerdevil/daemon/BackendConfig.cmake +++ b/powerdevil/daemon/BackendConfig.cmake @@ -9,6 +9,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/backends/upower set(powerdevilupowerbackend_SRCS backends/upower/upowersuspendjob.cpp + backends/upower/login1suspendjob.cpp backends/upower/powerdevilupowerbackend.cpp backends/upower/xrandrbrightness.cpp ) diff --git a/powerdevil/daemon/backends/upower/login1suspendjob.h b/powerdevil/daemon/backends/upower/login1suspendjob.h new file mode 100644 index 0000000..c7e33ba --- /dev/null +++ b/powerdevil/daemon/backends/upower/login1suspendjob.h @@ -0,0 +1,54 @@ +/* This file is part of the KDE project + Copyright (C) 2006 Kevin Ottens <ervin(a)kde.org> + Copyright (C) 2010 Alejandro Fiestas <alex(a)eyeos.org> + Copyright (C) 2013 Lukáš Tinkl <ltinkl(a)redhat.com> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + +*/ + +#ifndef LOGIN1SUSPENDJOB_H +#define LOGIN1SUSPENDJOB_H + +#include <kjob.h> +#include <QtDBus/QDBusInterface> +#include <QtDBus/QDBusMessage> +#include <QtDBus/QDBusPendingCallWatcher> + +#include "powerdevilbackendinterface.h" + +class Login1SuspendJob : public KJob +{ + Q_OBJECT +public: + Login1SuspendJob(QDBusInterface *login1Interface, + PowerDevil::BackendInterface::SuspendMethod method, + PowerDevil::BackendInterface::SuspendMethods supported); + virtual ~Login1SuspendJob(); + + void start(); + void kill(bool quietly); + +private Q_SLOTS: + void doStart(); + void sendResult(QDBusPendingCallWatcher* watcher); + +private: + QDBusInterface *m_login1Interface; + PowerDevil::BackendInterface::SuspendMethod m_method; + PowerDevil::BackendInterface::SuspendMethods m_supported; +}; + +#endif //LOGIN1SUSPENDJOB_H diff --git a/powerdevil/daemon/backends/upower/login1suspendjob.cpp b/powerdevil/daemon/backends/upower/login1suspendjob.cpp new file mode 100644 index 0000000..3ec0ddc --- /dev/null +++ b/powerdevil/daemon/backends/upower/login1suspendjob.cpp @@ -0,0 +1,99 @@ +/* This file is part of the KDE project + Copyright (C) 2006 Kevin Ottens <ervin(a)kde.org> + Copyright (C) 2010 Alejandro Fiestas <alex(a)eyeos.org> + Copyright (C) 2013 Lukáš Tinkl <ltinkl(a)redhat.com> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + +*/ + +#include "login1suspendjob.h" + +#include <QtDBus/QDBusMessage> +#include <QtDBus/QDBusReply> +#include <QTimer> +#include <KDebug> +#include <KLocale> + +Login1SuspendJob::Login1SuspendJob(QDBusInterface *login1Interface, + PowerDevil::BackendInterface::SuspendMethod method, + PowerDevil::BackendInterface::SuspendMethods supported) + : KJob(), m_login1Interface(login1Interface) +{ + kDebug() << "Starting Login1 suspend job"; + m_method = method; + m_supported = supported; +} + +Login1SuspendJob::~Login1SuspendJob() +{ + +} + +void Login1SuspendJob::start() +{ + QTimer::singleShot(0, this, SLOT(doStart())); +} + +void Login1SuspendJob::kill(bool /*quietly */) +{ + +} + +void Login1SuspendJob::doStart() +{ + if (m_supported & m_method) + { + QVariantList args; + args << true; // interactive, ie. with polkit dialogs + + QDBusPendingReply<void> reply; + QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this); + connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(sendResult(QDBusPendingCallWatcher*))); + + switch(m_method) + { + case PowerDevil::BackendInterface::ToRam: + reply = m_login1Interface->asyncCallWithArgumentList("Suspend", args); + break; + case PowerDevil::BackendInterface::ToDisk: + reply = m_login1Interface->asyncCallWithArgumentList("Hibernate", args); + break; + case PowerDevil::BackendInterface::HybridSuspend: + reply = m_login1Interface->asyncCallWithArgumentList("HybridSleep", args); + break; + default: + kDebug() << "Unsupported suspend method"; + setError(1); + setErrorText(i18n("Unsupported suspend method")); + break; + } + } +} + +void Login1SuspendJob::sendResult(QDBusPendingCallWatcher *watcher) +{ + const QDBusPendingReply<void> reply = *watcher; + if (!reply.isError()) { + emitResult(); + } else { + kWarning() << "Failed to start suspend job" << reply.error().name() << reply.error().message(); + } + + watcher->deleteLater(); +} + + +#include "login1suspendjob.moc" diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.h b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.h index ba942bd..ae3d754 100644 --- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.h +++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.h @@ -34,6 +34,7 @@ #include "upower_kbdbacklight_interface.h" #define UPOWER_SERVICE "org.freedesktop.UPower" +#define LOGIN1_SERVICE "org.freedesktop.login1" class XRandrBrightness; @@ -63,6 +64,7 @@ private slots: void slotDeviceRemoved(const QString &); void slotDeviceChanged(const QString &); void slotPropertyChanged(); + void slotLogin1Resuming(bool active); private: // upower devices @@ -74,6 +76,9 @@ private: OrgFreedesktopUPowerInterface *m_upowerInterface; OrgFreedesktopUPowerKbdBacklightInterface *m_kbdBacklight; + // login1 interface + QWeakPointer<QDBusInterface> m_login1Interface; + // buttons bool m_lidIsPresent; bool m_lidIsClosed; diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp index 97a409b..f9503b3 100644 --- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp +++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp @@ -2,7 +2,7 @@ Copyright (C) 2006 Kevin Ottens <ervin(a)kde.org> Copyright (C) 2008-2010 Dario Freddi <drf(a)kde.org> Copyright (C) 2010 Alejandro Fiestas <alex(a)eyeos.org> - Copyright (C) 2010 Lukas Tinkl <ltinkl(a)redhat.com> + Copyright (C) 2010-2013 Lukáš Tinkl <ltinkl(a)redhat.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -31,6 +31,7 @@ #include "xrandrbrightness.h" #include "upowersuspendjob.h" +#include "login1suspendjob.h" #define HELPER_ID "org.kde.powerdevil.backlighthelper" @@ -39,6 +40,7 @@ PowerDevilUPowerBackend::PowerDevilUPowerBackend(QObject* parent) m_brightnessControl(0), m_lidIsPresent(false), m_lidIsClosed(false), m_onBattery(false) { + } PowerDevilUPowerBackend::~PowerDevilUPowerBackend() @@ -80,11 +82,19 @@ bool PowerDevilUPowerBackend::isAvailable() void PowerDevilUPowerBackend::init() { // interfaces + if (!QDBusConnection::systemBus().interface()->isServiceRegistered(LOGIN1_SERVICE)) { + // Activate it. + QDBusConnection::systemBus().interface()->startService(LOGIN1_SERVICE); + } + if (!QDBusConnection::systemBus().interface()->isServiceRegistered(UPOWER_SERVICE)) { // Activate it. QDBusConnection::systemBus().interface()->startService(UPOWER_SERVICE); } + if (QDBusConnection::systemBus().interface()->isServiceRegistered(LOGIN1_SERVICE)) { + m_login1Interface = new QDBusInterface(LOGIN1_SERVICE, "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::systemBus(), this); + } m_upowerInterface = new OrgFreedesktopUPowerInterface(UPOWER_SERVICE, "/org/freedesktop/UPower", QDBusConnection::systemBus(), this); m_kbdBacklight = new OrgFreedesktopUPowerKbdBacklightInterface(UPOWER_SERVICE, "/org/freedesktop/UPower/KbdBacklight", QDBusConnection::systemBus(), this); m_brightnessControl = new XRandrBrightness(); @@ -113,7 +123,22 @@ void PowerDevilUPowerBackend::init() // Supported suspend methods SuspendMethods supported = UnknownSuspendMethod; - { + if (m_login1Interface) { + QDBusPendingReply<QString> canSuspend = m_login1Interface.data()->asyncCall("CanSuspend"); + canSuspend.waitForFinished(); + if (canSuspend.isValid() && (canSuspend.value() == "yes" || canSuspend.value() == "challenge")) + supported |= ToRam; + + QDBusPendingReply<QString> canHibernate = m_login1Interface.data()->asyncCall("CanHibernate"); + canHibernate.waitForFinished(); + if (canHibernate.isValid() && (canHibernate.value() == "yes" || canHibernate.value() == "challenge")) + supported |= ToDisk; + + QDBusPendingReply<QString> canHybridSleep = m_login1Interface.data()->asyncCall("CanHybridSleep"); + canHybridSleep.waitForFinished(); + if (canHybridSleep.isValid() && (canHybridSleep.value() == "yes" || canHybridSleep.value() == "challenge")) + supported |= HybridSuspend; + } else { if (m_upowerInterface->canSuspend() && m_upowerInterface->SuspendAllowed()) { kDebug() << "Can suspend"; supported |= ToRam; @@ -125,7 +150,16 @@ void PowerDevilUPowerBackend::init() } } - connect(m_upowerInterface, SIGNAL(Resuming()), this, SIGNAL(resumeFromSuspend())); + // "resuming" signal + QDBusInterface systemdIface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", + QDBusConnection::systemBus(), this); + int version = systemdIface.property("Version").toString().section(' ', 1).toInt(); + + if (m_login1Interface && version > 197) { + connect(m_login1Interface.data(), SIGNAL(PrepareForSleep(bool)), this, SLOT(slotLogin1Resuming(bool))); + } else { + connect(m_upowerInterface, SIGNAL(Resuming()), this, SIGNAL(resumeFromSuspend())); + } // battery QList<RecallNotice> recallList; @@ -246,7 +280,11 @@ bool PowerDevilUPowerBackend::setBrightness(float brightnessValue, PowerDevil::B KJob* PowerDevilUPowerBackend::suspend(PowerDevil::BackendInterface::SuspendMethod method) { - return new UPowerSuspendJob(m_upowerInterface, method, supportedSuspendMethods()); + if (m_login1Interface) { + return new Login1SuspendJob(m_login1Interface.data(), method, supportedSuspendMethods()); + } else { + return new UPowerSuspendJob(m_upowerInterface, method, supportedSuspendMethods()); + } } void PowerDevilUPowerBackend::enumerateDevices() @@ -337,4 +375,11 @@ void PowerDevilUPowerBackend::slotPropertyChanged() m_onBattery = onBattery; } +void PowerDevilUPowerBackend::slotLogin1Resuming(bool active) +{ + if (!active) { + emit resumeFromSuspend(); + } +} + #include "powerdevilupowerbackend.moc" diff --git a/powerdevil/daemon/backends/upower/upowersuspendjob.h b/powerdevil/daemon/backends/upower/upowersuspendjob.h index bbe2f45..aac4b12 100644 --- a/powerdevil/daemon/backends/upower/upowersuspendjob.h +++ b/powerdevil/daemon/backends/upower/upowersuspendjob.h @@ -25,7 +25,7 @@ #include <QtDBus/QDBusInterface> #include <QtDBus/QDBusMessage> -#include "powerdevilupowerbackend.h" +#include "powerdevilbackendinterface.h" class OrgFreedesktopUPowerInterface; @@ -34,8 +34,8 @@ class UPowerSuspendJob : public KJob Q_OBJECT public: UPowerSuspendJob(OrgFreedesktopUPowerInterface *upowerInterface, - PowerDevil::BackendInterface::SuspendMethod method, - PowerDevil::BackendInterface::SuspendMethods supported); + PowerDevil::BackendInterface::SuspendMethod method, + PowerDevil::BackendInterface::SuspendMethods supported); virtual ~UPowerSuspendJob(); void start(); diff --git a/powerdevil/daemon/backends/upower/upowersuspendjob.cpp b/powerdevil/daemon/backends/upower/upowersuspendjob.cpp index 536a7e1..08a850a 100644 --- a/powerdevil/daemon/backends/upower/upowersuspendjob.cpp +++ b/powerdevil/daemon/backends/upower/upowersuspendjob.cpp @@ -25,7 +25,6 @@ #include <QtDBus/QDBusMessage> #include <QtDBus/QDBusReply> #include <QTimer> -#include <KConfig> #include <KDebug> #include <KLocale> @@ -34,7 +33,7 @@ UPowerSuspendJob::UPowerSuspendJob(OrgFreedesktopUPowerInterface *upowerInterfac PowerDevil::BackendInterface::SuspendMethods supported) : KJob(), m_upowerInterface(upowerInterface) { - kDebug() << "Stancing Suspend job"; + kDebug() << "Starting UPower suspend job"; m_method = method; m_supported = supported; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit flac for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package flac for openSUSE:Factory checked in at 2013-03-01 10:47:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flac (Old) and /work/SRC/openSUSE:Factory/.flac.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flac", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/flac/flac.changes 2012-12-19 10:54:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.flac.new/flac.changes 2013-03-01 10:47:57.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 28 16:07:33 UTC 2013 - seife+obs(a)b1-systems.com + +- add flac-1.2.1-automake1_13.patch, fix build with automake-1.13.1 + +------------------------------------------------------------------- New: ---- flac-1.2.1-automake1_13.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flac.spec ++++++ --- /var/tmp/diff_new_pack.UsrkDc/_old 2013-03-01 10:47:58.000000000 +0100 +++ /var/tmp/diff_new_pack.UsrkDc/_new 2013-03-01 10:47:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package flac # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -42,6 +42,7 @@ Patch1: flac-ocloexec.patch Patch2: flac-openssl.patch Patch3: flac-fix-pkgconfig.patch +Patch4: flac-1.2.1-automake1_13.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -82,6 +83,7 @@ %patch1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build touch config.rpath ++++++ flac-1.2.1-automake1_13.patch ++++++ Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac @@ -40,11 +40,11 @@ AC_SYS_LARGEFILE AC_FUNC_FSEEKO AC_CHECK_SIZEOF(void*,0) AC_SEARCH_LIBS([lround],[m], [AC_DEFINE(HAVE_LROUND,1,lround support)]) #@@@ new name is AC_CONFIG_HEADERS -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AC_LANG_PUSH(C++) # c++ flavor first AC_C_VARARRAYS if test $ac_cv_c_vararrays = yes; then -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit branding-openSUSE for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:12.3 checked in at 2013-03-01 10:47:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/branding-openSUSE (Old) and /work/SRC/openSUSE:12.3/.branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "branding-openSUSE", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/branding-openSUSE/branding-openSUSE.changes 2013-02-17 16:56:13.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.branding-openSUSE.new/branding-openSUSE.changes 2013-03-01 10:47:47.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 28 21:05:11 UTC 2013 - coolo(a)suse.com + +- fix the %post of plymouth branding to still set openSUSE default + even if in live cd buildenv (bnc#804321) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.sTjFop/_old 2013-03-01 10:47:48.000000000 +0100 +++ /var/tmp/diff_new_pack.sTjFop/_new 2013-03-01 10:47:48.000000000 +0100 @@ -237,8 +237,8 @@ License: GPL-2.0+ Group: System/Fhs Requires: plymouth-plugin-label -Requires: plymouth-plugin-script -Requires(post): plymouth-scripts +PreReq: plymouth-plugin-script +PreReq: plymouth-scripts Supplements: packageand(plymouth:branding-openSUSE) Provides: plymouth-branding = %{version} Conflicts: otherproviders(plymouth-branding) @@ -368,10 +368,13 @@ %endif %post -n plymouth-branding-openSUSE -if [ ! -e /.buildenv ]; then - export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" -o "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" -o "$(%{_sbindir}/plymouth-set-default-theme)" == "basedonopensuse" ]; then +export LIB=%{_libdir} +OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" +if [ "$OTHEME" == "text" -o "$OTHEME" == "openSUSE" -o "$OTHEME" == "basedonopensuse" ]; then + if [ ! -e /.buildenv ]; then %{_sbindir}/plymouth-set-default-theme -R openSUSE + else + %{_sbindir}/plymouth-set-default-theme openSUSE fi fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Factory checked in at 2013-03-01 10:47:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "branding-openSUSE", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes 2013-02-17 16:56:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.branding-openSUSE.new/branding-openSUSE.changes 2013-03-01 10:47:43.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 28 21:05:11 UTC 2013 - coolo(a)suse.com + +- fix the %post of plymouth branding to still set openSUSE default + even if in live cd buildenv (bnc#804321) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.4ZnViL/_old 2013-03-01 10:47:46.000000000 +0100 +++ /var/tmp/diff_new_pack.4ZnViL/_new 2013-03-01 10:47:46.000000000 +0100 @@ -237,8 +237,8 @@ License: GPL-2.0+ Group: System/Fhs Requires: plymouth-plugin-label -Requires: plymouth-plugin-script -Requires(post): plymouth-scripts +PreReq: plymouth-plugin-script +PreReq: plymouth-scripts Supplements: packageand(plymouth:branding-openSUSE) Provides: plymouth-branding = %{version} Conflicts: otherproviders(plymouth-branding) @@ -368,10 +368,13 @@ %endif %post -n plymouth-branding-openSUSE -if [ ! -e /.buildenv ]; then - export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" -o "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" -o "$(%{_sbindir}/plymouth-set-default-theme)" == "basedonopensuse" ]; then +export LIB=%{_libdir} +OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" +if [ "$OTHEME" == "text" -o "$OTHEME" == "openSUSE" -o "$OTHEME" == "basedonopensuse" ]; then + if [ ! -e /.buildenv ]; then %{_sbindir}/plymouth-set-default-theme -R openSUSE + else + %{_sbindir}/plymouth-set-default-theme openSUSE fi fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zypper for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package zypper for openSUSE:12.3 checked in at 2013-03-01 09:12:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/zypper (Old) and /work/SRC/openSUSE:12.3/.zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper", Maintainer is "ma(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/zypper/zypper.changes 2013-02-15 18:56:55.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.zypper.new/zypper.changes 2013-03-01 09:12:37.000000000 +0100 @@ -1,0 +2,27 @@ +Thu Feb 28 11:46:36 CET 2013 - ma(a)suse.de + +- fix zypper disregarding zypp.conf cache path settings (bnc#806568) +- Allow re-install with different arch upon explicit request (bnc#804219) +- version 1.8.11 + +------------------------------------------------------------------- +Thu Feb 28 01:15:24 CET 2013 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Sun Feb 24 01:14:42 CET 2013 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Feb 21 01:14:25 CET 2013 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Sun Feb 17 01:14:01 CET 2013 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- zypper-1.8.10.tar.bz2 New: ---- zypper-1.8.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.HhmLqF/_old 2013-03-01 09:12:37.000000000 +0100 +++ /var/tmp/diff_new_pack.HhmLqF/_new 2013-03-01 09:12:37.000000000 +0100 @@ -33,7 +33,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Command line software manager using libzypp -Version: 1.8.10 +Version: 1.8.11 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ zypper-1.8.10.tar.bz2 -> zypper-1.8.11.tar.bz2 ++++++ /work/SRC/openSUSE:12.3/zypper/zypper-1.8.10.tar.bz2 /work/SRC/openSUSE:12.3/.zypper.new/zypper-1.8.11.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0