September 2011 - openSUSE Commits - openSUSE Mailing Lists

commit seamonkey for openSUSE:11.4
by root＠hilbert.suse.de 28 Sep '11

28 Sep '11

Hello community, here is the log from the commit of package seamonkey for openSUSE:11.4 checked in at Wed Sep 28 17:29:28 CEST 2011. -------- --- old-versions/11.4/UPDATES/all/seamonkey/seamonkey.changes 2011-09-08 02:11:26.000000000 +0200 +++ 11.4/seamonkey/seamonkey.changes 2011-09-26 14:58:38.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Sep 26 12:42:54 UTC 2011 - wr(a)rosenauer.org + +- update to 2.4 (bnc#720264) +- removed obsolete mozilla-cairo-lcd.patch +- rebased patches +- removed XLIB_SKIP_ARGB_VISUALS=1 from environment in + mozilla.sh.in (bnc#680758) + +------------------------------------------------------------------- +Wed Sep 14 07:07:13 UTC 2011 - wr(a)rosenauer.org + +- add dbus-1-glib-devel to BuildRequires (not pulled in + automatically with 12.1) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- l10n-2.3.3.tar.bz2 mozilla-cairo-lcd.patch seamonkey-2.3.3-source.tar.bz2 New: ---- l10n-2.4.tar.bz2 seamonkey-2.4-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seamonkey.spec ++++++ --- /var/tmp/diff_new_pack.9TlcL3/_old 2011-09-28 17:28:46.000000000 +0200 +++ /var/tmp/diff_new_pack.9TlcL3/_new 2011-09-28 17:28:46.000000000 +0200 @@ -20,12 +20,12 @@ Name: seamonkey -BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ hunspell-devel libgnomeui-devel libidl-devel libiw-devel libnotify-devel libproxy-devel nss-shared-helper-devel python startup-notification-devel unzip update-desktop-files yasm zip +BuildRequires: Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ hunspell-devel libgnomeui-devel libidl-devel libiw-devel libnotify-devel libproxy-devel nss-shared-helper-devel python startup-notification-devel unzip update-desktop-files yasm zip License: MPLv1.1 or GPLv2+ or LGPLv2+ Provides: web_browser -Version: 2.3.3 -Release: 0.<RELEASE2> -%define releasedate 2011090700 +Version: 2.4 +Release: 1.<RELEASE2> +%define releasedate 2011092200 Summary: The successor of the Mozilla Application Suite Url: http://www.mozilla.org/projects/seamonkey Group: Productivity/Networking/Web/Browsers @@ -43,7 +43,6 @@ Patch1: mozilla-nongnome-proxies.patch Patch2: mozilla-prefer_plugin_pref.patch Patch3: mozilla-shared-nss-db.patch -Patch4: mozilla-cairo-lcd.patch Patch5: mozilla-language.patch Patch7: mozilla-cairo-return.patch Patch8: mozilla-ntlm-full-path.patch @@ -146,7 +145,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch7 -p1 %patch8 -p1 @@ -324,6 +322,7 @@ %dir %{progdir}/distribution/extensions/ #%exclude %{progdir}/distribution/extensions/debugQA(a)mozilla.org.xpi %{progdir}/chrome/icons +%{progdir}/hyphenation/ %{progdir}/extensions/modern(a)themes.mozilla.org.xpi %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi #%{progdir}/greprefs/ ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.9TlcL3/_old 2011-09-28 17:28:47.000000000 +0200 +++ /var/tmp/diff_new_pack.9TlcL3/_new 2011-09-28 17:28:47.000000000 +0200 @@ -1,8 +1,8 @@ #!/bin/bash BRANCH="releases/comm-release" -RELEASE_TAG="SEAMONKEY_2_3_3_RELEASE" -VERSION="2.3.3" +RELEASE_TAG="SEAMONKEY_2_4_RELEASE" +VERSION="2.4" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH seamonkey ++++++ l10n-2.3.3.tar.bz2 -> l10n-2.4.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/seamonkey/l10n-2.3.3.tar.bz2 11.4/seamonkey/l10n-2.4.tar.bz2 differ: char 11, line 1 ++++++ mozilla-cairo-return.patch ++++++ --- /var/tmp/diff_new_pack.9TlcL3/_old 2011-09-28 17:28:47.000000000 +0200 +++ /var/tmp/diff_new_pack.9TlcL3/_new 2011-09-28 17:28:47.000000000 +0200 @@ -1,6 +1,6 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent e36e1a20cb5e1ba0e4bc3facac58029544d92e0a +# Parent 43cb27a012f2532add0e9791c1b5a7d0c3b03f9b Bug 631155 - undefined return value in function '_cairo_surface_wrapper_flush' diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper.c b/gfx/cairo/cairo/src/cairo-surface-wrapper.c ++++++ mozilla-language.patch ++++++ --- /var/tmp/diff_new_pack.9TlcL3/_old 2011-09-28 17:28:47.000000000 +0200 +++ /var/tmp/diff_new_pack.9TlcL3/_new 2011-09-28 17:28:47.000000000 +0200 @@ -1,48 +1,48 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent db620d83124746201970dcf50c661957df979eca +# Parent 0d6917b8f28f6e0398dbf329dda4932ba4f997c2 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp --- a/intl/locale/src/nsLocaleService.cpp +++ b/intl/locale/src/nsLocaleService.cpp -@@ -181,16 +181,17 @@ nsLocaleService::nsLocaleService(void) - } - +@@ -160,16 +160,17 @@ nsLocaleService::nsLocaleService(void) + nsRefPtr<nsLocale> resultLocale(new nsLocale()); + NS_ENSURE_TRUE(resultLocale, ); #ifdef MOZ_WIDGET_QT - const char* lang = QLocale::system().name().toAscii(); + const char* lang = QLocale::system().name().toAscii(); #else - // Get system configuration - const char* lang = getenv("LANG"); -+ const char* language = getenv("LANGUAGE"); + // Get system configuration + const char* lang = getenv("LANG"); ++ const char* language = getenv("LANGUAGE"); #endif - for( i = 0; i < LocaleListLength; i++ ) { - nsresult result; - // setlocale( , "") evaluates LC_* and LANG - char* lc_temp = setlocale(posix_locale_category[i], ""); - CopyASCIItoUTF16(LocaleList[i], category); - category_platform = category; -@@ -206,16 +207,21 @@ nsLocaleService::nsLocaleService(void) - else { - CopyASCIItoUTF16(lang, platformLocale); - result = posixConverter->GetXPLocale(lang, xpLocale); - } - } - if (NS_FAILED(result)) { - return; + nsAutoString xpLocale, platformLocale; + nsAutoString category, category_platform; + int i; + + for( i = 0; i < LocaleListLength; i++ ) { + nsresult result; +@@ -188,16 +189,21 @@ nsLocaleService::nsLocaleService(void) + } else { + CopyASCIItoUTF16(lang, platformLocale); + result = nsPosixLocale::GetXPLocale(lang, xpLocale); } -+ // LANGUAGE is overriding LC_MESSAGES -+ if (i == LC_MESSAGES && language && *language) { -+ CopyASCIItoUTF16(language, platformLocale); -+ result = posixConverter->GetXPLocale(language, xpLocale); -+ } - resultLocale->AddCategory(category, xpLocale); - resultLocale->AddCategory(category_platform, platformLocale); } - mSystemLocale = do_QueryInterface(resultLocale); - mApplicationLocale = do_QueryInterface(resultLocale); - } // if ( NS_SUCCEEDED )... + if (NS_FAILED(result)) { + return; + } ++ // LANGUAGE is overriding LC_MESSAGES ++ if (i == LC_MESSAGES && language && *language) { ++ CopyASCIItoUTF16(language, platformLocale); ++ result = nsPosixLocale::GetXPLocale(language, xpLocale); ++ } + resultLocale->AddCategory(category, xpLocale); + resultLocale->AddCategory(category_platform, platformLocale); + } + mSystemLocale = do_QueryInterface(resultLocale); + mApplicationLocale = do_QueryInterface(resultLocale); #endif // XP_UNIX + #ifdef XP_OS2 ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.9TlcL3/_old 2011-09-28 17:28:47.000000000 +0200 +++ /var/tmp/diff_new_pack.9TlcL3/_new 2011-09-28 17:28:47.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -582,16 +582,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS +@@ -579,16 +579,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ @@ -31,7 +31,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8507,16 +8507,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8625,16 +8625,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -66,7 +66,7 @@ diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -114,19 +114,20 @@ CSRCS += md4.c +@@ -114,12 +114,14 @@ CSRCS += md4.c EXTRA_DEPS = $(NSS_DEP_LIBS) @@ -77,14 +77,8 @@ # so that Mozilla's nss.h is used, not glibc's -LOCAL_INCLUDES += $(NSS_CFLAGS) +LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS) - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ -+ $(NSSHELPER_LIBS) \ - $(NSS_LIBS) \ - $(NULL) ++ ++EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) include $(topsrcdir)/config/rules.mk @@ -115,7 +109,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" -@@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(PRBool sho +@@ -1761,18 +1768,34 @@ nsNSSComponent::InitializeNSS(PRBool sho ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -128,11 +122,11 @@ - SECMOD_DB, init_flags); + SECStatus init_rv = SECFailure; +#ifdef MOZ_ENABLE_NSSHELPER -+ if (PR_GetEnv("MOZ_SM_NO_NSSHELPER")) { ++ if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); + } else { -+ init_rv = ::nsshelp_open_db ("seamonkey", profileStr.get(), init_flags); ++ init_rv = ::nsshelp_open_db ("SeaMonkey", profileStr.get(), init_flags); + + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get())); ++++++ mozilla.sh.in ++++++ --- /var/tmp/diff_new_pack.9TlcL3/_old 2011-09-28 17:28:47.000000000 +0200 +++ /var/tmp/diff_new_pack.9TlcL3/_new 2011-09-28 17:28:47.000000000 +0200 @@ -75,9 +75,6 @@ LD_LIBRARY_PATH=$MOZ_DIST_LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH -# ignore composite extension (needed for Flash) -export XLIB_SKIP_ARGB_VISUALS=1 - # needed for SUN Java under Xorg >= 7.2 export LIBXCB_ALLOW_SLOPPY_LOCK=1 ++++++ seamonkey-2.3.3-source.tar.bz2 -> seamonkey-2.4-source.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/seamonkey/seamonkey-2.3.3-source.tar.bz2 11.4/seamonkey/seamonkey-2.4-source.tar.bz2 differ: char 11, line 1 ++++++ seamonkey-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.9TlcL3/_old 2011-09-28 17:28:47.000000000 +0200 +++ /var/tmp/diff_new_pack.9TlcL3/_new 2011-09-28 17:28:47.000000000 +0200 @@ -8,7 +8,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -458,16 +458,20 @@ MOZ_PANGO_LIBS = @MOZ_PANGO_LIB +@@ -450,16 +450,20 @@ MOZ_PANGO_LIBS = @MOZ_PANGO_LIB XT_LIBS = @XT_LIBS@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ @@ -32,7 +32,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -6761,16 +6761,30 @@ fi +@@ -6675,16 +6675,30 @@ fi AC_SUBST(MOZ_CAIRO_LIBS) dnl qcms @@ -66,7 +66,7 @@ diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in --- a/suite/app/Makefile.in +++ b/suite/app/Makefile.in -@@ -105,16 +105,17 @@ endif +@@ -93,16 +93,17 @@ endif APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS) @@ -78,9 +78,9 @@ + $(NSSHELPER_LIBS) \ $(NULL) - ifdef BUILD_STATIC_LIBS - LIBS += \ - $(MOZ_JS_LIBS) \ - $(TK_LIBS) \ - $(NULL) + ifdef MOZ_JPROF + LIBS += -ljprof + endif + ifdef MOZ_ENABLE_DBUS + LIBS += $(MOZ_DBUS_GLIB_LIBS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:11.4
by root＠hilbert.suse.de 28 Sep '11

28 Sep '11

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:11.4 checked in at Wed Sep 28 17:28:16 CEST 2011. -------- --- old-versions/11.4/UPDATES/all/MozillaFirefox/MozillaFirefox.changes 2011-09-07 18:08:33.000000000 +0200 +++ 11.4/MozillaFirefox/MozillaFirefox.changes 2011-09-26 08:37:05.000000000 +0200 @@ -1,0 +2,30 @@ +Fri Sep 23 11:22:22 UTC 2011 - wr(a)rosenauer.org + +- update to Firefox 7 (bnc#720264) + including + * Improve Responsiveness with Memory Reductions + * Instant Sync + * WebSocket protocol 8 +- removed obsolete mozilla-cairo-lcd.patch +- rebased patches +- removed XLIB_SKIP_ARGB_VISUALS=1 from environment in + mozilla.sh.in (bnc#680758) + +------------------------------------------------------------------- +Fri Sep 16 06:57:38 UTC 2011 - wr(a)rosenauer.org + +- fixed loading of kde.js under KDE (bnc#718311) + +------------------------------------------------------------------- +Wed Sep 14 07:02:04 UTC 2011 - wr(a)rosenauer.org + +- add dbus-1-glib-devel to BuildRequires (not pulled in + automatically anymore on 12.1) +- increase minversions for NSPR and NSS + +------------------------------------------------------------------- +Fri Sep 9 20:44:15 UTC 2011 - wr(a)rosenauer.org + +- recreated source archive to get correct source-stamp.txt + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- firefox-6.0.2-source.tar.bz2 l10n-6.0.2.tar.bz2 mozilla-cairo-lcd.patch New: ---- firefox-7.0-source.tar.bz2 l10n-7.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.XS6q5d/_old 2011-09-28 17:26:51.000000000 +0200 +++ /var/tmp/diff_new_pack.XS6q5d/_new 2011-09-28 17:26:51.000000000 +0200 @@ -18,24 +18,24 @@ # norootforbuild -%define major 6 -%define mainver %major.0.2 +%define major 7 +%define mainver %major.0 Name: MozillaFirefox -BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip +BuildRequires: Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip %if %suse_version > 1110 BuildRequires: libiw-devel BuildRequires: libproxy-devel %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.8.6 -BuildRequires: mozilla-nss-devel >= 3.12.8 +BuildRequires: mozilla-nspr-devel >= 4.8.8 +BuildRequires: mozilla-nss-devel >= 3.12.10 BuildRequires: nss-shared-helper-devel License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: %{mainver} -Release: 0.<RELEASE2> -%define releasedate 2011090700 +Release: 1.<RELEASE2> +%define releasedate 2011092200 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} @@ -66,7 +66,6 @@ Patch3: mozilla-prefer_plugin_pref.patch Patch4: mozilla-shared-nss-db.patch Patch5: mozilla-kde.patch -Patch6: mozilla-cairo-lcd.patch Patch7: mozilla-language.patch Patch9: mozilla-cairo-return.patch Patch10: mozilla-ntlm-full-path.patch @@ -197,7 +196,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 %patch9 -p1 %patch10 -p1 @@ -213,8 +211,6 @@ %patch32 -p1 %if %suse_version >= 1110 %patch33 -p1 -# install kde.js -install -m 644 %{SOURCE6} browser/app/profile/kde.js %endif %if %suse_version >= 1140 %patch34 -p1 @@ -311,6 +307,10 @@ find $RPM_BUILD_ROOT%{progdir} \ -name "*.js" -o -name "*.jsm" -o -name "*.rdf" | xargs chmod a-x mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins +# install kde.js +%if %suse_version >= 1110 +install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/pref/kde.js +%endif # install add-plugins.sh sed "s:%%PROGDIR:%{progdir}:g" \ %{SOURCE13} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.XS6q5d/_old 2011-09-28 17:26:51.000000000 +0200 +++ /var/tmp/diff_new_pack.XS6q5d/_new 2011-09-28 17:26:51.000000000 +0200 @@ -1,8 +1,8 @@ #!/bin/bash BRANCH="releases/mozilla-release" -RELEASE_TAG="FIREFOX_6_0_2_RELEASE" -VERSION="6.0.2" +RELEASE_TAG="FIREFOX_7_0_RELEASE" +VERSION="7.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla ++++++ firefox-6.0.2-source.tar.bz2 -> firefox-7.0-source.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/MozillaFirefox/firefox-6.0.2-source.tar.bz2 11.4/MozillaFirefox/firefox-7.0-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.XS6q5d/_old 2011-09-28 17:26:51.000000000 +0200 +++ /var/tmp/diff_new_pack.XS6q5d/_new 2011-09-28 17:26:51.000000000 +0200 @@ -1,15 +1,15 @@ # HG changeset patch -# Parent 0a9fd1d7099ccdff12205e23f0d9bf4d93a328ee +# Parent 6948d58326d5c2e46936e186079421e7d76445e2 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -221,16 +221,21 @@ endif +@@ -199,16 +199,21 @@ DEFINES += -DMOZILLA_OFFICIAL + endif ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) libs:: $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons - $(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default @@ -29,7 +29,7 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in -@@ -68,18 +68,21 @@ OSX_BRANDING_FILES = \ +@@ -69,18 +69,21 @@ OSX_BRANDING_FILES = \ firefox.icns \ disk.icns \ document.icns \ @@ -43,7 +43,6 @@ default32.png \ default48.png \ + default256.png \ - document.png \ mozicon128.png \ $(NULL) @@ -51,10 +50,11 @@ firefox-os2.ico \ document-os2.ico \ $(NULL) + diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -416,18 +416,21 @@ +@@ -421,18 +421,21 @@ #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi #endif ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.XS6q5d/_old 2011-09-28 17:26:51.000000000 +0200 +++ /var/tmp/diff_new_pack.XS6q5d/_new 2011-09-28 17:26:51.000000000 +0200 @@ -1,29 +1,8 @@ -diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in ---- a/browser/app/Makefile.in -+++ b/browser/app/Makefile.in -@@ -44,16 +44,17 @@ srcdir = @srcdir@ - VPATH = @srcdir@ - - include $(DEPTH)/config/autoconf.mk - - DIRS = profile/extensions - - PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \ - $(srcdir)/profile/channel-prefs.js \ -+ $(srcdir)/profile/kde.js \ - $(NULL) - - - # hardcode en-US for the moment - AB_CD = en-US - - DEFINES += -DAB_CD=$(AB_CD) - diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1076 @@ +@@ -0,0 +1,1038 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -250,15 +229,6 @@ + </hbox> + </panel> + -+ <panel id="highlighter-panel" -+ hidden="true" -+ ignorekeys="true" -+ noautofocus="true" -+ noautohide="true" -+ onclick="InspectorUI.stopInspecting();" -+ onmousemove="InspectorUI.highlighter.handleMouseMove(event);" -+ onMozMousePixelScroll="InspectorUI.highlighter.handlePixelScroll(event);"/> -+ + <panel id="inspector-tree-panel" + orient="vertical" + hidden="true" @@ -276,26 +246,6 @@ + accesskey="&inspectButton.accesskey;" + class="toolbarbutton-text" + command="Inspector:Inspect"/> -+ <toolbarbutton id="inspector-previous-toolbutton" -+ label="&inspectPreviousButton.label;" -+ accesskey="&inspectPreviousButton.accesskey;" -+ class="toolbarbutton-text" -+ command="Inspector:Previous"/> -+ <toolbarbutton id="inspector-next-toolbutton" -+ label="&inspectNextButton.label;" -+ accesskey="&inspectNextButton.accesskey;" -+ class="toolbarbutton-text" -+ command="Inspector:Next"/> -+ <toolbarbutton id="inspector-style-toolbutton" -+ label="&inspectStyleButton.label;" -+ accesskey="&inspectStyleButton.accesskey;" -+ class="toolbarbutton-text" -+ oncommand="InspectorUI.toggleStylePanel();"/> -+ <toolbarbutton id="inspector-dom-toolbutton" -+ label="&inspectObjectButton.label;" -+ accesskey="&inspectObjectButton.accesskey;" -+ class="toolbarbutton-text" -+ oncommand="InspectorUI.toggleDOMPanel();"/> + </toolbar> + <hbox id="tree-panel-resizer-box" align="end"> + <spacer flex="1" /> @@ -303,21 +253,6 @@ + </hbox> + </panel> + -+ <panel id="inspector-style-panel" -+ hidden="true" -+ orient="vertical" -+ ignorekeys="true" -+ noautofocus="true" -+ noautohide="true" -+ titlebar="normal" -+ label="&inspectStylePanelTitle.label;"> -+ <listbox id="inspector-style-listbox" flex="1"/> -+ <hbox align="end"> -+ <spacer flex="1" /> -+ <resizer dir="bottomend"/> -+ </hbox> -+ </panel> -+ + <menupopup id="toolbar-context-menu" + onpopupshowing="onViewToolbarsPopupShowing(event);"> + <menuseparator/> @@ -1094,6 +1029,12 @@ +#endif + +</vbox> ++# <iframe id="highlighter-frame" ++# transparent="true" ++# type="content" ++# src="chrome://content/base/highlighter.html"/> is dynamically appended as ++# the last child of #tab-view-deck, only when it is needed, for minimal ++# performance impact. +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck. +# Introducing the iframe dynamically, as needed, was found to be better than +# starting with an empty iframe here in browser.xul from a Ts standpoint. @@ -1103,10 +1044,10 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -21,16 +21,18 @@ browser.jar: - * content/browser/aboutHome.css (content/aboutHome.css) - content/browser/aboutHome-restore-icon.png (content/aboutHome-restore-icon.png) +@@ -23,16 +23,18 @@ browser.jar: content/browser/aboutHome-restore-icon-small.png (content/aboutHome-restore-icon-small.png) + content/browser/aboutHome-snippet1.png (content/aboutHome-snippet1.png) + content/browser/aboutHome-snippet2.png (content/aboutHome-snippet2.png) content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) * content/browser/browser.css (content/browser.css) @@ -1116,12 +1057,12 @@ +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) + content/browser/highlighter.xhtml (content/highlighter.xhtml) * content/browser/inspector.html (content/inspector.html) * content/browser/scratchpad.xul (content/scratchpad.xul) * content/browser/scratchpad.js (content/scratchpad.js) * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) - * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp @@ -1624,7 +1565,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -435,16 +435,17 @@ +@@ -440,16 +440,17 @@ #endif #endif ++++++ l10n-6.0.2.tar.bz2 -> l10n-7.0.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/MozillaFirefox/l10n-6.0.2.tar.bz2 11.4/MozillaFirefox/l10n-7.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.XS6q5d/_old 2011-09-28 17:26:52.000000000 +0200 +++ /var/tmp/diff_new_pack.XS6q5d/_new 2011-09-28 17:26:52.000000000 +0200 @@ -1,7 +1,7 @@ diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in -@@ -87,14 +87,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas +@@ -77,14 +77,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas # Optimizer bug with GCC 3.2.2 on OS/2 ifeq ($(OS_ARCH), OS2) nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp @@ -39,7 +39,7 @@ #include "prefapi.h" #include "prefread.h" #include "prefapi_private_data.h" -@@ -822,30 +823,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -966,30 +967,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char } static nsresult pref_LoadPrefsInDirList(const char *listId) @@ -89,7 +89,7 @@ } static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) -@@ -938,28 +957,40 @@ static nsresult pref_InitInitialObjects( +@@ -1082,28 +1101,40 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -133,15 +133,15 @@ diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in -@@ -79,8 +79,10 @@ endif +@@ -77,8 +77,10 @@ EXTRA_COMPONENTS = \ + $(NULL) + endif ifdef ENABLE_TESTS DIRS += test endif include $(topsrcdir)/config/rules.mk - - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp @@ -168,7 +168,7 @@ #include "AndroidBridge.h" #endif -@@ -2192,16 +2196,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2203,16 +2207,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -194,7 +194,7 @@ PRInt64 goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2225,19 +2238,20 @@ nsDownload::SetState(DownloadState aStat +@@ -2236,19 +2249,20 @@ nsDownload::SetState(DownloadState aStat // If downloads are automatically removed per the user's // retention policy, there's no reason to make the text clickable // because if it is, they'll click open the download manager and @@ -2178,7 +2178,7 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -97,17 +97,18 @@ EXPORTS = nsWindowsDllInterceptor.h +@@ -98,17 +98,18 @@ EXPORTS = nsWindowsDllInterceptor.h else ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsNativeAppSupportCocoa.mm @@ -3119,7 +3119,7 @@ #include "nsXPIDLString.h" #include "nsIURL.h" #include "nsIFileStreams.h" -@@ -1219,29 +1219,29 @@ nsresult nsOSHelperAppService::OSProtoco +@@ -1191,29 +1191,29 @@ nsresult nsOSHelperAppService::OSProtoco ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':'); if (action.isValid()) @@ -3151,7 +3151,7 @@ nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) { -@@ -1327,17 +1327,17 @@ nsOSHelperAppService::GetFromExtension(c +@@ -1299,17 +1299,17 @@ nsOSHelperAppService::GetFromExtension(c minorType, mime_types_description, PR_TRUE); @@ -3170,7 +3170,7 @@ rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, -@@ -1453,17 +1453,17 @@ nsOSHelperAppService::GetFromType(const +@@ -1425,17 +1425,17 @@ nsOSHelperAppService::GetFromType(const #ifdef MOZ_WIDGET_GTK2 nsMIMEInfoBase *gnomeInfo = nsnull; if (handler.IsEmpty()) { @@ -3192,7 +3192,7 @@ diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in --- a/widget/src/gtk2/Makefile.in +++ b/widget/src/gtk2/Makefile.in -@@ -158,11 +158,14 @@ endif +@@ -134,11 +134,14 @@ endif DEFINES += -DCAIRO_GFX @@ -3246,7 +3246,7 @@ #define MAX_PREVIEW_SIZE 180 nsILocalFile *nsFilePicker::mPrevDisplayDirectory = nsnull; -@@ -271,17 +273,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil +@@ -282,17 +284,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil return nsBaseFilePicker::AppendFilters(aFilterMask); } @@ -3267,7 +3267,7 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -419,16 +423,19 @@ confirm_overwrite_file(GtkWidget *parent +@@ -430,16 +434,19 @@ confirm_overwrite_file(GtkWidget *parent gtk_widget_destroy(dialog); return result; @@ -3287,7 +3287,7 @@ GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget); GtkFileChooserAction action = GetGtkFileChooserAction(mMode); -@@ -569,8 +576,234 @@ nsFilePicker::Show(PRInt16 *aReturn) +@@ -580,8 +587,234 @@ nsFilePicker::Show(PRInt16 *aReturn) *aReturn = nsIFilePicker::returnCancel; break; } @@ -3690,7 +3690,7 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in -@@ -192,17 +192,17 @@ include $(topsrcdir)/ipc/chromium/chromi +@@ -190,17 +190,17 @@ include $(topsrcdir)/ipc/chromium/chromi DEFINES += -D_IMPL_NS_COM ifeq ($(OS_ARCH),Linux) ++++++ mozilla-language.patch ++++++ --- /var/tmp/diff_new_pack.XS6q5d/_old 2011-09-28 17:26:52.000000000 +0200 +++ /var/tmp/diff_new_pack.XS6q5d/_new 2011-09-28 17:26:52.000000000 +0200 @@ -1,48 +1,48 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent db620d83124746201970dcf50c661957df979eca +# Parent 0d6917b8f28f6e0398dbf329dda4932ba4f997c2 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp --- a/intl/locale/src/nsLocaleService.cpp +++ b/intl/locale/src/nsLocaleService.cpp -@@ -181,16 +181,17 @@ nsLocaleService::nsLocaleService(void) - } - +@@ -160,16 +160,17 @@ nsLocaleService::nsLocaleService(void) + nsRefPtr<nsLocale> resultLocale(new nsLocale()); + NS_ENSURE_TRUE(resultLocale, ); #ifdef MOZ_WIDGET_QT - const char* lang = QLocale::system().name().toAscii(); + const char* lang = QLocale::system().name().toAscii(); #else - // Get system configuration - const char* lang = getenv("LANG"); -+ const char* language = getenv("LANGUAGE"); + // Get system configuration + const char* lang = getenv("LANG"); ++ const char* language = getenv("LANGUAGE"); #endif - for( i = 0; i < LocaleListLength; i++ ) { - nsresult result; - // setlocale( , "") evaluates LC_* and LANG - char* lc_temp = setlocale(posix_locale_category[i], ""); - CopyASCIItoUTF16(LocaleList[i], category); - category_platform = category; -@@ -206,16 +207,21 @@ nsLocaleService::nsLocaleService(void) - else { - CopyASCIItoUTF16(lang, platformLocale); - result = posixConverter->GetXPLocale(lang, xpLocale); - } - } - if (NS_FAILED(result)) { - return; + nsAutoString xpLocale, platformLocale; + nsAutoString category, category_platform; + int i; + + for( i = 0; i < LocaleListLength; i++ ) { + nsresult result; +@@ -188,16 +189,21 @@ nsLocaleService::nsLocaleService(void) + } else { + CopyASCIItoUTF16(lang, platformLocale); + result = nsPosixLocale::GetXPLocale(lang, xpLocale); } -+ // LANGUAGE is overriding LC_MESSAGES -+ if (i == LC_MESSAGES && language && *language) { -+ CopyASCIItoUTF16(language, platformLocale); -+ result = posixConverter->GetXPLocale(language, xpLocale); -+ } - resultLocale->AddCategory(category, xpLocale); - resultLocale->AddCategory(category_platform, platformLocale); } - mSystemLocale = do_QueryInterface(resultLocale); - mApplicationLocale = do_QueryInterface(resultLocale); - } // if ( NS_SUCCEEDED )... + if (NS_FAILED(result)) { + return; + } ++ // LANGUAGE is overriding LC_MESSAGES ++ if (i == LC_MESSAGES && language && *language) { ++ CopyASCIItoUTF16(language, platformLocale); ++ result = nsPosixLocale::GetXPLocale(language, xpLocale); ++ } + resultLocale->AddCategory(category, xpLocale); + resultLocale->AddCategory(category_platform, platformLocale); + } + mSystemLocale = do_QueryInterface(resultLocale); + mApplicationLocale = do_QueryInterface(resultLocale); #endif // XP_UNIX + #ifdef XP_OS2 ++++++ mozilla-repo.patch ++++++ --- /var/tmp/diff_new_pack.XS6q5d/_old 2011-09-28 17:26:52.000000000 +0200 +++ /var/tmp/diff_new_pack.XS6q5d/_new 2011-09-28 17:26:52.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 1eb30390d6af83e41be9143c5d8c5fedf2ef69ef +# Parent 732243388ea9cc592d30e1951f29a94a0ce5a035 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -67,17 +67,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc +@@ -68,17 +68,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID) @@ -48,7 +48,7 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk -@@ -154,17 +154,17 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME +@@ -154,20 +154,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME TEST_PACKAGE = $(PKG_BASENAME).tests.zip ifneq (,$(wildcard $(DIST)/bin/application.ini)) @@ -68,10 +68,13 @@ +#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt + + # JavaScript Shell + PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -229,17 +229,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR +@@ -231,17 +231,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR endif endif ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.XS6q5d/_old 2011-09-28 17:26:52.000000000 +0200 +++ /var/tmp/diff_new_pack.XS6q5d/_new 2011-09-28 17:26:52.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -582,16 +582,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS +@@ -579,16 +579,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ @@ -31,7 +31,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8507,16 +8507,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8625,16 +8625,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -66,7 +66,7 @@ diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -114,19 +114,20 @@ CSRCS += md4.c +@@ -114,12 +114,14 @@ CSRCS += md4.c EXTRA_DEPS = $(NSS_DEP_LIBS) @@ -77,14 +77,8 @@ # so that Mozilla's nss.h is used, not glibc's -LOCAL_INCLUDES += $(NSS_CFLAGS) +LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS) - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ -+ $(NSSHELPER_LIBS) \ - $(NSS_LIBS) \ - $(NULL) ++ ++EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) include $(topsrcdir)/config/rules.mk @@ -115,7 +109,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" -@@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(PRBool sho +@@ -1761,18 +1768,34 @@ nsNSSComponent::InitializeNSS(PRBool sho ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs ++++++ mozilla-sle11.patch ++++++ --- /var/tmp/diff_new_pack.XS6q5d/_old 2011-09-28 17:26:52.000000000 +0200 +++ /var/tmp/diff_new_pack.XS6q5d/_new 2011-09-28 17:26:52.000000000 +0200 @@ -2,30 +2,6 @@ References: https://bugzilla.mozilla.org/show_bug.cgi?id=513422 -diff --git a/gfx/cairo/cairo/src/cairo-xlib-surface.c b/gfx/cairo/cairo/src/cairo-xlib-surface.c ---- a/gfx/cairo/cairo/src/cairo-xlib-surface.c -+++ b/gfx/cairo/cairo/src/cairo-xlib-surface.c -@@ -4041,17 +4041,19 @@ _cairo_xlib_surface_add_glyph (Display * - new = malloc (4 * c); - if (unlikely (new == NULL)) { - status = _cairo_error (CAIRO_STATUS_NO_MEMORY); - goto BAIL; - } - n = new; - d = (uint32_t *) data; - do { -- *n++ = bswap_32 (*d++); -+ *n = bswap_32 (*d); -+ *n++; -+ *d++; - } while (--c); - data = (uint8_t *) new; - } - break; - case CAIRO_FORMAT_RGB24: - default: - ASSERT_NOT_REACHED; - break; diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp --- a/xpcom/glue/SSE.cpp +++ b/xpcom/glue/SSE.cpp ++++++ mozilla.sh.in ++++++ --- /var/tmp/diff_new_pack.XS6q5d/_old 2011-09-28 17:26:52.000000000 +0200 +++ /var/tmp/diff_new_pack.XS6q5d/_new 2011-09-28 17:26:52.000000000 +0200 @@ -84,9 +84,6 @@ LD_LIBRARY_PATH=$MOZ_DIST_LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH -# ignore composite extension (needed for Flash) -export XLIB_SKIP_ARGB_VISUALS=1 - # needed for SUN Java under Xorg >= 7.2 export LIBXCB_ALLOW_SLOPPY_LOCK=1 ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.XS6q5d/_old 2011-09-28 17:26:52.000000000 +0200 +++ /var/tmp/diff_new_pack.XS6q5d/_new 2011-09-28 17:26:52.000000000 +0200 @@ -1,2 +1,2 @@ -REV=218ed8178b1e +REV=273977a2c0ea REPO=http://hg.mozilla.org/releases/mozilla-release ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaThunderbird for openSUSE:11.3
by root＠hilbert.suse.de 28 Sep '11

28 Sep '11

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:11.3 checked in at Wed Sep 28 17:25:07 CEST 2011. -------- --- old-versions/11.3/UPDATES/all/MozillaThunderbird/MozillaThunderbird.changes 2011-09-07 16:57:02.000000000 +0200 +++ 11.3/MozillaThunderbird/MozillaThunderbird.changes 2011-09-28 07:11:28.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 21 09:48:02 UTC 2011 - wr(a)rosenauer.org + +- security update to 3.1.15 (bnc#720264) + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 Old: ---- l10n-3.1.14.tar.bz2 thunderbird-3.1.14-source.tar.bz2 New: ---- l10n-3.1.15.tar.bz2 thunderbird-3.1.15-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.QCedme/_old 2011-09-28 17:23:22.000000000 +0200 +++ /var/tmp/diff_new_pack.QCedme/_new 2011-09-28 17:23:22.000000000 +0200 @@ -26,10 +26,10 @@ BuildRequires: nss-shared-helper-devel %endif License: MPLv1.1 or GPLv2+ or LGPLv2+ -%define mainversion 3.1.14 +%define mainversion 3.1.15 Version: %{mainversion} Release: 0.<RELEASE2> -%define releasedate 2011090700 +%define releasedate 2011092000 Provides: thunderbird = %{version} Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.QCedme/_old 2011-09-28 17:23:22.000000000 +0200 +++ /var/tmp/diff_new_pack.QCedme/_new 2011-09-28 17:23:22.000000000 +0200 @@ -2,8 +2,8 @@ BRANCH="releases/comm-1.9.2" # comm-central -RELEASE_TAG="THUNDERBIRD_3_1_14_RELEASE" -VERSION="3.1.14" +RELEASE_TAG="THUNDERBIRD_3_1_15_RELEASE" +VERSION="3.1.15" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird ++++++ l10n-3.1.14.tar.bz2 -> l10n-3.1.15.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/MozillaThunderbird/l10n-3.1.14.tar.bz2 11.3/MozillaThunderbird/l10n-3.1.15.tar.bz2 differ: char 11, line 1 ++++++ thunderbird-3.1.14-source.tar.bz2 -> thunderbird-3.1.15-source.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/MozillaThunderbird/thunderbird-3.1.14-source.tar.bz2 11.3/MozillaThunderbird/thunderbird-3.1.15-source.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lightdm for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '11

28 Sep '11

Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at Wed Sep 28 17:24:03 CEST 2011. -------- --- lightdm/lightdm.changes 2011-09-26 16:08:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/lightdm/lightdm.changes 2011-09-28 14:12:26.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Sep 28 09:22:46 UTC 2011 - gber(a)opensuse.org + +- update to version 1.0.0 + - explicitly grab keyboard focus in GTK greeter + - fix removed power and a11y menu items in GTK greeter + - put system binary directory into path when running in test mode + - call pam_getenvlist after pam_setcred + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lightdm-0.9.8.tar.gz New: ---- lightdm-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.Y6oDMN/_old 2011-09-28 17:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Y6oDMN/_new 2011-09-28 17:23:54.000000000 +0200 @@ -23,7 +23,7 @@ %define qt_lib lib%{qt_libname}-0 Name: lightdm -Version: 0.9.8 +Version: 1.0.0 Release: 1 Summary: Lightweight, Cross-desktop Display Manager Group: System/X11/Displaymanagers @@ -81,6 +81,7 @@ %lang_package %package -n %{gobject_lib} + Summary: LightDM GObject-based Client Library Group: System/Libraries @@ -89,6 +90,7 @@ %package gobject-devel + Summary: Development Files for %{gobject_lib} Group: Development/Libraries/C and C++ Requires: %{gobject_lib} = %{version} @@ -99,6 +101,7 @@ %package -n %{qt_lib} + Summary: LightDM Qt-based Client Library Group: System/Libraries @@ -107,6 +110,7 @@ %package qt-devel + Summary: Development Files for %{qt_lib} Group: Development/Libraries/C and C++ Requires: %{qt_lib} = %{version} @@ -117,6 +121,7 @@ %package gtk-greeter + Summary: GTK-based Greeter for LightDM Group: System/X11/Displaymanagers Requires(post): update-alternatives @@ -132,6 +137,7 @@ %package gtk-greeter-branding-upstream + Summary: Upstream branding of %{name}-gtk-greeter Group: System/X11/Displaymanagers Requires: %{name}-gtk-greeter = %{version} @@ -147,6 +153,7 @@ %package qt-greeter + Summary: Qt-based Greeter for LightDM Group: System/X11/Displaymanagers Requires(post): update-alternatives ++++++ lightdm-0.9.8.tar.gz -> lightdm-1.0.0.tar.gz ++++++ ++++ 5055 lines of diff (skipped) ++++++ lightdm-default-configuration.patch ++++++ --- /var/tmp/diff_new_pack.Y6oDMN/_old 2011-09-28 17:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Y6oDMN/_new 2011-09-28 17:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 151070165a310baed73af12324d27804fa2c556a +# Parent 1d749f63a68ca561bb71e7c28b9eea1aabd2373f openSUSE-specific default configuration diff --git a/data/lightdm.conf b/data/lightdm.conf ++++++ lightdm-desktop-session-env-pam.patch ++++++ --- /var/tmp/diff_new_pack.Y6oDMN/_old 2011-09-28 17:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Y6oDMN/_new 2011-09-28 17:23:54.000000000 +0200 @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 4ec4b8145067aadcb107ee3f68acb314e76f2f00 +# Parent 06e6212c9009762d88c7088acafc977dc31f71e3 pass a DESKTOP_SESSION environment variable with the name of the selected session into the PAM environment diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c -@@ -451,6 +451,8 @@ create_session (Display *display, PAMSes +@@ -450,6 +450,8 @@ create_session (Display *display, PAMSes session_set_is_greeter (session, is_greeter); session_set_authentication (session, authentication); session_set_command (session, command); @@ -17,7 +17,7 @@ diff --git a/src/pam-session.c b/src/pam-session.c --- a/src/pam-session.c +++ b/src/pam-session.c -@@ -134,7 +134,7 @@ pam_session_set_item (PAMSession *sessio +@@ -133,7 +133,7 @@ pam_session_set_item (PAMSession *sessio } gboolean @@ -26,7 +26,7 @@ { int result = PAM_SUCCESS; -@@ -144,6 +144,14 @@ pam_session_open (PAMSession *session) +@@ -143,6 +143,14 @@ pam_session_open (PAMSession *session) if (!passwd_file && getuid () == 0) { @@ -44,7 +44,7 @@ diff --git a/src/pam-session.h b/src/pam-session.h --- a/src/pam-session.h +++ b/src/pam-session.h -@@ -54,7 +54,7 @@ gboolean pam_session_get_is_authenticate +@@ -53,7 +53,7 @@ gboolean pam_session_get_is_authenticate gboolean pam_session_set_item (PAMSession *session, int item_type, const gchar *value); @@ -56,7 +56,7 @@ diff --git a/src/session.c b/src/session.c --- a/src/session.c +++ b/src/session.c -@@ -26,6 +26,9 @@ struct SessionPrivate +@@ -29,6 +29,9 @@ struct SessionPrivate /* Authentication for this session */ PAMSession *authentication; @@ -66,7 +66,7 @@ /* Command to run for this session */ gchar *command; -@@ -76,6 +79,21 @@ session_get_is_greeter (Session *session +@@ -94,6 +97,21 @@ session_get_is_greeter (Session *session return session->priv->is_greeter; } @@ -88,19 +88,19 @@ void session_set_command (Session *session, const gchar *command) { -@@ -290,7 +308,7 @@ session_real_start (Session *session) +@@ -307,7 +325,7 @@ session_real_start (Session *session) g_free (path); } - pam_session_open (session->priv->authentication); + pam_session_open (session->priv->authentication, session->priv->user_session_name); - set_env_from_authentication (session, session->priv->authentication); - set_language (session); + /* Open ConsoleKit session */ + if (getuid () == 0) diff --git a/src/session.h b/src/session.h --- a/src/session.h +++ b/src/session.h -@@ -60,6 +60,10 @@ void session_set_env (Session *process, +@@ -64,6 +64,10 @@ void session_set_env (Session *process, const gchar *session_get_env (Session *session, const gchar *name); ++++++ lightdm-lock-screen-before-switch.patch ++++++ --- /var/tmp/diff_new_pack.Y6oDMN/_old 2011-09-28 17:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Y6oDMN/_new 2011-09-28 17:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 046e23b2e58b9689e8e2d24ca6deaacdcf686512 +# Parent 84c2dd3007b3c2120859a3df68182e032e865828 try to lock the screen before switching users diff --git a/utils/gdmflexiserver b/utils/gdmflexiserver ++++++ lightdm-set-gdmflexiserver-envvar.patch ++++++ --- /var/tmp/diff_new_pack.Y6oDMN/_old 2011-09-28 17:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Y6oDMN/_new 2011-09-28 17:23:54.000000000 +0200 @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 6c8db608a5cf06a76e0d11f5cba91dba7b2b8765 +# Parent 6050a73b677334a6cdccd95e633129c4257e29d4 set the GDMFLEXISERVER environment variable for the gdmflexiserver wrapper diff --git a/src/session.c b/src/session.c --- a/src/session.c +++ b/src/session.c -@@ -274,6 +274,7 @@ session_start (Session *session) +@@ -292,6 +292,7 @@ session_start (Session *session) session_set_env (session, "USERNAME", user_get_name (user)); // FIXME: Is this required? session_set_env (session, "HOME", user_get_home_directory (user)); session_set_env (session, "SHELL", user_get_shell (user)); ++++++ lightdm-sysconfig-support.patch ++++++ --- /var/tmp/diff_new_pack.Y6oDMN/_old 2011-09-28 17:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Y6oDMN/_new 2011-09-28 17:23:54.000000000 +0200 @@ -51,7 +51,7 @@ diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c -@@ -822,7 +822,10 @@ static void +@@ -845,7 +845,10 @@ static void display_init (Display *display) { display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, DISPLAY_TYPE, DisplayPrivate); @@ -192,7 +192,7 @@ static void log_cb (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer data) -@@ -1086,6 +1198,9 @@ main (int argc, char **argv) +@@ -1100,6 +1212,9 @@ main (int argc, char **argv) loop = g_main_loop_new (NULL, FALSE); ++++++ lightdm-xauthlocalhostname-support.patch ++++++ --- /var/tmp/diff_new_pack.Y6oDMN/_old 2011-09-28 17:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Y6oDMN/_new 2011-09-28 17:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 150da7055968f940d56b7db0b206c0eef80e2697 +# Parent 2b3707e6fd26c6462c1d6c4d57edb303a7fa981a set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c @@ -16,17 +16,17 @@ diff --git a/src/xserver-local.c b/src/xserver-local.c --- a/src/xserver-local.c +++ b/src/xserver-local.c -@@ -375,7 +375,8 @@ xserver_local_start (DisplayServer *disp +@@ -396,7 +396,8 @@ xserver_local_start (DisplayServer *disp XServerLocal *server = XSERVER_LOCAL (display_server); gboolean result; - gchar *filename, *dir, *path, *absolute_command; + gchar *filename, *dir, *absolute_command; - gchar hostname[1024], *number; + gchar hostname[] = "localhost"; + gchar *number; GString *command; g_return_val_if_fail (server->priv->xserver_process == NULL, FALSE); -@@ -417,7 +418,6 @@ xserver_local_start (DisplayServer *disp +@@ -437,7 +438,6 @@ xserver_local_start (DisplayServer *disp if (server->priv->layout) g_string_append_printf (command, " -layout %s", server->priv->layout); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit seamonkey for openSUSE:11.3
by root＠hilbert.suse.de 28 Sep '11

28 Sep '11

Hello community, here is the log from the commit of package seamonkey for openSUSE:11.3 checked in at Wed Sep 28 17:16:11 CEST 2011. -------- --- old-versions/11.3/UPDATES/all/seamonkey/seamonkey.changes 2011-09-08 02:11:26.000000000 +0200 +++ 11.3/seamonkey/seamonkey.changes 2011-09-26 14:58:38.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Sep 26 12:42:54 UTC 2011 - wr(a)rosenauer.org + +- update to 2.4 (bnc#720264) +- removed obsolete mozilla-cairo-lcd.patch +- rebased patches +- removed XLIB_SKIP_ARGB_VISUALS=1 from environment in + mozilla.sh.in (bnc#680758) + +------------------------------------------------------------------- +Wed Sep 14 07:07:13 UTC 2011 - wr(a)rosenauer.org + +- add dbus-1-glib-devel to BuildRequires (not pulled in + automatically with 12.1) + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 Old: ---- l10n-2.3.3.tar.bz2 mozilla-cairo-lcd.patch seamonkey-2.3.3-source.tar.bz2 New: ---- l10n-2.4.tar.bz2 seamonkey-2.4-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seamonkey.spec ++++++ --- /var/tmp/diff_new_pack.d6hq4q/_old 2011-09-28 17:13:44.000000000 +0200 +++ /var/tmp/diff_new_pack.d6hq4q/_new 2011-09-28 17:13:44.000000000 +0200 @@ -20,12 +20,12 @@ Name: seamonkey -BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ hunspell-devel libgnomeui-devel libidl-devel libiw-devel libnotify-devel libproxy-devel nss-shared-helper-devel python startup-notification-devel unzip update-desktop-files yasm zip +BuildRequires: Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ hunspell-devel libgnomeui-devel libidl-devel libiw-devel libnotify-devel libproxy-devel nss-shared-helper-devel python startup-notification-devel unzip update-desktop-files yasm zip License: MPLv1.1 or GPLv2+ or LGPLv2+ Provides: web_browser -Version: 2.3.3 -Release: 0.<RELEASE2> -%define releasedate 2011090700 +Version: 2.4 +Release: 1.<RELEASE2> +%define releasedate 2011092200 Summary: The successor of the Mozilla Application Suite Url: http://www.mozilla.org/projects/seamonkey Group: Productivity/Networking/Web/Browsers @@ -43,7 +43,6 @@ Patch1: mozilla-nongnome-proxies.patch Patch2: mozilla-prefer_plugin_pref.patch Patch3: mozilla-shared-nss-db.patch -Patch4: mozilla-cairo-lcd.patch Patch5: mozilla-language.patch Patch7: mozilla-cairo-return.patch Patch8: mozilla-ntlm-full-path.patch @@ -146,7 +145,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch7 -p1 %patch8 -p1 @@ -324,6 +322,7 @@ %dir %{progdir}/distribution/extensions/ #%exclude %{progdir}/distribution/extensions/debugQA(a)mozilla.org.xpi %{progdir}/chrome/icons +%{progdir}/hyphenation/ %{progdir}/extensions/modern(a)themes.mozilla.org.xpi %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi #%{progdir}/greprefs/ ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.d6hq4q/_old 2011-09-28 17:13:45.000000000 +0200 +++ /var/tmp/diff_new_pack.d6hq4q/_new 2011-09-28 17:13:45.000000000 +0200 @@ -1,8 +1,8 @@ #!/bin/bash BRANCH="releases/comm-release" -RELEASE_TAG="SEAMONKEY_2_3_3_RELEASE" -VERSION="2.3.3" +RELEASE_TAG="SEAMONKEY_2_4_RELEASE" +VERSION="2.4" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH seamonkey ++++++ l10n-2.3.3.tar.bz2 -> l10n-2.4.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/seamonkey/l10n-2.3.3.tar.bz2 11.3/seamonkey/l10n-2.4.tar.bz2 differ: char 11, line 1 ++++++ mozilla-cairo-return.patch ++++++ --- /var/tmp/diff_new_pack.d6hq4q/_old 2011-09-28 17:13:45.000000000 +0200 +++ /var/tmp/diff_new_pack.d6hq4q/_new 2011-09-28 17:13:45.000000000 +0200 @@ -1,6 +1,6 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent e36e1a20cb5e1ba0e4bc3facac58029544d92e0a +# Parent 43cb27a012f2532add0e9791c1b5a7d0c3b03f9b Bug 631155 - undefined return value in function '_cairo_surface_wrapper_flush' diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper.c b/gfx/cairo/cairo/src/cairo-surface-wrapper.c ++++++ mozilla-language.patch ++++++ --- /var/tmp/diff_new_pack.d6hq4q/_old 2011-09-28 17:13:45.000000000 +0200 +++ /var/tmp/diff_new_pack.d6hq4q/_new 2011-09-28 17:13:45.000000000 +0200 @@ -1,48 +1,48 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent db620d83124746201970dcf50c661957df979eca +# Parent 0d6917b8f28f6e0398dbf329dda4932ba4f997c2 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp --- a/intl/locale/src/nsLocaleService.cpp +++ b/intl/locale/src/nsLocaleService.cpp -@@ -181,16 +181,17 @@ nsLocaleService::nsLocaleService(void) - } - +@@ -160,16 +160,17 @@ nsLocaleService::nsLocaleService(void) + nsRefPtr<nsLocale> resultLocale(new nsLocale()); + NS_ENSURE_TRUE(resultLocale, ); #ifdef MOZ_WIDGET_QT - const char* lang = QLocale::system().name().toAscii(); + const char* lang = QLocale::system().name().toAscii(); #else - // Get system configuration - const char* lang = getenv("LANG"); -+ const char* language = getenv("LANGUAGE"); + // Get system configuration + const char* lang = getenv("LANG"); ++ const char* language = getenv("LANGUAGE"); #endif - for( i = 0; i < LocaleListLength; i++ ) { - nsresult result; - // setlocale( , "") evaluates LC_* and LANG - char* lc_temp = setlocale(posix_locale_category[i], ""); - CopyASCIItoUTF16(LocaleList[i], category); - category_platform = category; -@@ -206,16 +207,21 @@ nsLocaleService::nsLocaleService(void) - else { - CopyASCIItoUTF16(lang, platformLocale); - result = posixConverter->GetXPLocale(lang, xpLocale); - } - } - if (NS_FAILED(result)) { - return; + nsAutoString xpLocale, platformLocale; + nsAutoString category, category_platform; + int i; + + for( i = 0; i < LocaleListLength; i++ ) { + nsresult result; +@@ -188,16 +189,21 @@ nsLocaleService::nsLocaleService(void) + } else { + CopyASCIItoUTF16(lang, platformLocale); + result = nsPosixLocale::GetXPLocale(lang, xpLocale); } -+ // LANGUAGE is overriding LC_MESSAGES -+ if (i == LC_MESSAGES && language && *language) { -+ CopyASCIItoUTF16(language, platformLocale); -+ result = posixConverter->GetXPLocale(language, xpLocale); -+ } - resultLocale->AddCategory(category, xpLocale); - resultLocale->AddCategory(category_platform, platformLocale); } - mSystemLocale = do_QueryInterface(resultLocale); - mApplicationLocale = do_QueryInterface(resultLocale); - } // if ( NS_SUCCEEDED )... + if (NS_FAILED(result)) { + return; + } ++ // LANGUAGE is overriding LC_MESSAGES ++ if (i == LC_MESSAGES && language && *language) { ++ CopyASCIItoUTF16(language, platformLocale); ++ result = nsPosixLocale::GetXPLocale(language, xpLocale); ++ } + resultLocale->AddCategory(category, xpLocale); + resultLocale->AddCategory(category_platform, platformLocale); + } + mSystemLocale = do_QueryInterface(resultLocale); + mApplicationLocale = do_QueryInterface(resultLocale); #endif // XP_UNIX + #ifdef XP_OS2 ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.d6hq4q/_old 2011-09-28 17:13:45.000000000 +0200 +++ /var/tmp/diff_new_pack.d6hq4q/_new 2011-09-28 17:13:45.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -582,16 +582,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS +@@ -579,16 +579,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ @@ -31,7 +31,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8507,16 +8507,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8625,16 +8625,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -66,7 +66,7 @@ diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -114,19 +114,20 @@ CSRCS += md4.c +@@ -114,12 +114,14 @@ CSRCS += md4.c EXTRA_DEPS = $(NSS_DEP_LIBS) @@ -77,14 +77,8 @@ # so that Mozilla's nss.h is used, not glibc's -LOCAL_INCLUDES += $(NSS_CFLAGS) +LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS) - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ -+ $(NSSHELPER_LIBS) \ - $(NSS_LIBS) \ - $(NULL) ++ ++EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) include $(topsrcdir)/config/rules.mk @@ -115,7 +109,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" -@@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(PRBool sho +@@ -1761,18 +1768,34 @@ nsNSSComponent::InitializeNSS(PRBool sho ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -128,11 +122,11 @@ - SECMOD_DB, init_flags); + SECStatus init_rv = SECFailure; +#ifdef MOZ_ENABLE_NSSHELPER -+ if (PR_GetEnv("MOZ_SM_NO_NSSHELPER")) { ++ if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); + } else { -+ init_rv = ::nsshelp_open_db ("seamonkey", profileStr.get(), init_flags); ++ init_rv = ::nsshelp_open_db ("SeaMonkey", profileStr.get(), init_flags); + + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get())); ++++++ mozilla.sh.in ++++++ --- /var/tmp/diff_new_pack.d6hq4q/_old 2011-09-28 17:13:45.000000000 +0200 +++ /var/tmp/diff_new_pack.d6hq4q/_new 2011-09-28 17:13:45.000000000 +0200 @@ -75,9 +75,6 @@ LD_LIBRARY_PATH=$MOZ_DIST_LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH -# ignore composite extension (needed for Flash) -export XLIB_SKIP_ARGB_VISUALS=1 - # needed for SUN Java under Xorg >= 7.2 export LIBXCB_ALLOW_SLOPPY_LOCK=1 ++++++ seamonkey-2.3.3-source.tar.bz2 -> seamonkey-2.4-source.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/seamonkey/seamonkey-2.3.3-source.tar.bz2 11.3/seamonkey/seamonkey-2.4-source.tar.bz2 differ: char 11, line 1 ++++++ seamonkey-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.d6hq4q/_old 2011-09-28 17:13:45.000000000 +0200 +++ /var/tmp/diff_new_pack.d6hq4q/_new 2011-09-28 17:13:45.000000000 +0200 @@ -8,7 +8,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -458,16 +458,20 @@ MOZ_PANGO_LIBS = @MOZ_PANGO_LIB +@@ -450,16 +450,20 @@ MOZ_PANGO_LIBS = @MOZ_PANGO_LIB XT_LIBS = @XT_LIBS@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ @@ -32,7 +32,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -6761,16 +6761,30 @@ fi +@@ -6675,16 +6675,30 @@ fi AC_SUBST(MOZ_CAIRO_LIBS) dnl qcms @@ -66,7 +66,7 @@ diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in --- a/suite/app/Makefile.in +++ b/suite/app/Makefile.in -@@ -105,16 +105,17 @@ endif +@@ -93,16 +93,17 @@ endif APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS) @@ -78,9 +78,9 @@ + $(NSSHELPER_LIBS) \ $(NULL) - ifdef BUILD_STATIC_LIBS - LIBS += \ - $(MOZ_JS_LIBS) \ - $(TK_LIBS) \ - $(NULL) + ifdef MOZ_JPROF + LIBS += -ljprof + endif + ifdef MOZ_ENABLE_DBUS + LIBS += $(MOZ_DBUS_GLIB_LIBS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:11.3
by root＠hilbert.suse.de 28 Sep '11

28 Sep '11

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:11.3 checked in at Wed Sep 28 17:12:24 CEST 2011. -------- --- old-versions/11.3/UPDATES/all/MozillaFirefox/MozillaFirefox.changes 2011-09-07 16:56:37.000000000 +0200 +++ 11.3/MozillaFirefox/MozillaFirefox.changes 2011-09-28 07:09:49.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 21 10:20:43 UTC 2011 - wr(a)rosenauer.org + +- security update to 3.6.23 (bnc#720264) + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 Old: ---- firefox-3.6.22-source.tar.bz2 l10n-3.6.22.tar.bz2 New: ---- firefox-3.6.23-source.tar.bz2 l10n-3.6.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.mdh7WU/_old 2011-09-28 17:11:24.000000000 +0200 +++ /var/tmp/diff_new_pack.mdh7WU/_new 2011-09-28 17:11:24.000000000 +0200 @@ -24,7 +24,7 @@ Name: MozillaFirefox %define xulrunner mozilla-xulrunner192 BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip -BuildRequires: %{xulrunner}-devel = 1.9.2.22 +BuildRequires: %{xulrunner}-devel = 1.9.2.23 %if %suse_version > 1020 BuildRequires: fdupes %endif @@ -34,13 +34,13 @@ BuildRequires: wireless-tools %endif License: MPLv1.1 or GPLv2+ or LGPLv2+ -Version: %mainver.22 +Version: %mainver.23 Release: 0.<RELEASE2> Provides: web_browser Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: firefox = %{version} -%define releasedate 2011090700 +%define releasedate 2011092000 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers ++++++ firefox-3.6.22-source.tar.bz2 -> firefox-3.6.23-source.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/MozillaFirefox/firefox-3.6.22-source.tar.bz2 11.3/MozillaFirefox/firefox-3.6.23-source.tar.bz2 differ: char 11, line 1 ++++++ l10n-3.6.22.tar.bz2 -> l10n-3.6.23.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/MozillaFirefox/l10n-3.6.22.tar.bz2 11.3/MozillaFirefox/l10n-3.6.23.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-xulrunner192 for openSUSE:11.3
by root＠hilbert.suse.de 28 Sep '11

28 Sep '11

Hello community, here is the log from the commit of package mozilla-xulrunner192 for openSUSE:11.3 checked in at Wed Sep 28 17:10:16 CEST 2011. -------- --- old-versions/11.3/UPDATES/all/mozilla-xulrunner192/mozilla-xulrunner192.changes 2011-09-07 16:55:36.000000000 +0200 +++ 11.3/mozilla-xulrunner192/mozilla-xulrunner192.changes 2011-09-27 08:50:10.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Sep 21 10:17:09 UTC 2011 - wr(a)rosenauer.org + +- security update to 1.9.2.23 (bnc#720264) +- bring KDE's dialog.xml in sync with original widget + +------------------------------------------------------------------- +Wed Sep 14 07:08:55 UTC 2011 - wr(a)rosenauer.org + +- add dbus-1-glib-devel to BuildRequires (not pulled in + automatically with 12.1) + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 Old: ---- l10n-1.9.2.22.tar.bz2 xulrunner-source-1.9.2.22.tar.bz2 New: ---- l10n-1.9.2.23.tar.bz2 xulrunner-source-1.9.2.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner192.spec ++++++ --- /var/tmp/diff_new_pack.X8TZuR/_old 2011-09-28 17:09:32.000000000 +0200 +++ /var/tmp/diff_new_pack.X8TZuR/_new 2011-09-28 17:09:32.000000000 +0200 @@ -20,7 +20,7 @@ Name: mozilla-xulrunner192 -BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel pkg-config python startup-notification-devel zip +BuildRequires: autoconf213 dbus-1-glib-devel gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel pkg-config python startup-notification-devel zip # needed for brp-check-bytecode-version (jar, fastjar would do as well) BuildRequires: unzip %if %suse_version > 1020 @@ -39,12 +39,12 @@ BuildRequires: wireless-tools %endif License: MPLv1.1 or GPLv2+ or LGPLv2+ -Version: 1.9.2.22 -Release: 0.<RELEASE2> -%define releasedate 2011090700 -%define version_internal 1.9.2.22 +Version: 1.9.2.23 +Release: 1.<RELEASE2> +%define releasedate 2011092000 +%define version_internal 1.9.2.23 %define apiversion 1.9.2 -%define uaweight 192220 +%define uaweight 192230 Summary: Mozilla Runtime Environment 1.9.2 Url: http://www.mozilla.org Group: Productivity/Other ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.X8TZuR/_old 2011-09-28 17:09:32.000000000 +0200 +++ /var/tmp/diff_new_pack.X8TZuR/_new 2011-09-28 17:09:32.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_6_22_RELEASE" -VERSION="1.9.2.22" +RELEASE_TAG="FIREFOX_3_6_23_RELEASE" +VERSION="1.9.2.23" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla ++++++ l10n-1.9.2.22.tar.bz2 -> l10n-1.9.2.23.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/mozilla-xulrunner192/l10n-1.9.2.22.tar.bz2 11.3/mozilla-xulrunner192/l10n-1.9.2.23.tar.bz2 differ: char 11, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.X8TZuR/_old 2011-09-28 17:09:32.000000000 +0200 +++ /var/tmp/diff_new_pack.X8TZuR/_new 2011-09-28 17:09:32.000000000 +0200 @@ -634,7 +634,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/dialog-kde.xml -@@ -0,0 +1,445 @@ +@@ -0,0 +1,447 @@ +<?xml version="1.0"?> + +<bindings id="dialogBindings" @@ -808,27 +808,29 @@ + document.commandDispatcher.advanceFocusIntoSubtree(dialog); + + var focusedElt = document.commandDispatcher.focusedElement; -+ var initialFocusedElt = focusedElt; -+ while (focusedElt.localName == "tab" || -+ focusedElt.getAttribute("noinitialfocus") == "true") { -+ document.commandDispatcher.advanceFocusIntoSubtree(focusedElt); -+ focusedElt = document.commandDispatcher.focusedElement; -+ if (focusedElt == initialFocusedElt) -+ break; -+ } ++ if (focusedElt) { ++ var initialFocusedElt = focusedElt; ++ while (focusedElt.localName == "tab" || ++ focusedElt.getAttribute("noinitialfocus") == "true") { ++ document.commandDispatcher.advanceFocusIntoSubtree(focusedElt); ++ focusedElt = document.commandDispatcher.focusedElement; ++ if (focusedElt == initialFocusedElt) ++ break; ++ } + -+ if (initialFocusedElt.localName == "tab") { -+ if (focusedElt.hasAttribute("dlgtype")) { -+ // We don't want to focus on anonymous OK, Cancel, etc. buttons, -+ // so return focus to the tab itself -+ initialFocusedElt.focus(); ++ if (initialFocusedElt.localName == "tab") { ++ if (focusedElt.hasAttribute("dlgtype")) { ++ // We don't want to focus on anonymous OK, Cancel, etc. buttons, ++ // so return focus to the tab itself ++ initialFocusedElt.focus(); ++ } + } -+ } +#ifndef XP_MACOSX -+ else if (focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) { -+ defaultButton.focus(); -+ } ++ else if (focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) { ++ defaultButton.focus(); ++ } +#endif ++ } + } + + try { @@ -3982,7 +3984,7 @@ #include <hildon-mime.h> #include <libosso.h> #endif -@@ -1627,36 +1628,46 @@ nsLocalFile::Launch() +@@ -1666,36 +1667,46 @@ nsLocalFile::Launch() return NS_OK; } @@ -4035,7 +4037,7 @@ NS_IMETHODIMP nsLocalFile::Launch() { -@@ -1674,16 +1685,23 @@ nsLocalFile::Launch() +@@ -1713,16 +1724,23 @@ nsLocalFile::Launch() if (nsnull == connection) return NS_ERROR_FAILURE; ++++++ xulrunner-source-1.9.2.22.tar.bz2 -> xulrunner-source-1.9.2.23.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/mozilla-xulrunner192/xulrunner-source-1.9.2.22.tar.bz2 11.3/mozilla-xulrunner192/xulrunner-source-1.9.2.23.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '11

28 Sep '11

Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:Factory checked in at Wed Sep 28 16:52:54 CEST 2011. -------- --- kdebase4-openSUSE/kdebase4-openSUSE.changes 2011-09-22 13:50:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-openSUSE/kdebase4-openSUSE.changes 2011-09-28 15:04:36.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Sep 28 13:04:13 UTC 2011 - coolo(a)suse.com + +- move kdm theme to branding-openSUSE too + +------------------------------------------------------------------- +Tue Sep 27 20:21:26 UTC 2011 - coolo(a)suse.com + +- move ksplashx and wallpapers out of here into branding-openSUSE + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.POJRPd/_old 2011-09-28 16:52:34.000000000 +0200 +++ /var/tmp/diff_new_pack.POJRPd/_new 2011-09-28 16:52:34.000000000 +0200 @@ -30,7 +30,7 @@ Name: kdebase4-openSUSE Version: %{_version} -Release: 44 +Release: 48 License: GPLv2+ Summary: openSUSE KDE Extension # git clone git://git.opensuse.org/projects/desktop/kdebase4-openSUSE.git @@ -43,6 +43,7 @@ BuildRequires: libkde4-devel BuildRequires: oxygen-icon-theme BuildRequires: rpm-devel +BuildRequires: wallpaper-branding-openSUSE PreReq: %fillup_prereq Requires: kdebase4-workspace Requires: plasmoid-folderview @@ -76,6 +77,8 @@ Group: System/GUI/KDE PreReq: %fillup_prereq Requires: kdebase4-workspace +Requires: ksplashx-branding-openSUSE = %{version} +Requires: wallpaper-branding-openSUSE = %{version} Requires: plasma-theme-aya = %{_kde_platform_version} Supplements: packageand(kdebase4-workspace:branding-openSUSE) Provides: kdebase4-workspace-branding = %{version} @@ -112,20 +115,6 @@ %description -n kio_sysinfo-branding-openSUSE This package contains a KDE KIO-Slave showing system information. -%package -n kdm-branding-openSUSE -License: GPLv2+ -Summary: KDE login and display manager -Group: System/GUI/KDE -PreReq: %fillup_prereq -Supplements: packageand(kdm:branding-openSUSE) -Provides: kdm-branding = %{version} -Provides: kde4-kdm-branding-openSUSE = %{version} -Obsoletes: kde4-kdm-branding-openSUSE < %{version} -Conflicts: otherproviders(kdm-branding) - -%description -n kdm-branding-openSUSE -This package contains kdm, the login and session manager for KDE. - %lang_package %prep %setup -q -n %{name} @@ -146,11 +135,6 @@ cp -a branding/root/* %{buildroot} gzip %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSEdefault/widgets/branding.svg mv %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSEdefault/widgets/branding.svg.gz %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSEdefault/widgets/branding.svgz - cp %{buildroot}%{_datadir}/wallpapers/openSUSEdefault/contents/images/1920x1200.jpg %{buildroot}%{_kde4_appsdir}/kdm/themes/SUSE/background-1920x1200.jpg - cp %{buildroot}%{_datadir}/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg %{buildroot}%{_kde4_appsdir}/kdm/themes/SUSE/background-1600x1200.jpg - mkdir -p %{buildroot}%{_kde4_appsdir}/ksplash/Themes/ksplashx-suse/1920x1200 - ln -s %{_datadir}/wallpapers/openSUSEdefault/contents/images/1920x1200.jpg %{buildroot}%{_kde4_appsdir}/ksplash/Themes/ksplashx-suse/1920x1200/background.jpg - ln -s %{_datadir}/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg %{buildroot}%{_kde4_appsdir}/ksplash/Themes/ksplashx-suse/1600x1200/background.jpg chmod og-w -R %{buildroot} %suse_update_desktop_file -u SUSEgreeter System Documentation %fdupes -s %{buildroot}%{_kde4_configdir}/SuSE/default/ @@ -159,9 +143,6 @@ %post -n kdebase4-workspace-branding-openSUSE %{fillup_only -n windowmanager -s kde4} -%post -n kdm-branding-openSUSE -%{fillup_only -n displaymanager -s kdm} - %post -n kio_sysinfo %{_kde4_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : @@ -199,10 +180,8 @@ %doc branding/COPYING %{_datadir}/autostart/ %{_datadir}/opensuse-kiwi -%{_datadir}/wallpapers/ %{_kde4_applicationsdir}/SUSEgreeter.desktop %{_kde4_appsdir}/konsole/ -%{_kde4_appsdir}/ksplash/ %{_kde4_appsdir}/kwin/ %{_kde4_appsdir}/plasma/updates/ %{_kde4_appsdir}/SUSEgreeter @@ -248,10 +227,4 @@ %doc branding/COPYING %{_kde4_appsdir}/sysinfo/ -%files -n kdm-branding-openSUSE -%defattr(-,root,root) -%doc branding/COPYING -%{_kde4_appsdir}/kdm -%{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager-kdm - %changelog ++++++ kdebase4-openSUSE-12.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/CMakeLists.txt new/kdebase4-openSUSE/CMakeLists.txt --- old/kdebase4-openSUSE/CMakeLists.txt 2011-09-22 13:44:08.000000000 +0200 +++ new/kdebase4-openSUSE/CMakeLists.txt 2011-09-28 15:00:50.000000000 +0200 @@ -13,6 +13,5 @@ macro_optional_add_subdirectory(greeter) macro_optional_add_subdirectory(sysinfo) macro_optional_add_subdirectory(krpmview) -macro_optional_add_subdirectory(ksplash) macro_optional_add_subdirectory(migrate) macro_optional_add_subdirectory(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/pics/.randomlist new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/pics/.randomlist --- old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/pics/.randomlist 2011-09-22 13:44:08.000000000 +0200 +++ new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/pics/.randomlist 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -person Files old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/pics/kdelogo.png and new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/pics/kdelogo.png differ Files old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/pics/shutdown.jpg and new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/pics/shutdown.jpg differ Files old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/pics/users/default1.png and new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/pics/users/default1.png differ Files old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/pics/users/root1.png and new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/pics/users/root1.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/KdmGreeterTheme.desktop new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/KdmGreeterTheme.desktop --- old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/KdmGreeterTheme.desktop 2011-09-22 13:44:08.000000000 +0200 +++ new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/KdmGreeterTheme.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[KdmGreeterTheme] -Encoding=UTF-8 -Greeter=suse.xml -Name=openSUSE 11.4 -Description=Default openSUSE 11.4 Theme -Author=Ivan Čukić -#Copyright=(c) 2008 Novell, Inc. -#Screenshot=screenshot.png diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/color.kcsrc new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/color.kcsrc --- old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/color.kcsrc 2011-09-22 13:44:08.000000000 +0200 +++ new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/color.kcsrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -[Color Scheme] -Name=SuSE -activeBackground=106,143,193 -activeBlend=82,117,165 -activeForeground=255,255,255 -activeTitleBtnBg=255,255,255 -alternateBackground=238,238,238 -background=251,248,241 -buttonBackground=255,250,237 -buttonForeground=16,16,16 -contrast=7 -foreground=0,0,0 -frame=82,117,165 -handle=82,117,165 -inactiveBackground=251,248,241 -inactiveBlend=251,248,241 -inactiveForeground=86,85,83 -inactiveFrame=251,248,241 -inactiveHandle=251,248,241 -inactiveTitleBtnBg=86,85,83 -linkColor=64,114,180 -selectBackground=38,76,3 -selectForeground=255,255,255 -shadeSortColumn=true -visitedLinkColor=142,121,176 -windowBackground=255,255,255 -windowForeground=16,16,16 Files old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/dots.png and new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/dots.png differ Files old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/enter.png and new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/enter.png differ Files old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/opensuse.png and new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/opensuse.png differ Files old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/screenshot.png and new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/screenshot.png differ Files old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/suse.png and new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/suse.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/suse.svg new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/suse.svg --- old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/suse.svg 2011-09-22 13:44:08.000000000 +0200 +++ new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/suse.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="60" - height="60" - id="svg4791" - sodipodi:version="0.32" - inkscape:version="0.45+devel" - version="1.0" - sodipodi:docname="suse.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> - <defs - id="defs4793"> - <filter - inkscape:collect="always" - id="filter5993"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.3020833" - id="feGaussianBlur5995" /> - </filter> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#6a6a6a" - bordercolor="#666666" - borderopacity="1.0" - gridtolerance="10000" - guidetolerance="10" - objecttolerance="10" - inkscape:pageopacity="0.75686275" - inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="86.714286" - inkscape:cy="2.2857143" - inkscape:document-units="px" - inkscape:current-layer="layer1" - borderlayer="true" - inkscape:showpageshadow="false" - width="60px" - height="60px" - inkscape:window-width="872" - inkscape:window-height="623" - inkscape:window-x="0" - inkscape:window-y="25" /> - <metadata - id="metadata4796"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-180.21429,-326.86218)"> - <g - id="g4806" - transform="translate(0.5000042,-1.5000024)"> - <path - id="path5914" - d="M 32.15625,9.15625 C 19.647873,9.15625 9.5,19.302969 9.5,31.8125 C 9.5,44.322031 19.647873,54.468751 32.15625,54.46875 C 44.664627,54.46875 54.8125,44.322031 54.8125,31.8125 C 54.8125,19.302969 44.664627,9.15625 32.15625,9.15625 z M 32.235885,12.301845 L 32.275703,12.301845 C 43.035104,12.323153 51.786358,21.049267 51.786358,31.8125 C 51.786358,42.590049 43.012279,51.323152 32.235885,51.323155 C 26.416424,51.323155 21.197614,48.793376 17.622803,44.75324 C 19.092679,43.612442 21.562234,43.890369 24.590894,44.235611 C 26.042296,44.400726 27.701097,44.595682 29.408831,44.633787 C 34.179865,44.661499 39.300652,43.788427 42.469025,42.403998 C 44.517383,41.505676 45.830074,40.880299 46.649879,40.134391 C 46.94547,39.891914 47.088954,39.519425 47.247144,39.099132 L 47.366597,38.820409 C 47.499383,38.48094 47.719148,37.745509 47.804591,37.347155 C 47.842695,37.172802 47.848502,36.966333 47.724956,36.869343 L 47.286962,36.948978 C 45.896758,37.782639 42.417975,39.392831 39.164159,39.457491 C 35.132104,39.541781 26.991299,35.395711 26.143783,34.958095 L 26.064148,34.838642 C 25.860928,34.353687 24.649294,31.464225 24.391806,30.856876 C 30.241287,34.708805 35.088964,36.856497 38.8058,37.187884 C 42.93831,37.555064 46.147207,35.285151 47.525868,34.321013 C 47.794903,34.137423 47.999026,33.993829 48.083315,33.962654 L 48.202768,33.843201 C 47.974146,32.390645 45.813868,25.337984 44.181184,23.649879 C 43.728559,23.186863 43.359192,22.72561 42.628295,22.296079 C 36.718772,18.851743 22.699562,16.777625 22.042564,16.681788 L 21.923111,16.721606 L 21.883293,16.841059 C 21.883293,16.841059 21.809432,19.742988 21.803658,20.06629 C 21.322166,19.906948 19.840858,19.418507 17.702438,18.831942 C 21.267848,14.840296 26.465987,12.313447 32.235885,12.301845 z M 37.690905,22.654438 C 41.001301,22.773367 43.61744,25.557907 43.504284,28.865993 C 43.445396,30.466344 42.761549,31.914728 41.593036,33.00703 C 40.421061,34.105107 38.902315,34.691513 37.292728,34.639554 C 33.988106,34.516007 31.411786,31.731466 31.519167,28.427999 C 31.575745,26.825337 32.21516,25.335983 33.390598,24.247144 C 34.561418,23.149067 36.08709,22.601324 37.690905,22.654438 z M 37.651087,24.406415 C 36.533382,24.364848 35.478792,24.758082 34.664763,25.521309 C 33.853041,26.283381 33.386574,27.310292 33.35078,28.427999 C 33.274572,30.737308 35.065364,32.682682 37.372364,32.768124 C 38.493534,32.802765 39.579855,32.412992 40.398506,31.653229 C 41.214847,30.887693 41.677848,29.859628 41.712489,28.74654 C 41.789851,26.433766 39.959243,24.487241 37.651087,24.406415 z M 38.327988,26.516751 C 39.353321,26.516751 40.199417,27.065234 40.199418,27.751098 C 40.199418,28.433501 39.353322,28.985446 38.327988,28.985446 C 37.299191,28.985446 36.496375,28.432345 36.496375,27.751098 C 36.496375,27.065234 37.299192,26.51675 38.327988,26.516751 z" - style="font-size:20.48839951px;opacity:0.33908045;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-miterlimit:4;filter:url(#filter5993);font-family:TrebuchetMS-Bold" - transform="matrix(0.8282897,0,0,0.8282897,183.0796,333.01221)" /> - <g - transform="translate(-27.285713,97.362184)" - id="g5901"> - <g - id="g6036" - inkscape:label="Layer 1" - transform="matrix(0.8282897,0,0,0.8282897,210.36531,234.65004)" - style="fill:#fefefe;fill-opacity:1"> - <path - style="font-size:20.48839951px;fill:#fefefe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-miterlimit:4;font-family:TrebuchetMS-Bold" - d="M 32.15625,9.15625 C 19.647873,9.15625 9.5,19.302969 9.5,31.8125 C 9.5,44.322031 19.647873,54.468751 32.15625,54.46875 C 44.664627,54.46875 54.8125,44.322031 54.8125,31.8125 C 54.8125,19.302969 44.664627,9.15625 32.15625,9.15625 z M 32.235885,12.301845 L 32.275703,12.301845 C 43.035104,12.323153 51.786358,21.049267 51.786358,31.8125 C 51.786358,42.590049 43.012279,51.323152 32.235885,51.323155 C 26.416424,51.323155 21.197614,48.793376 17.622803,44.75324 C 19.092679,43.612442 21.562234,43.890369 24.590894,44.235611 C 26.042296,44.400726 27.701097,44.595682 29.408831,44.633787 C 34.179865,44.661499 39.300652,43.788427 42.469025,42.403998 C 44.517383,41.505676 45.830074,40.880299 46.649879,40.134391 C 46.94547,39.891914 47.088954,39.519425 47.247144,39.099132 L 47.366597,38.820409 C 47.499383,38.48094 47.719148,37.745509 47.804591,37.347155 C 47.842695,37.172802 47.848502,36.966333 47.724956,36.869343 L 47.286962,36.948978 C 45.896758,37.782639 42.417975,39.392831 39.164159,39.457491 C 35.132104,39.541781 26.991299,35.395711 26.143783,34.958095 L 26.064148,34.838642 C 25.860928,34.353687 24.649294,31.464225 24.391806,30.856876 C 30.241287,34.708805 35.088964,36.856497 38.8058,37.187884 C 42.93831,37.555064 46.147207,35.285151 47.525868,34.321013 C 47.794903,34.137423 47.999026,33.993829 48.083315,33.962654 L 48.202768,33.843201 C 47.974146,32.390645 45.813868,25.337984 44.181184,23.649879 C 43.728559,23.186863 43.359192,22.72561 42.628295,22.296079 C 36.718772,18.851743 22.699562,16.777625 22.042564,16.681788 L 21.923111,16.721606 L 21.883293,16.841059 C 21.883293,16.841059 21.809432,19.742988 21.803658,20.06629 C 21.322166,19.906948 19.840858,19.418507 17.702438,18.831942 C 21.267848,14.840296 26.465987,12.313447 32.235885,12.301845 z M 37.690905,22.654438 C 41.001301,22.773367 43.61744,25.557907 43.504284,28.865993 C 43.445396,30.466344 42.761549,31.914728 41.593036,33.00703 C 40.421061,34.105107 38.902315,34.691513 37.292728,34.639554 C 33.988106,34.516007 31.411786,31.731466 31.519167,28.427999 C 31.575745,26.825337 32.21516,25.335983 33.390598,24.247144 C 34.561418,23.149067 36.08709,22.601324 37.690905,22.654438 z M 37.651087,24.406415 C 36.533382,24.364848 35.478792,24.758082 34.664763,25.521309 C 33.853041,26.283381 33.386574,27.310292 33.35078,28.427999 C 33.274572,30.737308 35.065364,32.682682 37.372364,32.768124 C 38.493534,32.802765 39.579855,32.412992 40.398506,31.653229 C 41.214847,30.887693 41.677848,29.859628 41.712489,28.74654 C 41.789851,26.433766 39.959243,24.487241 37.651087,24.406415 z M 38.327988,26.516751 C 39.353321,26.516751 40.199417,27.065234 40.199418,27.751098 C 40.199418,28.433501 39.353322,28.985446 38.327988,28.985446 C 37.299191,28.985446 36.496375,28.432345 36.496375,27.751098 C 36.496375,27.065234 37.299192,26.51675 38.327988,26.516751 z" - id="path2445" /> - </g> - <path - sodipodi:type="arc" - style="opacity:0.39655175;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:3.625, 3.625;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path5514" - sodipodi:cx="239" - sodipodi:cy="262" - sodipodi:rx="29" - sodipodi:ry="29" - d="M 268,262 A 29,29 0 1 1 210,262 A 29,29 0 1 1 268,262 z" - transform="matrix(0.8275862,0,0,0.8275862,39.206897,44.172414)" /> - </g> - </g> - </g> -</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/suse.xml new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/suse.xml --- old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/suse.xml 2011-09-22 13:44:08.000000000 +0200 +++ new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdm/themes/SUSE/suse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,252 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE greeter SYSTEM "greeter.dtd"> -<greeter> - - <item type="pixmap" id="background" background="true"> - <normal file="background.jpg" alpha="1"/> - <pos x="0" y="0" width="100%" height="100%"/> - </item> -  - <item type="pixmap"> - <normal file="opensuse.png" alpha="0.9"/> - <pos x="-10" y="10" width="64" height="26" anchor="ne"/> - </item> - -  - <item type="rect" id="userlist-background"> - <pos x="12%" y="10%" width="22%" height="70%"/> - <fixed id="fixeduser"> - <item type="list" id="userlist"> - <style text-color="#ffffff" highlighted-text-color="#000000" highlight-color="#a2bb68" /> - <pos x="0" y="0" width="100%" height="100%"/> - <normal color="#ffffff" alpha="0"/> - <show type="userlist"/> - </item> - </fixed> - </item> - - -<item type="rect"> - <pos y="30" x="100%" width="box" height="box" anchor="ne"/> - <box ypadding="10" xpadding="13" spacing="25" orientation="horizontal"> - <item type="label"> - <text>%h</text> - <normal font="Sans 9" color="#ffffff" alpha="0.5" /> - <pos x="50%" anchor="n"/> - </item> - </box> - <show modes="remote,remote-flexi" /> -</item> - - - <item type="rect" id="timed-rect"> - <show type="timed"/> - <normal color="#FFFFFF" alpha="0.1"/> - <pos anchor="c" x="50%" y="75%" width="box" height="box"/> - <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0"> - <item type="label" id="timed-label"> - <normal color="#ffffff" font="Sans 12"/> - <pos x="50%" anchor="n"/> - - <stock type="timed-label"/> - </item> - </box> - </item> - - <item type="rect"> - <pos y="50%" x="55%" width="box" height="box" anchor="c"/> - <box ypadding="5" xpadding="5" spacing="25" orientation="horizontal"> - - <item type="pixmap" id="susepng"> - <normal file="suse.png" alpha="1"/> - <pos y="40%" x="50%" width="60" height="60" anchor="c"/> - <show type="!userlist"/> - </item> - <item type="rect" id="suseplace"> - <normal color="#ffffff" alpha="0"/> - <pos y="40%" x="50%" width="60" height="60" anchor="c"/> - <show type="userlist"/> - </item> - <item type="rect"> - <pos width="box" height="box"/> - <box ypadding="5" xpadding="5" spacing="15" orientation="vertical"> - - - <item type="rect"> - <pos width="200" height="60"/> - </item> - - - <item type="rect" id="talker"> - <normal color="#FFFFFF" alpha="0"/> - <pos anchor="e" x="0" y="10%" width="box" height="box"/> - <box orientation="vertical" xpadding="0" ypadding="0" spacing="10"> - - <item type="label"> - <show type="!plugin-specific-generic"/> - <pos anchor="nw" x="100%"/> - <normal color="#FFFFFF" font="Sans 12"/> - <stock type="username-label"/> - </item> - - <item type="entry" id="user-entry"> - <show type="!plugin-specific-generic"/> - <pos anchor="nw" x="100%" height="24" width="250"/> - </item> - - <item type="label"> - <show type="!plugin-specific-generic"/> - <pos anchor="nw" x="100%"/> - <normal color="#FFFFFF" font="Sans 12"/> - <stock type="password-label"/> - </item> - <item type="label" id="pam-prompt"> - <show type="plugin-specific-generic"/> - <pos anchor="nw" x="100%"/> - <normal color="#FFFFFF" font="Sans 12"/> - <text>Reasonably long place for a message</text> - </item> - - <item type="rect"> - <normal color="#ff0000" alpha="0"/> - <pos anchor="nw" x="100%" height="24" width="300"/> - <fixed> - <item type="entry" id="pw-entry"> - <show type="!plugin-specific-generic"/> - <pos anchor="nw" x="0" height="24" width="250"/> - </item> - <item type="entry" id="user-pw-entry"> - <show type="plugin-specific-generic"/> - <pos anchor="nw" x="0" height="24" width="250"/> - </item> - <item type="pixmap" button="true" id="login_button"> - <pos anchor="sw" x="255" y="-0" height="21"/> - <normal file="enter.png"/> - </item> - </fixed> - </item> - <item type="label" id="pam-message"> - <show type="plugin-specific-generic"/> - <pos anchor="nw" x="100%"/> - <normal color="#FFFFFF" font="Sans 12"/> - <text>Some informational text shown here</text> - </item> - <item type="rect" id="plugin-specific-winbind"> - <show type="plugin-specific-winbind"/> - <pos anchor="nw" x="100%" width="250"/> - <fixed> - <item type="label" id="domain-label"> - <pos anchor="nw" x="0"/> - <normal color="#ffffff" font="Sans 12"/> - <stock type="domain-label"/> - </item> - <item type="entry" id="domain-entry"> - <pos anchor="nw" x="3%" y="30" height="24" width="100%"/> - </item> - </fixed> - </item> - </box> - </item> - </box> - </item> - </box> - </item> - <item type="rect" id="caps-lock-warning"> - <normal color="#FFFFFF" alpha="0.5"/> - <pos anchor="c" x="50%" y="75%" width="box" height="box"/> - <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0"> - <item type="label"> - <normal color="#000000" font="Sans 12"/> - <pos x="50%" anchor="n"/> - - <stock type="caps-lock-warning"/> - </item> - </box> - </item> - <item type="label" id="pam-error"> - <pos x="50%" y="65%" anchor="c"/> - <normal font="Sans Bold 12" color="#ffffff"/> - <text> </text> - </item> - - <item type="rect"> - <pos y="100%" x="20" width="100%" height="10%" anchor="sw"/> - <box xpadding="10" spacing="10" orientation="horizontal"> - <item type="rect" id="session_button" button="true"> - <pos y="50%" width="box" height="100%" anchor="w"/> - <box xpadding="0" spacing="2" orientation="horizontal"> - <item type="label"> - <normal font="Sans 12" color="#ffffff" alpha="1"/> - <prelight font="Sans 12" color="#ffffff" alpha="1"/> - <active font="Sans 12" color="#ffffff" alpha="1"/> - <pos y="50%" anchor="w"/> - <stock type="session"/> - </item> - </box> - </item> - <item type="rect" id="system_button" button="true"> - <show type="reboot" modes="console"/> - <pos y="50%" width="box" height="100%" anchor="w"/> - <box xpadding="0" spacing="2" orientation="horizontal"> - <item type="pixmap"> - <normal file="dots.png" alpha="1.0"/> - <pos x="0" y="0" height="100%"/> - </item> - <item type="label"> - <normal font="Sans 12" color="#ffffff" alpha="1"/> - <prelight font="Sans 12" color="#ffffff" alpha="1"/> - <active font="Sans 12" color="#ffffff" alpha="1"/> - <pos y="50%" anchor="w"/> - <stock type="system"/> - </item> - </box> - </item> - <item type="rect" id="admin_button" button="true"> -  - <pos y="50%" width="box" height="100%" anchor="w"/> - <box xpadding="0" spacing="2" orientation="horizontal"> - <item type="pixmap"> - <normal file="dots.png" alpha="1"/> - <pos x="0" y="0" height="100%"/> - <show type="admin"/> - </item> - <item type="label"> - <normal font="Sans 12" color="#ffffff" alpha="1"/> - <prelight font="Sans 12" color="#ffffff" alpha="1"/> - <active font="Sans 12" color="#ffffff" alpha="1"/> - <pos y="50%" anchor="w"/> - <stock type="admin"/> - <show type="admin"/> - </item> - </box> - </item> - <item type="rect" id="disconnect_button" button="true"> - <normal/> - <show modes="flexi,remote"/> - <pos y="50%" width="box" height="100%" anchor="w"/> - <box xpadding="0" spacing="2" orientation="horizontal"> - <item type="pixmap"> - <normal file="dots.png" alpha="1"/> - <pos x="0" y="0" height="100%"/> - </item> - <item type="label"> - <normal font="Sans 12" color="#ffffff" alpha="1"/> - <prelight font="Sans 12" color="#ffffff" alpha="1"/> - <active font="Sans 12" color="#ffffff" alpha="1"/> - <pos y="50%" anchor="w"/> - <stock type="disconnect"/> - <show modes="remote"/> - </item> - <item type="label"> - <normal font="Sans 12" color="#ffffff" alpha="1"/> - <prelight font="Sans 12" color="#ffffff" alpha="1"/> - <active font="Sans 12" color="#ffffff" alpha="1"/> - <pos y="50%" anchor="w"/> - <stock type="quit"/> - <show modes="flexi"/> - </item> - </box> - </item> - </box> - </item> -</greeter> Files old/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg and new/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg differ Files old/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1200.jpg and new/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1200.jpg differ Files old/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/screenshot.jpg and new/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/screenshot.jpg differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/metadata.desktop new/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/metadata.desktop --- old/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/metadata.desktop 2011-09-22 13:44:08.000000000 +0200 +++ new/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/metadata.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Stripes: openSUSE (Celadon) - -X-KDE-PluginInfo-Name=Stripes-openSUSE-celadon -X-KDE-PluginInfo-Author=Ivan Čukić -X-KDE-PluginInfo-Email=ivan.cukic(a)kde.org -X-KDE-PluginInfo-License=GPLv3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/var/adm/fillup-templates/sysconfig.displaymanager-kdm new/kdebase4-openSUSE/config-files/var/adm/fillup-templates/sysconfig.displaymanager-kdm --- old/kdebase4-openSUSE/config-files/var/adm/fillup-templates/sysconfig.displaymanager-kdm 2011-09-22 13:44:08.000000000 +0200 +++ new/kdebase4-openSUSE/config-files/var/adm/fillup-templates/sysconfig.displaymanager-kdm 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -## Path: Desktop/Display manager -## Description: settings to generate a proper displaymanager config -## Config: kdm3 - -## Type: string -## Default: -# -# space separated list of users for which icons should be shown in KDM -# if empty, then take system defaults -# -KDM_USERS="" - -## Type: string -## Default: -# -# Special greeting words in kdm -# -KDM_GREETSTRING="" - -## Type: string -## Default: -# -# Defines extra Server Arguments given to the kdm display manager when -# starting a local display. Useful to override e.g. the -dpi setting. -# -DISPLAYMANAGER_KDM_LOCALARGS="" - -## Type: string -## Default: SUSE -# -# Define the theme to be used by kdm. If empty, the traditional login -# window is used (which lacks some features) -# -DISPLAYMANAGER_KDM_THEME="SUSE" - -## Type: yesno -## Default: yes -# -# Allow local access of the user root to your display manager. Note -# that root can never login if DISPLAYMANAGER_SHUTDOWN is "auto" and -# System/Security/Permissions/PERMISSION_SECURITY is "paranoid". -# This settings currently works only with KDM. -# -DISPLAYMANAGER_ROOT_LOGIN_LOCAL="yes" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/ksplash/CMakeLists.txt new/kdebase4-openSUSE/ksplash/CMakeLists.txt --- old/kdebase4-openSUSE/ksplash/CMakeLists.txt 2011-09-22 13:44:08.000000000 +0200 +++ new/kdebase4-openSUSE/ksplash/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -add_subdirectory( ksplashx-suse ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/description.txt new/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/description.txt --- old/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/description.txt 2011-09-22 13:44:08.000000000 +0200 +++ new/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/description.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -# updated for openSUSE 11.3 -SCALE ON -BACKGROUND_IMAGE 0 0 background.jpg -SCALE OFF -IMAGE_REL RT -15 15 CC kde-logo.png -IMAGE_REL CC 0 -60 CC opensuse-logo.png -IMAGE_REL CC 0 0 CC progress0.png -#WAIT_STATE initial -IMAGE_REL CC 0 0 CC progress1.png -WAIT_STATE kcminit -IMAGE_REL CC 0 0 CC progress2.png -WAIT_STATE wm -IMAGE_REL CC 0 0 CC progress3.png -WAIT_STATE desktop -IMAGE_REL CC 0 0 CC progress4.png -WAIT_STATE ready Files old/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/kde-logo.png and new/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/kde-logo.png differ Files old/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/opensuse-logo.png and new/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/opensuse-logo.png differ Files old/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/progress0.png and new/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/progress0.png differ Files old/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/progress1.png and new/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/progress1.png differ Files old/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/progress2.png and new/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/progress2.png differ Files old/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/progress3.png and new/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/progress3.png differ Files old/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/progress4.png and new/kdebase4-openSUSE/ksplash/ksplashx-suse/1600x1200/progress4.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/ksplash/ksplashx-suse/CMakeLists.txt new/kdebase4-openSUSE/ksplash/ksplashx-suse/CMakeLists.txt --- old/kdebase4-openSUSE/ksplash/ksplashx-suse/CMakeLists.txt 2011-09-22 13:44:08.000000000 +0200 +++ new/kdebase4-openSUSE/ksplash/ksplashx-suse/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -install( FILES Preview.png Theme.rc DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/ksplashx-suse ) -install( FILES 1600x1200/description.txt - 1600x1200/kde-logo.png 1600x1200/opensuse-logo.png - 1600x1200/progress0.png 1600x1200/progress1.png 1600x1200/progress2.png - 1600x1200/progress3.png 1600x1200/progress4.png - DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/ksplashx-suse/1600x1200 ) -# 1600x1200/background.png and 1920x1200/background.png are symlinked from wallpapers Files old/kdebase4-openSUSE/ksplash/ksplashx-suse/Preview.png and new/kdebase4-openSUSE/ksplash/ksplashx-suse/Preview.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/ksplash/ksplashx-suse/Theme.rc new/kdebase4-openSUSE/ksplash/ksplashx-suse/Theme.rc --- old/kdebase4-openSUSE/ksplash/ksplashx-suse/Theme.rc 2011-09-22 13:44:08.000000000 +0200 +++ new/kdebase4-openSUSE/ksplash/ksplashx-suse/Theme.rc 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -[KSplash Theme: ksplashx-suse] -Name = openSUSE 11.4 -Description = KDE openSUSE 11.4 Splash -Version = 1.0 -Author = Ivan Čukić -#Homepage = http://plasma.kde.org -Engine = KSplashX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/po/zh_TW/SUSEgreeter.po new/kdebase4-openSUSE/po/zh_TW/SUSEgreeter.po --- old/kdebase4-openSUSE/po/zh_TW/SUSEgreeter.po 2011-02-25 11:47:32.000000000 +0100 +++ new/kdebase4-openSUSE/po/zh_TW/SUSEgreeter.po 2011-09-27 22:01:38.000000000 +0200 @@ -2,20 +2,20 @@ # Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg # This file is distributed under the same license as the package. # -# swyear <swyear(a)gmail.com>, 2008, 2010. +# swyear <swyear(a)gmail.com>, 2008, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: SUSEgreeter\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2010-04-13 19:48+0200\n" -"PO-Revision-Date: 2010-06-30 23:22+0800\n" +"PO-Revision-Date: 2011-09-27 13:49+0800\n" "Last-Translator: \n" "Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: main.cpp:34 main.cpp:35 @@ -47,8 +47,20 @@ #. i18n: file: greet.xml:6 #: rc.cpp:6 -msgid "The <a href=\"http://www.opensuse.org/\">openSUSE project</a> is a community program sponsored by <a href=\"http://www.novell.com/linux/\">Novell</a>. Promoting the use of Linux everywhere, openSUSE.org provides free, easy access to the world's most usable Linux distribution, openSUSE. You'll find more information available in many languages on the <a href=\"http://en.opensuse.org/\">project wiki</a>. For the latest news, visit our <a href=\"http://news.opensuse.org/\">openSUSE News</a> portal." -msgstr "<a href=\"http://www.opensuse.org/\">openSUSE 計畫</a>是由<a href=\"http://www.novell.com/linux/\">Novell</a>所贊助的社群計畫。致力於推廣 Linux 在各方面的使用，openSUSE.org 提供了免費、簡易的管道讓您取得世界上最好用的 Linux 發行版本 - openSUSE。您可以在<a href=\"http://www.opensuse.org/\">本計畫的維基百科</a>獲取各種語言版本的進一步訊息。要得到最新的消息，請造訪我們的<a href=\"http://news.opensuse.org/\">openSUSE 新聞</a>入口。" +msgid "" +"The <a href=\"http://www.opensuse.org/\">openSUSE project</a> is a community " +"program sponsored by <a href=\"http://www.novell.com/linux/\">Novell</a>. " +"Promoting the use of Linux everywhere, openSUSE.org provides free, easy " +"access to the world's most usable Linux distribution, openSUSE. You'll find " +"more information available in many languages on the <a href=\"http://en." +"opensuse.org/\">project wiki</a>. For the latest news, visit our <a " +"href=\"http://news.opensuse.org/\">openSUSE News</a> portal." +msgstr "" +"<a href=\"http://www.opensuse.org/\">openSUSE 計畫</a>是由<a href=\"http://www." +"novell.com/linux/\">Novell</a>所贊助的社群計畫。致力於推廣 Linux 在各方面的使用，openSUSE.org " +"提供了免費、簡易的管道讓您取得世界上最好用的 Linux 發行版本 - openSUSE。您可以在<a href=\"http://www." +"opensuse.org/\">本計畫的維基百科</a>獲取各種語言版本的進一步訊息。要得到最新的消息，請造訪我們的<a " +"href=\"http://news.opensuse.org/\">openSUSE 新聞</a>入口。" #. i18n: file: greet.xml:9 #: rc.cpp:8 @@ -57,8 +69,16 @@ #. i18n: file: greet.xml:11 #: rc.cpp:10 -msgid "The openSUSE community are helpful people. Various ways exist to contact other openSUSE members, ask questions, discuss openSUSE and Linux. The official <a href=\"http://forums.opensuse.org/\">openSUSE Forums</a> are very accessible. Other ways including online chat are described on our <a href=\"http://help.opensuse.org/\">Online Help</a> site." -msgstr "openSUSE 社群非常樂意助人。有很多種方法來連絡其他 openSUSE 成員、問問題、討論 openSUSE 和 Linux。官方 <a href=\"http://forums.opensuse.org/\">openSUSE 論壇</a> 是一個好管道。其他方法包括了線上聊天可以在我們的 <a href=\"http://help.opensuse.org/\">線上求助</a> 網站找到。" +msgid "" +"The openSUSE community are helpful people. Various ways exist to contact " +"other openSUSE members, ask questions, discuss openSUSE and Linux. The " +"official <a href=\"http://forums.opensuse.org/\">openSUSE Forums</a> are very " +"accessible. Other ways including online chat are described on our <a " +"href=\"http://help.opensuse.org/\">Online Help</a> site." +msgstr "" +"openSUSE 社群非常樂意助人。有很多種方法來連絡其他 openSUSE 成員、問問題、討論 openSUSE 和 Linux。官方 <a " +"href=\"http://forums.opensuse.org/\">openSUSE 論壇</a> 是一個好管道。其他方法包括了線上聊天可以在我們的 " +"<a href=\"http://help.opensuse.org/\">線上求助</a> 網站找到。" #. i18n: file: greet.xml:14 #: rc.cpp:12 @@ -67,8 +87,18 @@ #. i18n: file: greet.xml:16 #: rc.cpp:14 -msgid "The <a href=\"http://en.opensuse.org/Build_Service\">openSUSE Build Service</a> is an open and complete distribution development platform. It provides software developers with a tool to compile, release and publish their software for a broad user audience. For non-developers it offers a large collection of easy to install software packages. Just visit the <a href=\"http://software.opensuse.org/\">openSUSE Software</a> site." -msgstr "<a href=\"http://en.opensuse.org/Build_Service\">openSUSE Build Service</a>是一個開放且完整的發行版本開發平台。它提供軟體開發者一套工具，讓開發者能使用它來編譯並對廣大的使用者群發布軟體。對非開發者而言，它則提供了一個廣泛收集軟體之處，讓使用者能輕鬆的安裝軟體套件。請直接造訪<a href=\"http://software.opensuse.org/\">openSUSE 軟體</a>網站。" +msgid "" +"The <a href=\"http://en.opensuse.org/Build_Service\">openSUSE Build Service<" +"/a> is an open and complete distribution development platform. It provides " +"software developers with a tool to compile, release and publish their " +"software for a broad user audience. For non-developers it offers a large " +"collection of easy to install software packages. Just visit the <a " +"href=\"http://software.opensuse.org/\">openSUSE Software</a> site." +msgstr "" +"<a href=\"http://en.opensuse.org/Build_Service\">openSUSE Build Service</a>" +"是一個開放且完整的發行版本開發平台。它提供軟體開發者一套工具，讓開發者能使用它來編譯並對廣大的使用者群發布軟體。對非開發者而言，它則提供了一個廣泛收集軟體之" +"處，讓使用者能輕鬆的安裝軟體套件。請直接造訪<a href=\"http://software.opensuse.org/\">openSUSE 軟體<" +"/a>網站。" #: greetings.cpp:48 greetings.cpp:65 greetings.cpp:81 greetings.cpp:87 #: greetings.cpp:129 @@ -78,7 +108,7 @@ #: greetings.cpp:138 msgid "Have a lot of fun!" -msgstr "祝您使用愉快！" +msgstr "" #: greetings.cpp:139 msgid "CLOSE" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-desktop-sharp2 for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '11

28 Sep '11

Hello community, here is the log from the commit of package gnome-desktop-sharp2 for openSUSE:Factory checked in at Wed Sep 28 15:03:13 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-desktop-sharp2/gnome-desktop-sharp2.changes 2011-09-28 14:12:11.000000000 +0200 @@ -0,0 +1,70 @@ +------------------------------------------------------------------- +Wed Sep 28 12:11:57 UTC 2011 - coolo(a)suse.com + +- make it build for factory in ignoring dropped stuff + +------------------------------------------------------------------- +Wed Sep 8 02:52:46 CEST 2010 - vuntz(a)opensuse.org + +- Use pkgconfig() style BuildRequires on 11.3 and later: + + old-style: gnome-desktop-devel, gtkhtml2-devel, + gtksourceview-devel, libgnomeprintui-devel, librsvg-devel, + libwnck-devel, vte-devel. + + new-style: gnome-desktop-2.0, gtksourceview-2.0, + libgnomeprint-2.2, libgnomeprintui-2.2, libgtkhtml-3.14, + libpanelapplet-2.0, librsvg-2.0, libwnck-1.0, vte. +- This will make it easier to switch to GNOME 3 libraries in + openSUSE, since they can cause changes in package names. + +------------------------------------------------------------------- +Mon Apr 12 07:14:19 UTC 2010 - aj(a)suse.de + +- Fix libgnome-desktop version number for 11.3. + +------------------------------------------------------------------- +Fri Apr 9 08:03:13 UTC 2010 - aj(a)suse.de + +- Disable nautilusburn for openSUSE 11.3 + +------------------------------------------------------------------- +Mon Aug 31 19:49:20 UTC 2009 - ajorgensen(a)novell.com + +- Update to 2.26.0 + * Fix so version of native library dependency + +------------------------------------------------------------------- +Tue Aug 11 16:51:54 UTC 2009 - ajorgensen(a)novell.com + +- ppc64 is native now (don't use biarchcompat) + +------------------------------------------------------------------- +Thu Feb 12 00:58:16 CET 2009 - ro(a)suse.de + +- add libgnomeprintui-devel to buildrequires to fix build + +------------------------------------------------------------------- +Wed Sep 10 09:38:07 MDT 2008 - ajorgensen(a)novell.com + +- Re-add 2.20.1 tarball as I need it to build on 11.0 + +------------------------------------------------------------------- +Wed Sep 8 11:18:07 MDT 2008 - ajorgensen(a)novell.com + +- Update to 2.24.0 + * Update to GNOME 2.24 API + * Add gnome-print-sharp.dll and gnome-panel-sharp.dll assemblies + along with .pcs to detect their availability + +------------------------------------------------------------------- +Wed Apr 09 09:25:27 MST 2008 - wberrier(a)novell.com + +- Remove gnome-desktop-sharp2-complete package +- Rename gnomedesktop2-sharp to gnome-desktop-sharp2 so we have a + sub-package named the same as the .spec file +- Don't call autoreconf since we don't have any patches + +------------------------------------------------------------------- +Fri Jan 11 22:25:27 CST 2008 - mkestner(a)novell.com + +- Initial package of gnome-desktop-sharp2 + calling whatdependson for head-i586 New: ---- gnome-desktop-sharp-2.20.1.tar.bz2 gnome-desktop-sharp-2.24.0.tar.bz2 gnome-desktop-sharp-2.26.0.tar.bz2 gnome-desktop-sharp2.changes gnome-desktop-sharp2.spec gnome-desktop-version-11.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-desktop-sharp2.spec ++++++ # # spec file for package gnome-desktop-sharp2 # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: gnome-desktop-sharp2 %define _name gnome-desktop-sharp Url: http://mono-project.com License: LGPLv2.1 Group: System/GUI/GNOME Summary: Mono bindings for libgnome-desktop BuildRequires: gnome-sharp2 gtk-sharp2-gapi %define _version 2.20.1 ##### suse #### %if 0%{?suse_version} %define gnome_version 220 %if %{suse_version} >= 1110 %define gnome_version 224 %endif %if %{suse_version} >= 1120 %define gnome_version 226 %endif %if %{suse_version} >= 1130 %define gnome_version 230 %endif %if %{suse_version} >= 1130 # On 11.3 and later, we use pkgconfig()-style BuildRequires, since the package names might get changed for GNOME 3 BuildRequires: pkgconfig(gnome-desktop-2.0) BuildRequires: pkgconfig(gtksourceview-2.0) BuildRequires: pkgconfig(libgnomeprint-2.2) BuildRequires: pkgconfig(libgnomeprintui-2.2) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libwnck-1.0) BuildRequires: pkgconfig(vte) %else # On 11.2 and earlier, pkgconfig()-style BuildRequires didn't work BuildRequires: gnome-desktop-devel gtkhtml2-devel gtksourceview-devel libgnomeprintui-devel librsvg-devel libwnck-devel vte-devel # Only exists on 11.2 and earlier BuildRequires: nautilus-cd-burner-devel %endif BuildRequires: mono-devel monodoc-core update-desktop-files %endif ################# #### fedora #### %if 0%{?fedora_version} %if %{fedora_version} >= 10 %define gnome_version 224 %else %define gnome_version 220 %endif %define env_options export MONO_SHARED_DIR=/tmp # All fedora distros (5 and 6) have the same names, requirements BuildRequires: gtkhtml3-devel gtksourceview-devel librsvg2-devel libwnck-devel mono-devel monodoc-core nautilus-cd-burner-devel vte-devel %endif ################# %if %{gnome_version} >= 224 %define _version 2.24.0 %if %{gnome_version} >= 226 %define _version 2.26.0 %endif BuildRequires: gnome-panel-devel %endif Version: %_version Release: 2 Source: %{_name}-%{version}.tar.bz2 Patch1: gnome-desktop-version-11.3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Mono bindings for libgnome-desktop Authors: -------- Mike Kestner <mkestner(a)novell.com %package -n gtksourceview2-sharp License: LGPLv2.1 Summary: Mono bindings for gtksourceview2 Group: System/GUI/GNOME Requires: libgtksourceview2sharpglue-2.so Provides: libgtksourceview2sharpglue-2.so %description -n gtksourceview2-sharp Mono bindings for gtksourceview2 Authors: -------- Mike Kestner <mkestner(a)novell.com> %package -n rsvg2-sharp License: LGPLv2.1 Summary: Mono bindings for rsvg Group: System/GUI/GNOME %description -n rsvg2-sharp This package contains Mono bindings for librsvg. %package -n gtkhtml314-sharp License: LGPLv2.1 Summary: Mono bindings for gtkhtml Group: System/GUI/GNOME Requires: libgtkhtmlsharpglue-2.so Provides: libgtkhtmlsharpglue-2.so %description -n gtkhtml314-sharp This package contains Mono bindings for gtkhtml. %package -n wnck-sharp License: LGPLv2.1 Summary: Mono bindings for wnck Group: System/GUI/GNOME Requires: libwncksharpglue-2.so Provides: libwncksharpglue-2.so %description -n wnck-sharp Mono bindings for wnck Authors: -------- Mike Kestner <mkestner(a)novell.com> %package -n vte016-sharp License: GPLv2 ; LGPLv2.1 Group: System/GUI/GNOME Summary: Mono bindings for vte Requires: libvtesharpglue-2.so Provides: libvtesharpglue-2.so %description -n vte016-sharp This package contains Mono bindings for vte. %if %{gnome_version} <= 226 %package -n nautilusburn-sharp License: LGPLv2.1 Summary: Mono bindings for nautilusburn Group: System/GUI/GNOME Requires: libnautilusburnsharpglue-2.so Provides: libnautilusburnsharpglue-2.so %description -n nautilusburn-sharp Mono bindings for nautilusburn %endif Authors: -------- Mike Kestner <mkestner(a)novell.com> %if %{gnome_version} >= 224 %package -n gnome-panel-sharp License: LGPLv2.1 Summary: Mono bindings for gnome-panel Group: System/GUI/GNOME Requires: libgnomepanelsharpglue-2.so Provides: libgnomepanelsharpglue-2.so %description -n gnome-panel-sharp Mono bindings for gnome-panel Authors: -------- Mike Kestner <mkestner(a)novell.com %package -n gnome-print-sharp License: LGPLv2.1 Summary: Mono bindings for gnome-print Group: System/GUI/GNOME %description -n gnome-print-sharp Mono bindings for gnome-print Authors: -------- Mike Kestner <mkestner(a)novell.com %endif %prep %setup -q -n %{_name}-%{version} %if %{gnome_version} >= 226 %patch1 %endif %build %{?env_options} # FIXME: windowmanager.c:*: warning: dereferencing type-punned pointer will break strict-aliasing rules export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure\ --libexecdir=%{_prefix}/lib\ --enable-debug make %install %{?env_options} make install DESTDIR=%buildroot rm $RPM_BUILD_ROOT%{_libdir}/*.*a %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{_libdir}/pkgconfig/gnome-desktop-sharp-2.0.pc %{_prefix}/lib/mono/gac/*gnomedesktop-sharp %{_prefix}/lib/mono/gnomedesktop-sharp-2.20 %dir %{_prefix}/share/gnomedesktop-sharp %{_prefix}/share/gnomedesktop-sharp/2.20 %files -n gtksourceview2-sharp %defattr(-,root,root) %{_libdir}/pkgconfig/gtksourceview2-sharp.pc %{_prefix}/lib/mono/gac/*gtksourceview2-sharp %{_prefix}/lib/mono/gtksourceview2-sharp-2.0 %dir %{_prefix}/share/gtksourceview2-sharp %{_prefix}/share/gtksourceview2-sharp/2.0 %if %{gnome_version} >= 224 %{_libdir}/libgtksourceview2sharpglue-2.so %endif %files -n rsvg2-sharp %defattr(-,root,root) %{_libdir}/pkgconfig/rsvg2-sharp-2.0.pc %{_prefix}/lib/mono/gac/*rsvg2-sharp %{_prefix}/lib/mono/rsvg2-sharp-2.0 %dir %{_prefix}/share/rsvg2-sharp %{_prefix}/share/rsvg2-sharp/2.0 %if %suse_version < 1200 %files -n gtkhtml314-sharp %defattr(-,root,root) %{_libdir}/pkgconfig/gtkhtml-sharp-3.14.pc %{_prefix}/lib/mono/gac/*gtkhtml-sharp %{_prefix}/lib/mono/gtkhtml-sharp-3.14 %dir %{_prefix}/share/gtkhtml-sharp %{_prefix}/share/gtkhtml-sharp/3.14 %if %{gnome_version} >= 224 %{_libdir}/libgtkhtmlsharpglue-2.so %endif %endif %if %{gnome_version} <= 226 %files -n nautilusburn-sharp %defattr(-,root,root) %{_libdir}/pkgconfig/nautilusburn-sharp.pc %{_prefix}/lib/mono/gac/*nautilusburn-sharp %{_prefix}/lib/mono/nautilusburn-sharp-2.20 %dir %{_prefix}/share/nautilusburn-sharp %{_prefix}/share/nautilusburn-sharp/2.20 %if %{gnome_version} >= 224 %{_libdir}/libnautilusburnsharpglue-2.so %endif %endif %files -n vte016-sharp %defattr(-, root, root) %{_libdir}/libvtesharpglue-2.so %{_libdir}/pkgconfig/vte-sharp-0.16.pc %{_prefix}/lib/mono/gac/*vte-sharp %{_prefix}/lib/mono/vte-sharp-0.16 %dir %{_prefix}/share/vte-sharp %{_prefix}/share/vte-sharp/0.16 %files -n wnck-sharp %defattr(-, root, root) %{_libdir}/pkgconfig/wnck-sharp-1.0.pc %{_prefix}/lib/mono/gac/*wnck-sharp %{_prefix}/lib/mono/wnck-sharp-2.20 %dir %{_prefix}/share/wnck-sharp %{_prefix}/share/wnck-sharp/2.20 %if %{gnome_version} >= 224 %{_libdir}/libwncksharpglue-2.so %endif %if %{gnome_version} >= 224 %if %suse_version < 1200 %files -n gnome-panel-sharp %defattr(-, root, root) %{_libdir}/pkgconfig/gnome-panel-sharp-2.24.pc %{_prefix}/lib/mono/gac/gnome-panel-sharp %{_prefix}/lib/mono/gnome-panel-sharp-2.24 %dir %{_prefix}/share/gnome-panel-sharp %{_prefix}/share/gnome-panel-sharp/2.24 %{_libdir}/libgnomepanelsharpglue-2.so %endif %files -n gnome-print-sharp %defattr(-, root, root) %{_libdir}/pkgconfig/gnome-print-sharp-2.18.pc %{_prefix}/lib/mono/gac/gnome-print-sharp %{_prefix}/lib/mono/gnome-print-sharp-2.18 %dir %{_prefix}/share/gnome-print-sharp %{_prefix}/share/gnome-print-sharp/2.18 %endif %if 0%{?fedora_version} # Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) %define _use_internal_dependency_generator 0 %endif %define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' %define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' %changelog ++++++ gnome-desktop-version-11.3.patch ++++++ Index: gnomedesktop/gnomedesktop-sharp.dll.config.in =================================================================== --- gnomedesktop/gnomedesktop-sharp.dll.config.in.orig +++ gnomedesktop/gnomedesktop-sharp.dll.config.in @@ -3,5 +3,5 @@ <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> - <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2@LIB_PREFIX@.11@LIB_SUFFIX@"/> + <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2@LIB_PREFIX@.17@LIB_SUFFIX@"/> </configuration> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '11

28 Sep '11

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Wed Sep 28 15:02:25 CEST 2011. -------- --- kernel-source/kernel-debug.changes 2011-09-15 15:08:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2011-09-28 14:23:56.000000000 +0200 @@ -1,0 +2,70 @@ +Tue Sep 27 22:25:34 CEST 2011 - eich(a)suse.de + +- Refresh patches.suse/SUSE-bootsplash. + Fix crash when updating boxes: Don't reallocate + picture. +- commit ba0cfdc + +------------------------------------------------------------------- +Mon Sep 26 15:56:27 CEST 2011 - mmarek(a)suse.cz + +- rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol + in userspace programs, so that they keep working on older systems. +- rpm/kernel-binary.spec.in: Pass -include + %_sourcedir/host-memcpy-hack.h to the compiler when compiling + userspace programs. +- commit 1de2384 + +------------------------------------------------------------------- +Mon Sep 26 13:23:42 CEST 2011 - jbeulich(a)novell.com + +- Update Xen patches to 3.1-rc7 and c/s 1105. +- pass PCI segment information to Xen. +- ACPI: Implement overriding of arbitrary ACPI tables via initrd. +- x86: allow NVS can be accessed by driver. +- commit 7de39e8 + +------------------------------------------------------------------- +Mon Sep 26 10:01:25 CEST 2011 - jeffm(a)suse.com + +- Update to 3.1-rc7. +- commit ee8cc90 + +------------------------------------------------------------------- +Wed Sep 21 13:20:35 CEST 2011 - trenn(a)suse.de + +- Refresh + patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch. +-> Fix build on ia64, by moving asm/e820.h into ifdef config protected region. +- commit 0ac4276 + +------------------------------------------------------------------- +Wed Sep 21 11:16:18 CEST 2011 - mhocko(a)suse.cz + +- Provide memory controller swap extension. + Keep the feature disabled by default. Use swapaccount=1 kernel + boot parameter for enabling it. +- commit 000742c + +------------------------------------------------------------------- +Wed Sep 21 11:11:10 CEST 2011 - mhocko(a)suse.cz + +- Update config files. + Clean run_oldconfig.sh run to get configs into sync +- commit c985824 + +------------------------------------------------------------------- +Tue Sep 20 18:09:04 CEST 2011 - trenn(a)suse.de + +- ACPI: Implement overriding of arbitrary ACPI tables via initrd + (none). +- ACPICA: Fix wrongly mapped acpi table header when overriding + via initrd (none). +- ACPICA: Introduce acpi_os_phys_table_override function (none). +- x86: allow NVS can be accessed by driver (none). +- Update config files: + CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y + on i386 and x86_64 flavors +- commit 34bb195 + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change calling whatdependson for head-i586 Old: ---- linux-3.1-rc6.tar.bz2 New: ---- host-memcpy-hack.h linux-3.1-rc7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.1-rc6 -%define patchversion 3.1.0-rc6 +%define srcversion 3.1-rc7 +%define patchversion 3.1.0-rc7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,8 +55,8 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 3.1.rc6 -Release: 1 +Version: 3.1.rc7 +Release: <RELEASE> %if %using_buildservice %else %endif @@ -176,6 +176,7 @@ Source65: kernel-spec-macros Source66: configtool.pl Source67: log.sh +Source68: host-memcpy-hack.h Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -293,6 +294,21 @@ cd %kernel_build_dir +# Override the timestamp 'uname -v' reports with the source timestamp and +# the commit hash. +date=$(head -n 1 %_sourcedir/source-timestamp) +commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp) +cat > .kernel-binary.spec.buildenv <<EOF +export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})" +export KBUILD_VERBOSE=0 +export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 +export KBUILD_BUILD_USER=geeko +export KBUILD_BUILD_HOST=buildhost +export HOST_EXTRACFLAGS="-include %_sourcedir/host-memcpy-hack.h" +EOF +source .kernel-binary.spec.buildenv + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi @@ -338,19 +354,6 @@ rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files -# Override the timestamp 'uname -v' reports with the source timestamp and -# the commit hash. -date=$(head -n 1 %_sourcedir/source-timestamp) -commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp) -cat > .kernel-binary.spec.buildenv <<EOF -export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})" -export KBUILD_VERBOSE=0 -export KBUILD_SYMTYPES=1 -export KBUILD_OVERRIDE=1 -export KBUILD_BUILD_USER=geeko -export KBUILD_BUILD_HOST=buildhost -EOF - %build cd %kernel_build_dir source .kernel-binary.spec.buildenv kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200 @@ -17,15 +17,15 @@ # norootforbuild -%define patchversion 3.1.0-rc6 +%define patchversion 3.1.0-rc7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.1.rc6 -Release: 1 +Version: 3.1.rc7 +Release: <RELEASE> %if %using_buildservice %else %endif ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.1-rc6 -%define patchversion 3.1.0-rc6 +%define srcversion 3.1-rc7 +%define patchversion 3.1.0-rc7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,8 +55,8 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel -Version: 3.1.rc6 -Release: 1 +Version: 3.1.rc7 +Release: <RELEASE> %if %using_buildservice %else %endif @@ -172,6 +172,7 @@ Source65: kernel-spec-macros Source66: configtool.pl Source67: log.sh +Source68: host-memcpy-hack.h Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -291,6 +292,21 @@ cd %kernel_build_dir +# Override the timestamp 'uname -v' reports with the source timestamp and +# the commit hash. +date=$(head -n 1 %_sourcedir/source-timestamp) +commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp) +cat > .kernel-binary.spec.buildenv <<EOF +export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})" +export KBUILD_VERBOSE=0 +export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 +export KBUILD_BUILD_USER=geeko +export KBUILD_BUILD_HOST=buildhost +export HOST_EXTRACFLAGS="-include %_sourcedir/host-memcpy-hack.h" +EOF +source .kernel-binary.spec.buildenv + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi @@ -336,19 +352,6 @@ rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files -# Override the timestamp 'uname -v' reports with the source timestamp and -# the commit hash. -date=$(head -n 1 %_sourcedir/source-timestamp) -commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp) -cat > .kernel-binary.spec.buildenv <<EOF -export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})" -export KBUILD_VERBOSE=0 -export KBUILD_SYMTYPES=1 -export KBUILD_OVERRIDE=1 -export KBUILD_BUILD_USER=geeko -export KBUILD_BUILD_HOST=buildhost -EOF - %build cd %kernel_build_dir source .kernel-binary.spec.buildenv kernel-pae.spec: same change kernel-ppc64.spec: same change kernel-s390.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200 @@ -18,8 +18,8 @@ # norootforbuild # icecream 0 -%define srcversion 3.1-rc6 -%define patchversion 3.1.0-rc6 +%define srcversion 3.1-rc7 +%define patchversion 3.1.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -29,8 +29,8 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.1.rc6 -Release: 1 +Version: 3.1.rc7 +Release: <RELEASE> %if %using_buildservice %else %endif @@ -85,6 +85,7 @@ Source65: kernel-spec-macros Source66: configtool.pl Source67: log.sh +Source68: host-memcpy-hack.h Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200 @@ -23,8 +23,8 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.1.rc6 -Release: 1 +Version: 3.1.rc7 +Release: <RELEASE> %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.1-rc6 -%define patchversion 3.1.0-rc6 +%define srcversion 3.1-rc7 +%define patchversion 3.1.0-rc7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,8 +55,8 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.1.rc6 -Release: 1 +Version: 3.1.rc7 +Release: <RELEASE> %if %using_buildservice %else %endif @@ -184,6 +184,7 @@ Source65: kernel-spec-macros Source66: configtool.pl Source67: log.sh +Source68: host-memcpy-hack.h Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -300,6 +301,21 @@ cd %kernel_build_dir +# Override the timestamp 'uname -v' reports with the source timestamp and +# the commit hash. +date=$(head -n 1 %_sourcedir/source-timestamp) +commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp) +cat > .kernel-binary.spec.buildenv <<EOF +export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})" +export KBUILD_VERBOSE=0 +export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 +export KBUILD_BUILD_USER=geeko +export KBUILD_BUILD_HOST=buildhost +export HOST_EXTRACFLAGS="-include %_sourcedir/host-memcpy-hack.h" +EOF +source .kernel-binary.spec.buildenv + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi @@ -345,19 +361,6 @@ rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files -# Override the timestamp 'uname -v' reports with the source timestamp and -# the commit hash. -date=$(head -n 1 %_sourcedir/source-timestamp) -commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp) -cat > .kernel-binary.spec.buildenv <<EOF -export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})" -export KBUILD_VERBOSE=0 -export KBUILD_SYMTYPES=1 -export KBUILD_OVERRIDE=1 -export KBUILD_BUILD_USER=geeko -export KBUILD_BUILD_HOST=buildhost -EOF - %build cd %kernel_build_dir source .kernel-binary.spec.buildenv kernel-vanilla.spec: same change kernel-xen.spec: same change ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=3.1-rc6 +SRCVERSION=3.1-rc7 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2011-09-15 14:16:08.000000000 +0200 +++ new/config/i386/debug 2011-09-21 11:18:54.000000000 +0200 @@ -130,7 +130,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -517,6 +518,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default --- old/config/i386/default 2011-09-15 14:16:08.000000000 +0200 +++ new/config/i386/default 2011-09-21 11:18:54.000000000 +0200 @@ -131,7 +131,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -501,6 +502,7 @@ CONFIG_ACPI_THERMAL=m CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop --- old/config/i386/desktop 2011-09-15 14:16:08.000000000 +0200 +++ new/config/i386/desktop 2011-09-21 11:18:54.000000000 +0200 @@ -133,7 +133,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -520,6 +521,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/ec2 new/config/i386/ec2 --- old/config/i386/ec2 2011-09-15 14:16:08.000000000 +0200 +++ new/config/i386/ec2 2011-09-21 11:18:54.000000000 +0200 @@ -118,7 +118,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2011-09-15 14:16:08.000000000 +0200 +++ new/config/i386/pae 2011-09-21 11:18:54.000000000 +0200 @@ -131,7 +131,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -518,6 +519,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/trace new/config/i386/trace --- old/config/i386/trace 2011-09-15 14:16:08.000000000 +0200 +++ new/config/i386/trace 2011-09-21 11:18:54.000000000 +0200 @@ -131,7 +131,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -518,6 +519,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vanilla new/config/i386/vanilla --- old/config/i386/vanilla 2011-09-15 14:16:08.000000000 +0200 +++ new/config/i386/vanilla 2011-09-21 11:18:54.000000000 +0200 @@ -129,7 +129,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2011-09-15 14:16:08.000000000 +0200 +++ new/config/i386/xen 2011-09-21 11:18:54.000000000 +0200 @@ -119,7 +119,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -424,6 +425,7 @@ CONFIG_ACPI_THERMAL=m CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2011-09-15 14:16:08.000000000 +0200 +++ new/config/ia64/debug 2011-09-21 11:18:54.000000000 +0200 @@ -65,7 +65,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2011-09-15 14:16:08.000000000 +0200 +++ new/config/ia64/default 2011-09-21 11:18:54.000000000 +0200 @@ -65,7 +65,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/trace new/config/ia64/trace --- old/config/ia64/trace 2011-09-15 14:16:08.000000000 +0200 +++ new/config/ia64/trace 2011-09-21 11:18:54.000000000 +0200 @@ -65,7 +65,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/vanilla new/config/ia64/vanilla --- old/config/ia64/vanilla 2011-09-15 14:16:08.000000000 +0200 +++ new/config/ia64/vanilla 2011-09-21 11:18:54.000000000 +0200 @@ -63,7 +63,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default --- old/config/ppc/default 2011-09-15 14:16:08.000000000 +0200 +++ new/config/ppc/default 2011-09-21 11:18:54.000000000 +0200 @@ -126,7 +126,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/ppc64 new/config/ppc/ppc64 --- old/config/ppc/ppc64 2011-09-15 14:16:08.000000000 +0200 +++ new/config/ppc/ppc64 2011-09-21 11:18:54.000000000 +0200 @@ -133,7 +133,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/vanilla new/config/ppc/vanilla --- old/config/ppc/vanilla 2011-09-15 14:16:08.000000000 +0200 +++ new/config/ppc/vanilla 2011-09-21 11:18:54.000000000 +0200 @@ -124,7 +124,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/debug new/config/ppc64/debug --- old/config/ppc64/debug 2011-09-15 14:16:08.000000000 +0200 +++ new/config/ppc64/debug 2011-09-21 11:18:54.000000000 +0200 @@ -133,7 +133,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default --- old/config/ppc64/default 2011-09-15 14:16:08.000000000 +0200 +++ new/config/ppc64/default 2011-09-21 11:18:54.000000000 +0200 @@ -133,7 +133,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/ppc64 new/config/ppc64/ppc64 --- old/config/ppc64/ppc64 2011-09-15 14:16:08.000000000 +0200 +++ new/config/ppc64/ppc64 2011-09-21 11:18:54.000000000 +0200 @@ -133,7 +133,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/trace new/config/ppc64/trace --- old/config/ppc64/trace 2011-09-15 14:16:08.000000000 +0200 +++ new/config/ppc64/trace 2011-09-21 11:18:54.000000000 +0200 @@ -133,7 +133,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/vanilla new/config/ppc64/vanilla --- old/config/ppc64/vanilla 2011-09-15 14:16:08.000000000 +0200 +++ new/config/ppc64/vanilla 2011-09-21 11:18:54.000000000 +0200 @@ -131,7 +131,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/s390 new/config/s390/s390 --- old/config/s390/s390 2011-09-15 14:16:08.000000000 +0200 +++ new/config/s390/s390 2011-09-21 11:18:54.000000000 +0200 @@ -88,7 +88,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/trace new/config/s390/trace --- old/config/s390/trace 2011-09-15 14:16:08.000000000 +0200 +++ new/config/s390/trace 2011-09-21 11:18:54.000000000 +0200 @@ -88,7 +88,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/vanilla new/config/s390/vanilla --- old/config/s390/vanilla 2011-09-15 14:16:08.000000000 +0200 +++ new/config/s390/vanilla 2011-09-21 11:18:54.000000000 +0200 @@ -87,7 +87,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/default new/config/s390x/default --- old/config/s390x/default 2011-09-15 14:16:08.000000000 +0200 +++ new/config/s390x/default 2011-09-21 11:18:54.000000000 +0200 @@ -89,7 +89,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/trace new/config/s390x/trace --- old/config/s390x/trace 2011-09-15 14:16:08.000000000 +0200 +++ new/config/s390x/trace 2011-09-21 11:18:54.000000000 +0200 @@ -89,7 +89,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/vanilla new/config/s390x/vanilla --- old/config/s390x/vanilla 2011-09-15 14:16:08.000000000 +0200 +++ new/config/s390x/vanilla 2011-09-21 11:18:54.000000000 +0200 @@ -87,7 +87,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2011-09-15 14:16:08.000000000 +0200 +++ new/config/x86_64/debug 2011-09-21 11:18:54.000000000 +0200 @@ -132,7 +132,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -480,6 +481,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2011-09-15 14:16:08.000000000 +0200 +++ new/config/x86_64/default 2011-09-21 11:18:54.000000000 +0200 @@ -132,7 +132,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -480,6 +481,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop --- old/config/x86_64/desktop 2011-09-15 14:16:08.000000000 +0200 +++ new/config/x86_64/desktop 2011-09-21 11:18:54.000000000 +0200 @@ -134,7 +134,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -482,6 +483,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/ec2 new/config/x86_64/ec2 --- old/config/x86_64/ec2 2011-09-15 14:16:08.000000000 +0200 +++ new/config/x86_64/ec2 2011-09-21 11:18:54.000000000 +0200 @@ -118,7 +118,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/trace new/config/x86_64/trace --- old/config/x86_64/trace 2011-09-15 14:16:08.000000000 +0200 +++ new/config/x86_64/trace 2011-09-21 11:18:54.000000000 +0200 @@ -132,7 +132,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -480,6 +481,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/vanilla new/config/x86_64/vanilla --- old/config/x86_64/vanilla 2011-09-15 14:16:08.000000000 +0200 +++ new/config/x86_64/vanilla 2011-09-21 11:18:54.000000000 +0200 @@ -130,7 +130,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2011-09-15 14:16:08.000000000 +0200 +++ new/config/x86_64/xen 2011-09-21 11:18:54.000000000 +0200 @@ -119,7 +119,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -394,6 +395,7 @@ CONFIG_ACPI_THERMAL=m CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set ++++++ host-memcpy-hack.h ++++++ #ifdef __x86_64__ /* * Force the linker to use the older memcpy variant, so that the user programs * work on older systems */ __asm__(".symver memcpy,memcpy(a)GLIBC_2.2.5"); #endif ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200 @@ -217,6 +217,21 @@ cd %kernel_build_dir +# Override the timestamp 'uname -v' reports with the source timestamp and +# the commit hash. +date=$(head -n 1 %_sourcedir/source-timestamp) +commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp) +cat > .kernel-binary.spec.buildenv <<EOF +export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})" +export KBUILD_VERBOSE=0 +export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 +export KBUILD_BUILD_USER=geeko +export KBUILD_BUILD_HOST=buildhost +export HOST_EXTRACFLAGS="-include %_sourcedir/host-memcpy-hack.h" +EOF +source .kernel-binary.spec.buildenv + if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi @@ -262,19 +277,6 @@ rm -f source find . ! -type d -printf '%%P\n' > %my_builddir/obj-files -# Override the timestamp 'uname -v' reports with the source timestamp and -# the commit hash. -date=$(head -n 1 %_sourcedir/source-timestamp) -commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp) -cat > .kernel-binary.spec.buildenv <<EOF -export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})" -export KBUILD_VERBOSE=0 -export KBUILD_SYMTYPES=1 -export KBUILD_OVERRIDE=1 -export KBUILD_BUILD_USER=geeko -export KBUILD_BUILD_HOST=buildhost -EOF - %build cd %kernel_build_dir source .kernel-binary.spec.buildenv ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200 @@ -86,6 +86,7 @@ Source65: kernel-spec-macros Source66: configtool.pl Source67: log.sh +Source68: host-memcpy-hack.h Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 ++++++ linux-3.1-rc6.tar.bz2 -> linux-3.1-rc7.tar.bz2 ++++++ kernel-source/linux-3.1-rc6.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/linux-3.1-rc7.tar.bz2 differ: char 11, line 1 ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ patches.arch.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch new/patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch --- old/patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch 2011-09-21 13:20:35.000000000 +0200 @@ -0,0 +1,453 @@ +Subject: ACPI: Implement overriding of arbitrary ACPI tables via initrd +From: Thomas Renninger <trenn(a)suse.de> +References: none +Patch-Mainline: submitted, aiming for 3.2 + +Details can be found in: +Documentation/acpi/initrd_table_override.txt + +Additional dmesg output of a booted system with +FACP (FADT), DSDT and SSDT (the 9th dynamically loaded one) +tables overridden (with ### marked comments): + +### ACPI tables found glued to initrd +DSDT ACPI table found in initrd - size: 16234 +FACP ACPI table found in initrd - size: 116 +SSDT ACPI table found in initrd - size: 334 +### Re-printed e820 map via e820_update() with additionally created +### ACPI data section at 0xcff55000 where the ACPI tables passed via +### initrd where copied to +modified physical RAM map: +... + ### New ACPI data section: + modified: 00000000cff55000 - 00000000cff5912c (ACPI data) + ### BIOS e820 provided ACPI data section: + modified: 00000000cff60000 - 00000000cff69000 (ACPI data) +... +### Total size of all ACPI tables glued to initrd +### The address is initrd_start which gets updated to +### initrd_start = initrd_start + "size of all ACPI tables glued to initrd" +Found acpi tables of size: 16684 at 0xffff8800374c4000 + +Disabling lock debugging due to kernel taint +### initrd provided FACP and DSDT tables are used instead of BIOS provided ones +ACPI: FACP @ 0x00000000cff68dd8 Phys table override, replaced with: +ACPI: FACP 00000000cff58f6a 00074 (v01 INTEL TUMWATER 06040000 PTL 00000003) +ACPI: DSDT @ 0x00000000cff649d4 Phys table override, replaced with: +ACPI: DSDT 00000000cff55000 04404 (v01 Intel BLAKFORD 06040000 MSFT 0100000E) +... +### Much later, the 9th (/sys/firmware/acpi/table/dynamic/SSDT9) dynamically +### loaded ACPI table matches and gets overridden: +ACPI: SSDT @ 0x00000000cff64824 Phys table override, replaced with: +ACPI: SSDT 00000000cff58fde 0014E (v01 PmRef Cpu7Ist 00003000 INTL 20110316) +ACPI: Dynamic OEM Table Load: +ACPI: SSDT (null) 0014E (v01 PmRef Cpu7Ist 00003000 INTL 20110316) +... + +If the initrd does not start with a valid ACPI table signature or the ACPI +table's checksum is wrong, there is no functional change. + +Signed-off-by: Thomas Renninger <trenn(a)suse.de> +CC: linux-acpi(a)vger.kernel.org +CC: lenb(a)kernel.org +CC: linux-kernel(a)vger.kernel.org +CC: x86(a)kernel.org +--- + Documentation/acpi/initrd_table_override.txt | 110 +++++++++++++++++++ + arch/x86/kernel/setup.c | 18 ++- + arch/x86/mm/init.c | 6 + + drivers/acpi/Kconfig | 10 + + drivers/acpi/osl.c | 150 ++++++++++++++++++++++++++- + include/linux/acpi.h | 4 + include/linux/initrd.h | 3 + 7 files changed, 293 insertions(+), 8 deletions(-) + create mode 100644 Documentation/acpi/initrd_table_override.txt + +Index: linux-3.1-rc6-master/Documentation/acpi/initrd_table_override.txt +=================================================================== +--- /dev/null ++++ linux-3.1-rc6-master/Documentation/acpi/initrd_table_override.txt +@@ -0,0 +1,110 @@ ++Overriding ACPI tables via initrd ++================================= ++ ++1) Introduction (What is this about) ++2) What is this for ++3) How does it work ++4) References (Where to retrieve userspace tools) ++ ++1) What is this about ++--------------------- ++ ++If ACPI_INITRD_TABLE_OVERRIDE compile option is true, it is possible to ++override nearly any ACPI table provided by the BIOS with an instrumented, ++modified one. ++ ++Up to 10 arbitrary ACPI tables can be passed. ++For a full list of ACPI tables that can be overridden, take a look at ++the char *table_sigs[MAX_ACPI_SIGNATURE]; definition in drivers/acpi/osl.c ++All ACPI tables iasl (Intel's ACPI compiler and disassembler) knows should ++be overridable, except: ++ - ACPI_SIG_RSDP (has a signature of 6 bytes) ++ - ACPI_SIG_FACS (does not have an ordinary ACPI table header) ++Both could get implemented as well. ++ ++ ++2) What is this for ++------------------- ++ ++Please keep in mind that this is a debug option. ++ACPI tables should not get overridden for productive use. ++If BIOS ACPI tables are overridden the kernel will get tainted with the ++TAINT_OVERRIDDEN_ACPI_TABLE flag. ++Complain to your platform/BIOS vendor if you find a bug which is that sever ++that a workaround is not accepted in the Linus kernel. ++ ++Still, it can and should be enabled in any kernel, because: ++ - There is no functional change with not instrumented initrds ++ - It provides a powerful feature to easily debug and test ACPI BIOS table ++ compatibility with the Linux kernel. ++ ++Until now it was only possible to override the DSDT by compiling it into ++the kernel. This is a nightmare when trying to work on ACPI related bugs ++and a lot bugs got stuck because of that. ++Even for people with enough kernel knowledge, building a kernel to try out ++things is very time consuming. Also people may have to browse and modify the ++ACPI interpreter code to find a possible BIOS bug. With this feature, people ++can correct the ACPI tables and try out quickly whether this is the root cause ++that needs to get addressed in the kernel. ++ ++This could even ease up testing for BIOS providers who could flush their BIOS ++to test, but overriding table via initrd is much easier and quicker. ++For example one could prepare different initrds overriding NUMA tables with ++different affinity settings. Set up a script, let the machine reboot and ++run tests over night and one can get a picture how these settings influence ++the Linux kernel and which values are best. ++ ++People can instrument the dynamic ACPI (ASL) code (for example with debug ++statements showing up in syslog when the ACPI code is processed, etc.), ++to better understand BIOS to OS interfaces, to hunt down ACPI BIOS code related ++bugs quickly or to easier develop ACPI based drivers. ++ ++Intstrumenting ACPI code in SSDTs is now much easier. Before, one had to copy ++all SSDTs into the DSDT to compile it into the kernel for testing ++(because only DSDT could get overridden). That's what the acpi_no_auto_ssdt ++boot param is for: the BIOS provided SSDTs are ignored and all have to get ++copied into the DSDT, complicated and time consuming. ++ ++Much more use cases, depending on which ACPI parts you are working on... ++ ++ ++3) How does it work ++------------------- ++ ++# Extract the machine's ACPI tables: ++acpidump >acpidump ++acpixtract -a acpidump ++# Disassemble, modify and recompile them: ++iasl -d *.dat ++# For example add this statement into a _PRT (PCI Routing Table) function ++# of the DSDT: ++Store("Hello World", debug) ++iasl -sa *.dsl ++# glue them together with the initrd. ACPI tables go first, original initrd ++# goes on top: ++cat TBL1.dat >>instrumented_initrd ++cat TBL2.dat >>instrumented_initrd ++cat TBL3.dat >>instrumented_initrd ++cat /boot/initrd >>instrumented_initrd ++# reboot with increased acpi debug level, e.g. boot params: ++acpi.debug_level=0x2 acpi.debug_layer=0xFFFFFFFF ++# and check your syslog: ++[ 1.268089] ACPI: PCI Interrupt Routing Table [\_SB_.PCI0._PRT] ++[ 1.272091] [ACPI Debug] String [0x0B] "HELLO WORLD" ++ ++iasl is able to disassemble and recompile quite a lot different, ++also static ACPI tables. ++ ++4) Where to retrieve userspace tools ++------------------------------------ ++ ++iasl and acpixtract are part of Intel's ACPICA project: ++http://acpica.org/ ++and should be packaged by distributions (for example in the acpica package ++on SUSE). ++ ++acpidump can be found in Len Browns pmtools: ++ftp://kernel.org/pub/linux/kernel/people/lenb/acpi/utils/pmtools/acpidump ++This tool is also part of the acpica package on SUSE. ++Alternatively used ACPI tables can be retrieved via sysfs in latest kernels: ++/sys/firmware/acpi/tables +Index: linux-3.1-rc6-master/arch/x86/kernel/setup.c +=================================================================== +--- linux-3.1-rc6-master.orig/arch/x86/kernel/setup.c ++++ linux-3.1-rc6-master/arch/x86/kernel/setup.c +@@ -411,12 +411,20 @@ static void __init reserve_initrd(void) + */ + initrd_start = ramdisk_image + PAGE_OFFSET; + initrd_end = initrd_start + ramdisk_size; +- return; ++ } else { ++ relocate_initrd(); ++ memblock_x86_free_range(ramdisk_image, ramdisk_end); + } +- +- relocate_initrd(); +- +- memblock_x86_free_range(ramdisk_image, ramdisk_end); ++#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE ++ acpi_initrd_offset = acpi_initrd_table_override((void *)initrd_start, ++ (void *)initrd_end); ++ if (!acpi_initrd_offset) ++ return; ++ printk(KERN_INFO "Found acpi tables of size: %lu at 0x%lx\n", ++ acpi_initrd_offset, initrd_start); ++ initrd_start += acpi_initrd_offset; ++ return; ++#endif + } + #else + static void __init reserve_initrd(void) +Index: linux-3.1-rc6-master/arch/x86/mm/init.c +=================================================================== +--- linux-3.1-rc6-master.orig/arch/x86/mm/init.c ++++ linux-3.1-rc6-master/arch/x86/mm/init.c +@@ -390,6 +390,12 @@ void free_initrd_mem(unsigned long start + * - relocate_initrd() + * So here We can do PAGE_ALIGN() safely to get partial page to be freed + */ ++#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE ++ if (acpi_initrd_offset) ++ free_init_pages("initrd memory", start - acpi_initrd_offset, ++ PAGE_ALIGN(end)); ++ else ++#endif + free_init_pages("initrd memory", start, PAGE_ALIGN(end)); + } + #endif +Index: linux-3.1-rc6-master/drivers/acpi/Kconfig +=================================================================== +--- linux-3.1-rc6-master.orig/drivers/acpi/Kconfig ++++ linux-3.1-rc6-master/drivers/acpi/Kconfig +@@ -261,6 +261,16 @@ config ACPI_CUSTOM_DSDT + bool + default ACPI_CUSTOM_DSDT_FILE != "" + ++config ACPI_INITRD_TABLE_OVERRIDE ++ bool ++ depends on X86 ++ default y ++ help ++ This option provides functionality to override arbitrary ACPI tables ++ via initrd. No functional change if no ACPI tables are glued to the ++ initrd, therefore it's safe to say Y. ++ See Documentation/acpi/initrd_table_override.txt for details ++ + config ACPI_BLACKLIST_YEAR + int "Disable ACPI for systems before Jan 1st this year" if X86_32 + default 0 +Index: linux-3.1-rc6-master/drivers/acpi/osl.c +=================================================================== +--- linux-3.1-rc6-master.orig/drivers/acpi/osl.c ++++ linux-3.1-rc6-master/drivers/acpi/osl.c +@@ -44,6 +44,7 @@ + #include <linux/list.h> + #include <linux/jiffies.h> + #include <linux/semaphore.h> ++#include <linux/memblock.h> + + #include <asm/io.h> + #include <asm/uaccess.h> +@@ -499,6 +500,109 @@ acpi_os_predefined_override(const struct + return AE_OK; + } + ++#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE ++#include <asm/e820.h> ++ ++#define ACPI_OVERRIDE_TABLES 10 ++ ++static unsigned long acpi_table_override_offset[ACPI_OVERRIDE_TABLES]; ++static u64 acpi_tables_inram; ++ ++unsigned long __initdata acpi_initrd_offset; ++ ++/* Copied from acpica/tbutils.c:acpi_tb_checksum() */ ++u8 __init acpi_table_checksum(u8 *buffer, u32 length) ++{ ++ u8 sum = 0; ++ u8 *end = buffer + length; ++ ++ while (buffer < end) ++ sum = (u8) (sum + *(buffer++)); ++ return sum; ++} ++ ++/* All but ACPI_SIG_RSDP and ACPI_SIG_FACS: */ ++#define MAX_ACPI_SIGNATURE 35 ++static const char *table_sigs[MAX_ACPI_SIGNATURE] = { ++ ACPI_SIG_BERT, ACPI_SIG_CPEP, ACPI_SIG_ECDT, ACPI_SIG_EINJ, ++ ACPI_SIG_ERST, ACPI_SIG_HEST, ACPI_SIG_MADT, ACPI_SIG_MSCT, ++ ACPI_SIG_SBST, ACPI_SIG_SLIT, ACPI_SIG_SRAT, ACPI_SIG_ASF, ++ ACPI_SIG_BOOT, ACPI_SIG_DBGP, ACPI_SIG_DMAR, ACPI_SIG_HPET, ++ ACPI_SIG_IBFT, ACPI_SIG_IVRS, ACPI_SIG_MCFG, ACPI_SIG_MCHI, ++ ACPI_SIG_SLIC, ACPI_SIG_SPCR, ACPI_SIG_SPMI, ACPI_SIG_TCPA, ++ ACPI_SIG_UEFI, ACPI_SIG_WAET, ACPI_SIG_WDAT, ACPI_SIG_WDDT, ++ ACPI_SIG_WDRT, ACPI_SIG_DSDT, ACPI_SIG_FADT, ACPI_SIG_PSDT, ++ ACPI_SIG_RSDT, ACPI_SIG_XSDT, ACPI_SIG_SSDT }; ++ ++int __init acpi_initrd_table_override(void *start_addr, void *end_addr) ++{ ++ int table_nr, sig; ++ unsigned long offset = 0, max_len = end_addr - start_addr; ++ char *p; ++ ++ for (table_nr = 0; table_nr < ACPI_OVERRIDE_TABLES; table_nr++) { ++ struct acpi_table_header *table; ++ if (max_len < offset + sizeof(struct acpi_table_header)) { ++ WARN_ON(1); ++ return 0; ++ } ++ table = start_addr + offset; ++ ++ for (sig = 0; sig < MAX_ACPI_SIGNATURE; sig++) ++ if (!memcmp(table->signature, table_sigs[sig], 4)) ++ break; ++ ++ if (sig >= MAX_ACPI_SIGNATURE) ++ break; ++ ++ if (max_len < offset + table->length) { ++ WARN_ON(1); ++ return 0; ++ } ++ ++ if (acpi_table_checksum(start_addr + offset, table->length)) { ++ WARN(1, "%4.4s has invalid checksum\n", ++ table->signature); ++ continue; ++ } ++ printk(KERN_INFO "%4.4s ACPI table found in initrd" ++ " - size: %d\n", table->signature, table->length); ++ ++ offset += table->length; ++ acpi_table_override_offset[table_nr] = offset; ++ } ++ if (!offset) ++ return 0; ++ ++ acpi_tables_inram = ++ memblock_find_in_range(0, max_low_pfn_mapped << PAGE_SHIFT, ++ offset, PAGE_SIZE); ++ if (acpi_tables_inram == MEMBLOCK_ERROR) ++ panic("Cannot find place for ACPI override tables\n"); ++ ++ /* ++ * Only calling e820_add_reserve does not work and the ++ * tables are invalid (memory got used) later. ++ * memblock_x86_reserve_range works as expected and the tables ++ * won't get modified. But it's not enough because ioremap will ++ * complain later (used by acpi_os_map_memory) that the pages ++ * that should get mapped are not marked "reserved". ++ * Both memblock_x86_reserve_range and e820_add_region works fine. ++ */ ++ memblock_x86_reserve_range(acpi_tables_inram, ++ acpi_tables_inram + offset, ++ "ACPI TABLE OVERRIDE"); ++ e820_add_region(acpi_tables_inram, offset, E820_ACPI); ++ update_e820(); ++ ++ p = early_ioremap(acpi_tables_inram, offset); ++ memcpy(p, start_addr, offset); ++ early_iounmap(p, offset); ++ return offset; ++} ++ ++#endif ++ + acpi_status + acpi_os_table_override(struct acpi_table_header * existing_table, + struct acpi_table_header ** new_table) +@@ -526,11 +630,51 @@ acpi_status + acpi_os_phys_table_override(struct acpi_table_header *existing_table, + acpi_physical_address *address, u32 *table_length) + { +- if (!existing_table) +- return AE_BAD_PARAMETER; + +- table_length = 0; ++#ifndef CONFIG_ACPI_INITRD_TABLE_OVERRIDE ++ *table_length = 0; ++ *address = 0; + return AE_OK; ++#else ++ int table_nr = 0; ++ *table_length = 0; ++ *address = 0; ++ for (; table_nr < ACPI_OVERRIDE_TABLES && ++ acpi_table_override_offset[table_nr]; table_nr++) { ++ int table_offset; ++ int table_len; ++ struct acpi_table_header *table; ++ ++ if (table_nr == 0) ++ table_offset = 0; ++ else ++ table_offset = acpi_table_override_offset[table_nr - 1]; ++ ++ table_len = acpi_table_override_offset[table_nr] - table_offset; ++ ++ table = acpi_os_map_memory(acpi_tables_inram + table_offset, ++ table_len); ++ ++ if (memcmp(existing_table->signature, table->signature, 4)) { ++ acpi_os_unmap_memory(table, table_len); ++ continue; ++ } ++ ++ /* Only override tables with matching oem id */ ++ if (memcmp(table->oem_table_id, existing_table->oem_table_id, ++ ACPI_OEM_TABLE_ID_SIZE)) { ++ acpi_os_unmap_memory(table, table_len); ++ continue; ++ } ++ ++ acpi_os_unmap_memory(table, table_len); ++ *address = acpi_tables_inram + table_offset; ++ *table_length = table_len; ++ add_taint(TAINT_OVERRIDDEN_ACPI_TABLE); ++ break; ++ } ++ return AE_OK; ++#endif + } + + static irqreturn_t acpi_irq(int irq, void *dev_id) +Index: linux-3.1-rc6-master/include/linux/acpi.h +=================================================================== +--- linux-3.1-rc6-master.orig/include/linux/acpi.h ++++ linux-3.1-rc6-master/include/linux/acpi.h +@@ -76,6 +76,10 @@ typedef int (*acpi_table_handler) (struc + + typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end); + ++#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE ++int __init acpi_initrd_table_override(void *start_addr, void *end_addr); ++#endif ++ + char * __acpi_map_table (unsigned long phys_addr, unsigned long size); + void __acpi_unmap_table(char *map, unsigned long size); + int early_acpi_boot_init(void); +Index: linux-3.1-rc6-master/include/linux/initrd.h +=================================================================== +--- linux-3.1-rc6-master.orig/include/linux/initrd.h ++++ linux-3.1-rc6-master/include/linux/initrd.h +@@ -16,5 +16,8 @@ extern int initrd_below_start_ok; + /* free_initrd_mem always gets called with the next two as arguments.. */ + extern unsigned long initrd_start, initrd_end; + extern void free_initrd_mem(unsigned long, unsigned long); ++#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE ++extern unsigned long acpi_initrd_offset; ++#endif + + extern unsigned int real_root_dev; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch new/patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch --- old/patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch 2011-09-21 13:20:35.000000000 +0200 @@ -0,0 +1,45 @@ +Subject: ACPICA: Fix wrongly mapped acpi table header when overriding via initrd +From: Michael Chang <mchang(a)suse.com> +References: none +Patch-Mainline: submitted, aiming for 3.2 + +Fix the overriding ACPI table header do not override the existing ACPI +header thus the existing one is still in use. This caused a discrepency +of header and body, which would introdce a serios side effect that when +overriding DSDT, system might have error with "Unable to load the System +Description Tables" due to DSDT table verified failed. + +Most field in ACPI table is static, but the length field is dyamically +changed and corresponds the new assembled *.aml size. We reserve the +ACPI data region using the overridden table size but attemps to map it +with existing ACPI table size introduced by above discrepency. It +would lead to remap fail during verifying DSDT able if length difference +cross a page boundary. + +Signed-off-by: Michael Chang <mchang(a)suse.com> +--- + drivers/acpi/acpica/tbutils.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c +index df85afe..2e797d9 100644 +--- a/drivers/acpi/acpica/tbutils.c ++++ b/drivers/acpi/acpica/tbutils.c +@@ -511,9 +511,9 @@ acpi_tb_install_table(acpi_physical_address address, + ACPI_CAST_PTR(void, address))); + acpi_os_unmap_memory(mapped_table, + sizeof(struct acpi_table_header)); ++ address = tmp_addr; + mapped_table = acpi_os_map_memory(address, + sizeof(struct acpi_table_header)); +- address = tmp_addr; + } + flags = ACPI_TABLE_ORIGIN_MAPPED; + table_to_install = mapped_table; +-- +1.7.3.4 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-acpi" in +the body of a message to majordomo(a)vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpica_introduce_acpi_os_phys_table_override_function.patch new/patches.arch/acpica_introduce_acpi_os_phys_table_override_function.patch --- old/patches.arch/acpica_introduce_acpi_os_phys_table_override_function.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/acpica_introduce_acpi_os_phys_table_override_function.patch 2011-09-21 13:20:35.000000000 +0200 @@ -0,0 +1,129 @@ +Subject: ACPICA: Introduce acpi_os_phys_table_override function +From: Thomas Renninger <trenn(a)suse.de> +References: none +Patch-Mainline: submitted, aiming for 3.2 + +Currently it's only possible to feed acpica with virtual +address for table overriding. +This patch introduces a function which allows the OS to +pass physical addresses for table overriding. + +This is necessary to allow early table overridings of +arbitrary ACPI tables. + +An extra flag like ACPI_TABLE_ORIGIN_OVERRIDE is not used, +because physical address overriding is rather transparent +(the same way acpica expects to get tables from reserved +memory BIOS regions which is the normal way). + +Signed-off-by: Thomas Renninger <trenn(a)suse.de> +CC: devel(a)acpica.org +CC: linux-acpi(a)vger.kernel.org +CC: lenb(a)kernel.org +--- + drivers/acpi/acpica/tbinstal.c | 15 +++++++++++++++ + drivers/acpi/acpica/tbutils.c | 18 +++++++++++++++++- + drivers/acpi/osl.c | 11 +++++++++++ + include/acpi/acpiosxf.h | 4 ++++ + 4 files changed, 47 insertions(+), 1 deletions(-) + +diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c +index 62365f6..b9b9d2a 100644 +--- a/drivers/acpi/acpica/tbinstal.c ++++ b/drivers/acpi/acpica/tbinstal.c +@@ -242,6 +242,21 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index) + table_desc->pointer = override_table; + table_desc->length = override_table->length; + table_desc->flags = ACPI_TABLE_ORIGIN_OVERRIDE; ++ } else { ++ acpi_physical_address address = 0; ++ u32 table_len = 0; ++ status = acpi_os_phys_table_override(table_desc->pointer, ++ &address, &table_len); ++ if (ACPI_SUCCESS(status) && table_len && address) { ++ ACPI_INFO((AE_INFO, "%4.4s @ 0x%p " ++ "Phys table override, replaced with:", ++ table_desc->pointer->signature, ++ ACPI_CAST_PTR(void, table_desc->address))); ++ table_desc->address = address; ++ table_desc->pointer = acpi_os_map_memory(address, ++ table_len); ++ table_desc->length = table_len; ++ } + } + + /* Add the table to the global root table list */ +diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c +index 0f2d395..df85afe 100644 +--- a/drivers/acpi/acpica/tbutils.c ++++ b/drivers/acpi/acpica/tbutils.c +@@ -499,8 +499,24 @@ acpi_tb_install_table(acpi_physical_address address, + table_to_install = override_table; + flags = ACPI_TABLE_ORIGIN_OVERRIDE; + } else { +- table_to_install = mapped_table; ++ u32 table_len = 0; ++ acpi_physical_address tmp_addr = 0; ++ ++ status = acpi_os_phys_table_override(mapped_table, ++ &tmp_addr, &table_len); ++ if (ACPI_SUCCESS(status) && table_len && tmp_addr) { ++ ACPI_INFO((AE_INFO, "%4.4s @ 0x%p " ++ "Phys table override, replaced with:", ++ mapped_table->signature, ++ ACPI_CAST_PTR(void, address))); ++ acpi_os_unmap_memory(mapped_table, ++ sizeof(struct acpi_table_header)); ++ mapped_table = acpi_os_map_memory(address, ++ sizeof(struct acpi_table_header)); ++ address = tmp_addr; ++ } + flags = ACPI_TABLE_ORIGIN_MAPPED; ++ table_to_install = mapped_table; + } + + /* Initialize the table entry */ +diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c +index fa32f58..49b5fa6 100644 +--- a/drivers/acpi/osl.c ++++ b/drivers/acpi/osl.c +@@ -522,6 +522,17 @@ acpi_os_table_override(struct acpi_table_header * existing_table, + return AE_OK; + } + ++acpi_status ++acpi_os_phys_table_override(struct acpi_table_header *existing_table, ++ acpi_physical_address *address, u32 *table_length) ++{ ++ if (!existing_table) ++ return AE_BAD_PARAMETER; ++ ++ table_length = 0; ++ return AE_OK; ++} ++ + static irqreturn_t acpi_irq(int irq, void *dev_id) + { + u32 handled; +diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h +index 4543b6f..0bef969 100644 +--- a/include/acpi/acpiosxf.h ++++ b/include/acpi/acpiosxf.h +@@ -95,6 +95,10 @@ acpi_status + acpi_os_table_override(struct acpi_table_header *existing_table, + struct acpi_table_header **new_table); + ++acpi_status ++acpi_os_phys_table_override(struct acpi_table_header *existing_table, ++ acpi_physical_address *address, u32 *table_length); ++ + /* + * Spinlock primitives + */ +-- +1.7.3.4 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-acpi" in +the body of a message to majordomo(a)vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/apei_allow_drivers_access_nvs_ram.patch new/patches.drivers/apei_allow_drivers_access_nvs_ram.patch --- old/patches.drivers/apei_allow_drivers_access_nvs_ram.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/apei_allow_drivers_access_nvs_ram.patch 2011-09-20 18:09:04.000000000 +0200 @@ -0,0 +1,28 @@ +From: Yinghai Lu <yinghai(a)kernel.org> +Subject: [PATCH] x86: allow NVS can be accessed by driver +References: none +Patch-Mainline: submitted, aiming for 3.2 + +APEI related... + +Signed-off-by: Yinghai Lu <yinghai(a)kernel.org> +Signed-off-by: Thomas Renninger <trenn(a)suse.de> + +--- + arch/x86/kernel/e820.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: linux-2.6/arch/x86/kernel/e820.c +=================================================================== +--- linux-2.6.orig/arch/x86/kernel/e820.c ++++ linux-2.6/arch/x86/kernel/e820.c +@@ -995,7 +995,8 @@ void __init e820_reserve_resources(void) + * pcibios_resource_survey() + */ + if (e820.map[i].type != E820_RESERVED || res->start < (1ULL<<20)) { +- res->flags |= IORESOURCE_BUSY; ++ if (e820.map[i].type != E820_NVS) ++ res->flags |= IORESOURCE_BUSY; + insert_resource(&iomem_resource, res); + } + res++; ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/SUSE-bootsplash new/patches.suse/SUSE-bootsplash --- old/patches.suse/SUSE-bootsplash 2011-09-15 09:30:03.000000000 +0200 +++ new/patches.suse/SUSE-bootsplash 2011-09-27 22:27:57.000000000 +0200 @@ -17,6 +17,9 @@ These framebuffers are rare these days, the legendary and still popular server chipset Radeon ES1000 supports it, though. + * Fix crash when updating boxes: + Don't reallocate picture. + Signed-off-by: Egbert Eich <eich(a)suse.de> --- drivers/tty/n_tty.c | 11 @@ -26,17 +29,17 @@ drivers/video/Makefile | 1 drivers/video/bootsplash/Kconfig | 17 drivers/video/bootsplash/Makefile | 5 - drivers/video/bootsplash/bootsplash.c | 2416 ++++++++++++++++++++++++++++++++++ - drivers/video/bootsplash/decode-jpg.c | 998 ++++++++++++++ - drivers/video/bootsplash/decode-jpg.h | 36 + drivers/video/bootsplash/bootsplash.c | 2473 ++++++++++++++++++++++++++++++++++ + drivers/video/bootsplash/decode-jpg.c | 1045 ++++++++++++++ + drivers/video/bootsplash/decode-jpg.h | 37 drivers/video/bootsplash/render.c | 491 ++++++ drivers/video/console/bitblit.c | 31 drivers/video/console/fbcon.c | 58 drivers/video/console/fbcon.h | 47 - include/linux/bootsplash.h | 76 + + include/linux/bootsplash.h | 86 + include/linux/console_struct.h | 3 include/linux/fb.h | 4 - 17 files changed, 4236 insertions(+) + 17 files changed, 4351 insertions(+) create mode 100644 drivers/video/bootsplash/Kconfig create mode 100644 drivers/video/bootsplash/Makefile create mode 100644 drivers/video/bootsplash/bootsplash.c @@ -45,10 +48,8 @@ create mode 100644 drivers/video/bootsplash/render.c create mode 100644 include/linux/bootsplash.h -Index: linux-3.0-master/drivers/tty/n_tty.c -=================================================================== ---- linux-3.0-master.orig/drivers/tty/n_tty.c -+++ linux-3.0-master/drivers/tty/n_tty.c +--- linux-3.1-rc6-master.orig/drivers/tty/n_tty.c ++++ linux-3.1-rc6-master/drivers/tty/n_tty.c @@ -50,6 +50,8 @@ #include <linux/uaccess.h> #include <linux/module.h> @@ -74,10 +75,8 @@ if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) { retval = -EIO; break; -Index: linux-3.0-master/drivers/tty/vt/keyboard.c -=================================================================== ---- linux-3.0-master.orig/drivers/tty/vt/keyboard.c -+++ linux-3.0-master/drivers/tty/vt/keyboard.c +--- linux-3.1-rc6-master.orig/drivers/tty/vt/keyboard.c ++++ linux-3.1-rc6-master/drivers/tty/vt/keyboard.c @@ -43,6 +43,8 @@ #include <linux/notifier.h> #include <linux/jiffies.h> @@ -101,10 +100,8 @@ #ifdef CONFIG_SPARC if (keycode == KEY_A && sparc_l1_a_state) { sparc_l1_a_state = false; -Index: linux-3.0-master/drivers/tty/vt/vt.c -=================================================================== ---- linux-3.0-master.orig/drivers/tty/vt/vt.c -+++ linux-3.0-master/drivers/tty/vt/vt.c +--- linux-3.1-rc6-master.orig/drivers/tty/vt/vt.c ++++ linux-3.1-rc6-master/drivers/tty/vt/vt.c @@ -4204,6 +4204,35 @@ void vcs_scr_updated(struct vc_data *vc) notify_update(vc); } @@ -141,10 +138,8 @@ /* * Visible symbols for modules */ -Index: linux-3.0-master/drivers/video/Kconfig -=================================================================== ---- linux-3.0-master.orig/drivers/video/Kconfig -+++ linux-3.0-master/drivers/video/Kconfig +--- linux-3.1-rc6-master.orig/drivers/video/Kconfig ++++ linux-3.1-rc6-master/drivers/video/Kconfig @@ -2397,4 +2397,8 @@ if FB || SGI_NEWPORT_CONSOLE source "drivers/video/logo/Kconfig" endif @@ -154,10 +149,8 @@ +endif + endmenu -Index: linux-3.0-master/drivers/video/Makefile -=================================================================== ---- linux-3.0-master.orig/drivers/video/Makefile -+++ linux-3.0-master/drivers/video/Makefile +--- linux-3.1-rc6-master.orig/drivers/video/Makefile ++++ linux-3.1-rc6-master/drivers/video/Makefile @@ -14,6 +14,7 @@ fb-objs := $(f obj-$(CONFIG_VT) += console/ obj-$(CONFIG_LOGO) += logo/ @@ -166,10 +159,8 @@ obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o -Index: linux-3.0-master/drivers/video/bootsplash/Kconfig -=================================================================== --- /dev/null -+++ linux-3.0-master/drivers/video/bootsplash/Kconfig ++++ linux-3.1-rc6-master/drivers/video/bootsplash/Kconfig @@ -0,0 +1,17 @@ +# +# Bootsplash configuration @@ -188,21 +179,17 @@ + If you are unsure, say N +endmenu + -Index: linux-3.0-master/drivers/video/bootsplash/Makefile -=================================================================== --- /dev/null -+++ linux-3.0-master/drivers/video/bootsplash/Makefile ++++ linux-3.1-rc6-master/drivers/video/bootsplash/Makefile @@ -0,0 +1,5 @@ +# Makefile for the Linux bootsplash + +obj-$(CONFIG_BOOTSPLASH) += bootsplash.o +obj-$(CONFIG_BOOTSPLASH) += decode-jpg.o +obj-$(CONFIG_BOOTSPLASH) += render.o -Index: linux-3.0-master/drivers/video/bootsplash/bootsplash.c -=================================================================== --- /dev/null -+++ linux-3.0-master/drivers/video/bootsplash/bootsplash.c -@@ -0,0 +1,2486 @@ ++++ linux-3.1-rc6-master/drivers/video/bootsplash/bootsplash.c +@@ -0,0 +1,2473 @@ +/* + * linux/drivers/video/bootsplash/bootsplash.c - + * splash screen handling functions. @@ -936,7 +923,7 @@ + } +} + -+static int get_raw_v2(struct vc_data *vc, ++static int update_boxes(struct vc_data *vc, + const int *offsets, + unsigned char *ndata, int len, unsigned char * end, + int *update) @@ -1007,19 +994,6 @@ + } + if (update) + *update = up; -+ -+ if (sd->pic->ref_cnt > 1) { -+ struct splash_pic_data *pic; -+ pic = kzalloc(sizeof -+ (struct splash_pic_data), -+ GFP_KERNEL); -+ if (!pic) -+ return -1; -+ sd->pic = pic; -+ } -+ sd->pic->ref_cnt = 1; -+ sd->pic->splash_pic = NULL; -+ sd->pic->splash_pic_size = 0; + } + return 0; +} @@ -1095,7 +1069,7 @@ + * since we can have multiple splash_data records + */ + if (splash_size == (int)0xffffffff && version > 1) { -+ if (get_raw_v2(vc, offsets, ndata, len, end, update) < 0) ++ if (update_boxes(vc, offsets, ndata, len, end, update) < 0) + return -1; + + return unit; @@ -2689,10 +2663,8 @@ + } + return 0; +} -Index: linux-3.0-master/drivers/video/bootsplash/decode-jpg.c -=================================================================== --- /dev/null -+++ linux-3.0-master/drivers/video/bootsplash/decode-jpg.c ++++ linux-3.1-rc6-master/drivers/video/bootsplash/decode-jpg.c @@ -0,0 +1,1045 @@ +/* + * linux/drivers/video/bootsplash/decode-jpg.c - a tiny jpeg decoder. @@ -3739,10 +3711,8 @@ + outy += 64 * 2 - 16 * 4; + } +} -Index: linux-3.0-master/drivers/video/bootsplash/decode-jpg.h -=================================================================== --- /dev/null -+++ linux-3.0-master/drivers/video/bootsplash/decode-jpg.h ++++ linux-3.1-rc6-master/drivers/video/bootsplash/decode-jpg.h @@ -0,0 +1,37 @@ +/* + * linux/drivers/video/bootsplash/decode-jpg.h - a tiny jpeg decoder. @@ -3775,16 +3745,14 @@ + int dquant[3][64]; +}; + -+extern int jpeg_decode(unsigned char *buf, unsigned char *pic, ++extern int jpeg_decode(unsigned char *buf, unsigned char *pic, + int width, int height, enum splash_color_format cf, + struct jpeg_decdata *); +extern void jpeg_get_size(unsigned char *, int *, int *); + +#endif -Index: linux-3.0-master/drivers/video/bootsplash/render.c -=================================================================== --- /dev/null -+++ linux-3.0-master/drivers/video/bootsplash/render.c ++++ linux-3.1-rc6-master/drivers/video/bootsplash/render.c @@ -0,0 +1,491 @@ +/* + * linux/drivers/video/bootsplash/render.c - splash screen render functions. @@ -4277,10 +4245,8 @@ + /* update_screen(vc->vc_num); */ + } +} -Index: linux-3.0-master/drivers/video/console/bitblit.c -=================================================================== ---- linux-3.0-master.orig/drivers/video/console/bitblit.c -+++ linux-3.0-master/drivers/video/console/bitblit.c +--- linux-3.1-rc6-master.orig/drivers/video/console/bitblit.c ++++ linux-3.1-rc6-master/drivers/video/console/bitblit.c @@ -19,6 +19,9 @@ #include <asm/types.h> #include "fbcon.h" @@ -4354,10 +4320,8 @@ if (info->fbops->fb_cursor) err = info->fbops->fb_cursor(info, &cursor); -Index: linux-3.0-master/drivers/video/console/fbcon.c -=================================================================== ---- linux-3.0-master.orig/drivers/video/console/fbcon.c -+++ linux-3.0-master/drivers/video/console/fbcon.c +--- linux-3.1-rc6-master.orig/drivers/video/console/fbcon.c ++++ linux-3.1-rc6-master/drivers/video/console/fbcon.c @@ -80,6 +80,7 @@ #include <asm/system.h> @@ -4487,10 +4451,8 @@ cols /= w; rows /= h; vc_resize(vc, cols, rows); -Index: linux-3.0-master/drivers/video/console/fbcon.h -=================================================================== ---- linux-3.0-master.orig/drivers/video/console/fbcon.h -+++ linux-3.0-master/drivers/video/console/fbcon.h +--- linux-3.1-rc6-master.orig/drivers/video/console/fbcon.h ++++ linux-3.1-rc6-master/drivers/video/console/fbcon.h @@ -25,6 +25,53 @@ * low-level frame buffer device */ @@ -4545,10 +4507,8 @@ struct display { /* Filled in by the low-level console driver */ const u_char *fontdata; -Index: linux-3.0-master/include/linux/bootsplash.h -=================================================================== --- /dev/null -+++ linux-3.0-master/include/linux/bootsplash.h ++++ linux-3.1-rc6-master/include/linux/bootsplash.h @@ -0,0 +1,86 @@ +/* + * linux/drivers/video/bootsplash/bootsplash.h - splash screen definition. @@ -4636,10 +4596,8 @@ +# endif + +#endif -Index: linux-3.0-master/include/linux/console_struct.h -=================================================================== ---- linux-3.0-master.orig/include/linux/console_struct.h -+++ linux-3.0-master/include/linux/console_struct.h +--- linux-3.1-rc6-master.orig/include/linux/console_struct.h ++++ linux-3.1-rc6-master/include/linux/console_struct.h @@ -107,6 +107,9 @@ struct vc_data { unsigned long vc_uni_pagedir; unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */ @@ -4650,10 +4608,8 @@ /* additional information is in vt_kern.h */ }; -Index: linux-3.0-master/include/linux/fb.h -=================================================================== ---- linux-3.0-master.orig/include/linux/fb.h -+++ linux-3.0-master/include/linux/fb.h +--- linux-3.1-rc6-master.orig/include/linux/fb.h ++++ linux-3.1-rc6-master/include/linux/fb.h @@ -878,6 +878,10 @@ struct fb_info { void *fbcon_par; /* fbcon use-only private area */ /* From here on everything is device dependent */ ++++++ patches.xen.tar.bz2 ++++++ ++++ 26832 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:37.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:37.000000000 +0200 @@ -215,6 +215,12 @@ # Queued for 2.6.36 -> just revert after some time patches.fixes/acpi_ec_sys_access_user_space_with_get_user.patch + patches.drivers/apei_allow_drivers_access_nvs_ram.patch + + patches.arch/acpica_introduce_acpi_os_phys_table_override_function.patch + patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch + patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch + ######################################################## # CPUFREQ ######################################################## @@ -727,21 +733,14 @@ patches.xen/xen3-patch-2.6.39 patches.xen/xen3-patch-3.0 patches.xen/xen3-patch-3.1-rc5 + patches.xen/xen3-patch-3.1-rc6-rc7 + patches.xen/xen3-apei_allow_drivers_access_nvs_ram.patch + patches.xen/xen3-acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch patches.xen/xen3-stack-unwind patches.xen/xen3-x86_64-unwind-annotations # bugfixes and enhancements - patches.xen/xen-balloon-max-target - patches.xen/xen-blkif-protocol-fallback-hack - patches.xen/xen-blkback-cdrom - patches.xen/xen-blktap-modular - patches.xen/xen-blktap-write-barriers - patches.xen/xen-blktap2-configurable-nr-devs - patches.xen/xen-op-packet - patches.xen/xen-blkfront-cdrom - patches.xen/xen-blkfront-hvm-no-cdrom patches.xen/xen-kconfig-compat - patches.xen/xen-cpufreq-report patches.xen/xen-sys-suspend patches.xen/xen-ipi-per-cpu-irq patches.xen/xen-virq-per-cpu-irq @@ -750,7 +749,22 @@ patches.xen/xen-pcpu-hotplug patches.xen/xen-mem-hotplug patches.xen/xen-swiotlb-heuristics + patches.xen/xen-pci-multi-segment patches.xen/xen-configurable-guest-devices + patches.xen/xen-setup-gsi + patches.xen/xen-kzalloc + patches.xen/xen-sections + patches.xen/xen-unpriv-build + patches.xen/xen-cpufreq-report + patches.xen/xen-balloon-max-target + patches.xen/xen-blkif-protocol-fallback-hack + patches.xen/xen-blkback-cdrom + patches.xen/xen-blktap-modular + patches.xen/xen-blktap-write-barriers + patches.xen/xen-blktap2-configurable-nr-devs + patches.xen/xen-op-packet + patches.xen/xen-blkfront-cdrom + patches.xen/xen-blkfront-hvm-no-cdrom patches.xen/xen-netback-nr-irqs patches.xen/xen-netback-notify-multi patches.xen/xen-netback-generalize @@ -759,10 +773,6 @@ patches.xen/xen-cxgb3 patches.xen/xen-dcdbas patches.xen/xen-floppy - patches.xen/xen-sections - patches.xen/xen-kzalloc - patches.xen/xen-unpriv-build - patches.xen/xen-setup-gsi patches.xen/xen-x86-panic-no-reboot patches.xen/xen-x86-dcr-fallback patches.xen/xen-x86-no-lapic @@ -772,7 +782,6 @@ patches.xen/xen-x86-per-cpu-vcpu-info patches.xen/xen-x86-msr-on-pcpu patches.xen/xen-x86-EFI - patches.xen/xen-x86-mmcfg-ACPI-reserved patches.xen/xen-x86_64-pgd-pin patches.xen/xen-x86_64-pgd-alloc-order patches.xen/xen-x86_64-dump-user-pgt ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:38.000000000 +0200 +++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:38.000000000 +0200 @@ -1,3 +1,3 @@ -2011-09-15 22:18:41 +0200 -GIT Revision: 532c24ffdc1e085588774cecacdc52535bddc3a1 +2011-09-27 22:27:57 +0200 +GIT Revision: ba0cfdcb4a536831694e3844d9ecdb3870506e6b GIT Branch: master ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0