summaryrefslogtreecommitdiffstats
path: root/source/x/x11/patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2009-08-26 10:00:38 -0500
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:41:17 +0200
commit5a12e7c134274dba706667107d10d231517d3e05 (patch)
tree55718d5acb710fde798d9f38d0bbaf594ed4b296 /source/x/x11/patch
downloadcurrent-5a12e7c134274dba706667107d10d231517d3e05.tar.gz
current-5a12e7c134274dba706667107d10d231517d3e05.tar.xz
Slackware 13.0slackware-13.0
Wed Aug 26 10:00:38 CDT 2009 Slackware 13.0 x86_64 is released as stable! Thanks to everyone who helped make this release possible -- see the RELEASE_NOTES for the credits. The ISOs are off to the replicator. This time it will be a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. We're taking pre-orders now at store.slackware.com. Please consider picking up a copy to help support the project. Once again, thanks to the entire Slackware community for all the help testing and fixing things and offering suggestions during this development cycle. As always, have fun and enjoy! -P.
Diffstat (limited to 'source/x/x11/patch')
-rw-r--r--source/x/x11/patch/compiz.patch3
-rw-r--r--source/x/x11/patch/compiz/compiz-0.7.8-kde42-crash.patch66
-rw-r--r--source/x/x11/patch/compiz/compiz-0.7.8-kde42-krunner.patch19
-rw-r--r--source/x/x11/patch/compiz/compiz-0.7.8-kde42.patch89
-rw-r--r--source/x/x11/patch/xorg-server.patch1
-rw-r--r--source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff13
-rw-r--r--source/x/x11/patch/xscope.patch1
-rw-r--r--source/x/x11/patch/xscope/xscope-1.1-scope.c.diff11
8 files changed, 203 insertions, 0 deletions
diff --git a/source/x/x11/patch/compiz.patch b/source/x/x11/patch/compiz.patch
new file mode 100644
index 000000000..c2920994d
--- /dev/null
+++ b/source/x/x11/patch/compiz.patch
@@ -0,0 +1,3 @@
+zcat $CWD/patch/compiz/compiz-0.7.8-kde42-crash.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patch/compiz/compiz-0.7.8-kde42-krunner.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patch/compiz/compiz-0.7.8-kde42.patch.gz | patch -p1 --verbose || exit 1
diff --git a/source/x/x11/patch/compiz/compiz-0.7.8-kde42-crash.patch b/source/x/x11/patch/compiz/compiz-0.7.8-kde42-crash.patch
new file mode 100644
index 000000000..00f89e2cd
--- /dev/null
+++ b/source/x/x11/patch/compiz/compiz-0.7.8-kde42-crash.patch
@@ -0,0 +1,66 @@
+Implement KDecorationBridge unstable API, needed for KDE 4.2.
+---
+
+diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp
+index d2d362b..68c856b 100644
+--- a/kde/window-decorator-kde4/window.cpp
++++ b/kde/window-decorator-kde4/window.cpp
+@@ -764,6 +764,31 @@ KWD::Window::grabXServer (bool)
+ }
+
+ void
++KWD::Window::repaintShadow (void)
++{
++}
++
++bool
++KWD::Window::compositingActive (void) const
++{
++ return true;
++}
++
++bool
++KWD::Window::shadowsActive (void) const
++{
++ /* we are drawing the shadows ourselves, no need for the
++ decoration engine to do so */
++ return false;
++}
++
++double
++KWD::Window::opacity (void) const
++{
++ return 1.0;
++}
++
++void
+ KWD::Window::createDecoration (void)
+ {
+ KDecoration *decor;
+diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h
+index bdf2c47..034e6fe 100644
+--- a/kde/window-decorator-kde4/window.h
++++ b/kde/window-decorator-kde4/window.h
+@@ -45,7 +45,7 @@ class QMenu;
+
+ namespace KWD
+ {
+-class Window:public QWidget, public KDecorationBridge {
++class Window:public QWidget, public KDecorationBridgeUnstable {
+ Q_OBJECT public:
+
+ enum Type
+@@ -104,6 +104,12 @@ class Window:public QWidget, public KDecorationBridge {
+ virtual Qt::WFlags initialWFlags (void) const;
+ virtual void grabXServer (bool grab);
+
++ /* unstable API */
++ virtual void repaintShadow ();
++ virtual bool compositingActive () const;
++ virtual bool shadowsActive () const;
++ virtual double opacity () const;
++
+ void handleActiveChange (void);
+ void updateFrame (WId frame);
+ void updateWindowGeometry (void);
+
diff --git a/source/x/x11/patch/compiz/compiz-0.7.8-kde42-krunner.patch b/source/x/x11/patch/compiz/compiz-0.7.8-kde42-krunner.patch
new file mode 100644
index 000000000..3de71af82
--- /dev/null
+++ b/source/x/x11/patch/compiz/compiz-0.7.8-kde42-krunner.patch
@@ -0,0 +1,19 @@
+diff --git a/kde/window-decorator-kde4/decorator.cpp b/kde/window-decorator-kde4/decorator.cpp
+index 96b818d..0bf4718 100644
+--- a/kde/window-decorator-kde4/decorator.cpp
++++ b/kde/window-decorator-kde4/decorator.cpp
+@@ -649,9 +649,10 @@ KWD::Decorator::x11EventFilter (XEvent *xevent)
+ }
+ else if (action == Atoms::toolkitActionRunDialogAtom)
+ {
+- QDBusInterface krunner ("org.kde.krunner", "/Interface",
+- "org.kde.krunner.Interface");
+- krunner.call ("display", "");
++ QDBusInterface krunner ("org.kde.krunner", "/App",
++ "org.kde.krunner.App");
++ if (krunner.isValid ())
++ krunner.call ("display");
+ }
+ else if (action == Atoms::toolkitActionForceQuitDialogAtom)
+ {
+
diff --git a/source/x/x11/patch/compiz/compiz-0.7.8-kde42.patch b/source/x/x11/patch/compiz/compiz-0.7.8-kde42.patch
new file mode 100644
index 000000000..0f9962233
--- /dev/null
+++ b/source/x/x11/patch/compiz/compiz-0.7.8-kde42.patch
@@ -0,0 +1,89 @@
+diff -ur compiz-0.7.8/configure compiz-0.7.8-kde42/configure
+--- compiz-0.7.8/configure 2008-09-17 13:34:28.000000000 +0200
++++ compiz-0.7.8-kde42/configure 2008-12-01 19:07:49.000000000 +0100
+@@ -25429,7 +25429,7 @@
+ kde4libs=`kde4-config --install lib --expandvars 2>/dev/null`
+ kde4incs=`kde4-config --install include --expandvars 2>/dev/null`
+
+- kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h"
++ kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h"
+
+ { echo "$as_me:$LINENO: checking for KWin headers" >&5
+ echo $ECHO_N "checking for KWin headers... $ECHO_C" >&6; }
+diff -ur compiz-0.7.8/configure.ac compiz-0.7.8-kde42/configure.ac
+--- compiz-0.7.8/configure.ac 2008-09-17 13:33:40.000000000 +0200
++++ compiz-0.7.8-kde42/configure.ac 2008-12-01 19:07:33.000000000 +0100
+@@ -487,7 +487,7 @@
+ kde4libs=`kde4-config --install lib --expandvars 2>/dev/null`
+ kde4incs=`kde4-config --install include --expandvars 2>/dev/null`
+
+- kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h"
++ kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h"
+
+ dnl Check for KWin headers
+ AC_MSG_CHECKING([for KWin headers])
+diff -ur compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.cpp
+--- compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp 2008-08-08 13:20:31.000000000 +0200
++++ compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.cpp 2008-12-01 19:13:18.000000000 +0100
+@@ -30,7 +30,7 @@
+
+ #include <fixx11h.h>
+
+-#include <KDE/Plasma/PanelSvg>
++#include <KDE/Plasma/FrameSvg>
+ #include <KDE/Plasma/Theme>
+
+ #include <kwindowsystem.h>
+@@ -46,9 +46,9 @@
+ QColor color;
+ color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor);
+
+- mBackground = new Plasma::PanelSvg();
++ mBackground = new Plasma::FrameSvg();
+ mBackground->setImagePath ("dialogs/background");
+- mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders);
++ mBackground->setEnabledBorders(Plasma::FrameSvg::AllBorders);
+
+ mBorder.left = mBackground->marginSize(Plasma::LeftMargin);
+ mBorder.right = mBackground->marginSize(Plasma::RightMargin);
+@@ -131,8 +131,8 @@
+ p.setCompositionMode (QPainter::CompositionMode_Source);
+ p.setRenderHint (QPainter::SmoothPixmapTransform);
+
+- mBackground->resizePanel (QSizeF (contentWidth, contentHeight));
+- mBackground->paintPanel (&p, QRect (0, 0, contentWidth,
++ mBackground->resizeFrame (QSizeF (contentWidth, contentHeight));
++ mBackground->paintFrame (&p, QRect (0, 0, contentWidth,
+ contentHeight));
+
+ mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top,
+@@ -168,7 +168,7 @@
+ p.setCompositionMode (QPainter::CompositionMode_Source);
+
+
+- mBackground->paintPanel (&p, QRect (mBorder.left, mBorder.top +
++ mBackground->paintFrame (&p, QRect (mBorder.left, mBorder.top +
+ mGeometry.height () + 5, mGeometry.width (),
+ fm.height ()));
+
+diff -ur compiz-0.7.8/kde/window-decorator-kde4/switcher.h compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.h
+--- compiz-0.7.8/kde/window-decorator-kde4/switcher.h 2008-08-08 13:20:31.000000000 +0200
++++ compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.h 2008-12-01 19:28:37.000000000 +0100
+@@ -30,7 +30,7 @@
+
+ namespace Plasma
+ {
+-class PanelSvg;
++class FrameSvg;
+ }
+
+ class QSpacerItem;
+@@ -70,7 +70,7 @@
+
+ QRect mGeometry;
+
+- Plasma::PanelSvg *mBackground;
++ Plasma::FrameSvg *mBackground;
+ QPixmap mPixmap;
+ QPixmap mBackgroundPixmap;
+
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
new file mode 100644
index 000000000..41aa4270d
--- /dev/null
+++ b/source/x/x11/patch/xorg-server.patch
@@ -0,0 +1 @@
+zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || exit 1
diff --git a/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff b/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff
new file mode 100644
index 000000000..bfa9c305d
--- /dev/null
+++ b/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff
@@ -0,0 +1,13 @@
+--- ./dix/window.c.orig 2007-01-22 23:39:15.000000000 -0600
++++ ./dix/window.c 2007-02-14 03:21:03.000000000 -0600
+@@ -140,8 +140,8 @@
+ *
+ ******/
+
+-static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11};
+-static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88};
++static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00};
++static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00};
+
+ _X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF;
+
diff --git a/source/x/x11/patch/xscope.patch b/source/x/x11/patch/xscope.patch
new file mode 100644
index 000000000..a41588a0b
--- /dev/null
+++ b/source/x/x11/patch/xscope.patch
@@ -0,0 +1 @@
+zcat $CWD/patch/xscope/xscope-1.1-scope.c.diff.gz | patch -p1 --verbose || exit 1
diff --git a/source/x/x11/patch/xscope/xscope-1.1-scope.c.diff b/source/x/x11/patch/xscope/xscope-1.1-scope.c.diff
new file mode 100644
index 000000000..2c01dbac2
--- /dev/null
+++ b/source/x/x11/patch/xscope/xscope-1.1-scope.c.diff
@@ -0,0 +1,11 @@
+diff -Nur xscope-1.1.orig/scope.c xscope-1.1/scope.c
+--- xscope-1.1.orig/scope.c 2008-09-22 21:18:16.000000000 -0500
++++ xscope-1.1/scope.c 2009-04-08 23:54:12.230818270 -0500
+@@ -58,6 +58,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <netdb.h>
++#include <linux/param.h>
+
+ #ifdef SYSV
+ #define bzero(s,l) memset(s, 0, l)