Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Hi,
I would like to upload kgamma 4.8.4-2.
The only change is the backport of an upstream patch to fix the crash
of this configuration module when being run as different user than the
one currently logged in X.
Attached the current diff out of the packaging repo of the changes
above.
Thanks,
--
Pino
diff --git a/debian/changelog b/debian/changelog
index c8f3e08..8af9522 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+kgamma (4:4.8.4-2) UNRELEASED; urgency=low
+
+ [ Pino Toscano ]
+ * Backport upstream commit 1918f145261a52a3b2a917c6784c2cebecbb4064 to fix
+ crash when run as different user (e.g. root); patch
+ upstream_Fix-crash-when-XVidExtWrap-is-not-available.patch.
+ (Closes: #688767)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-...@lists.debian.org> Wed, 28 Nov 2012 10:42:59 +0100
+
kgamma (4:4.8.4-1) unstable; urgency=low
* Team upload.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b4726e5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_Fix-crash-when-XVidExtWrap-is-not-available.patch
diff --git a/debian/patches/upstream_Fix-crash-when-XVidExtWrap-is-not-available.patch b/debian/patches/upstream_Fix-crash-when-XVidExtWrap-is-not-available.patch
new file mode 100644
index 0000000..abe8479
--- /dev/null
+++ b/debian/patches/upstream_Fix-crash-when-XVidExtWrap-is-not-available.patch
@@ -0,0 +1,50 @@
+From 1918f145261a52a3b2a917c6784c2cebecbb4064 Mon Sep 17 00:00:00 2001
+From: Christoph Feck <christ...@maxiom.de>
+Date: Sun, 11 Nov 2012 02:19:01 +0100
+Subject: [PATCH] Fix crash when XVidExtWrap is not available
+
+This can happen when run as root
+BUG: 292335
+FIXED-IN: 4.10
+---
+ kcmkgamma/kgamma.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/kcmkgamma/kgamma.cpp b/kcmkgamma/kgamma.cpp
+index ffe29ea..890ba99 100644
+--- a/kcmkgamma/kgamma.cpp
++++ b/kcmkgamma/kgamma.cpp
+@@ -70,7 +70,7 @@ KGamma::KGamma(QWidget* parent_P, const QVariantList &)
+ :KCModule(KGammaConfigFactory::componentData(), parent_P), rootProcess(0)
+ {
+ bool ok;
+- GammaCorrection = true;
++ GammaCorrection = false;
+ xv = new XVidExtWrap(&ok, NULL);
+ if (ok) { /* KDE 4: Uneccessary test, when all KCM wrappers do conditional loading */
+ xv->getGamma(XVidExtWrap::Red, &ok);
+@@ -94,6 +94,7 @@ KGamma::KGamma(QWidget* parent_P, const QVariantList &)
+ xv->setScreen(currentScreen);
+
+ rootProcess = new KProcess;
++ GammaCorrection = true;
+ setupUI();
+ saved = false;
+
+@@ -107,10 +108,9 @@ KGamma::KGamma(QWidget* parent_P, const QVariantList &)
+ }
+ load();
+ }
+- else { //something is wrong, show only error message
+- GammaCorrection = false;
+- setupUI();
+- }
++ }
++ if (!GammaCorrection) { //something is wrong, show only error message
++ setupUI();
+ }
+ }
+
+--
+1.7.10.4
+
--
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-kde-talk
