Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Sun Feb 27 13:37:23 CET 2011.
-------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2011-02-24 16:08:42.000000000 +0100 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2011-02-27 10:18:51.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Feb 26 18:02:50 UTC 2011 - [email protected] + +- simplify perl update script for blur blacklist (bnc#675388) + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.3GmvzQ/_old 2011-02-27 13:36:50.000000000 +0100 +++ /var/tmp/diff_new_pack.3GmvzQ/_new 2011-02-27 13:36:50.000000000 +0100 @@ -23,7 +23,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.6.0 -Release: 6 +Release: 7 BuildRequires: libdbusmenu-qt-devel BuildRequires: libkdepimlibs4-devel >= %version BuildRequires: libqimageblitz-devel ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.3GmvzQ/_old 2011-02-27 13:36:50.000000000 +0100 +++ /var/tmp/diff_new_pack.3GmvzQ/_new 2011-02-27 13:36:50.000000000 +0100 @@ -23,7 +23,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.6.0 -Release: 13 +Release: 14 BuildRequires: audit-devel BuildRequires: bluez-devel BuildRequires: ConsoleKit-devel ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.3GmvzQ/_old 2011-02-27 13:36:50.000000000 +0100 +++ /var/tmp/diff_new_pack.3GmvzQ/_new 2011-02-27 13:36:50.000000000 +0100 @@ -27,7 +27,7 @@ Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ Version: 4.6.0 -Release: 6 +Release: 7 BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libdbusmenu-qt-devel libkdepimlibs4-devel >= %version libqimageblitz-devel BuildRequires: libknotificationitem-devel libsmbclient-devel libxklavier-devel python-kde4-devel >= %version Source0: kdebase-workspace-%version.tar.bz2 ++++++ kwin-update-blacklist-11.4.diff ++++++ --- /var/tmp/diff_new_pack.3GmvzQ/_old 2011-02-27 13:36:50.000000000 +0100 +++ /var/tmp/diff_new_pack.3GmvzQ/_new 2011-02-27 13:36:50.000000000 +0100 @@ -6,64 +6,48 @@ Add blacklist updater for Blur on Intel 945GM on openSUSE 11.4 -diff --git a/kwin/data/CMakeLists.txt b/kwin/data/CMakeLists.txt -index ca6ff12..f1f314e 100644 ---- a/kwin/data/CMakeLists.txt -+++ b/kwin/data/CMakeLists.txt -@@ -38,5 +38,5 @@ install( TARGETS kwin_update_tabbox_settings DESTINATION ${LIB_INSTALL_DIR}/kcon +Index: kdebase-workspace-4.6.0/kwin/data/CMakeLists.txt +=================================================================== +--- kdebase-workspace-4.6.0.orig/kwin/data/CMakeLists.txt 2011-01-19 23:05:20.000000000 +0100 ++++ kdebase-workspace-4.6.0/kwin/data/CMakeLists.txt 2011-02-26 19:00:17.413355775 +0100 +@@ -38,5 +38,5 @@ install( TARGETS kwin_update_tabbox_sett install( FILES fsp_workarounds_1.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules ) install( FILES pop.wav DESTINATION ${SOUND_INSTALL_DIR} ) install( FILES kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd kwin_on_off.upd kwin_window_shortcuts.upd kwin_update_tabbox_settings.upd kwin_blacklist.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -install( PROGRAMS pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh on-off_to_true-false.sh kwin_window_shortcuts.sh kwin_blacklist.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) +install( PROGRAMS pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh on-off_to_true-false.sh kwin_window_shortcuts.sh kwin_blacklist.sh kwin_blacklist-opensuse-11.4.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -diff --git a/kwin/data/kwin_blacklist-opensuse-11.4.pl b/kwin/data/kwin_blacklist-opensuse-11.4.pl -new file mode 100755 -index 0000000..28a6e63 ---- /dev/null -+++ b/kwin/data/kwin_blacklist-opensuse-11.4.pl -@@ -0,0 +1,32 @@ +Index: kdebase-workspace-4.6.0/kwin/data/kwin_blacklist-opensuse-11.4.pl +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ kdebase-workspace-4.6.0/kwin/data/kwin_blacklist-opensuse-11.4.pl 2011-02-26 19:02:28.778969843 +0100 +@@ -0,0 +1,17 @@ +#! /usr/bin/perl + +use strict; + -+my $currentGroup = ""; -+my $key; -+my $value; -+my $i; -+my $out; -+my @blacklist; -+my $found = 0; -+my $toblacklist = "Mesa DRI Intel(R) 945GM GEM 20100330 DEVELOPMENT x86/MMX/SSE2:-:1.4 Mesa 7.10"; ++my $out = "Mesa DRI Intel(R) 945GM GEM 20100330 DEVELOPMENT x86/MMX/SSE2:-:1.4 Mesa 7.10"; +while (<>) +{ + chomp; -+ ($key, $value) = ($_ =~ /([^=]+)=[ \t]*([^\n]+)/); -+ if ($_ =~ /Intel/) ++ if ($_ =~ m/^Intel=[ \t]*([^\n]+)$/) + { -+ @blacklist = split(/,/, $value); -+ push(@blacklist, $toblacklist); -+ $value = join(',', @blacklist); -+ $found = 1; ++ $out = "$out,$1"; + } -+ if (not $found) { -+ $value = $toblacklist; -+ } -+ +} + +print("[Blacklist][Blur]\n"); -+print("Intel=$value\n"); ++print("Intel=$out\n"); + -diff --git a/kwin/data/kwin_blacklist.upd b/kwin/data/kwin_blacklist.upd -index 59bfda6..160ff9e 100644 ---- a/kwin/data/kwin_blacklist.upd -+++ b/kwin/data/kwin_blacklist.upd +Index: kdebase-workspace-4.6.0/kwin/data/kwin_blacklist.upd +=================================================================== +--- kdebase-workspace-4.6.0.orig/kwin/data/kwin_blacklist.upd 2011-01-19 23:05:20.000000000 +0100 ++++ kdebase-workspace-4.6.0/kwin/data/kwin_blacklist.upd 2011-02-26 19:12:34.456575142 +0100 @@ -1,3 +1,9 @@ Id=Blacklist-4.5 File=kwinrc Script=kwin_blacklist.sh,sh -+Id=Blacklist-openSUSE-11.4 ++Id=Blacklist-openSUSE-114 +Group=[Blacklist][Blur] +Options=overwrite +File=kwinrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
