September 2011 - openSUSE Commits - openSUSE Mailing Lists

commit compiz-plugins-extra 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 compiz-plugins-extra for openSUSE:Factory checked in at Wed Sep 28 14:05:46 CEST 2011. -------- --- compiz-plugins-extra/compiz-plugins-extra.changes 2011-07-06 20:31:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/compiz-plugins-extra/compiz-plugins-extra.changes 2011-09-22 21:15:32.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 21 19:35:20 UTC 2011 - dimstar(a)opensuse.org + +- Update to version 0.9.5.94: + + Sync version. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-plugins-extra.spec ++++++ --- /var/tmp/diff_new_pack.togEY8/_old 2011-09-28 14:05:40.000000000 +0200 +++ /var/tmp/diff_new_pack.togEY8/_new 2011-09-28 14:05:40.000000000 +0200 @@ -18,7 +18,7 @@ Name: compiz-plugins-extra -Version: 0.9.5 +Version: 0.9.5.94 Release: 1 License: GPLv2+ Summary: Compiz extra plugins ++++++ compiz-plugins-extra.tar.bz2 ++++++ compiz-plugins-extra/compiz-plugins-extra.tar.bz2 /mounts/work_src_done/STABLE/compiz-plugins-extra/compiz-plugins-extra.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 compiz 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 compiz for openSUSE:Factory checked in at Wed Sep 28 14:05:36 CEST 2011. -------- --- compiz/compiz.changes 2011-06-27 12:07:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2011-09-21 21:45:18.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Sep 21 19:34:23 UTC 2011 - dimstar(a)opensuse.org + +- Update to 0.9.5.92.1: + + Fix failure to build from source due to merge failure on the + last release +- Changes from version 0.9.5.92: + + Added GSettings schema generation + + Revised libdecoration interface + + Fixed crashes on shutdown + + Don't unredirect overlay windows until they have been shaped + +------------------------------------------------------------------- +Tue Aug 23 06:57:15 UTC 2011 - andrea.turrini(a)gmail.com + +- Fixed typos in compiz.spec + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.GqDLfp/_old 2011-09-28 14:05:31.000000000 +0200 +++ /var/tmp/diff_new_pack.GqDLfp/_new 2011-09-28 14:05:31.000000000 +0200 @@ -19,7 +19,7 @@ Name: compiz -Version: 0.9.5 +Version: 0.9.5.92.1 Release: 1 License: GPLv2+ ; MIT License (or similar) Summary: OpenGL window and compositing manager @@ -30,8 +30,6 @@ Source2: sle.png # Helper to update to latest git snapshot. Source99: update.sh -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches -Patch0: 0001-Use-dynamic-allocation-for-plugin-class-indexes-and-.patch BuildRequires: Mesa-devel BuildRequires: boost-devel BuildRequires: cairo-devel @@ -76,7 +74,7 @@ ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %description -Compiz is an OpenGL compositing manager that use +Compiz is an OpenGL compositing manager that uses GLX_EXT_texture_from_drawable for binding redirected top-level windows to texture objects. It has a flexible plug-in system and it is designed to run well on most graphics hardware. @@ -94,7 +92,7 @@ %package kde4 License: GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) -Summary: OpenGL window and compositing managerdecorator for kde4 +Summary: OpenGL window and compositing manager decorator for kde4 Group: System/GUI/KDE Requires: %name = %version Requires: kde4-kwin @@ -115,7 +113,7 @@ Requires: xorg-x11-devel %description devel -Compiz is an OpenGL compositing manager that use +Compiz is an OpenGL compositing manager that uses GLX_EXT_texture_from_drawable for binding redirected top-level windows to texture objects. It has a flexible plug-in system and it is designed to run well on most graphics hardware. @@ -132,7 +130,7 @@ Conflicts: otherproviders(compiz-branding) %description branding-openSUSE -Compiz is an OpenGL compositing manager that use +Compiz is an OpenGL compositing manager that uses GLX_EXT_texture_from_drawable for binding redirected top-level windows to texture objects. It has a flexible plug-in system and it is designed to run well on most graphics hardware. @@ -149,7 +147,7 @@ Conflicts: otherproviders(compiz-branding) %description branding-SLE -Compiz is an OpenGL compositing manager that use +Compiz is an OpenGL compositing manager that uses GLX_EXT_texture_from_drawable for binding redirected top-level windows to texture objects. It has a flexible plug-in system and it is designed to run well on most graphics hardware. @@ -166,7 +164,7 @@ Conflicts: otherproviders(compiz-branding) %description branding-upstream -Compiz is an OpenGL compositing manager that use +Compiz is an OpenGL compositing manager that uses GLX_EXT_texture_from_drawable for binding redirected top-level windows to texture objects. It has a flexible plug-in system and it is designed to run well on most graphics hardware. @@ -175,9 +173,6 @@ %prep %setup -q -n %{name} translation-update-upstream po compiz -%if 0%{?suse_version} > 1120 -%patch0 -p1 -%endif mkdir build %build @@ -340,9 +335,11 @@ %{_datadir}/%{name}/cmake/CompizCommon.cmake %{_datadir}/%{name}/cmake/CompizDefaults.cmake %{_datadir}/%{name}/cmake/CompizGconf.cmake +%{_datadir}/%{name}/cmake/CompizGSettings.cmake %{_datadir}/%{name}/cmake/CompizPackage.cmake %{_datadir}/%{name}/cmake/CompizPlugin.cmake %{_datadir}/%{name}/cmake/plugin_extensions/CompizGenGconf.cmake +%{_datadir}/%{name}/cmake/plugin_extensions/CompizGenGSettings.cmake %{_datadir}/%{name}/cmake/plugin_extensions/CompizGenInstallData.cmake %{_datadir}/%{name}/cmake/plugin_extensions/CompizGenInstallImages.cmake %{_datadir}/cmake/Modules/FindCompiz.cmake ++++++ compiz.tar.bz2 ++++++ compiz/compiz.tar.bz2 /mounts/work_src_done/STABLE/compiz/compiz.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 circuslinux 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 circuslinux for openSUSE:Factory checked in at Wed Sep 28 14:05:20 CEST 2011. -------- --- circuslinux/circuslinux.changes 2011-07-02 19:23:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/circuslinux/circuslinux.changes 2011-09-18 00:59:57.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 17 22:59:52 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ circuslinux.spec ++++++ --- /var/tmp/diff_new_pack.OOGTUv/_old 2011-09-28 14:05:17.000000000 +0200 +++ /var/tmp/diff_new_pack.OOGTUv/_new 2011-09-28 14:05:17.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: circuslinux @@ -36,10 +35,6 @@ to bounce clowns into the air. When they reach the top, they pop rows of balloons, and then fall back down. -Authors: --------- - Bill Kendrick <bill(a)newbreedsoftware.com> - %prep %setup -q %patch0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bsd-games 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 bsd-games for openSUSE:Factory checked in at Wed Sep 28 14:02:54 CEST 2011. -------- --- bsd-games/bsd-games.changes 2009-06-02 14:30:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/bsd-games/bsd-games.changes 2011-09-17 22:53:09.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Sep 17 20:52:49 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsd-games.spec ++++++ --- /var/tmp/diff_new_pack.YIOFlx/_old 2011-09-28 14:02:45.000000000 +0200 +++ /var/tmp/diff_new_pack.YIOFlx/_new 2011-09-28 14:02:45.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package bsd-games (Version 2.17) +# spec file for package bsd-games # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: bsd-games @@ -26,7 +25,6 @@ Provides: bsdgames Obsoletes: bsdgames PreReq: permissions -AutoReqProv: on Version: 2.17 Release: 89 Summary: Several Text-Mode Games @@ -50,13 +48,6 @@ paranoia, pom, ppt, primes, rain, robots, sail, snake, snscore, teachgammon, trek, wargames, worm, worms, and wump. - - -Authors: --------- - Curt Olson <curt(a)sledge.mn.org> - Andy Tefft <teffta(a)erie.ge.com> - %prep %setup -q -n bsd-games-%{version} %patch0 @@ -76,7 +67,8 @@ echo echo "n" # Set owners/groups on installed files yes "") | ./configure -make OPTIMIZE="$RPM_OPT_FLAGS -I/usr/include/ncurses" dab_CXXFLAGS="-DHAVE_fgetln" +make OPTIMIZE="$RPM_OPT_FLAGS -I/usr/include/ncurses" \ + dab_CXXFLAGS="-DHAVE_fgetln" %{?_smp_mflags} %install make INSTALL_PREFIX=$RPM_BUILD_ROOT install @@ -101,9 +93,6 @@ done rm $RPM_BUILD_ROOT/usr/share/doc/bsd-games/trek.me -%clean -rm -rf $RPM_BUILD_ROOT - %post %run_permissions %verifyscript ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 branding-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 branding-openSUSE for openSUSE:Factory checked in at Wed Sep 28 14:02:40 CEST 2011. -------- --- branding-openSUSE/branding-openSUSE.changes 2011-09-22 18:04:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/branding-openSUSE/branding-openSUSE.changes 2011-09-28 11:51:19.000000000 +0200 @@ -1,0 +2,32 @@ +Wed Sep 28 09:50:10 UTC 2011 - coolo(a)suse.com + +- adopt ksplashx to new logo position + +------------------------------------------------------------------- +Tue Sep 27 20:33:57 UTC 2011 - coolo(a)suse.com + +- move ksplashx and kde wallpaper here too + +------------------------------------------------------------------- +Tue Sep 27 14:49:43 UTC 2011 - coolo(a)suse.com + +- update bootsplash graphics + +------------------------------------------------------------------- +Tue Sep 27 11:31:16 UTC 2011 - coolo(a)suse.com + +- fix %ifarch logic - and update to azul previews + +------------------------------------------------------------------- +Mon Sep 26 12:32:01 UTC 2011 - vuntz(a)opensuse.org + +- Add missing update-alternatives Requires(post)/Requires(postun) + to wallpaper-branding-openSUSE, since this is now using + update-alternatives. + +------------------------------------------------------------------- +Fri Sep 23 15:05:20 CEST 2011 - meissner(a)suse.de + +- gfxboot is only on x86_64 and %ix86 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.aXpflv/_old 2011-09-28 14:02:36.000000000 +0200 +++ /var/tmp/diff_new_pack.aXpflv/_new 2011-09-28 14:02:36.000000000 +0200 @@ -32,10 +32,12 @@ Source20: sysconfig.bootsplash-branding-openSUSE Source100: %{name}-COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +%ifarch x86_64 %ix86 +%define package_gfxboot 1 +BuildRequires: gfxboot-devel +%endif Summary: SuSE Brand File BuildRequires: fribidi -BuildRequires: gfxboot-devel BuildRequires: kde4-filesystem BuildRequires: update-desktop-files @@ -43,6 +45,22 @@ This package contains the file /etc/SuSE-brand, and its name is used as a trigger for installation of correct vendor brand packages. +%if 0%{?package_gfxboot} > 0 + +%package -n gfxboot-branding-openSUSE +Summary: Graphical bootloader openSUSE theme +Group: System/Boot +PreReq: gfxboot >= 4 +Supplements: packageand(gfxboot:branding-openSUSE) +Provides: gfxboot-theme = %{version} +Provides: gfxboot-branding = %{version} +Conflicts: otherproviders(gfxboot-branding) +BuildArch: noarch + +%description -n gfxboot-branding-openSUSE +openSUSE theme for gfxboot (bootloader graphics). +%endif + %package -n bootsplash-branding-openSUSE License: BSD3c Supplements: packageand(bootsplash:branding-openSUSE) @@ -58,18 +76,6 @@ %description -n bootsplash-branding-openSUSE This package contains a theme with openSUSE artwork -%package -n gfxboot-branding-openSUSE -Summary: Graphical bootloader openSUSE theme -Group: System/Boot -PreReq: gfxboot >= 4 -Supplements: packageand(gfxboot:branding-openSUSE) -Provides: gfxboot-theme = %{version} -Provides: gfxboot-branding = %{version} -Conflicts: otherproviders(gfxboot-branding) - -%description -n gfxboot-branding-openSUSE -openSUSE theme for gfxboot (bootloader graphics). - %package -n kdelibs4-branding-openSUSE Summary: KDE Base Libraries: Build Environment Group: System/GUI/KDE @@ -77,14 +83,18 @@ Supplements: packageand(kdelibs4:branding-openSUSE) Provides: kdelibs4-branding = %{version} Conflicts: otherproviders(kdelibs4-branding) +BuildArch: noarch %description -n kdelibs4-branding-openSUSE openSUSE branding for about KDE %package -n wallpaper-branding-openSUSE Summary: openSUSE default wallpapers +Requires(post): update-alternatives +Requires(postun): update-alternatives Provides: wallpaper-branding = %{version} Conflicts: otherproviders(wallpaper-branding) +BuildArch: noarch %description -n wallpaper-branding-openSUSE openSUSE wallpapers @@ -94,10 +104,24 @@ Provides: yast2-qt-branding = %{version} Conflicts: otherproviders(yast2-qt-branding) Supplements: packageand(yast2-qt:branding-openSUSE) +BuildArch: noarch %description -n yast2-qt-branding-openSUSE openSUSE branding for yast2-qt +%package -n ksplashx-branding-openSUSE +Summary: openSUSE branding for KDE splash +Provides: ksplashx-branding = %{version} +Conflicts: otherproviders(ksplashx-branding) +Supplements: packageand(kdebase4-workspace:branding-openSUSE) +BuildArch: noarch +# links its images +Requires: bootsplash-branding-openSUSE + +%description -n ksplashx-branding-openSUSE +openSUSE branding for KDE splash + + %prep %setup -c cp -a %{SOURCE100} COPYING @@ -108,6 +132,7 @@ VERSION = %{version} EOF +%if 0%{?package_gfxboot} > 0 mkdir gfx cp -a /usr/share/gfxboot/themes/openSUSE/ gfx list=`cd openSUSE/gfxboot && find -type f` @@ -119,6 +144,7 @@ export PATH=/usr/sbin:$PATH make popd +%endif %install mkdir -p %{buildroot}%{_sysconfdir} @@ -131,6 +157,7 @@ mkdir -p %{buildroot}/var/adm/fillup-templates cp %{SOURCE20} %{buildroot}/var/adm/fillup-templates/ +%if 0%{?package_gfxboot} > 0 install -d -m 755 %{buildroot}/etc/bootsplash/themes/openSUSE/{bootloader,cdrom} cp gfx/openSUSE/bootlogo %{buildroot}/etc/bootsplash/themes/openSUSE/cdrom /usr/share/gfxboot/bin/unpack_bootlogo %{buildroot}/etc/bootsplash/themes/openSUSE/cdrom @@ -139,6 +166,7 @@ mkdir %{buildroot}/boot touch %{buildroot}/boot/message +%endif install -D -m 644 openSUSE/kdelibs/body-background.jpg %{buildroot}%{_kde4_appsdir}/kdeui/about/body-background.jpg @@ -175,6 +203,18 @@ install -d %{buildroot}/usr/share/YaST2/theme/openSUSE cp -a openSUSE/yast_wizard %{buildroot}/usr/share/YaST2/theme/openSUSE/wizard +install -d %{buildroot}/usr/share/kde4/apps/ksplash/Themes +cp -a openSUSE/ksplashx %{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse +%suse_update_desktop_file %{buildroot}/usr/share/kde4/apps/ksplash/Themes/ksplashx-suse/Theme.rc + +# as long as its just links, it's better to keep them in wallpaper-branding. If we need custom ones, we should split +install -d %{buildroot}/usr/share/wallpapers/openSUSEdefault/contents/images +ln -s /usr/share/wallpapers/default-1600x1200.jpg %{buildroot}/usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg +ln -s /usr/share/wallpapers/default-1920x1200.jpg %{buildroot}/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1200.jpg +cp openSUSE/kde-workspace/screenshot.jpg %{buildroot}/usr/share/wallpapers/openSUSEdefault/contents/screenshot.jpg +cp openSUSE/kde-workspace/metadata.desktop %{buildroot}/usr/share/wallpapers/openSUSEdefault/metadata.desktop +%suse_update_desktop_file %{buildroot}/usr/share/wallpapers/openSUSEdefault/metadata.desktop + %post -n bootsplash-branding-openSUSE %{fillup_only -ns bootsplash branding-openSUSE } perl -pi -e 's/^(THEME=).*/$1"openSUSE"/' /etc/sysconfig/bootsplash @@ -182,8 +222,11 @@ /sbin/mkinitrd fi +%if 0%{?package_gfxboot} > 0 + %post -n gfxboot-branding-openSUSE gfxboot --update-theme openSUSE +%endif %post -n wallpaper-branding-openSUSE update-alternatives --install /usr/share/wallpapers/openSUSE-default.xml openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-static.xml 5 @@ -204,15 +247,20 @@ %dir /etc/bootsplash %dir /etc/bootsplash/themes /etc/bootsplash/themes/openSUSE +%if 0%{?package_gfxboot} > 0 %exclude %{_sysconfdir}/bootsplash/themes/openSUSE/bootloader %exclude %{_sysconfdir}/bootsplash/themes/openSUSE/cdrom +%endif %config /var/adm/fillup-templates/sysconfig.bootsplash-branding-openSUSE +%if 0%{?package_gfxboot} > 0 + %files -n gfxboot-branding-openSUSE %defattr(-,root,root) %{_sysconfdir}/bootsplash/themes/openSUSE/bootloader %{_sysconfdir}/bootsplash/themes/openSUSE/cdrom %ghost /boot/message +%endif %files -n kdelibs4-branding-openSUSE %defattr(-,root,root) @@ -235,4 +283,11 @@ %dir /usr/share/YaST2/theme/openSUSE /usr/share/YaST2/theme/openSUSE/wizard +%files -n ksplashx-branding-openSUSE +%defattr(-,root,root) +%dir /usr/share/kde4 +%dir /usr/share/kde4/apps +%dir /usr/share/kde4/apps/ksplash +/usr/share/kde4/apps/ksplash/Themes + %changelog ++++++ openSUSE.tar.gz ++++++ branding-openSUSE/openSUSE.tar.gz /mounts/work_src_done/STABLE/branding-openSUSE/openSUSE.tar.gz differ: char 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa-plugins 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 alsa-plugins for openSUSE:Factory checked in at Wed Sep 28 14:02:25 CEST 2011. -------- --- alsa-plugins/alsa-plugins.changes 2011-09-17 12:56:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins.changes 2011-09-27 09:57:09.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Sep 27 09:56:18 CEST 2011 - tiwai(a)suse.de + +- Set CLOEXEC flag to left-over fds in pulse plugin + +------------------------------------------------------------------- +Tue Sep 20 10:02:49 CEST 2011 - tiwai(a)suse.de + +- Install pulse plugin setup in the new config.d directory, + use the upstream default + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0008-pulse-Install-a-PulseAudio-config-snippet-into-alsa..patch 0009-Set-CLOEXEC-flag-for-pipes-in-PulseAudio-plugins.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-plugins.spec ++++++ --- /var/tmp/diff_new_pack.L7rt2K/_old 2011-09-28 14:02:21.000000000 +0200 +++ /var/tmp/diff_new_pack.L7rt2K/_new 2011-09-28 14:02:21.000000000 +0200 @@ -54,6 +54,8 @@ Patch5: 0005-jack-Fix-hanging-applications-when-using-jack-plugin.patch Patch6: 0006-pulse-only-underrun-if-no-more-data-has-been-written.patch Patch7: 0007-pulse-Define-a-dummy-PA_CHECK_VERSION-when-not-avail.patch +Patch8: 0008-pulse-Install-a-PulseAudio-config-snippet-into-alsa..patch +Patch9: 0009-Set-CLOEXEC-flag-for-pipes-in-PulseAudio-plugins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -138,6 +140,8 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build export AUTOMAKE_JOBS="%{?_smp_mflags}" @@ -188,6 +192,7 @@ %{_libdir}/alsa-lib/libasound_module_conf_pulse.so %config /etc/asound-pulse.conf %config /etc/alsa-pulse.conf +%{_datadir}/alsa/alsa.conf.d %endif %files maemo ++++++ 0008-pulse-Install-a-PulseAudio-config-snippet-into-alsa..patch ++++++ >From 84ce9d8230d19ebd67bc8db691bab74c4cbac979 Mon Sep 17 00:00:00 2001 From: Colin Guthrie <colin(a)mageia.org> Date: Fri, 16 Sep 2011 10:35:17 +0100 Subject: [PATCH] pulse: Install a PulseAudio config snippet into alsa.conf.d v2: Assing priorities to the config snippets. Signed-off-by: Colin Guthrie <colin(a)mageia.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- configure.in | 19 ++++++++++++++++++- pulse/50-pulseaudio.conf | 13 +++++++++++++ pulse/99-pulseaudio-default.conf.example | 13 +++++++++++++ pulse/Makefile.am | 2 ++ 4 files changed, 46 insertions(+), 1 deletions(-) create mode 100644 pulse/50-pulseaudio.conf create mode 100644 pulse/99-pulseaudio-default.conf.example diff --git a/configure.in b/configure.in index ccf59ba..3839dd5 100644 --- a/configure.in +++ b/configure.in @@ -131,10 +131,10 @@ fi AM_CONDITIONAL(HAVE_PPH, test "$PPH" = "builtin" -o "$PPH" = "lib") AM_CONDITIONAL(USE_LIBSPEEX, test "$PPH" = "lib") -dnl ALSA plugin directory test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix=$prefix +dnl ALSA plugin directory AC_ARG_WITH(plugindir, AS_HELP_STRING([--with-plugindir=dir], [path where ALSA plugin files are stored]), @@ -151,6 +151,23 @@ AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "$plugindir", [directory containing ALSA add ALSA_PLUGIN_DIR="$plugindir" AC_SUBST(ALSA_PLUGIN_DIR) +dnl ALSA data directory +AC_ARG_WITH(alsadatadir, + AS_HELP_STRING([--with-alsadatadir=dir], + [path where ALSA data files are stored]), + alsadatadir="$withval", alsadatadir="") +if test -z "$alsadatadir"; then + eval dir="$datadir" + case "$dir" in + /*) ;; + *) dir="$dir" + esac + alsadatadir="$dir/alsa" +fi +AC_DEFINE_UNQUOTED(ALSA_DATA_DIR, "$alsadatadir", [directory containing ALSA data files]) +ALSA_DATA_DIR="$alsadatadir" +AC_SUBST(ALSA_DATA_DIR) + SAVE_PLUGINS_VERSION AC_OUTPUT([ diff --git a/pulse/50-pulseaudio.conf b/pulse/50-pulseaudio.conf new file mode 100644 index 0000000..dd85dab --- /dev/null +++ b/pulse/50-pulseaudio.conf @@ -0,0 +1,13 @@ +# Add a specific named PulseAudio pcm and ctl (typically useful for testing) + +pcm.pulse { + type pulse + hint { + show on + description "PulseAudio Sound Server" + } +} + +ctl.pulse { + type pulse +} diff --git a/pulse/99-pulseaudio-default.conf.example b/pulse/99-pulseaudio-default.conf.example new file mode 100644 index 0000000..4f58858 --- /dev/null +++ b/pulse/99-pulseaudio-default.conf.example @@ -0,0 +1,13 @@ +# Default to PulseAudio + +pcm.!default { + type pulse + hint { + show on + description "Default ALSA Output (currently PulseAudio Sound Server)" + } +} + +ctl.!default { + type pulse +} diff --git a/pulse/Makefile.am b/pulse/Makefile.am index e89e8ee..e184c62 100644 --- a/pulse/Makefile.am +++ b/pulse/Makefile.am @@ -1,10 +1,12 @@ asound_module_pcm_LTLIBRARIES = libasound_module_pcm_pulse.la asound_module_ctl_LTLIBRARIES = libasound_module_ctl_pulse.la asound_module_conf_LTLIBRARIES = libasound_module_conf_pulse.la +asound_module_data_DATA = 50-pulseaudio.conf 99-pulseaudio-default.conf.example asound_module_pcmdir = @ALSA_PLUGIN_DIR@ asound_module_ctldir = @ALSA_PLUGIN_DIR@ asound_module_confdir = @ALSA_PLUGIN_DIR@ +asound_module_datadir = @ALSA_DATA_DIR@/alsa.conf.d AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(PTHREAD_CFLAGS) $(pulseaudio_CFLAGS) -D_GNU_SOURCE AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) -- 1.7.6.1 ++++++ 0009-Set-CLOEXEC-flag-for-pipes-in-PulseAudio-plugins.patch ++++++ >From edfb903f625b7193c4127e91cbe641ba5f421c27 Mon Sep 17 00:00:00 2001 From: Chris Rankin <rankincj(a)yahoo.com> Date: Tue, 27 Sep 2011 09:44:15 +0200 Subject: [PATCH] Set CLOEXEC flag for pipes in PulseAudio plugins I have noticed that Alsa / PulseAudio are leaking a couple of pipes after a fork/exec, and have traced the leak to the following two plugins: libasound_module_ctl_pulse.so libasound_module_pcm_pulse.so This is with Fedora 15. I have attached a patch for the problem. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- pulse/pulse.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/pulse/pulse.c b/pulse/pulse.c index c34671b..cf0546b 100644 --- a/pulse/pulse.c +++ b/pulse/pulse.c @@ -114,6 +114,11 @@ static int make_nonblock(int fd) { return fcntl(fd, F_SETFL, fl | O_NONBLOCK); } +static int make_close_on_exec(int fd) +{ + return fcntl(fd, F_SETFD, FD_CLOEXEC); +} + snd_pulse_t *pulse_new(void) { snd_pulse_t *p; @@ -134,7 +139,9 @@ snd_pulse_t *pulse_new(void) p->thread_fd = fd[1]; make_nonblock(p->main_fd); + make_close_on_exec(p->main_fd); make_nonblock(p->thread_fd); + make_close_on_exec(p->thread_fd); p->mainloop = pa_threaded_mainloop_new(); if (!p->mainloop) -- 1.7.6.1 ++++++ asound-pulse.conf ++++++ --- /var/tmp/diff_new_pack.L7rt2K/_old 2011-09-28 14:02:21.000000000 +0200 +++ /var/tmp/diff_new_pack.L7rt2K/_new 2011-09-28 14:02:21.000000000 +0200 @@ -1,18 +1,15 @@ # PulseAudio plugin configuration -# Let's create a virtual device "pulse" for mixer and PCM - -pcm.pulse { +pcm.!default { type pulse + hint { + show on + description "Default ALSA Output (currently PulseAudio Sound Server)" + } fallback "sysdefault" } -ctl.pulse { +ctl.!default { type pulse fallback "sysdefault" } - -# Let's make it the default! - -pcm.!default "pulse" -ctl.!default "pulse" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 acpid 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 acpid for openSUSE:Factory checked in at Wed Sep 28 14:02:13 CEST 2011. -------- --- acpid/acpid.changes 2011-09-23 16:30:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/acpid/acpid.changes 2011-09-26 18:21:09.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 26 16:20:40 UTC 2011 - fcrozat(a)suse.com + +- Use latest systemd RPM macros. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpid.spec ++++++ --- /var/tmp/diff_new_pack.ZU1rTK/_old 2011-09-28 14:02:09.000000000 +0200 +++ /var/tmp/diff_new_pack.ZU1rTK/_new 2011-09-28 14:02:09.000000000 +0200 @@ -77,20 +77,15 @@ touch %buildroot%_var/log/acpid %pre -%service_migrate_to_systemd_pre acpid +%service_add_pre acpid.service %post %{fillup_and_insserv -y -f acpid} -%service_migrate_to_systemd_post acpid -%service_add acpid.service -if [ $FIRST_ARG -eq 1 ]; then - /bin/systemctl enable acpid.service 2> /dev/null || : -fi +%service_add_post acpid.service %postun %restart_on_update acpid %{insserv_cleanup} -%service_migrate_to_systemd_postun acpid %service_del_postun acpid.service %preun ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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:Factory
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:Factory checked in at Wed Sep 28 14:02:00 CEST 2011. -------- --- MozillaThunderbird/MozillaThunderbird.changes 2011-09-14 09:06:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/MozillaThunderbird/MozillaThunderbird.changes 2011-09-26 15:42:23.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 26 09:18:56 UTC 2011 - wolfgang(a)rosenauer.org + +- update to version 7.0 (bnc#720264) +- removed obsolete mozilla-cairo-lcd.patch +- rebased patches + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- l10n-6.0.2.tar.bz2 mozilla-cairo-lcd.patch thunderbird-6.0.2-source.tar.bz2 New: ---- l10n-7.0.tar.bz2 thunderbird-7.0-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.3brdN7/_old 2011-09-28 14:01:48.000000000 +0200 +++ /var/tmp/diff_new_pack.3brdN7/_new 2011-09-28 14:01:48.000000000 +0200 @@ -21,13 +21,14 @@ Name: MozillaThunderbird BuildRequires: Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ hunspell-devel libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip -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+ -%define mainversion 6.0.2 +%define mainversion 7.0 Version: %{mainversion} -Release: 29 -%define releasedate 2011090700 +Release: 1 +%define releasedate 2011092200 Provides: thunderbird = %{version} Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ @@ -46,7 +47,6 @@ Source11: compare-locales.tar.bz2 # Gecko/Toolkit Patch1: mozilla-shared-nss-db.patch -Patch2: mozilla-cairo-lcd.patch Patch3: mozilla-language.patch Patch4: mozilla-linux3.patch Patch5: mozilla-cairo-return.patch @@ -166,7 +166,6 @@ # xulrunner patches pushd mozilla %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -462,6 +461,7 @@ %dir %{progdir}/chrome/ %{progdir}/chrome/icons/ %dir %{progdir}/dictionaries/ +%{progdir}/hyphenation/ %{progdir}/defaults/ %dir %{progdir}/extensions/ %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.3brdN7/_old 2011-09-28 14:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.3brdN7/_new 2011-09-28 14:01:49.000000000 +0200 @@ -2,8 +2,8 @@ BRANCH="releases/comm-release" -RELEASE_TAG="THUNDERBIRD_6_0_2_RELEASE" -VERSION="6.0.2" +RELEASE_TAG="THUNDERBIRD_7_0_RELEASE" +VERSION="7.0" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird ++++++ l10n-6.0.2.tar.bz2 -> l10n-7.0.tar.bz2 ++++++ MozillaThunderbird/l10n-6.0.2.tar.bz2 /mounts/work_src_done/STABLE/MozillaThunderbird/l10n-7.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-cairo-return.patch ++++++ --- /var/tmp/diff_new_pack.3brdN7/_old 2011-09-28 14:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.3brdN7/_new 2011-09-28 14:01:49.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.3brdN7/_old 2011-09-28 14:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.3brdN7/_new 2011-09-28 14:01:49.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.3brdN7/_old 2011-09-28 14:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.3brdN7/_new 2011-09-28 14:01:49.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 ++++++ thunderbird-6.0.2-source.tar.bz2 -> thunderbird-7.0-source.tar.bz2 ++++++ MozillaThunderbird/thunderbird-6.0.2-source.tar.bz2 /mounts/work_src_done/STABLE/MozillaThunderbird/thunderbird-7.0-source.tar.bz2 differ: char 11, line 1 ++++++ thunderbird-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.3brdN7/_old 2011-09-28 14:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.3brdN7/_new 2011-09-28 14:01:49.000000000 +0200 @@ -66,7 +66,7 @@ diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in --- a/mail/app/Makefile.in +++ b/mail/app/Makefile.in -@@ -119,16 +119,17 @@ endif +@@ -107,16 +107,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:Factory
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:Factory checked in at Wed Sep 28 14:01:33 CEST 2011. -------- --- MozillaFirefox/MozillaFirefox.changes 2011-09-14 09:03:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes 2011-09-26 08:37:05.000000000 +0200 @@ -1,0 +2,18 @@ +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) + +------------------------------------------------------------------- calling whatdependson for head-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.kyGuxB/_old 2011-09-28 14:01:22.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGuxB/_new 2011-09-28 14:01:22.000000000 +0200 @@ -18,8 +18,8 @@ # norootforbuild -%define major 6 -%define mainver %major.0.2 +%define major 7 +%define mainver %major.0 Name: MozillaFirefox 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 @@ -34,8 +34,8 @@ BuildRequires: nss-shared-helper-devel License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: %{mainver} -Release: 4 -%define releasedate 2011090700 +Release: 1 +%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.kyGuxB/_old 2011-09-28 14:01:22.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGuxB/_new 2011-09-28 14:01:22.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 ++++++ MozillaFirefox/firefox-6.0.2-source.tar.bz2 /mounts/work_src_done/STABLE/MozillaFirefox/firefox-7.0-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.kyGuxB/_old 2011-09-28 14:01:22.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGuxB/_new 2011-09-28 14:01:22.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.kyGuxB/_old 2011-09-28 14:01:23.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGuxB/_new 2011-09-28 14:01:23.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 ++++++ MozillaFirefox/l10n-6.0.2.tar.bz2 /mounts/work_src_done/STABLE/MozillaFirefox/l10n-7.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.kyGuxB/_old 2011-09-28 14:01:23.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGuxB/_new 2011-09-28 14:01:23.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.kyGuxB/_old 2011-09-28 14:01:23.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGuxB/_new 2011-09-28 14:01:23.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.kyGuxB/_old 2011-09-28 14:01:23.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGuxB/_new 2011-09-28 14:01:23.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.kyGuxB/_old 2011-09-28 14:01:23.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGuxB/_new 2011-09-28 14:01:23.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.kyGuxB/_old 2011-09-28 14:01:23.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGuxB/_new 2011-09-28 14:01:23.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.kyGuxB/_old 2011-09-28 14:01:23.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGuxB/_new 2011-09-28 14:01:23.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.kyGuxB/_old 2011-09-28 14:01:23.000000000 +0200 +++ /var/tmp/diff_new_pack.kyGuxB/_new 2011-09-28 14:01:23.000000000 +0200 @@ -1,2 +1,2 @@ -REV=5b6c2f8ff6da +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

drop libccrtp2 from openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '11

27 Sep '11

Hello community, FYI: Package libccrtp2 was dropped from openSUSE:Factory at Tue Sep 27 16:19:18 CEST 2011. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=li… 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