Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2011-11-21 15:47:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4", Maintainer is "dmuel...@suse.com" Changes: -------- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes 2011-10-24 13:41:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2011-11-21 15:47:37.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 21 00:21:24 CET 2011 - r...@suse.de + +- rediffed webkit-ia64_s390x.patch and reactivated patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.Wy9Glf/_old 2011-11-21 15:47:46.000000000 +0100 +++ /var/tmp/diff_new_pack.Wy9Glf/_new 2011-11-21 15:47:46.000000000 +0100 @@ -129,7 +129,7 @@ %patch87 %patch101 # ### 47 rediff -# %patch107 +%patch107 %patch109 %patch113 %patch118 -p1 libqt4-sql-plugins.spec: same change libqt4.spec: same change ++++++ webkit-ia64_s390x.patch ++++++ --- /var/tmp/diff_new_pack.Wy9Glf/_old 2011-11-21 15:47:46.000000000 +0100 +++ /var/tmp/diff_new_pack.Wy9Glf/_new 2011-11-21 15:47:46.000000000 +0100 @@ -1,46 +1,44 @@ --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -322,6 +322,11 @@ - #define WTF_PLATFORM_ALPHA 1 +@@ -123,6 +123,11 @@ + #define WTF_CPU_ALPHA 1 #endif +/* PLATFORM(S390X) */ +#if defined(__s390x__) -+#define WTF_PLATFORM_S390X 1 ++#define WTF_CPU_S390X 1 +#endif + - /* PLATFORM(SH4) */ - #if defined(__SH4__) - #define WTF_PLATFORM_SH4 1 -@@ -725,7 +730,7 @@ + /* CPU(IA64) - Itanium / IA-64 */ + #if defined(__ia64__) || defined(__ia64) || defined(_M_IA64) + #define WTF_CPU_IA64 1 +@@ -870,7 +875,7 @@ + #endif + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) - #if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX)) - #define WTF_USE_JSVALUE64 1 --#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA) -+#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA) || PLATFORM(S390X) - #define WTF_USE_JSVALUE64 1 - #elif PLATFORM(AIX64) +-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) ++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X) #define WTF_USE_JSVALUE64 1 + #elif CPU(ARM) || CPU(PPC64) + #define WTF_USE_JSVALUE32 1 --- src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h -@@ -367,6 +367,11 @@ - #define WTF_PLATFORM_ALPHA 1 +@@ -113,6 +113,10 @@ + #define WTF_CPU_ALPHA 1 #endif -+/* PLATFORM(S390X) */ -+#if defined(__s390x__) -+#define WTF_PLATFORM_S390X 1 ++#if defined(__s390x__) ++#define WTF_CPU_S390X 1 +#endif + - /* PLATFORM(SH4) */ - #if defined(__SH4__) - #define WTF_PLATFORM_SH4 1 -@@ -729,7 +734,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA) -+#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA) || PLATFORM(S390X) + /* CPU(IA64) - Itanium / IA-64 */ + #if defined(__ia64__) + #define WTF_CPU_IA64 1 +@@ -885,6 +889,7 @@ + #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ + || (CPU(IA64) && !CPU(IA64_32)) \ + || CPU(ALPHA) \ ++ || CPU(S390X) \ + || CPU(SPARC64) #define WTF_USE_JSVALUE64 1 - #elif PLATFORM(ARM) || PLATFORM(PPC64) - #define WTF_USE_JSVALUE32 1 + #elif CPU(ARM) || CPU(PPC64) || CPU(MIPS) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
